Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / print-igmp.c

diff --git a/print-igmp.c b/print-igmp.c
index b1f3b493d2f1ea849533100886fe608791bce4c1..a848562985d90f89c391fe700bc0a1b87789d92a 100644 (file)
--- a/print-igmp.c
+++ b/print-igmp.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-igmp.c,v 1.10 2002-11-09 17:19:26 itojun Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-igmp.c,v 1.15 2004-03-24 00:59:16 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -51,7 +51,7 @@ struct tr_query {
     u_int32_t  tr_dst;          /* traceroute destination */
     u_int32_t  tr_raddr;        /* traceroute response address */
     u_int32_t  tr_rttlqid;      /* response ttl and qid */
-} __attribute__((packed));
+};
 
 #define TR_GETTTL(x)        (int)(((x) >> 24) & 0xff)
 #define TR_GETQID(x)        ((x) & 0x00ffffff)
@@ -72,7 +72,7 @@ struct tr_resp {
     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 */
-} __attribute__((packed));
+};
 
 /* defs within mtrace */
 #define TR_QUERY 1
@@ -116,12 +116,12 @@ print_mtrace(register const u_char *bp, register u_int len)
        (void)printf(" [invalid len %d]", len);
        return;
     }
-    printf("mtrace %lu: %s to %s reply-to %s",
-        (u_long)TR_GETQID(ntohl(tr->tr_rttlqid)),
+    printf("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));
-    if (IN_CLASSD(ntohl(tr->tr_raddr)))
-        printf(" with-ttl %d", TR_GETTTL(ntohl(tr->tr_rttlqid)));
+    if (IN_CLASSD(EXTRACT_32BITS(&tr->tr_raddr)))
+        printf(" with-ttl %d", TR_GETTTL(EXTRACT_32BITS(&tr->tr_rttlqid)));
     return;
 trunc:
     (void)printf("[|igmp]");
@@ -139,11 +139,11 @@ print_mresp(register const u_char *bp, register u_int len)
        return;
     }
     printf("mresp %lu: %s to %s reply-to %s",
-        (u_long)TR_GETQID(ntohl(tr->tr_rttlqid)),
+        (u_long)TR_GETQID(EXTRACT_32BITS(&tr->tr_rttlqid)),
         ipaddr_string(&tr->tr_src), ipaddr_string(&tr->tr_dst),
         ipaddr_string(&tr->tr_raddr));
-    if (IN_CLASSD(ntohl(tr->tr_raddr)))
-        printf(" with-ttl %d", TR_GETTTL(ntohl(tr->tr_rttlqid)));
+    if (IN_CLASSD(EXTRACT_32BITS(&tr->tr_raddr)))
+        printf(" with-ttl %d", TR_GETTTL(EXTRACT_32BITS(&tr->tr_rttlqid)));
     return;
 trunc:
     (void)printf("[|igmp]");
@@ -218,6 +218,7 @@ print_igmpv3_query(register const u_char *bp, register u_int len)
        (void)printf(" [invalid len %d]", len);
        return;
     }
+    TCHECK(bp[1]);
     mrc = bp[1];
     if (mrc < 128) {
        mrt = mrc;
@@ -263,19 +264,21 @@ igmp_print(register const u_char *bp, register u_int len)
         return;
     }
 
-    TCHECK2(bp[0], 8);
+    TCHECK(bp[0]);
     switch (bp[0]) {
     case 0x11:
         (void)printf("igmp query");
        if (len >= 12)
            print_igmpv3_query(bp, len);
        else {
+            TCHECK(bp[1]);
            if (bp[1]) {
                (void)printf(" v2");
                if (bp[1] != 100)
                    (void)printf(" [max resp time %d]", bp[1]);
            } else
                (void)printf(" v1");
+            TCHECK2(bp[4], 4);
            if (EXTRACT_32BITS(&bp[4]))
                 (void)printf(" [gaddr %s]", ipaddr_string(&bp[4]));
             if (len != 8)
@@ -283,11 +286,13 @@ igmp_print(register const u_char *bp, register u_int len)
        }
         break;
     case 0x12:
+        TCHECK2(bp[4], 4);
         (void)printf("igmp v1 report %s", ipaddr_string(&bp[4]));
         if (len != 8)
             (void)printf(" [len %d]", len);
         break;
     case 0x16:
+        TCHECK2(bp[4], 4);
         (void)printf("igmp v2 report %s", ipaddr_string(&bp[4]));
         break;
     case 0x22:
@@ -295,6 +300,7 @@ igmp_print(register const u_char *bp, register u_int len)
        print_igmpv3_report(bp, len);
         break;
     case 0x17:
+        TCHECK2(bp[4], 4);
         (void)printf("igmp leave %s", ipaddr_string(&bp[4]));
         break;
     case 0x13: