X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1cde6435df23876fb88998e38739def0dc7dca47..5287bffd3f4fa1fda9d7734b45f8cf02391d3855:/print-igmp.c diff --git a/print-igmp.c b/print-igmp.c index 728fcaf1..fc0ef683 100644 --- a/print-igmp.c +++ b/print-igmp.c @@ -19,16 +19,17 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED +/* \summary: Internet Group Management Protocol (IGMP) printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" -#include "extract.h" /* must come after interface.h */ +#include "extract.h" #ifndef IN_CLASSD #define IN_CLASSD(i) (((int32_t)(i) & 0xf0000000) == 0xe0000000) @@ -42,10 +43,10 @@ static const char tstr[] = "[|igmp]"; * The packet format for a traceroute request. */ struct tr_query { - u_int32_t tr_src; /* traceroute source */ - u_int32_t tr_dst; /* traceroute destination */ - u_int32_t tr_raddr; /* traceroute response address */ - u_int32_t tr_rttlqid; /* response ttl and qid */ + uint32_t tr_src; /* traceroute source */ + uint32_t tr_dst; /* traceroute destination */ + uint32_t tr_raddr; /* traceroute response address */ + uint32_t tr_rttlqid; /* response ttl and qid */ }; #define TR_GETTTL(x) (int)(((x) >> 24) & 0xff) @@ -56,17 +57,17 @@ struct tr_query { * beginning, followed by one tr_resp for each hop taken. */ struct tr_resp { - u_int32_t tr_qarr; /* query arrival time */ - u_int32_t tr_inaddr; /* incoming interface address */ - u_int32_t tr_outaddr; /* outgoing interface address */ - u_int32_t tr_rmtaddr; /* parent address in source tree */ - u_int32_t tr_vifin; /* input packet count on interface */ - u_int32_t tr_vifout; /* output packet count on interface */ - u_int32_t tr_pktcnt; /* total incoming packets for src-grp */ - u_int8_t tr_rproto; /* routing proto deployed on router */ - u_int8_t tr_fttl; /* ttl required to forward on outvif */ - u_int8_t tr_smask; /* subnet mask for src addr */ - u_int8_t tr_rflags; /* forwarding error codes */ + uint32_t tr_qarr; /* query arrival time */ + uint32_t tr_inaddr; /* incoming interface address */ + uint32_t tr_outaddr; /* outgoing interface address */ + uint32_t tr_rmtaddr; /* parent address in source tree */ + uint32_t tr_vifin; /* input packet count on interface */ + uint32_t tr_vifout; /* output packet count on interface */ + uint32_t tr_pktcnt; /* total incoming packets for src-grp */ + uint8_t tr_rproto; /* routing proto deployed on router */ + uint8_t tr_fttl; /* ttl required to forward on outvif */ + uint8_t tr_smask; /* subnet mask for src addr */ + uint8_t tr_rflags; /* forwarding error codes */ }; /* defs within mtrace */ @@ -113,11 +114,11 @@ print_mtrace(netdissect_options *ndo, return; } ND_PRINT((ndo, "mtrace %u: %s to %s reply-to %s", - TR_GETQID(EXTRACT_32BITS(&tr->tr_rttlqid)), + TR_GETQID(EXTRACT_BE_32BITS(&tr->tr_rttlqid)), ipaddr_string(ndo, &tr->tr_src), ipaddr_string(ndo, &tr->tr_dst), ipaddr_string(ndo, &tr->tr_raddr))); - if (IN_CLASSD(EXTRACT_32BITS(&tr->tr_raddr))) - ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_32BITS(&tr->tr_rttlqid)))); + if (IN_CLASSD(EXTRACT_BE_32BITS(&tr->tr_raddr))) + ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_BE_32BITS(&tr->tr_rttlqid)))); return; trunc: ND_PRINT((ndo, "%s", tstr)); @@ -135,11 +136,11 @@ print_mresp(netdissect_options *ndo, return; } ND_PRINT((ndo, "mresp %lu: %s to %s reply-to %s", - (u_long)TR_GETQID(EXTRACT_32BITS(&tr->tr_rttlqid)), + (u_long)TR_GETQID(EXTRACT_BE_32BITS(&tr->tr_rttlqid)), ipaddr_string(ndo, &tr->tr_src), ipaddr_string(ndo, &tr->tr_dst), ipaddr_string(ndo, &tr->tr_raddr))); - if (IN_CLASSD(EXTRACT_32BITS(&tr->tr_raddr))) - ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_32BITS(&tr->tr_rttlqid)))); + if (IN_CLASSD(EXTRACT_BE_32BITS(&tr->tr_raddr))) + ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_BE_32BITS(&tr->tr_rttlqid)))); return; trunc: ND_PRINT((ndo, "%s", tstr)); @@ -158,7 +159,7 @@ print_igmpv3_report(netdissect_options *ndo, return; } ND_TCHECK2(bp[6], 2); - ngroups = EXTRACT_16BITS(&bp[6]); + ngroups = EXTRACT_BE_16BITS(&bp[6]); ND_PRINT((ndo, ", %d group record(s)", ngroups)); if (ndo->ndo_vflag > 0) { /* Print the group records */ @@ -172,7 +173,7 @@ print_igmpv3_report(netdissect_options *ndo, ND_PRINT((ndo, " [gaddr %s", ipaddr_string(ndo, &bp[group+4]))); ND_PRINT((ndo, " %s", tok2str(igmpv3report2str, " [v3-report-#%d]", bp[group]))); - nsrcs = EXTRACT_16BITS(&bp[group+2]); + nsrcs = EXTRACT_BE_16BITS(&bp[group + 2]); /* Check the number of sources and print them */ if (len < group+8+(nsrcs<<2)) { ND_PRINT((ndo, " [invalid number of sources %d]", nsrcs)); @@ -204,7 +205,7 @@ print_igmpv3_query(netdissect_options *ndo, register const u_char *bp, register u_int len) { u_int mrc; - int mrt; + u_int mrt; u_int nsrcs; register u_int i; @@ -226,16 +227,16 @@ print_igmpv3_query(netdissect_options *ndo, if (mrt < 600) { ND_PRINT((ndo, "%.1fs", mrt * 0.1)); } else { - relts_print(ndo, mrt / 10); + unsigned_relts_print(ndo, mrt / 10); } ND_PRINT((ndo, "]")); } ND_TCHECK2(bp[4], 4); - if (EXTRACT_32BITS(&bp[4]) == 0) + if (EXTRACT_BE_32BITS(&bp[4]) == 0) return; ND_PRINT((ndo, " [gaddr %s", ipaddr_string(ndo, &bp[4]))); ND_TCHECK2(bp[10], 2); - nsrcs = EXTRACT_16BITS(&bp[10]); + nsrcs = EXTRACT_BE_16BITS(&bp[10]); if (nsrcs > 0) { if (len < 12 + (nsrcs << 2)) ND_PRINT((ndo, " [invalid number of sources]")); @@ -281,7 +282,7 @@ igmp_print(netdissect_options *ndo, } else ND_PRINT((ndo, " v1")); ND_TCHECK2(bp[4], 4); - if (EXTRACT_32BITS(&bp[4])) + if (EXTRACT_BE_32BITS(&bp[4])) ND_PRINT((ndo, " [gaddr %s]", ipaddr_string(ndo, &bp[4]))); if (len != 8) ND_PRINT((ndo, " [len %d]", len)); @@ -327,12 +328,12 @@ igmp_print(netdissect_options *ndo, break; } - if (ndo->ndo_vflag && ND_TTEST2(bp[0], len)) { + if (ndo->ndo_vflag && len >= 4 && ND_TTEST2(bp[0], len)) { /* Check the IGMP checksum */ vec[0].ptr = bp; vec[0].len = len; if (in_cksum(vec, 1)) - ND_PRINT((ndo, " bad igmp cksum %x!", EXTRACT_16BITS(&bp[2]))); + ND_PRINT((ndo, " bad igmp cksum %x!", EXTRACT_BE_16BITS(&bp[2]))); } return; trunc: