Page MenuHomeFreeBSD
Differential D41636

iostat: getopt() / usage() cleanup.
ClosedPublic
Actions

Authored by des on Aug 29 2023, 4:16 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 18, 12:53 PM
Unknown Object (File)
Sat, Apr 12, 6:54 PM
Unknown Object (File)
Mon, Mar 24, 4:43 PM
Unknown Object (File)
Feb 22 2025, 10:51 AM
Unknown Object (File)
Feb 22 2025, 10:11 AM
Unknown Object (File)
Feb 3 2025, 8:29 PM
Unknown Object (File)
Jan 30 2025, 6:34 AM
Unknown Object (File)
Jan 26 2025, 5:58 PM
View All 74 Files
Subscribers
allanjude
imp

Details

Reviewers
allanjude
Group Reviewers
Klara
Commits
rG62d509951cb9: iostat: getopt() / usage() cleanup.
rGcbc42905e524: iostat: getopt() / usage() cleanup.
rG09c45b089d2f: iostat: getopt() / usage() cleanup.
Summary

MFC after: 1 week
Sponsored by: Klara, Inc.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
usr.sbin/
iostat/
40 lines
24 lines

Diff 126651

View Options

usr.sbin/iostat/iostat.8

Show First 20 Lines • Show All 676 Lines • ▼ Show 20 Lines
int int
gre_input(struct mbuf **mp, int *offp, int proto) gre_input(struct mbuf **mp, int *offp, int proto)
{ {
struct gre_softc *sc; struct gre_softc *sc;
struct grehdr *gh; struct grehdr *gh;
struct ifnet *ifp; struct ifnet *ifp;
struct mbuf *m; struct mbuf *m;
uint32_t *opts, key; uint32_t *opts;
#ifdef notyet
uint32_t key;
#endif
uint16_t flags; uint16_t flags;
int hlen, isr, af; int hlen, isr, af;
m = *mp; m = *mp;
sc = encap_getarg(m); sc = encap_getarg(m);
KASSERT(sc != NULL, ("encap_getarg returned NULL")); KASSERT(sc != NULL, ("encap_getarg returned NULL"));
ifp = GRE2IFP(sc); ifp = GRE2IFP(sc);
Show All 16 Lines if (flags & GRE_FLAGS_CP) {
if (((uint16_t *)opts)[1] != 0) if (((uint16_t *)opts)[1] != 0)
goto drop; goto drop;
if (in_cksum_skip(m, m->m_pkthdr.len, *offp) != 0) if (in_cksum_skip(m, m->m_pkthdr.len, *offp) != 0)
goto drop; goto drop;
hlen += 2 * sizeof(uint16_t); hlen += 2 * sizeof(uint16_t);
opts++; opts++;
} }
if (flags & GRE_FLAGS_KP) { if (flags & GRE_FLAGS_KP) {
#ifdef notyet
/*
* XXX: The current implementation uses the key only for outgoing
* packets. But we can check the key value here, or even in the
* encapcheck function.
*/
key = ntohl(*opts); key = ntohl(*opts);
#endif
hlen += sizeof(uint32_t); hlen += sizeof(uint32_t);
opts++; opts++;
}
#ifdef notyet
} else } else
key = 0; key = 0;
/*
if (sc->gre_key != 0 && (key != sc->gre_key || key != 0)) if (sc->gre_key != 0 && (key != sc->gre_key || key != 0))
goto drop; goto drop;
*/ #endif
if (flags & GRE_FLAGS_SP) { if (flags & GRE_FLAGS_SP) {
/* seq = ntohl(*opts); */ #ifdef notyet
seq = ntohl(*opts);
#endif
hlen += sizeof(uint32_t); hlen += sizeof(uint32_t);
} }
switch (ntohs(gh->gre_proto)) { switch (ntohs(gh->gre_proto)) {
case ETHERTYPE_WCCP: case ETHERTYPE_WCCP:
/* /*
* For WCCP skip an additional 4 bytes if after GRE header * For WCCP skip an additional 4 bytes if after GRE header
* doesn't follow an IP header. * doesn't follow an IP header.
*/ */
▲ Show 20 Lines • Show All 251 Lines • Show Last 20 Lines
View Options

usr.sbin/iostat/iostat.c

Show First 20 Lines • Show All 676 Lines • ▼ Show 20 Lines
int int
gre_input(struct mbuf **mp, int *offp, int proto) gre_input(struct mbuf **mp, int *offp, int proto)
{ {
struct gre_softc *sc; struct gre_softc *sc;
struct grehdr *gh; struct grehdr *gh;
struct ifnet *ifp; struct ifnet *ifp;
struct mbuf *m; struct mbuf *m;
uint32_t *opts, key; uint32_t *opts;
#ifdef notyet
uint32_t key;
#endif
uint16_t flags; uint16_t flags;
int hlen, isr, af; int hlen, isr, af;
m = *mp; m = *mp;
sc = encap_getarg(m); sc = encap_getarg(m);
KASSERT(sc != NULL, ("encap_getarg returned NULL")); KASSERT(sc != NULL, ("encap_getarg returned NULL"));
ifp = GRE2IFP(sc); ifp = GRE2IFP(sc);
Show All 16 Lines if (flags & GRE_FLAGS_CP) {
if (((uint16_t *)opts)[1] != 0) if (((uint16_t *)opts)[1] != 0)
goto drop; goto drop;
if (in_cksum_skip(m, m->m_pkthdr.len, *offp) != 0) if (in_cksum_skip(m, m->m_pkthdr.len, *offp) != 0)
goto drop; goto drop;
hlen += 2 * sizeof(uint16_t); hlen += 2 * sizeof(uint16_t);
opts++; opts++;
} }
if (flags & GRE_FLAGS_KP) { if (flags & GRE_FLAGS_KP) {
#ifdef notyet
/*
* XXX: The current implementation uses the key only for outgoing
* packets. But we can check the key value here, or even in the
* encapcheck function.
*/
key = ntohl(*opts); key = ntohl(*opts);
#endif
hlen += sizeof(uint32_t); hlen += sizeof(uint32_t);
opts++; opts++;
}
#ifdef notyet
} else } else
key = 0; key = 0;
/*
if (sc->gre_key != 0 && (key != sc->gre_key || key != 0)) if (sc->gre_key != 0 && (key != sc->gre_key || key != 0))
goto drop; goto drop;
*/ #endif
if (flags & GRE_FLAGS_SP) { if (flags & GRE_FLAGS_SP) {
/* seq = ntohl(*opts); */ #ifdef notyet
seq = ntohl(*opts);
#endif
hlen += sizeof(uint32_t); hlen += sizeof(uint32_t);
} }
switch (ntohs(gh->gre_proto)) { switch (ntohs(gh->gre_proto)) {
case ETHERTYPE_WCCP: case ETHERTYPE_WCCP:
/* /*
* For WCCP skip an additional 4 bytes if after GRE header * For WCCP skip an additional 4 bytes if after GRE header
* doesn't follow an IP header. * doesn't follow an IP header.
*/ */
▲ Show 20 Lines • Show All 251 Lines • Show Last 20 Lines