Squelch a Coverity warning.

[tcpdump] / print-igmp.c

diff --git a/print-igmp.c b/print-igmp.c
index d8403e902f679a40fedb4205a039d2057a3abc80..4b8e82dc8510cf323163961461b3cc74de62799e 100644 (file)
--- a/print-igmp.c
+++ b/print-igmp.c
@@ -19,41 +19,32 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-igmp.c,v 1.6 2002-06-02 18:24:41 guy Exp $ (LBL)";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
+#include <netdissect-stdinc.h>

 
 

-#include <stdio.h>
-#include <string.h>
-
-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.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)
 #endif
 
 
 #ifndef IN_CLASSD
 #define IN_CLASSD(i) (((int32_t)(i) & 0xf0000000) == 0xe0000000)
 #endif
 

+static const char tstr[] = "[|igmp]";
+

 /* (following from ipmulti/mrouted/prune.h) */
 
 /*
  * The packet format for a traceroute request.
  */
 struct tr_query {
 /* (following from ipmulti/mrouted/prune.h) */
 
 /*
  * 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 */
+    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)
 };
 
 #define TR_GETTTL(x)        (int)(((x) >> 24) & 0xff)


@@ -64,17 +55,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 */
+    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 */
 };
 
 /* defs within mtrace */


@@ -99,7 +90,7 @@ struct tr_resp {
 #define TR_PROTO_CBT    4
 
 /* igmpv3 report types */
 #define TR_PROTO_CBT    4
 
 /* igmpv3 report types */

-static struct tok igmpv3report2str[] = {
+static const struct tok igmpv3report2str[] = {

        { 1,    "is_in" },
        { 2,    "is_ex" },
        { 3,    "to_in" },
        { 1,    "is_in" },
        { 2,    "is_ex" },
        { 3,    "to_in" },


@@ -109,100 +100,120 @@ static struct tok igmpv3report2str[] = {
        { 0,    NULL }
 };
 
        { 0,    NULL }
 };
 

-static void 
-print_mtrace(register const u_char *bp, register u_int len)
+static void
+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);
 
 {
     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)),
-        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)));
+    ND_TCHECK(*tr);
+    if (len < 8 + sizeof (struct tr_query)) {
+       ND_PRINT((ndo, " [invalid len %d]", len));
+       return;
+    }
+    ND_PRINT((ndo, "mtrace %u: %s to %s reply-to %s",
+        TR_GETQID(EXTRACT_32BITS(&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_32BITS(&tr->tr_raddr)))
+        ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_32BITS(&tr->tr_rttlqid))));
+    return;
+trunc:
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 }
 

-static void 
-print_mresp(register const u_char *bp, register u_int len)
+static void
+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);
 
 {
     register const struct tr_query *tr = (const struct tr_query *)(bp + 8);
 

-    printf("mresp %lu: %s to %s reply-to %s",
-        (u_long)TR_GETQID(ntohl(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)));
+    ND_TCHECK(*tr);
+    if (len < 8 + sizeof (struct tr_query)) {
+       ND_PRINT((ndo, " [invalid len %d]", len));
+       return;
+    }
+    ND_PRINT((ndo, "mresp %lu: %s to %s reply-to %s",
+        (u_long)TR_GETQID(EXTRACT_32BITS(&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_32BITS(&tr->tr_raddr)))
+        ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_32BITS(&tr->tr_rttlqid))));
+    return;
+trunc:
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 }
 

-static void 
-print_igmpv3_report(register const u_char *bp, register u_int len)
+static void
+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) {
 {
     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);
-       return;
+       ND_PRINT((ndo, " [invalid len %d]", len));
+       return;

     }
     }

-    TCHECK2(bp[6], 2);
+    ND_TCHECK2(bp[6], 2);

     ngroups = EXTRACT_16BITS(&bp[6]);
     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 */
        /* Print the group records */

-       group = 8;
+       group = 8;

         for (i=0; i<ngroups; i++) {
            if (len < group+8) {
         for (i=0; i<ngroups; i++) {
            if (len < group+8) {

-               (void)printf(" [invalid number of groups]");
+               ND_PRINT((ndo, " [invalid number of groups]"));

                return;
            }
                return;
            }

-           TCHECK2(bp[group+4], 4);
-            (void)printf(" [gaddr %s", ipaddr_string(&bp[group+4]));
-           (void)printf(" %s", tok2str(igmpv3report2str, " [v3-report-#%d]",
-                                                               bp[group]));
+           ND_TCHECK2(bp[group+4], 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]);
            /* Check the number of sources and print them */
            if (len < group+8+(nsrcs<<2)) {
             nsrcs = EXTRACT_16BITS(&bp[group+2]);
            /* Check the number of sources and print them */
            if (len < group+8+(nsrcs<<2)) {

-               (void)printf(" [invalid number of sources %d]", nsrcs);
+               ND_PRINT((ndo, " [invalid number of sources %d]", nsrcs));

                return;
            }
                return;
            }

-            if (vflag == 1)
-                (void)printf(", %d source(s)", nsrcs);
+            if (ndo->ndo_vflag == 1)
+                ND_PRINT((ndo, ", %d source(s)", nsrcs));

             else {
                /* Print the sources */
             else {
                /* Print the sources */

-                (void)printf(" {");
+                ND_PRINT((ndo, " {"));

                 for (j=0; j<nsrcs; j++) {
                 for (j=0; j<nsrcs; j++) {

-                   TCHECK2(bp[group+8+(j<<2)], 4);
-                   (void)printf(" %s", ipaddr_string(&bp[group+8+(j<<2)]));
+                   ND_TCHECK2(bp[group+8+(j<<2)], 4);
+                   ND_PRINT((ndo, " %s", ipaddr_string(ndo, &bp[group+8+(j<<2)])));

                }
                }

-                (void)printf(" }");
+                ND_PRINT((ndo, " }"));

             }
            /* Next group record */
             group += 8 + (nsrcs << 2);
             }
            /* Next group record */
             group += 8 + (nsrcs << 2);

-           (void)printf("]");
+           ND_PRINT((ndo, "]"));

         }
     }
     return;
 trunc:
         }
     }
     return;
 trunc:

-    (void)printf("[|igmp]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 static void
 }
 
 static void

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

 {
     u_int mrc;
     int mrt;
     u_int nsrcs;
     register u_int i;
 
 {
     u_int mrc;
     int mrt;
     u_int nsrcs;
     register u_int i;
 

-    (void)printf(" v3");
+    ND_PRINT((ndo, " v3"));

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

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

     }
     }

+    ND_TCHECK(bp[1]);

     mrc = bp[1];
     if (mrc < 128) {
        mrt = mrc;
     mrc = bp[1];
     if (mrc < 128) {
        mrt = mrc;


@@ -210,106 +221,119 @@ print_igmpv3_query(register const u_char *bp, register u_int len)
         mrt = ((mrc & 0x0f) | 0x10) << (((mrc & 0x70) >> 4) + 3);
     }
     if (mrc != 100) {
         mrt = ((mrc & 0x0f) | 0x10) << (((mrc & 0x70) >> 4) + 3);
     }
     if (mrc != 100) {

-       (void)printf(" [max resp time ");
-       relts_print(mrt);
-       (void)printf("]");
+       ND_PRINT((ndo, " [max resp time "));
+        if (mrt < 600) {
+            ND_PRINT((ndo, "%.1fs", mrt * 0.1));
+        } else {
+            relts_print(ndo, mrt / 10);
+        }
+       ND_PRINT((ndo, "]"));

     }
     }

-    TCHECK2(bp[4], 4);
+    ND_TCHECK2(bp[4], 4);

     if (EXTRACT_32BITS(&bp[4]) == 0)
        return;
     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(ndo, &bp[4])));
+    ND_TCHECK2(bp[10], 2);

     nsrcs = EXTRACT_16BITS(&bp[10]);
     if (nsrcs > 0) {
        if (len < 12 + (nsrcs << 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; i<nsrcs; i++) {
            for (i=0; i<nsrcs; i++) {

-               TCHECK2(bp[12+(i<<2)], 4);
-               (void)printf(" %s", ipaddr_string(&bp[12+(i<<2)]));
+               ND_TCHECK2(bp[12+(i<<2)], 4);
+               ND_PRINT((ndo, " %s", ipaddr_string(ndo, &bp[12+(i<<2)])));

            }
            }

-           (void)printf(" }");
+           ND_PRINT((ndo, " }"));

        } else
        } else

-           (void)printf(", %d source(s)", nsrcs);
+           ND_PRINT((ndo, ", %d source(s)", nsrcs));

     }
     }

-    (void)printf("]");
+    ND_PRINT((ndo, "]"));

     return;
 trunc:
     return;
 trunc:

-    (void)printf("[|igmp]");
-    return;
+    ND_PRINT((ndo, "%s", tstr));

 }
 
 void
 }
 
 void

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

 {
 {

-    if (qflag) {
-        (void)printf("igmp");
+    struct cksum_vec vec[1];
+
+    if (ndo->ndo_qflag) {
+        ND_PRINT((ndo, "igmp"));

         return;
     }
 
         return;
     }
 

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

     switch (bp[0]) {
     case 0x11:
     switch (bp[0]) {
     case 0x11:

-        (void)printf("igmp query");
+        ND_PRINT((ndo, "igmp query"));

        if (len >= 12)
        if (len >= 12)

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

        else {
        else {

+            ND_TCHECK(bp[1]);

            if (bp[1]) {
            if (bp[1]) {

-               (void)printf(" v2");
+               ND_PRINT((ndo, " v2"));

                if (bp[1] != 100)
                if (bp[1] != 100)

-                   (void)printf(" [max resp time %d]", bp[1]);
+                   ND_PRINT((ndo, " [max resp time %d]", bp[1]));

            } else
            } else

-               (void)printf(" v1");
-                   if (EXTRACT_32BITS(&bp[4]))
-                (void)printf(" [gaddr %s]", ipaddr_string(&bp[4]));
+               ND_PRINT((ndo, " v1"));
+            ND_TCHECK2(bp[4], 4);
+           if (EXTRACT_32BITS(&bp[4]))
+                ND_PRINT((ndo, " [gaddr %s]", ipaddr_string(ndo, &bp[4])));

             if (len != 8)
             if (len != 8)

-                (void)printf(" [len %d]", len);
+                ND_PRINT((ndo, " [len %d]", len));

        }
         break;
     case 0x12:
        }
         break;
     case 0x12:

-        (void)printf("igmp v1 report %s", ipaddr_string(&bp[4]));
+        ND_TCHECK2(bp[4], 4);
+        ND_PRINT((ndo, "igmp v1 report %s", ipaddr_string(ndo, &bp[4])));

         if (len != 8)
         if (len != 8)

-            (void)printf(" [len %d]", len);
+            ND_PRINT((ndo, " [len %d]", len));

         break;
     case 0x16:
         break;
     case 0x16:

-        (void)printf("igmp v2 report %s", ipaddr_string(&bp[4]));
+        ND_TCHECK2(bp[4], 4);
+        ND_PRINT((ndo, "igmp v2 report %s", ipaddr_string(ndo, &bp[4])));

         break;
     case 0x22:
         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:
         break;
     case 0x17:

-        (void)printf("igmp leave %s", ipaddr_string(&bp[4]));
+        ND_TCHECK2(bp[4], 4);
+        ND_PRINT((ndo, "igmp leave %s", ipaddr_string(ndo, &bp[4])));

         break;
     case 0x13:
         break;
     case 0x13:

-        (void)printf("igmp dvmrp");
+        ND_PRINT((ndo, "igmp dvmrp"));

         if (len < 8)
         if (len < 8)

-            (void)printf(" [len %d]", len);
+            ND_PRINT((ndo, " [len %d]", len));

         else
         else

-            dvmrp_print(bp, len);
+            dvmrp_print(ndo, bp, len);

         break;
     case 0x14:
         break;
     case 0x14:

-        (void)printf("igmp pimv1");
-        pimv1_print(bp, len);
+        ND_PRINT((ndo, "igmp pimv1"));
+        pimv1_print(ndo, bp, len);

         break;
     case 0x1e:
         break;
     case 0x1e:

-        print_mresp(bp, len);
+        print_mresp(ndo, bp, len);

         break;
     case 0x1f:
         break;
     case 0x1f:

-        print_mtrace(bp, len);
+        print_mtrace(ndo, bp, len);

         break;
     default:
         break;
     default:

-        (void)printf("igmp-%d", bp[0]);
+        ND_PRINT((ndo, "igmp-%d", bp[0]));

         break;
     }
 
         break;
     }
 

-    if (vflag && TTEST2(bp[0], len)) {
+    if (ndo->ndo_vflag && ND_TTEST2(bp[0], len)) {

         /* Check the IGMP checksum */
         /* Check the IGMP checksum */

-        if (in_cksum((const u_short*)bp, len, 0))
-            printf(" bad igmp cksum %x!", EXTRACT_16BITS(&bp[2]));
+        vec[0].ptr = bp;
+        vec[0].len = len;
+        if (in_cksum(vec, 1))
+            ND_PRINT((ndo, " bad igmp cksum %x!", EXTRACT_16BITS(&bp[2])));

     }
     return;
 trunc:
     }
     return;
 trunc:

-    fputs("[|igmp]", stdout);
+    ND_PRINT((ndo, "%s", tstr));

 }
 }