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

[tcpdump] / print-pim.c

diff --git a/print-pim.c b/print-pim.c
index 18c6da4df5307cc00573843d3afccaff72bfef1c..f9fd0c69f553b9a272742a9c3e932018f6ef060c 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.45 2005-04-06 21:32:42 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-pim.c,v 1.49 2006-02-13 01:31:35 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -79,6 +79,15 @@ static struct tok pimv2_hello_option_values[] = {
     { 0, NULL}
 };
 
+#define PIMV2_REGISTER_FLAG_LEN      4
+#define PIMV2_REGISTER_FLAG_BORDER 0x80000000
+#define PIMV2_REGISTER_FLAG_NULL   0x40000000
+
+static struct tok pimv2_register_flag_values[] = {
+    { PIMV2_REGISTER_FLAG_BORDER, "Border" },
+    { PIMV2_REGISTER_FLAG_NULL, "Null" },
+    { 0, NULL}
+};    
 
 /*
  * XXX: We consider a case where IPv6 is not ready yet for portability,
@@ -109,7 +118,7 @@ struct pim {
 
 #include "ip.h"
 
-static void pimv2_print(register const u_char *bp, register u_int len);
+static void pimv2_print(register const u_char *bp, register u_int len, u_int cksum);
 
 static void
 pimv1_join_prune_print(register const u_char *bp, register u_int len)
@@ -140,7 +149,7 @@ pimv1_join_prune_print(register const u_char *bp, register u_int len)
                return;
        }
 
-       TCHECK2(bp[0], 4);
+       TCHECK2(bp[0], sizeof(struct in_addr));
        if (vflag > 1)
                (void)printf("\n");
        (void)printf(" Upstream Nbr: %s", ipaddr_string(bp));
@@ -161,9 +170,13 @@ pimv1_join_prune_print(register const u_char *bp, register u_int len)
        bp += 4;
        len -= 4;
        while (ngroups--) {
-               TCHECK2(bp[0], 4);
+               /*
+                * XXX - does the address have length "addrlen" and the
+                * mask length "maddrlen"?
+                */
+               TCHECK2(bp[0], sizeof(struct in_addr));
                (void)printf("\n\tGroup: %s", ipaddr_string(bp));
-               TCHECK2(bp[4], 4);
+               TCHECK2(bp[4], sizeof(struct in_addr));
                if (EXTRACT_32BITS(&bp[4]) != 0xffffffff)
                        (void)printf("/%s", ipaddr_string(&bp[4]));
                TCHECK2(bp[8], 4);
@@ -243,7 +256,7 @@ pimv1_print(register const u_char *bp, register u_int len)
                break;
        case 2:
                (void)printf(" Register-Stop");
-               TCHECK2(bp[12], 4);
+               TCHECK2(bp[12], sizeof(struct in_addr));
                (void)printf(" for %s > %s", ipaddr_string(&bp[8]),
                    ipaddr_string(&bp[12]));
                break;
@@ -266,7 +279,7 @@ pimv1_print(register const u_char *bp, register u_int len)
                break;
        case 5:
                (void)printf(" Assert");
-               TCHECK2(bp[16], 4);
+               TCHECK2(bp[16], sizeof(struct in_addr));
                (void)printf(" for %s > %s", ipaddr_string(&bp[16]),
                    ipaddr_string(&bp[8]));
                if (EXTRACT_32BITS(&bp[12]) != 0xffffffff)
@@ -400,7 +413,7 @@ trunc:
 }
 
 void
-pim_print(register const u_char *bp, register u_int len)
+pim_print(register const u_char *bp, register u_int len, u_int cksum)
 {
        register const u_char *ep;
        register struct pim *pim = (struct pim *)bp;
@@ -415,21 +428,21 @@ pim_print(register const u_char *bp, register u_int len)
        switch (PIM_VER(pim->pim_typever)) {
        case 2:
             if (!vflag) {
-                printf("PIMv%u, %s, length: %u",
+                printf("PIMv%u, %s, length %u",
                        PIM_VER(pim->pim_typever),
                        tok2str(pimv2_type_values,"Unknown Type",PIM_TYPE(pim->pim_typever)),
                        len);
                 return;
             } else {
-                printf("PIMv%u, length: %u\n\t%s",
+                printf("PIMv%u, length %u\n\t%s",
                        PIM_VER(pim->pim_typever),
                        len,
                        tok2str(pimv2_type_values,"Unknown Type",PIM_TYPE(pim->pim_typever)));
-                pimv2_print(bp, len);
+                pimv2_print(bp, len, cksum);
             }
             break;
        default:
-               printf("PIMv%u, length: %u",
+               printf("PIMv%u, length %u",
                        PIM_VER(pim->pim_typever),
                        len);
                break;
@@ -507,7 +520,6 @@ static int
 pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent)
 {
        int af;
-       const char *afstr;
        int len, hdrlen;
 
        TCHECK(bp[0]);
@@ -517,14 +529,12 @@ pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent)
                switch (bp[0]) {
                case 1:
                        af = AF_INET;
-                       afstr = "IPv4";
-                       len = 4;
+                       len = sizeof(struct in_addr);
                        break;
 #ifdef INET6
                case 2:
                        af = AF_INET6;
-                       afstr = "IPv6";
-                       len = 16;
+                       len = sizeof(struct in6_addr);
                        break;
 #endif
                default:
@@ -535,14 +545,12 @@ pimv2_addr_print(const u_char *bp, enum pimv2_addrtype at, int silent)
                hdrlen = 2;
        } else {
                switch (pimv2_addr_len) {
-               case 4:
+               case sizeof(struct in_addr):
                        af = AF_INET;
-                       afstr = "IPv4";
                        break;
 #ifdef INET6
-               case 16:
+               case sizeof(struct in6_addr):
                        af = AF_INET6;
-                       afstr = "IPv6";
                        break;
 #endif
                default:
@@ -610,7 +618,7 @@ trunc:
 }
 
 static void
-pimv2_print(register const u_char *bp, register u_int len)
+pimv2_print(register const u_char *bp, register u_int len, u_int cksum)
 {
        register const u_char *ep;
        register struct pim *pim = (struct pim *)bp;
@@ -626,6 +634,13 @@ pimv2_print(register const u_char *bp, register u_int len)
        if (pimv2_addr_len != 0)
                (void)printf(", RFC2117-encoding");
 
+        printf(", cksum 0x%04x ", EXTRACT_16BITS(&pim->pim_cksum));
+        if (EXTRACT_16BITS(&pim->pim_cksum) == 0) {
+                printf("(unverified)");
+        } else {
+                printf("(%scorrect)", TTEST2(bp[0], len) && cksum ? "in" : "" );
+        }
+
        switch (PIM_TYPE(pim->pim_typever)) {
        case PIMV2_TYPE_HELLO:
            {
@@ -637,7 +652,7 @@ pimv2_print(register const u_char *bp, register u_int len)
                        olen = EXTRACT_16BITS(&bp[2]);
                        TCHECK2(bp[0], 4 + olen);
 
-                        printf("\n\t  %s Option (%u), length: %u, Value: ",
+                        printf("\n\t  %s Option (%u), length %u, Value: ",
                                tok2str( pimv2_hello_option_values,"Unknown",otype),
                                otype,
                                olen);
@@ -730,30 +745,35 @@ pimv2_print(register const u_char *bp, register u_int len)
        {
                struct ip *ip;
 
-               if (vflag && bp + 8 <= ep) {
-                       (void)printf(" %s%s", bp[4] & 0x80 ? "B" : "",
-                               bp[4] & 0x40 ? "N" : "");
-               }
-               bp += 8; len -= 8;
+                if (!TTEST2(*(bp+4), PIMV2_REGISTER_FLAG_LEN))
+                        goto trunc;
+
+                printf(", Flags [ %s ]\n\t",
+                       tok2str(pimv2_register_flag_values,
+                               "none",
+                               EXTRACT_32BITS(bp+4)));
 
+               bp += 8; len -= 8;
                /* encapsulated multicast packet */
-               if (bp >= ep)
-                       break;
                ip = (struct ip *)bp;
                switch (IP_V(ip)) {
+                case 0: /* Null header */
+                       (void)printf("IP-Null-header %s > %s",
+                                     ipaddr_string(&ip->ip_src),
+                                     ipaddr_string(&ip->ip_dst));
+                       break;
+
                case 4: /* IPv4 */
-                       printf(" ");
                        ip_print(gndo, bp, len);
                        break;
 #ifdef INET6
                case 6: /* IPv6 */
-                       printf(" ");
                        ip6_print(bp, len);
                        break;
 #endif
-               default:
-                       (void)printf(" IP ver %d", IP_V(ip));
-                       break;
+                default:
+                        (void)printf("IP ver %d", IP_V(ip));
+                        break;
                }
                break;
        }