X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/93bee2402670249e78478ee3c7ce998a5e2343e6..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-igmp.c diff --git a/print-igmp.c b/print-igmp.c index 635c1c53..d5356dd2 100644 --- a/print-igmp.c +++ b/print-igmp.c @@ -21,6 +21,14 @@ /* \summary: Internet Group Management Protocol (IGMP) printer */ +/* + * specification: + * + * RFC 2236 for IGMPv2 + * RFC 3376 for IGMPv3 + * draft-asaeda-mboned-mtrace-v2 for the mtrace message + */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -43,15 +51,13 @@ static const char tstr[] = "[|igmp]"; * The packet format for a traceroute request. */ struct tr_query { - 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 */ + nd_uint32_t tr_src; /* traceroute source */ + nd_uint32_t tr_dst; /* traceroute destination */ + nd_uint32_t tr_raddr; /* traceroute response address */ + nd_uint8_t tr_rttl; /* response ttl */ + nd_uint24_t tr_qid; /* qid */ }; -#define TR_GETTTL(x) (int)(((x) >> 24) & 0xff) -#define TR_GETQID(x) ((x) & 0x00ffffff) - /* * Traceroute response format. A traceroute response has a tr_query at the * beginning, followed by one tr_resp for each hop taken. @@ -104,9 +110,9 @@ static const struct tok igmpv3report2str[] = { static void print_mtrace(netdissect_options *ndo, - register const u_char *bp, register u_int len) + const u_char *bp, u_int len) { - register const struct tr_query *tr = (const struct tr_query *)(bp + 8); + const struct tr_query *tr = (const struct tr_query *)(bp + 8); ND_TCHECK(*tr); if (len < 8 + sizeof (struct tr_query)) { @@ -114,11 +120,11 @@ print_mtrace(netdissect_options *ndo, return; } ND_PRINT((ndo, "mtrace %u: %s to %s reply-to %s", - 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_BE_32BITS(&tr->tr_raddr))) - ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_BE_32BITS(&tr->tr_rttlqid)))); + EXTRACT_BE_U_3(tr->tr_qid), + ipaddr_string(ndo, tr->tr_src), ipaddr_string(ndo, tr->tr_dst), + ipaddr_string(ndo, tr->tr_raddr))); + if (IN_CLASSD(EXTRACT_BE_U_4(tr->tr_raddr))) + ND_PRINT((ndo, " with-ttl %u", EXTRACT_U_1(tr->tr_rttl))); return; trunc: ND_PRINT((ndo, "%s", tstr)); @@ -126,21 +132,21 @@ trunc: static void print_mresp(netdissect_options *ndo, - register const u_char *bp, register u_int len) + const u_char *bp, u_int len) { - register const struct tr_query *tr = (const struct tr_query *)(bp + 8); + const struct tr_query *tr = (const struct tr_query *)(bp + 8); ND_TCHECK(*tr); if (len < 8 + sizeof (struct tr_query)) { ND_PRINT((ndo, " [invalid len %d]", len)); return; } - ND_PRINT((ndo, "mresp %lu: %s to %s reply-to %s", - (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_BE_32BITS(&tr->tr_raddr))) - ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_BE_32BITS(&tr->tr_rttlqid)))); + ND_PRINT((ndo, "mresp %u: %s to %s reply-to %s", + EXTRACT_BE_U_3(tr->tr_qid), + ipaddr_string(ndo, tr->tr_src), ipaddr_string(ndo, tr->tr_dst), + ipaddr_string(ndo, tr->tr_raddr))); + if (IN_CLASSD(EXTRACT_BE_U_4(tr->tr_raddr))) + ND_PRINT((ndo, " with-ttl %u", EXTRACT_U_1(tr->tr_rttl))); return; trunc: ND_PRINT((ndo, "%s", tstr)); @@ -148,18 +154,18 @@ trunc: static void print_igmpv3_report(netdissect_options *ndo, - register const u_char *bp, register u_int len) + const u_char *bp, u_int len) { u_int group, nsrcs, ngroups; - register u_int i, j; + u_int i, j; /* Minimum len is 16, and should be a multiple of 4 */ if (len < 16 || len & 0x03) { ND_PRINT((ndo, " [invalid len %d]", len)); return; } - ND_TCHECK2(bp[6], 2); - ngroups = EXTRACT_BE_16BITS(bp + 6); + ND_TCHECK_2(bp + 6); + ngroups = EXTRACT_BE_U_2(bp + 6); ND_PRINT((ndo, ", %d group record(s)", ngroups)); if (ndo->ndo_vflag > 0) { /* Print the group records */ @@ -169,11 +175,11 @@ print_igmpv3_report(netdissect_options *ndo, ND_PRINT((ndo, " [invalid number of groups]")); return; } - ND_TCHECK2(bp[group+4], 4); - ND_PRINT((ndo, " [gaddr %s", ipaddr_string(ndo, &bp[group+4]))); + ND_TCHECK_4(bp + (group + 4)); + ND_PRINT((ndo, " [gaddr %s", ipaddr_string(ndo, bp + group + 4))); ND_PRINT((ndo, " %s", tok2str(igmpv3report2str, " [v3-report-#%d]", - bp[group]))); - nsrcs = EXTRACT_BE_16BITS(bp + group + 2); + EXTRACT_U_1(bp + group)))); + nsrcs = EXTRACT_BE_U_2(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)); @@ -185,8 +191,8 @@ print_igmpv3_report(netdissect_options *ndo, /* Print the sources */ ND_PRINT((ndo, " {")); for (j=0; j 0) { if (len < 12 + (nsrcs << 2)) ND_PRINT((ndo, " [invalid number of sources]")); else if (ndo->ndo_vflag > 1) { ND_PRINT((ndo, " {")); for (i=0; i= 12) print_igmpv3_query(ndo, bp, len); else { - ND_TCHECK(bp[1]); - if (bp[1]) { + ND_TCHECK_1(bp + 1); + if (EXTRACT_U_1(bp + 1)) { ND_PRINT((ndo, " v2")); - if (bp[1] != 100) - ND_PRINT((ndo, " [max resp time %d]", bp[1])); + if (EXTRACT_U_1(bp + 1) != 100) + ND_PRINT((ndo, " [max resp time %u]", EXTRACT_U_1(bp + 1))); } else ND_PRINT((ndo, " v1")); - ND_TCHECK2(bp[4], 4); - if (EXTRACT_BE_32BITS(bp + 4)) - ND_PRINT((ndo, " [gaddr %s]", ipaddr_string(ndo, &bp[4]))); + ND_TCHECK_4(bp + 4); + if (EXTRACT_BE_U_4(bp + 4)) + ND_PRINT((ndo, " [gaddr %s]", ipaddr_string(ndo, bp + 4))); if (len != 8) ND_PRINT((ndo, " [len %d]", len)); } break; case 0x12: - ND_TCHECK2(bp[4], 4); - ND_PRINT((ndo, "igmp v1 report %s", ipaddr_string(ndo, &bp[4]))); + ND_TCHECK_4(bp + 4); + ND_PRINT((ndo, "igmp v1 report %s", ipaddr_string(ndo, bp + 4))); if (len != 8) ND_PRINT((ndo, " [len %d]", len)); break; case 0x16: - ND_TCHECK2(bp[4], 4); - ND_PRINT((ndo, "igmp v2 report %s", ipaddr_string(ndo, &bp[4]))); + ND_TCHECK_4(bp + 4); + ND_PRINT((ndo, "igmp v2 report %s", ipaddr_string(ndo, bp + 4))); break; case 0x22: ND_PRINT((ndo, "igmp v3 report")); print_igmpv3_report(ndo, bp, len); break; case 0x17: - ND_TCHECK2(bp[4], 4); - ND_PRINT((ndo, "igmp leave %s", ipaddr_string(ndo, &bp[4]))); + ND_TCHECK_4(bp + 4); + ND_PRINT((ndo, "igmp leave %s", ipaddr_string(ndo, bp + 4))); break; case 0x13: ND_PRINT((ndo, "igmp dvmrp")); @@ -324,16 +330,16 @@ igmp_print(netdissect_options *ndo, print_mtrace(ndo, bp, len); break; default: - ND_PRINT((ndo, "igmp-%d", bp[0])); + ND_PRINT((ndo, "igmp-%d", EXTRACT_U_1(bp))); break; } - if (ndo->ndo_vflag && len >= 4 && ND_TTEST2(bp[0], len)) { + if (ndo->ndo_vflag && len >= 4 && ND_TTEST_LEN(bp, 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_BE_16BITS(bp + 2))); + ND_PRINT((ndo, " bad igmp cksum %x!", EXTRACT_BE_U_2(bp + 2))); } return; trunc: