Use more the EXTRACT_8BITS() macro to fetch a one-byte value (17/n)

[tcpdump] / print-igmp.c

diff --git a/print-igmp.c b/print-igmp.c
index d3a685aa9b970191d9b889d9c746d7e49e052aec..635c1c53e163ae391cd973cda75acf35add1a043 100644 (file)
--- a/print-igmp.c
+++ b/print-igmp.c
@@ -19,15 +19,17 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

+/* \summary: Internet Group Management Protocol (IGMP) printer */
+

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

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.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)
 
 #ifndef IN_CLASSD
 #define IN_CLASSD(i) (((int32_t)(i) & 0xf0000000) == 0xe0000000)


@@ -112,11 +114,11 @@ print_mtrace(netdissect_options *ndo,
        return;
     }
     ND_PRINT((ndo, "mtrace %u: %s to %s reply-to %s",
        return;
     }
     ND_PRINT((ndo, "mtrace %u: %s to %s reply-to %s",

-        TR_GETQID(EXTRACT_32BITS(&tr->tr_rttlqid)),
+        TR_GETQID(EXTRACT_BE_32BITS(&tr->tr_rttlqid)),

         ipaddr_string(ndo, &tr->tr_src), ipaddr_string(ndo, &tr->tr_dst),
         ipaddr_string(ndo, &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))));
+    if (IN_CLASSD(EXTRACT_BE_32BITS(&tr->tr_raddr)))
+        ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_BE_32BITS(&tr->tr_rttlqid))));

     return;
 trunc:
     ND_PRINT((ndo, "%s", tstr));
     return;
 trunc:
     ND_PRINT((ndo, "%s", tstr));


@@ -134,11 +136,11 @@ print_mresp(netdissect_options *ndo,
        return;
     }
     ND_PRINT((ndo, "mresp %lu: %s to %s reply-to %s",
        return;
     }
     ND_PRINT((ndo, "mresp %lu: %s to %s reply-to %s",

-        (u_long)TR_GETQID(EXTRACT_32BITS(&tr->tr_rttlqid)),
+        (u_long)TR_GETQID(EXTRACT_BE_32BITS(&tr->tr_rttlqid)),

         ipaddr_string(ndo, &tr->tr_src), ipaddr_string(ndo, &tr->tr_dst),
         ipaddr_string(ndo, &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))));
+    if (IN_CLASSD(EXTRACT_BE_32BITS(&tr->tr_raddr)))
+        ND_PRINT((ndo, " with-ttl %d", TR_GETTTL(EXTRACT_BE_32BITS(&tr->tr_rttlqid))));

     return;
 trunc:
     ND_PRINT((ndo, "%s", tstr));
     return;
 trunc:
     ND_PRINT((ndo, "%s", tstr));


@@ -157,7 +159,7 @@ print_igmpv3_report(netdissect_options *ndo,
        return;
     }
     ND_TCHECK2(bp[6], 2);
        return;
     }
     ND_TCHECK2(bp[6], 2);

-    ngroups = EXTRACT_16BITS(&bp[6]);
+    ngroups = EXTRACT_BE_16BITS(bp + 6);

     ND_PRINT((ndo, ", %d group record(s)", ngroups));
     if (ndo->ndo_vflag > 0) {
        /* Print the group records */
     ND_PRINT((ndo, ", %d group record(s)", ngroups));
     if (ndo->ndo_vflag > 0) {
        /* Print the group records */


@@ -171,7 +173,7 @@ print_igmpv3_report(netdissect_options *ndo,
             ND_PRINT((ndo, " [gaddr %s", ipaddr_string(ndo, &bp[group+4])));
            ND_PRINT((ndo, " %s", tok2str(igmpv3report2str, " [v3-report-#%d]",
                                                                bp[group])));
             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]);
+            nsrcs = EXTRACT_BE_16BITS(bp + group + 2);

            /* Check the number of sources and print them */
            if (len < group+8+(nsrcs<<2)) {
                ND_PRINT((ndo, " [invalid number of sources %d]", nsrcs));
            /* Check the number of sources and print them */
            if (len < group+8+(nsrcs<<2)) {
                ND_PRINT((ndo, " [invalid number of sources %d]", nsrcs));


@@ -203,7 +205,7 @@ print_igmpv3_query(netdissect_options *ndo,
                    register const u_char *bp, register u_int len)
 {
     u_int mrc;
                    register const u_char *bp, register u_int len)
 {
     u_int mrc;

-    int mrt;
+    u_int mrt;

     u_int nsrcs;
     register u_int i;
 
     u_int nsrcs;
     register u_int i;
 


@@ -225,16 +227,16 @@ print_igmpv3_query(netdissect_options *ndo,
         if (mrt < 600) {
             ND_PRINT((ndo, "%.1fs", mrt * 0.1));
         } else {
         if (mrt < 600) {
             ND_PRINT((ndo, "%.1fs", mrt * 0.1));
         } else {

-            relts_print(ndo, mrt / 10);
+            unsigned_relts_print(ndo, mrt / 10);

         }
        ND_PRINT((ndo, "]"));
     }
     ND_TCHECK2(bp[4], 4);
         }
        ND_PRINT((ndo, "]"));
     }
     ND_TCHECK2(bp[4], 4);

-    if (EXTRACT_32BITS(&bp[4]) == 0)
+    if (EXTRACT_BE_32BITS(bp + 4) == 0)

        return;
     ND_PRINT((ndo, " [gaddr %s", ipaddr_string(ndo, &bp[4])));
     ND_TCHECK2(bp[10], 2);
        return;
     ND_PRINT((ndo, " [gaddr %s", ipaddr_string(ndo, &bp[4])));
     ND_TCHECK2(bp[10], 2);

-    nsrcs = EXTRACT_16BITS(&bp[10]);
+    nsrcs = EXTRACT_BE_16BITS(bp + 10);

     if (nsrcs > 0) {
        if (len < 12 + (nsrcs << 2))
            ND_PRINT((ndo, " [invalid number of sources]"));
     if (nsrcs > 0) {
        if (len < 12 + (nsrcs << 2))
            ND_PRINT((ndo, " [invalid number of sources]"));


@@ -280,7 +282,7 @@ igmp_print(netdissect_options *ndo,
            } else
                ND_PRINT((ndo, " v1"));
             ND_TCHECK2(bp[4], 4);
            } else
                ND_PRINT((ndo, " v1"));
             ND_TCHECK2(bp[4], 4);

-           if (EXTRACT_32BITS(&bp[4]))
+           if (EXTRACT_BE_32BITS(bp + 4))

                 ND_PRINT((ndo, " [gaddr %s]", ipaddr_string(ndo, &bp[4])));
             if (len != 8)
                 ND_PRINT((ndo, " [len %d]", len));
                 ND_PRINT((ndo, " [gaddr %s]", ipaddr_string(ndo, &bp[4])));
             if (len != 8)
                 ND_PRINT((ndo, " [len %d]", len));


@@ -326,12 +328,12 @@ igmp_print(netdissect_options *ndo,
         break;
     }
 
         break;
     }
 

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

         /* Check the IGMP checksum */
         vec[0].ptr = bp;
         vec[0].len = len;
         if (in_cksum(vec, 1))
         /* Check the IGMP checksum */
         vec[0].ptr = bp;
         vec[0].len = len;
         if (in_cksum(vec, 1))

-            ND_PRINT((ndo, " bad igmp cksum %x!", EXTRACT_16BITS(&bp[2])));
+            ND_PRINT((ndo, " bad igmp cksum %x!", EXTRACT_BE_16BITS(bp + 2)));

     }
     return;
 trunc:
     }
     return;
 trunc: