X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e2982e7f6f0b624a773ec5a58885ee80fab46d34..5ef0bcb5edd748de9d9af13c40da0395dfdd94e8:/print-igmp.c diff --git a/print-igmp.c b/print-igmp.c index 9be2c5d3..8c5bc15d 100644 --- a/print-igmp.c +++ b/print-igmp.c @@ -30,10 +30,10 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include "netdissect.h" #include "addrtoname.h" @@ -43,7 +43,6 @@ #define IN_CLASSD(i) (((int32_t)(i) & 0xf0000000) == 0xe0000000) #endif -static const char tstr[] = "[|igmp]"; /* (following from ipmulti/mrouted/prune.h) */ @@ -63,17 +62,17 @@ struct tr_query { * beginning, followed by one tr_resp for each hop taken. */ struct tr_resp { - 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 */ + nd_uint32_t tr_qarr; /* query arrival time */ + nd_uint32_t tr_inaddr; /* incoming interface address */ + nd_uint32_t tr_outaddr; /* outgoing interface address */ + nd_uint32_t tr_rmtaddr; /* parent address in source tree */ + nd_uint32_t tr_vifin; /* input packet count on interface */ + nd_uint32_t tr_vifout; /* output packet count on interface */ + nd_uint32_t tr_pktcnt; /* total incoming packets for src-grp */ + nd_uint8_t tr_rproto; /* routing proto deployed on router */ + nd_uint8_t tr_fttl; /* ttl required to forward on outvif */ + nd_uint8_t tr_smask; /* subnet mask for src addr */ + nd_uint8_t tr_rflags; /* forwarding error codes */ }; /* defs within mtrace */ @@ -116,18 +115,18 @@ print_mtrace(netdissect_options *ndo, ND_TCHECK_SIZE(tr); if (len < 8 + sizeof (struct tr_query)) { - ND_PRINT(" [invalid len %d]", len); + ND_PRINT(" [invalid len %u]", len); return; } ND_PRINT("mtrace %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(" with-ttl %u", EXTRACT_U_1(tr->tr_rttl)); + GET_BE_U_3(tr->tr_qid), + GET_IPADDR_STRING(tr->tr_src), GET_IPADDR_STRING(tr->tr_dst), + GET_IPADDR_STRING(tr->tr_raddr)); + if (IN_CLASSD(GET_BE_U_4(tr->tr_raddr))) + ND_PRINT(" with-ttl %u", GET_U_1(tr->tr_rttl)); return; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); } static void @@ -138,18 +137,18 @@ print_mresp(netdissect_options *ndo, ND_TCHECK_SIZE(tr); if (len < 8 + sizeof (struct tr_query)) { - ND_PRINT(" [invalid len %d]", len); + ND_PRINT(" [invalid len %u]", len); return; } ND_PRINT("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(" with-ttl %u", EXTRACT_U_1(tr->tr_rttl)); + GET_BE_U_3(tr->tr_qid), + GET_IPADDR_STRING(tr->tr_src), GET_IPADDR_STRING(tr->tr_dst), + GET_IPADDR_STRING(tr->tr_raddr)); + if (IN_CLASSD(GET_BE_U_4(tr->tr_raddr))) + ND_PRINT(" with-ttl %u", GET_U_1(tr->tr_rttl)); return; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); } static void @@ -161,12 +160,11 @@ print_igmpv3_report(netdissect_options *ndo, /* Minimum len is 16, and should be a multiple of 4 */ if (len < 16 || len & 0x03) { - ND_PRINT(" [invalid len %d]", len); + ND_PRINT(" [invalid len %u]", len); return; } - ND_TCHECK_2(bp + 6); - ngroups = EXTRACT_BE_U_2(bp + 6); - ND_PRINT(", %d group record(s)", ngroups); + ngroups = GET_BE_U_2(bp + 6); + ND_PRINT(", %u group record(s)", ngroups); if (ndo->ndo_vflag > 0) { /* Print the group records */ group = 8; @@ -176,23 +174,23 @@ print_igmpv3_report(netdissect_options *ndo, return; } ND_TCHECK_4(bp + (group + 4)); - ND_PRINT(" [gaddr %s", ipaddr_string(ndo, bp + group + 4)); - ND_PRINT(" %s", tok2str(igmpv3report2str, " [v3-report-#%d]", - EXTRACT_U_1(bp + group))); - nsrcs = EXTRACT_BE_U_2(bp + group + 2); + ND_PRINT(" [gaddr %s", GET_IPADDR_STRING(bp + group + 4)); + ND_PRINT(" %s", tok2str(igmpv3report2str, " [v3-report-#%u]", + GET_U_1(bp + group))); + nsrcs = GET_BE_U_2(bp + group + 2); /* Check the number of sources and print them */ if (len < group+8+(nsrcs<<2)) { - ND_PRINT(" [invalid number of sources %d]", nsrcs); + ND_PRINT(" [invalid number of sources %u]", nsrcs); return; } if (ndo->ndo_vflag == 1) - ND_PRINT(", %d source(s)", nsrcs); + ND_PRINT(", %u source(s)", nsrcs); else { /* Print the sources */ ND_PRINT(" {"); for (j=0; j 0) { if (len < 12 + (nsrcs << 2)) ND_PRINT(" [invalid number of sources]"); @@ -250,16 +245,16 @@ print_igmpv3_query(netdissect_options *ndo, ND_PRINT(" {"); for (i=0; indo_protocol = "igmp"; if (ndo->ndo_qflag) { ND_PRINT("igmp"); return; } - ND_TCHECK_1(bp); - switch (EXTRACT_U_1(bp)) { + switch (GET_U_1(bp)) { case 0x11: ND_PRINT("igmp query"); if (len >= 12) print_igmpv3_query(ndo, bp, len); else { - ND_TCHECK_1(bp + 1); - if (EXTRACT_U_1(bp + 1)) { + if (GET_U_1(bp + 1)) { ND_PRINT(" v2"); - if (EXTRACT_U_1(bp + 1) != 100) - ND_PRINT(" [max resp time %u]", EXTRACT_U_1(bp + 1)); + if (GET_U_1(bp + 1) != 100) + ND_PRINT(" [max resp time %u]", GET_U_1(bp + 1)); } else ND_PRINT(" v1"); - ND_TCHECK_4(bp + 4); - if (EXTRACT_BE_U_4(bp + 4)) - ND_PRINT(" [gaddr %s]", ipaddr_string(ndo, bp + 4)); + if (GET_BE_U_4(bp + 4)) + ND_PRINT(" [gaddr %s]", GET_IPADDR_STRING(bp + 4)); if (len != 8) - ND_PRINT(" [len %d]", len); + ND_PRINT(" [len %u]", len); } break; case 0x12: - ND_TCHECK_4(bp + 4); - ND_PRINT("igmp v1 report %s", ipaddr_string(ndo, bp + 4)); + ND_PRINT("igmp v1 report %s", GET_IPADDR_STRING(bp + 4)); if (len != 8) - ND_PRINT(" [len %d]", len); + ND_PRINT(" [len %u]", len); break; case 0x16: - ND_TCHECK_4(bp + 4); - ND_PRINT("igmp v2 report %s", ipaddr_string(ndo, bp + 4)); + ND_PRINT("igmp v2 report %s", GET_IPADDR_STRING(bp + 4)); break; case 0x22: ND_PRINT("igmp v3 report"); print_igmpv3_report(ndo, bp, len); break; case 0x17: - ND_TCHECK_4(bp + 4); - ND_PRINT("igmp leave %s", ipaddr_string(ndo, bp + 4)); + ND_PRINT("igmp leave %s", GET_IPADDR_STRING(bp + 4)); break; case 0x13: ND_PRINT("igmp dvmrp"); if (len < 8) - ND_PRINT(" [len %d]", len); + ND_PRINT(" [len %u]", len); else dvmrp_print(ndo, bp, len); break; @@ -330,7 +320,7 @@ igmp_print(netdissect_options *ndo, print_mtrace(ndo, bp, len); break; default: - ND_PRINT("igmp-%d", EXTRACT_U_1(bp)); + ND_PRINT("igmp-%u", GET_U_1(bp)); break; } @@ -339,9 +329,6 @@ igmp_print(netdissect_options *ndo, vec[0].ptr = bp; vec[0].len = len; if (in_cksum(vec, 1)) - ND_PRINT(" bad igmp cksum %x!", EXTRACT_BE_U_2(bp + 2)); + ND_PRINT(" bad igmp cksum %x!", GET_BE_U_2(bp + 2)); } - return; -trunc: - ND_PRINT("%s", tstr); }