Page MenuHomeFreeBSD
Differential D5949

The original example was bad, try to make it better.
ClosedPublic
Actions

Authored by mat on Apr 14 2016, 12:53 PM.
Tags
None
Referenced Files
F114475245: D5949.id15389.diff
Sat, Apr 12, 10:46 PM
Unknown Object (File)
Wed, Apr 9, 3:35 AM
Unknown Object (File)
Fri, Mar 21, 11:59 AM
Unknown Object (File)
Mar 1 2025, 11:54 AM
Unknown Object (File)
Feb 20 2025, 12:23 PM
Unknown Object (File)
Feb 8 2025, 12:56 AM
Unknown Object (File)
Jan 30 2025, 7:40 PM
Unknown Object (File)
Jan 18 2025, 8:18 AM
View All 93 Files
Subscribers
None

Details

Reviewers
wblock
Commits
rD48703: Document USES=sqlite.
rD48701: Document USES=mate.
rD48704: Catch up with the different USES.
rD48702: Document USES=pyqt.
rD48697: USES=tcl/tk gained tea support, while there, rewrite the whole thing, it
rD48700: Document USES=gnome.
rD48699: Document USES=firebird.
rD48698: Document USES=7z.
rD48696: Improve USES=shebangfix's documentation.

Diff Detail

Event Timeline

mat updated this revision to Diff 15192.Apr 14 2016, 12:53 PM
mat retitled this revision from to The original example was bad, try to make it better..
mat updated this object.
mat edited the test plan for this revision. (Show Details)
mat added a reviewer: wblock.
wblock added inline comments.Apr 14 2016, 7:27 PM
en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
1837

variables variables is repeated repeated.

1844

"Contains" is not needed, just "The list of supported interpreters."

1851

"Contains" is not needed.
Not sure what "bad" means here. Obsolete? Deprecated? Will run rm -rf?

Maybe:

The list of obsolete, old-style invocations of interpreters.
1852

The second part of this needs to be a separate sentence and is hard to understand. What will be appended to what else, and why? What is this used for?

"The SHEBANG value is compared to the obsolete/outmoded/deprecated interpreter invocations listed in interp_OLD_CMD. Then something happens (the user is warned, portlint freaks out, the time/space continuum is damaged)."

1863

"Contains" no es necesario.

1864

s/It has a default value of/The default value is/

1870

Not clear what "support" means here. Is it in addition to something, or is it switching from something?

mat marked 7 inline comments as done.Apr 19 2016, 2:59 PM
mat added inline comments.
en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
1851

The list of bad shebang lines, like /bin/bash or /usr/bin/perl

Maybe wrong is better.

mat updated this revision to Diff 15323.Apr 19 2016, 2:59 PM
mat marked an inline comment as done.
  • The original example was bad, try to make it better.
  • Update shebangfix with wblock's comments.
  • USES=tcl/tk gained tea support, while there, rewrite the whole thing, it
mat updated this revision to Diff 15381.Apr 20 2016, 12:36 PM
  • Document USES=7z.
mat updated this revision to Diff 15389.Apr 20 2016, 2:52 PM
  • Document USES=firebird.
  • Document USES=gnome.
  • Document USES=mate.
  • Document USES=pyqt.
  • Document USES=sqlite.
  • Catch up with the different USES.
wblock added inline comments.Apr 20 2016, 3:07 PM
en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml
464

s/Adds/Add/

1460

Possibly s/If the needed,/If needed,/

1742

Use serial comma:
s/run/run,/

1853

Is "correct" needed here? The "path to the command interpreter" is assumed to be correct.

Unless this means something more specific, like "the correct path to the command interpreter on &os;".

1862

It might help to have a sentence that explains how they are wrong, like

<para>The list of wrong invocations of interpreters.  These are typically obsolete paths, or paths used
  on other operating systems that are incorrect on &os;.
1865

"it" is not clear here. interp_OLD_CMD ?

mat marked 6 inline comments as done.Apr 21 2016, 1:07 PM
Closed by commit rD48696: Improve USES=shebangfix's documentation. (authored by mat). · Explain WhyApr 21 2016, 1:12 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
en_US.ISO8859-1/
books/
porters-handbook/
uses/
800 lines
share/
xml/
1 line

Diff 15389

View Options

en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml

Show First 20 Lines • Show All 327 Lines • ▼ Show 20 Lines
static int bridge_ioctl_sproto(struct bridge_softc *, void *); static int bridge_ioctl_sproto(struct bridge_softc *, void *);
static int bridge_ioctl_stxhc(struct bridge_softc *, void *); static int bridge_ioctl_stxhc(struct bridge_softc *, void *);
static int bridge_pfil(struct mbuf **, struct ifnet *, struct ifnet *, static int bridge_pfil(struct mbuf **, struct ifnet *, struct ifnet *,
int); int);
static int bridge_ip_checkbasic(struct mbuf **mp); static int bridge_ip_checkbasic(struct mbuf **mp);
#ifdef INET6 #ifdef INET6
static int bridge_ip6_checkbasic(struct mbuf **mp); static int bridge_ip6_checkbasic(struct mbuf **mp);
#endif /* INET6 */ #endif /* INET6 */
static int bridge_fragment(struct ifnet *, struct mbuf *, static int bridge_fragment(struct ifnet *, struct mbuf **mp,
struct ether_header *, int, struct llc *); struct ether_header *, int, struct llc *);
static void bridge_linkstate(struct ifnet *ifp); static void bridge_linkstate(struct ifnet *ifp);
static void bridge_linkcheck(struct bridge_softc *sc); static void bridge_linkcheck(struct bridge_softc *sc);
extern void (*bridge_linkstate_p)(struct ifnet *ifp); extern void (*bridge_linkstate_p)(struct ifnet *ifp);
/* The default bridge vlan is 1 (IEEE 802.1Q-2003 Table 9-2) */ /* The default bridge vlan is 1 (IEEE 802.1Q-2003 Table 9-2) */
#define VLANTAGOF(_m) \ #define VLANTAGOF(_m) \
▲ Show 20 Lines • Show All 1,567 Lines • ▼ Show 20 Lines if ((m->m_flags & M_VLANTAG) &&
if_printf(dst_ifp, if_printf(dst_ifp,
"unable to prepend VLAN header\n"); "unable to prepend VLAN header\n");
if_inc_counter(dst_ifp, IFCOUNTER_OERRORS, 1); if_inc_counter(dst_ifp, IFCOUNTER_OERRORS, 1);
continue; continue;
} }
m->m_flags &= ~M_VLANTAG; m->m_flags &= ~M_VLANTAG;
} }
M_ASSERTPKTHDR(m); /* We shouldn't transmit mbuf without pkthdr */
if ((err = dst_ifp->if_transmit(dst_ifp, m))) { if ((err = dst_ifp->if_transmit(dst_ifp, m))) {
m_freem(m0); m_freem(m0);
if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1); if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1);
break; break;
} }
if_inc_counter(sc->sc_ifp, IFCOUNTER_OPACKETS, 1); if_inc_counter(sc->sc_ifp, IFCOUNTER_OPACKETS, 1);
if_inc_counter(sc->sc_ifp, IFCOUNTER_OBYTES, len); if_inc_counter(sc->sc_ifp, IFCOUNTER_OBYTES, len);
▲ Show 20 Lines • Show All 1,301 Lines • ▼ Show 20 Lines case ETHERTYPE_IP:
if (V_pfil_bridge && dir == PFIL_IN && bifp != NULL) if (V_pfil_bridge && dir == PFIL_IN && bifp != NULL)
error = pfil_run_hooks(&V_inet_pfil_hook, mp, bifp, error = pfil_run_hooks(&V_inet_pfil_hook, mp, bifp,
dir, NULL); dir, NULL);
if (*mp == NULL || error != 0) /* filter may consume */ if (*mp == NULL || error != 0) /* filter may consume */
break; break;
/* check if we need to fragment the packet */ /* check if we need to fragment the packet */
/* bridge_fragment generates a mbuf chain of packets */
/* that already include eth headers */
if (V_pfil_member && ifp != NULL && dir == PFIL_OUT) { if (V_pfil_member && ifp != NULL && dir == PFIL_OUT) {
i = (*mp)->m_pkthdr.len; i = (*mp)->m_pkthdr.len;
if (i > ifp->if_mtu) { if (i > ifp->if_mtu) {
error = bridge_fragment(ifp, *mp, &eh2, snap, error = bridge_fragment(ifp, mp, &eh2, snap,
&llc1); &llc1);
return (error); return (error);
} }
} }
/* Recalculate the ip checksum. */ /* Recalculate the ip checksum. */
ip = mtod(*mp, struct ip *); ip = mtod(*mp, struct ip *);
hlen = ip->ip_hl << 2; hlen = ip->ip_hl << 2;
▲ Show 20 Lines • Show All 222 Lines • ▼ Show 20 Linesbad:
*mp = m; *mp = m;
return (-1); return (-1);
} }
#endif /* INET6 */ #endif /* INET6 */
/* /*
* bridge_fragment: * bridge_fragment:
* *
* Return a fragmented mbuf chain. * Fragment mbuf chain in multiple packets and prepend ethernet header.
*/ */
static int static int
bridge_fragment(struct ifnet *ifp, struct mbuf *m, struct ether_header *eh, bridge_fragment(struct ifnet *ifp, struct mbuf **mp, struct ether_header *eh,
int snap, struct llc *llc) int snap, struct llc *llc)
{ {
struct mbuf *m0; struct mbuf *m = *mp, *m0 = NULL, *mprev = NULL, *mcur = NULL;
struct ip *ip; struct ip *ip;
int error = -1; int error = -1;
if (m->m_len < sizeof(struct ip) && if (m->m_len < sizeof(struct ip) &&
(m = m_pullup(m, sizeof(struct ip))) == NULL) (m = m_pullup(m, sizeof(struct ip))) == NULL)
goto out; goto dropit;
ip = mtod(m, struct ip *); ip = mtod(m, struct ip *);
m->m_pkthdr.csum_flags |= CSUM_IP; m->m_pkthdr.csum_flags |= CSUM_IP;
error = ip_fragment(ip, &m, ifp->if_mtu, ifp->if_hwassist); error = ip_fragment(ip, &m, ifp->if_mtu, ifp->if_hwassist);
if (error) if (error)
goto out; goto dropit;
/* walk the chain and re-add the Ethernet header */ /*
for (m0 = m; m0; m0 = m0->m_nextpkt) { * walk the chain and re-add the Ethernet header for
if (error == 0) { * each mbuf packets
*/
for (mcur = m; mcur; mcur = mcur->m_nextpkt) {
m0 = mcur;
if (snap) { if (snap) {
M_PREPEND(m0, sizeof(struct llc), M_NOWAIT); M_PREPEND(mcur, sizeof(struct llc), M_NOWAIT);
if (m0 == NULL) {
if (mcur == NULL) {
error = ENOBUFS; error = ENOBUFS;
continue; goto dropit;
} }
bcopy(llc, mtod(m0, caddr_t), bcopy(llc, mtod(mcur, caddr_t),sizeof(struct llc));
sizeof(struct llc));
} }
kpUnsubmitted
Done
Inline Actions

Doesn't this need to go before the if (snap) block? If we end up prepending an mbuf for the snap header but not for the ethernet header we still need to do the m_next/m_nextpkt pointer reshuffle.

kp: Doesn't this need to go before the if (snap) block? If we end up prepending an mbuf for the…
M_PREPEND(m0, ETHER_HDR_LEN, M_NOWAIT);
if (m0 == NULL) { M_PREPEND(mcur, ETHER_HDR_LEN, M_NOWAIT);
if (mcur == NULL) {
error = ENOBUFS; error = ENOBUFS;
continue; goto dropit;
} }
bcopy(eh, mtod(m0, caddr_t), ETHER_HDR_LEN); bcopy(eh, mtod(mcur, caddr_t), ETHER_HDR_LEN);
} else /*
m_freem(m); * if M_PREPEND had to create a new mbuf, we need to:
* 1. update previous mbuf packet to use this new one
* 2. moving m_nextpkt from the old mbuf to the new one
* But we can have two new mbufs prepending: LLC and Ethernet HDR!
*/
kpUnsubmitted
Done
Inline Actions

Won't this break in a (worst-case) scenario where both the snap and ethernet M_PREPEND()s end up adding a new mbuf?

kp: Won't this break in a (worst-case) scenario where both the snap and ethernet M_PREPEND()s end…
if ( m0 != mcur ) {
if ( mcur->m_next->m_next && mcur->m_next->m_next->m_nextpkt ) {
/* If two new mbufs insered (LLC and Ethernet header) */
mcur->m_nextpkt = mcur->m_next->m_next->m_nextpkt;
mcur->m_next->m_next->m_nextpkt = NULL;
} else {
/* If only one mbuf insered (Ethernet header) */
mcur->m_nextpkt = mcur->m_next->m_nextpkt;
mcur->m_next->m_nextpkt = NULL;
} }
if (mprev != NULL) { /* It's not the first packet in the chain*/
mprev->m_nextpkt = mcur;
} else { /* the first mbuf in the original chain needs to be updated */
*mp = mcur;
}
}
mprev = mcur;
}
if (error == 0)
KMOD_IPSTAT_INC(ips_fragmented); KMOD_IPSTAT_INC(ips_fragmented);
return (error); return (error);
out: dropit:
if (m != NULL) for (mcur = *mp; mcur; mcur = m) { /* droping the full packet chain */
kpUnsubmitted
Done
Inline Actions

You don't need this check, the for loop has the same effect.

kp: You don't need this check, the for loop has the same effect.
m_freem(m); m = mcur->m_nextpkt;
m_freem(mcur);
}
return (error); return (error);
} }
static void static void
bridge_linkstate(struct ifnet *ifp) bridge_linkstate(struct ifnet *ifp)
{ {
struct bridge_softc *sc = ifp->if_bridge; struct bridge_softc *sc = ifp->if_bridge;
struct bridge_iflist *bif; struct bridge_iflist *bif;
Show All 37 Lines
View Options

share/xml/man-refs.ent

Show First 20 Lines • Show All 327 Lines • ▼ Show 20 Lines
static int bridge_ioctl_sproto(struct bridge_softc *, void *); static int bridge_ioctl_sproto(struct bridge_softc *, void *);
static int bridge_ioctl_stxhc(struct bridge_softc *, void *); static int bridge_ioctl_stxhc(struct bridge_softc *, void *);
static int bridge_pfil(struct mbuf **, struct ifnet *, struct ifnet *, static int bridge_pfil(struct mbuf **, struct ifnet *, struct ifnet *,
int); int);
static int bridge_ip_checkbasic(struct mbuf **mp); static int bridge_ip_checkbasic(struct mbuf **mp);
#ifdef INET6 #ifdef INET6
static int bridge_ip6_checkbasic(struct mbuf **mp); static int bridge_ip6_checkbasic(struct mbuf **mp);
#endif /* INET6 */ #endif /* INET6 */
static int bridge_fragment(struct ifnet *, struct mbuf *, static int bridge_fragment(struct ifnet *, struct mbuf **mp,
struct ether_header *, int, struct llc *); struct ether_header *, int, struct llc *);
static void bridge_linkstate(struct ifnet *ifp); static void bridge_linkstate(struct ifnet *ifp);
static void bridge_linkcheck(struct bridge_softc *sc); static void bridge_linkcheck(struct bridge_softc *sc);
extern void (*bridge_linkstate_p)(struct ifnet *ifp); extern void (*bridge_linkstate_p)(struct ifnet *ifp);
/* The default bridge vlan is 1 (IEEE 802.1Q-2003 Table 9-2) */ /* The default bridge vlan is 1 (IEEE 802.1Q-2003 Table 9-2) */
#define VLANTAGOF(_m) \ #define VLANTAGOF(_m) \
▲ Show 20 Lines • Show All 1,567 Lines • ▼ Show 20 Lines if ((m->m_flags & M_VLANTAG) &&
if_printf(dst_ifp, if_printf(dst_ifp,
"unable to prepend VLAN header\n"); "unable to prepend VLAN header\n");
if_inc_counter(dst_ifp, IFCOUNTER_OERRORS, 1); if_inc_counter(dst_ifp, IFCOUNTER_OERRORS, 1);
continue; continue;
} }
m->m_flags &= ~M_VLANTAG; m->m_flags &= ~M_VLANTAG;
} }
M_ASSERTPKTHDR(m); /* We shouldn't transmit mbuf without pkthdr */
if ((err = dst_ifp->if_transmit(dst_ifp, m))) { if ((err = dst_ifp->if_transmit(dst_ifp, m))) {
m_freem(m0); m_freem(m0);
if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1); if_inc_counter(sc->sc_ifp, IFCOUNTER_OERRORS, 1);
break; break;
} }
if_inc_counter(sc->sc_ifp, IFCOUNTER_OPACKETS, 1); if_inc_counter(sc->sc_ifp, IFCOUNTER_OPACKETS, 1);
if_inc_counter(sc->sc_ifp, IFCOUNTER_OBYTES, len); if_inc_counter(sc->sc_ifp, IFCOUNTER_OBYTES, len);
▲ Show 20 Lines • Show All 1,301 Lines • ▼ Show 20 Lines case ETHERTYPE_IP:
if (V_pfil_bridge && dir == PFIL_IN && bifp != NULL) if (V_pfil_bridge && dir == PFIL_IN && bifp != NULL)
error = pfil_run_hooks(&V_inet_pfil_hook, mp, bifp, error = pfil_run_hooks(&V_inet_pfil_hook, mp, bifp,
dir, NULL); dir, NULL);
if (*mp == NULL || error != 0) /* filter may consume */ if (*mp == NULL || error != 0) /* filter may consume */
break; break;
/* check if we need to fragment the packet */ /* check if we need to fragment the packet */
/* bridge_fragment generates a mbuf chain of packets */
/* that already include eth headers */
if (V_pfil_member && ifp != NULL && dir == PFIL_OUT) { if (V_pfil_member && ifp != NULL && dir == PFIL_OUT) {
i = (*mp)->m_pkthdr.len; i = (*mp)->m_pkthdr.len;
if (i > ifp->if_mtu) { if (i > ifp->if_mtu) {
error = bridge_fragment(ifp, *mp, &eh2, snap, error = bridge_fragment(ifp, mp, &eh2, snap,
&llc1); &llc1);
return (error); return (error);
} }
} }
/* Recalculate the ip checksum. */ /* Recalculate the ip checksum. */
ip = mtod(*mp, struct ip *); ip = mtod(*mp, struct ip *);
hlen = ip->ip_hl << 2; hlen = ip->ip_hl << 2;
▲ Show 20 Lines • Show All 222 Lines • ▼ Show 20 Linesbad:
*mp = m; *mp = m;
return (-1); return (-1);
} }
#endif /* INET6 */ #endif /* INET6 */
/* /*
* bridge_fragment: * bridge_fragment:
* *
* Return a fragmented mbuf chain. * Fragment mbuf chain in multiple packets and prepend ethernet header.
*/ */
static int static int
bridge_fragment(struct ifnet *ifp, struct mbuf *m, struct ether_header *eh, bridge_fragment(struct ifnet *ifp, struct mbuf **mp, struct ether_header *eh,
int snap, struct llc *llc) int snap, struct llc *llc)
{ {
struct mbuf *m0; struct mbuf *m = *mp, *m0 = NULL, *mprev = NULL, *mcur = NULL;
struct ip *ip; struct ip *ip;
int error = -1; int error = -1;
if (m->m_len < sizeof(struct ip) && if (m->m_len < sizeof(struct ip) &&
(m = m_pullup(m, sizeof(struct ip))) == NULL) (m = m_pullup(m, sizeof(struct ip))) == NULL)
goto out; goto dropit;
ip = mtod(m, struct ip *); ip = mtod(m, struct ip *);
m->m_pkthdr.csum_flags |= CSUM_IP; m->m_pkthdr.csum_flags |= CSUM_IP;
error = ip_fragment(ip, &m, ifp->if_mtu, ifp->if_hwassist); error = ip_fragment(ip, &m, ifp->if_mtu, ifp->if_hwassist);
if (error) if (error)
goto out; goto dropit;
/* walk the chain and re-add the Ethernet header */ /*
for (m0 = m; m0; m0 = m0->m_nextpkt) { * walk the chain and re-add the Ethernet header for
if (error == 0) { * each mbuf packets
*/
for (mcur = m; mcur; mcur = mcur->m_nextpkt) {
m0 = mcur;
if (snap) { if (snap) {
M_PREPEND(m0, sizeof(struct llc), M_NOWAIT); M_PREPEND(mcur, sizeof(struct llc), M_NOWAIT);
if (m0 == NULL) {
if (mcur == NULL) {
error = ENOBUFS; error = ENOBUFS;
continue; goto dropit;
} }
bcopy(llc, mtod(m0, caddr_t), bcopy(llc, mtod(mcur, caddr_t),sizeof(struct llc));
sizeof(struct llc));
} }
kpUnsubmitted
Done
Inline Actions

Doesn't this need to go before the if (snap) block? If we end up prepending an mbuf for the snap header but not for the ethernet header we still need to do the m_next/m_nextpkt pointer reshuffle.

kp: Doesn't this need to go before the if (snap) block? If we end up prepending an mbuf for the…
M_PREPEND(m0, ETHER_HDR_LEN, M_NOWAIT);
if (m0 == NULL) { M_PREPEND(mcur, ETHER_HDR_LEN, M_NOWAIT);
if (mcur == NULL) {
error = ENOBUFS; error = ENOBUFS;
continue; goto dropit;
} }
bcopy(eh, mtod(m0, caddr_t), ETHER_HDR_LEN); bcopy(eh, mtod(mcur, caddr_t), ETHER_HDR_LEN);
} else /*
m_freem(m); * if M_PREPEND had to create a new mbuf, we need to:
* 1. update previous mbuf packet to use this new one
* 2. moving m_nextpkt from the old mbuf to the new one
* But we can have two new mbufs prepending: LLC and Ethernet HDR!
*/
kpUnsubmitted
Done
Inline Actions

Won't this break in a (worst-case) scenario where both the snap and ethernet M_PREPEND()s end up adding a new mbuf?

kp: Won't this break in a (worst-case) scenario where both the snap and ethernet M_PREPEND()s end…
if ( m0 != mcur ) {
if ( mcur->m_next->m_next && mcur->m_next->m_next->m_nextpkt ) {
/* If two new mbufs insered (LLC and Ethernet header) */
mcur->m_nextpkt = mcur->m_next->m_next->m_nextpkt;
mcur->m_next->m_next->m_nextpkt = NULL;
} else {
/* If only one mbuf insered (Ethernet header) */
mcur->m_nextpkt = mcur->m_next->m_nextpkt;
mcur->m_next->m_nextpkt = NULL;
} }
if (mprev != NULL) { /* It's not the first packet in the chain*/
mprev->m_nextpkt = mcur;
} else { /* the first mbuf in the original chain needs to be updated */
*mp = mcur;
}
}
mprev = mcur;
}
if (error == 0)
KMOD_IPSTAT_INC(ips_fragmented); KMOD_IPSTAT_INC(ips_fragmented);
return (error); return (error);
out: dropit:
if (m != NULL) for (mcur = *mp; mcur; mcur = m) { /* droping the full packet chain */
kpUnsubmitted
Done
Inline Actions

You don't need this check, the for loop has the same effect.

kp: You don't need this check, the for loop has the same effect.
m_freem(m); m = mcur->m_nextpkt;
m_freem(mcur);
}
return (error); return (error);
} }
static void static void
bridge_linkstate(struct ifnet *ifp) bridge_linkstate(struct ifnet *ifp)
{ {
struct bridge_softc *sc = ifp->if_bridge; struct bridge_softc *sc = ifp->if_bridge;
struct bridge_iflist *bif; struct bridge_iflist *bif;
Show All 37 Lines