Address Michael's comments.

[tcpdump] / print-igmp.c

diff --git a/print-igmp.c b/print-igmp.c
index ac335acc8866f6bc233c311e6949b362ba1b80d1..4087ee0980205cc6ea17e845c8cbe84bb9617e9a 100644 (file)
--- a/print-igmp.c
+++ b/print-igmp.c
@@ -20,33 +20,15 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-igmp.c,v 1.1 2000-11-02 02:18:30 fenner 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
 #include "config.h"
 #endif
 
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
+#include <tcpdump-stdinc.h>

 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>


@@ -65,10 +47,10 @@ struct rtentry;
  * The packet format for a traceroute request.
  */
 struct tr_query {
  * The packet format for a traceroute request.
  */
 struct tr_query {

-    u_int  tr_src;          /* traceroute source */
-    u_int  tr_dst;          /* traceroute destination */
-    u_int  tr_raddr;        /* traceroute response address */
-    u_int  tr_rttlqid;      /* response ttl and qid */
+    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 */

 };
 
 #define TR_GETTTL(x)        (int)(((x) >> 24) & 0xff)
 };
 
 #define TR_GETTTL(x)        (int)(((x) >> 24) & 0xff)


@@ -79,17 +61,17 @@ struct tr_query {
  * beginning, followed by one tr_resp for each hop taken.
  */
 struct tr_resp {
  * beginning, followed by one tr_resp for each hop taken.
  */
 struct tr_resp {

-    u_int tr_qarr;          /* query arrival time */
-    u_int tr_inaddr;        /* incoming interface address */
-    u_int tr_outaddr;       /* outgoing interface address */
-    u_int tr_rmtaddr;       /* parent address in source tree */
-    u_int tr_vifin;         /* input packet count on interface */
-    u_int tr_vifout;        /* output packet count on interface */
-    u_int tr_pktcnt;        /* total incoming packets for src-grp */
-    u_char  tr_rproto;      /* routing proto deployed on router */
-    u_char  tr_fttl;        /* ttl required to forward on outvif */
-    u_char  tr_smask;       /* subnet mask for src addr */
-    u_char  tr_rflags;      /* forwarding error codes */
+    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 */

 };
 
 /* defs within mtrace */
 };
 
 /* defs within mtrace */


@@ -124,50 +106,67 @@ static struct tok igmpv3report2str[] = {
        { 0,    NULL }
 };
 
        { 0,    NULL }
 };
 

-static void 
+static void

 print_mtrace(register const u_char *bp, register u_int len)
 {
 print_mtrace(register const u_char *bp, register u_int len)
 {

-    register struct tr_query *tr = (struct tr_query *)(bp + 8);
+    register const struct tr_query *tr = (const struct tr_query *)(bp + 8);

 
 

-    printf("mtrace %lu: %s to %s reply-to %s",
-        (u_long)TR_GETQID(ntohl(tr->tr_rttlqid)),
+    TCHECK(*tr);
+    if (len < 8 + sizeof (struct tr_query)) {
+       (void)printf(" [invalid len %d]", len);
+       return;
+    }
+    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));
         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]");
+    return;

 }
 
 }
 

-static void 
+static void

 print_mresp(register const u_char *bp, register u_int len)
 {
 print_mresp(register const u_char *bp, register u_int len)
 {

-    register struct tr_query *tr = (struct tr_query *)(bp + 8);
+    register const struct tr_query *tr = (const struct tr_query *)(bp + 8);

 
 

+    TCHECK(*tr);
+    if (len < 8 + sizeof (struct tr_query)) {
+       (void)printf(" [invalid len %d]", len);
+       return;
+    }

     printf("mresp %lu: %s to %s reply-to %s",
     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));
         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]");
+    return;

 }
 
 }
 

-static void 
-print_igmpv3_report(register const u_char *bp, register u_int len,
-       register const u_char *bp2)
+static void
+print_igmpv3_report(register const u_char *bp, register u_int len)

 {
 {

-    int group, nsrcs, ngroups;
-    register int i, j;
+    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) {
 
     /* Minimum len is 16, and should be a multiple of 4 */
     if (len < 16 || len & 0x03) {

-       (void)printf(" [invalid len %d]", len);
-       return;
+       (void)printf(" [invalid len %d]", len);
+       return;

     }
     TCHECK2(bp[6], 2);
     ngroups = EXTRACT_16BITS(&bp[6]);
     }
     TCHECK2(bp[6], 2);
     ngroups = EXTRACT_16BITS(&bp[6]);

-    (void)printf(", %d group record(s)", ngroups); 
+    (void)printf(", %d group record(s)", ngroups);

     if (vflag > 0) {
        /* Print the group records */
     if (vflag > 0) {
        /* Print the group records */

-       group = 8;
+       group = 8;

         for (i=0; i<ngroups; i++) {
            if (len < group+8) {
                (void)printf(" [invalid number of groups]");
         for (i=0; i<ngroups; i++) {
            if (len < group+8) {
                (void)printf(" [invalid number of groups]");


@@ -206,17 +205,34 @@ trunc:
 }
 
 static void
 }
 
 static void

-print_igmpv3_query(register const u_char *bp, register u_int len,
-       register const u_char *bp2)
+print_igmpv3_query(register const u_char *bp, register u_int len)

 {
 {

-    int nsrcs;
-    register int i;
+    u_int mrc;
+    int mrt;
+    u_int nsrcs;
+    register u_int i;

 
     (void)printf(" v3");
     /* Minimum len is 12, and should be a multiple of 4 */
     if (len < 12 || len & 0x03) {
 
     (void)printf(" v3");
     /* Minimum len is 12, and should be a multiple of 4 */
     if (len < 12 || len & 0x03) {

-       (void)printf(" [invalid len %d]", len);
-       return;
+       (void)printf(" [invalid len %d]", len);
+       return;
+    }
+    TCHECK(bp[1]);
+    mrc = bp[1];
+    if (mrc < 128) {
+       mrt = mrc;
+    } else {
+        mrt = ((mrc & 0x0f) | 0x10) << (((mrc & 0x70) >> 4) + 3);
+    }
+    if (mrc != 100) {
+       (void)printf(" [max resp time ");
+        if (mrt < 600) {
+            (void)printf("%.1fs", mrt * 0.1);
+        } else {
+            relts_print(mrt / 10);
+        }
+       (void)printf("]");

     }
     TCHECK2(bp[4], 4);
     if (EXTRACT_32BITS(&bp[4]) == 0)
     }
     TCHECK2(bp[4], 4);
     if (EXTRACT_32BITS(&bp[4]) == 0)


@@ -245,53 +261,52 @@ trunc:
 }
 
 void
 }
 
 void

-igmp_print(register const u_char *bp, register u_int len,
-       register const u_char *bp2)
+igmp_print(register const u_char *bp, register u_int len)

 {
 {

-    register const struct ip *ip;
-
-    ip = (const struct ip *)bp2;
-    (void)printf("%s > %s: ",
-        ipaddr_string(&ip->ip_src),
-        ipaddr_string(&ip->ip_dst));
+    struct cksum_vec vec[1];

 
     if (qflag) {
         (void)printf("igmp");
         return;
     }
 
 
     if (qflag) {
         (void)printf("igmp");
         return;
     }
 

-    TCHECK2(bp[0], 8);
+    TCHECK(bp[0]);

     switch (bp[0]) {
     case 0x11:
         (void)printf("igmp query");
        if (len >= 12)
     switch (bp[0]) {
     case 0x11:
         (void)printf("igmp query");
        if (len >= 12)

-           print_igmpv3_query(bp, len, bp2);
+           print_igmpv3_query(bp, len);

        else {
        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");
            if (bp[1]) {
                (void)printf(" v2");
                if (bp[1] != 100)
                    (void)printf(" [max resp time %d]", bp[1]);
            } else
                (void)printf(" v1");

-                   if (EXTRACT_32BITS(&bp[4]))
+            TCHECK2(bp[4], 4);
+           if (EXTRACT_32BITS(&bp[4]))

                 (void)printf(" [gaddr %s]", ipaddr_string(&bp[4]));
             if (len != 8)
                 (void)printf(" [len %d]", len);
        }
         break;
     case 0x12:
                 (void)printf(" [gaddr %s]", ipaddr_string(&bp[4]));
             if (len != 8)
                 (void)printf(" [len %d]", 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:
         (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:
         (void)printf("igmp v3 report");
         (void)printf("igmp v2 report %s", ipaddr_string(&bp[4]));
         break;
     case 0x22:
         (void)printf("igmp v3 report");

-       print_igmpv3_report(bp, len, bp2);
+       print_igmpv3_report(bp, len);

         break;
     case 0x17:
         break;
     case 0x17:

+        TCHECK2(bp[4], 4);

         (void)printf("igmp leave %s", ipaddr_string(&bp[4]));
         break;
     case 0x13:
         (void)printf("igmp leave %s", ipaddr_string(&bp[4]));
         break;
     case 0x13:


@@ -318,7 +333,9 @@ igmp_print(register const u_char *bp, register u_int len,
 
     if (vflag && TTEST2(bp[0], len)) {
         /* Check the IGMP checksum */
 
     if (vflag && TTEST2(bp[0], len)) {
         /* Check the IGMP checksum */

-        if (in_cksum((const u_short*)bp, len, 0))
+        vec[0].ptr = bp;
+        vec[0].len = len;
+        if (in_cksum(vec, 1))

             printf(" bad igmp cksum %x!", EXTRACT_16BITS(&bp[2]));
     }
     return;
             printf(" bad igmp cksum %x!", EXTRACT_16BITS(&bp[2]));
     }
     return;