From 17934c433e64063bfb3e1a1b7ca8e5cff95f8710 Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Wed, 19 Mar 2014 13:57:56 +0400 Subject: NDOize 7 bigger decoders This change converts IGMP, IPv6 mobility options, LDP, Lightweight Access Point, PGM, PPTP and RIP decoders. --- print-igmp.c | 179 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 89 insertions(+), 90 deletions(-) (limited to 'print-igmp.c') diff --git a/print-igmp.c b/print-igmp.c index d1cc4f35..14b55fd3 100644 --- a/print-igmp.c +++ b/print-igmp.c @@ -19,15 +19,13 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif #include -#include -#include - #include "interface.h" #include "addrtoname.h" #include "extract.h" /* must come after interface.h */ @@ -104,118 +102,119 @@ static const struct tok igmpv3report2str[] = { }; static void -print_mtrace(register const u_char *bp, register u_int len) +print_mtrace(netdissect_options *ndo, + register const u_char *bp, register u_int len) { register const struct tr_query *tr = (const struct tr_query *)(bp + 8); - TCHECK(*tr); + ND_TCHECK(*tr); if (len < 8 + sizeof (struct tr_query)) { - (void)printf(" [invalid len %d]", len); + ND_PRINT((ndo, " [invalid len %d]", len)); return; } - printf("mtrace %u: %s to %s reply-to %s", + ND_PRINT((ndo, "mtrace %u: %s to %s reply-to %s", TR_GETQID(EXTRACT_32BITS(&tr->tr_rttlqid)), ipaddr_string(&tr->tr_src), ipaddr_string(&tr->tr_dst), - ipaddr_string(&tr->tr_raddr)); + ipaddr_string(&tr->tr_raddr))); if (IN_CLASSD(EXTRACT_32BITS(&tr->tr_raddr))) - printf(" with-ttl %d", TR_GETTTL(EXTRACT_32BITS(&tr->tr_rttlqid))); + ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_32BITS(&tr->tr_rttlqid)))); return; trunc: - printf("%s", tstr); - return; + ND_PRINT((ndo, "%s", tstr)); } static void -print_mresp(register const u_char *bp, register u_int len) +print_mresp(netdissect_options *ndo, + register const u_char *bp, register u_int len) { register const struct tr_query *tr = (const struct tr_query *)(bp + 8); - TCHECK(*tr); + ND_TCHECK(*tr); if (len < 8 + sizeof (struct tr_query)) { - (void)printf(" [invalid len %d]", len); + ND_PRINT((ndo, " [invalid len %d]", len)); return; } - printf("mresp %lu: %s to %s reply-to %s", + ND_PRINT((ndo, "mresp %lu: %s to %s reply-to %s", (u_long)TR_GETQID(EXTRACT_32BITS(&tr->tr_rttlqid)), ipaddr_string(&tr->tr_src), ipaddr_string(&tr->tr_dst), - ipaddr_string(&tr->tr_raddr)); + ipaddr_string(&tr->tr_raddr))); if (IN_CLASSD(EXTRACT_32BITS(&tr->tr_raddr))) - printf(" with-ttl %d", TR_GETTTL(EXTRACT_32BITS(&tr->tr_rttlqid))); + ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_32BITS(&tr->tr_rttlqid)))); return; trunc: - printf("%s", tstr); - return; + ND_PRINT((ndo, "%s", tstr)); } static void -print_igmpv3_report(register const u_char *bp, register u_int len) +print_igmpv3_report(netdissect_options *ndo, + register const u_char *bp, register u_int len) { u_int group, nsrcs, ngroups; register u_int i, j; /* Minimum len is 16, and should be a multiple of 4 */ if (len < 16 || len & 0x03) { - (void)printf(" [invalid len %d]", len); + ND_PRINT((ndo, " [invalid len %d]", len)); return; } - TCHECK2(bp[6], 2); + ND_TCHECK2(bp[6], 2); ngroups = EXTRACT_16BITS(&bp[6]); - (void)printf(", %d group record(s)", ngroups); - if (vflag > 0) { + ND_PRINT((ndo, ", %d group record(s)", ngroups)); + if (ndo->ndo_vflag > 0) { /* Print the group records */ group = 8; for (i=0; indo_vflag == 1) + ND_PRINT((ndo, ", %d source(s)", nsrcs)); else { /* Print the sources */ - (void)printf(" {"); + ND_PRINT((ndo, " {")); for (j=0; j> 4) + 3); } if (mrc != 100) { - (void)printf(" [max resp time "); + ND_PRINT((ndo, " [max resp time ")); if (mrt < 600) { - (void)printf("%.1fs", mrt * 0.1); + ND_PRINT((ndo, "%.1fs", mrt * 0.1)); } else { relts_print(mrt / 10); } - (void)printf("]"); + ND_PRINT((ndo, "]")); } - TCHECK2(bp[4], 4); + ND_TCHECK2(bp[4], 4); if (EXTRACT_32BITS(&bp[4]) == 0) return; - (void)printf(" [gaddr %s", ipaddr_string(&bp[4])); - TCHECK2(bp[10], 2); + ND_PRINT((ndo, " [gaddr %s", ipaddr_string(&bp[4]))); + ND_TCHECK2(bp[10], 2); nsrcs = EXTRACT_16BITS(&bp[10]); if (nsrcs > 0) { if (len < 12 + (nsrcs << 2)) - (void)printf(" [invalid number of sources]"); - else if (vflag > 1) { - (void)printf(" {"); + ND_PRINT((ndo, " [invalid number of sources]")); + else if (ndo->ndo_vflag > 1) { + ND_PRINT((ndo, " {")); for (i=0; indo_qflag) { + ND_PRINT((ndo, "igmp")); return; } - TCHECK(bp[0]); + ND_TCHECK(bp[0]); switch (bp[0]) { case 0x11: - (void)printf("igmp query"); + ND_PRINT((ndo, "igmp query")); if (len >= 12) - print_igmpv3_query(bp, len); + print_igmpv3_query(ndo, bp, len); else { - TCHECK(bp[1]); + ND_TCHECK(bp[1]); if (bp[1]) { - (void)printf(" v2"); + ND_PRINT((ndo, " v2")); if (bp[1] != 100) - (void)printf(" [max resp time %d]", bp[1]); + ND_PRINT((ndo, " [max resp time %d]", bp[1])); } else - (void)printf(" v1"); - TCHECK2(bp[4], 4); + ND_PRINT((ndo, " v1")); + ND_TCHECK2(bp[4], 4); if (EXTRACT_32BITS(&bp[4])) - (void)printf(" [gaddr %s]", ipaddr_string(&bp[4])); + ND_PRINT((ndo, " [gaddr %s]", ipaddr_string(&bp[4]))); if (len != 8) - (void)printf(" [len %d]", len); + ND_PRINT((ndo, " [len %d]", len)); } break; case 0x12: - TCHECK2(bp[4], 4); - (void)printf("igmp v1 report %s", ipaddr_string(&bp[4])); + ND_TCHECK2(bp[4], 4); + ND_PRINT((ndo, "igmp v1 report %s", ipaddr_string(&bp[4]))); if (len != 8) - (void)printf(" [len %d]", len); + ND_PRINT((ndo, " [len %d]", len)); break; case 0x16: - TCHECK2(bp[4], 4); - (void)printf("igmp v2 report %s", ipaddr_string(&bp[4])); + ND_TCHECK2(bp[4], 4); + ND_PRINT((ndo, "igmp v2 report %s", ipaddr_string(&bp[4]))); break; case 0x22: - (void)printf("igmp v3 report"); - print_igmpv3_report(bp, len); + ND_PRINT((ndo, "igmp v3 report")); + print_igmpv3_report(ndo, bp, len); break; case 0x17: - TCHECK2(bp[4], 4); - (void)printf("igmp leave %s", ipaddr_string(&bp[4])); + ND_TCHECK2(bp[4], 4); + ND_PRINT((ndo, "igmp leave %s", ipaddr_string(&bp[4]))); break; case 0x13: - (void)printf("igmp dvmrp"); + ND_PRINT((ndo, "igmp dvmrp")); if (len < 8) - (void)printf(" [len %d]", len); + ND_PRINT((ndo, " [len %d]", len)); else dvmrp_print(bp, len); break; case 0x14: - (void)printf("igmp pimv1"); + ND_PRINT((ndo, "igmp pimv1")); pimv1_print(bp, len); break; case 0x1e: - print_mresp(bp, len); + print_mresp(ndo, bp, len); break; case 0x1f: - print_mtrace(bp, len); + print_mtrace(ndo, bp, len); break; default: - (void)printf("igmp-%d", bp[0]); + ND_PRINT((ndo, "igmp-%d", bp[0])); break; } - if (vflag && TTEST2(bp[0], len)) { + if (ndo->ndo_vflag && ND_TTEST2(bp[0], len)) { /* Check the IGMP checksum */ vec[0].ptr = bp; vec[0].len = len; if (in_cksum(vec, 1)) - printf(" bad igmp cksum %x!", EXTRACT_16BITS(&bp[2])); + ND_PRINT((ndo, " bad igmp cksum %x!", EXTRACT_16BITS(&bp[2]))); } return; trunc: - (void)printf("%s", tstr); + ND_PRINT((ndo, "%s", tstr)); } -- cgit v1.2.1