X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/49ccafc4bcd0829923391423e348b4df8691b3b1..0845bc813c1cc48b18cdefff0b387c110647463c:/print-igmp.c

diff --git a/print-igmp.c b/print-igmp.c
index d2138ec5..6cdcde27 100644
--- a/print-igmp.c
+++ b/print-igmp.c
@@ -19,16 +19,15 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
-#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 +41,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 +55,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 */
@@ -114,8 +113,8 @@ print_mtrace(netdissect_options *ndo,
     }
     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(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))));
     return;
@@ -136,8 +135,8 @@ print_mresp(netdissect_options *ndo,
     }
     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(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))));
     return;
@@ -169,7 +168,7 @@ print_igmpv3_report(netdissect_options *ndo,
 		return;
 	    }
 	    ND_TCHECK2(bp[group+4], 4);
-            ND_PRINT((ndo, " [gaddr %s", ipaddr_string(&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_16BITS(&bp[group+2]);
@@ -185,7 +184,7 @@ print_igmpv3_report(netdissect_options *ndo,
                 ND_PRINT((ndo, " {"));
                 for (j=0; j<nsrcs; j++) {
 		    ND_TCHECK2(bp[group+8+(j<<2)], 4);
-		    ND_PRINT((ndo, " %s", ipaddr_string(&bp[group+8+(j<<2)])));
+		    ND_PRINT((ndo, " %s", ipaddr_string(ndo, &bp[group+8+(j<<2)])));
 		}
                 ND_PRINT((ndo, " }"));
             }
@@ -226,14 +225,14 @@ print_igmpv3_query(netdissect_options *ndo,
         if (mrt < 600) {
             ND_PRINT((ndo, "%.1fs", mrt * 0.1));
         } else {
-            relts_print(mrt / 10);
+            relts_print(ndo, mrt / 10);
         }
 	ND_PRINT((ndo, "]"));
     }
     ND_TCHECK2(bp[4], 4);
     if (EXTRACT_32BITS(&bp[4]) == 0)
 	return;
-    ND_PRINT((ndo, " [gaddr %s", ipaddr_string(&bp[4])));
+    ND_PRINT((ndo, " [gaddr %s", ipaddr_string(ndo, &bp[4])));
     ND_TCHECK2(bp[10], 2);
     nsrcs = EXTRACT_16BITS(&bp[10]);
     if (nsrcs > 0) {
@@ -243,7 +242,7 @@ print_igmpv3_query(netdissect_options *ndo,
 	    ND_PRINT((ndo, " {"));
 	    for (i=0; i<nsrcs; i++) {
 		ND_TCHECK2(bp[12+(i<<2)], 4);
-		ND_PRINT((ndo, " %s", ipaddr_string(&bp[12+(i<<2)])));
+		ND_PRINT((ndo, " %s", ipaddr_string(ndo, &bp[12+(i<<2)])));
 	    }
 	    ND_PRINT((ndo, " }"));
 	} else
@@ -282,20 +281,20 @@ igmp_print(netdissect_options *ndo,
 		ND_PRINT((ndo, " v1"));
             ND_TCHECK2(bp[4], 4);
 	    if (EXTRACT_32BITS(&bp[4]))
-                ND_PRINT((ndo, " [gaddr %s]", ipaddr_string(&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(&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(&bp[4])));
+        ND_PRINT((ndo, "igmp v2 report %s", ipaddr_string(ndo, &bp[4])));
         break;
     case 0x22:
         ND_PRINT((ndo, "igmp v3 report"));
@@ -303,7 +302,7 @@ igmp_print(netdissect_options *ndo,
         break;
     case 0x17:
         ND_TCHECK2(bp[4], 4);
-        ND_PRINT((ndo, "igmp leave %s", ipaddr_string(&bp[4])));
+        ND_PRINT((ndo, "igmp leave %s", ipaddr_string(ndo, &bp[4])));
         break;
     case 0x13:
         ND_PRINT((ndo, "igmp dvmrp"));
@@ -314,7 +313,7 @@ igmp_print(netdissect_options *ndo,
         break;
     case 0x14:
         ND_PRINT((ndo, "igmp pimv1"));
-        pimv1_print(bp, len);
+        pimv1_print(ndo, bp, len);
         break;
     case 0x1e:
         print_mresp(ndo, bp, len);