More nd_ification of structures.

[tcpdump] / print-igmp.c

diff --git a/print-igmp.c b/print-igmp.c
index 2d9a580f3407dfbba6c63c7fba7bb5688680c968..082919e1bd68732b3003789c526ee06238fcaddd 100644 (file)
--- 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.
@@ -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_U_4(&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_U_4(&tr->tr_raddr)))
-        ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_BE_U_4(&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));
@@ -135,12 +141,12 @@ print_mresp(netdissect_options *ndo,
        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_U_4(&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_U_4(&tr->tr_raddr)))
-        ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_BE_U_4(&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));
@@ -169,8 +175,8 @@ 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]",
                                                                EXTRACT_U_1(bp + group))));
             nsrcs = EXTRACT_BE_U_2(bp + group + 2);
@@ -185,8 +191,8 @@ print_igmpv3_report(netdissect_options *ndo,
                /* Print the sources */
                 ND_PRINT((ndo, " {"));
                 for (j=0; j<nsrcs; j++) {
-                   ND_TCHECK2(bp[group+8+(j<<2)], 4);
-                   ND_PRINT((ndo, " %s", ipaddr_string(ndo, &bp[group+8+(j<<2)])));
+                   ND_TCHECK_4(bp + (group + 8 + (j << 2)));
+                   ND_PRINT((ndo, " %s", ipaddr_string(ndo, bp + group + 8 + (j << 2))));
                }
                 ND_PRINT((ndo, " }"));
             }
@@ -234,7 +240,7 @@ print_igmpv3_query(netdissect_options *ndo,
     ND_TCHECK_4(bp + 4);
     if (EXTRACT_BE_U_4(bp + 4) == 0)
        return;
-    ND_PRINT((ndo, " [gaddr %s", ipaddr_string(ndo, &bp[4])));
+    ND_PRINT((ndo, " [gaddr %s", ipaddr_string(ndo, bp + 4)));
     ND_TCHECK_2(bp + 10);
     nsrcs = EXTRACT_BE_U_2(bp + 10);
     if (nsrcs > 0) {
@@ -243,8 +249,8 @@ print_igmpv3_query(netdissect_options *ndo,
        else if (ndo->ndo_vflag > 1) {
            ND_PRINT((ndo, " {"));
            for (i=0; i<nsrcs; i++) {
-               ND_TCHECK2(bp[12+(i<<2)], 4);
-               ND_PRINT((ndo, " %s", ipaddr_string(ndo, &bp[12+(i<<2)])));
+               ND_TCHECK_4(bp + (12 + (i << 2)));
+               ND_PRINT((ndo, " %s", ipaddr_string(ndo, bp + 12 + (i << 2))));
            }
            ND_PRINT((ndo, " }"));
        } else
@@ -283,28 +289,28 @@ igmp_print(netdissect_options *ndo,
                ND_PRINT((ndo, " v1"));
             ND_TCHECK_4(bp + 4);
            if (EXTRACT_BE_U_4(bp + 4))
-                ND_PRINT((ndo, " [gaddr %s]", ipaddr_string(ndo, &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"));