MSDP: Modernize packet parsing

Use ND_ICHECK_U() in length/type tests and add an 'invalid' label.
Remove the 'trunc' label.
Move '#define ND_LONGJMP_FROM_TCHECK' just before '#include "netdissect.h"'
as for all other uses.

diff --git a/CHANGES b/CHANGES
index 6039fc929c1a0099c28dda50c2b5caededfe00fe..03bf1a03d8a131ce592b536dcc6819d554986b50 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -42,7 +42,7 @@ DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
       Remove unused missing/snprintf.c.
       Remove unused missing/strdup.c.
       (FIXME: somebody please wrap the line below just before the release)
       Remove unused missing/snprintf.c.
       Remove unused missing/strdup.c.
       (FIXME: somebody please wrap the line below just before the release)

-      AODV, AppleTalk, BOOTP, CHDLC, DCCP, EAP, EGP, EIGRP, ForCES, Geneve, GRE, ICMP, Juniper, L2TP, mobile, NetFlow, NFLOG, NTP, OLSR, pflog, PGM, RADIUS, RIP, RSVP, SCTP, SNMP, TCP, UDP, vsock: Modernize packet parsing style
+      AODV, AppleTalk, BOOTP, CHDLC, DCCP, EAP, EGP, EIGRP, ForCES, Geneve, GRE, ICMP, Juniper, L2TP, mobile, MSDP, NetFlow, NFLOG, NTP, OLSR, pflog, PGM, RADIUS, RIP, RSVP, SCTP, SNMP, TCP, UDP, vsock: Modernize packet parsing style

       DCCP, EGP: Replace custom code with tok2str()
       UDP: Clean up address and port printing.
       AppleTalk: Declutter appletalk.h.
       DCCP, EGP: Replace custom code with tok2str()
       UDP: Clean up address and port printing.
       AppleTalk: Declutter appletalk.h.

diff --git a/print-msdp.c b/print-msdp.c
index 1d01233c6551407bc9531902e567e27d14b092fa..922a93b24b5bae83649264b4c72574e1e890a15e 100644 (file)
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -20,9 +20,9 @@
 
 #include <config.h>
 
 
 #include <config.h>
 

-#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect-stdinc.h"
 
 #include "netdissect-stdinc.h"
 

+#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"


@@ -40,21 +40,20 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
        /* See if we think we're at the beginning of a compound packet */
        type = GET_U_1(sp);
        len = GET_BE_U_2(sp + 1);
        /* See if we think we're at the beginning of a compound packet */
        type = GET_U_1(sp);
        len = GET_BE_U_2(sp + 1);

-       if (len > 1500 || len < 3 || type == 0 || type > MSDP_TYPE_MAX)
-               goto trunc;     /* not really truncated, but still not decodable */
+       ND_ICHECK_U(len, >, 1500);
+       ND_ICHECK_U(len, <, 3);
+       ND_ICHECK_U(type, ==, 0);
+       ND_ICHECK_U(type, >, MSDP_TYPE_MAX);

        while (length != 0) {
                unsigned int entry_count;
 
        while (length != 0) {
                unsigned int entry_count;
 

-               if (length < 3)
-                       goto trunc;
+               ND_ICHECK_U(length, <, 3);

                type = GET_U_1(sp);
                len = GET_BE_U_2(sp + 1);
                if (len > 1400 || ndo->ndo_vflag)
                        ND_PRINT(" [len %u]", len);
                type = GET_U_1(sp);
                len = GET_BE_U_2(sp + 1);
                if (len > 1400 || ndo->ndo_vflag)
                        ND_PRINT(" [len %u]", len);

-               if (len < 3)
-                       goto trunc;
-               if (length < len)
-                       goto trunc;
+               ND_ICHECK_U(len, <, 3);
+               ND_ICHECK_U(length, <, len);

                switch (type) {
                case 1: /* IPv4 Source-Active */
                case 3: /* IPv4 Source-Active Response */
                switch (type) {
                case 1: /* IPv4 Source-Active */
                case 3: /* IPv4 Source-Active Response */


@@ -64,14 +63,12 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
                                ND_PRINT(" SA-Response");
 
                        /* Entry Count */
                                ND_PRINT(" SA-Response");
 
                        /* Entry Count */

-                       if (len < 4)
-                               goto trunc;
+                       ND_ICHECK_U(len, <, 4);

                        entry_count = GET_U_1(sp + 3);
                        ND_PRINT(" %u entries", entry_count);
 
                        /* RP Address */
                        entry_count = GET_U_1(sp + 3);
                        ND_PRINT(" %u entries", entry_count);
 
                        /* RP Address */

-                       if (len < 8)
-                               goto trunc;
+                       ND_ICHECK_U(len, <, 8);

                        /* XXX -print this based on ndo_vflag? */
                        ND_TCHECK_LEN(sp + 4, 4);
 
                        /* XXX -print this based on ndo_vflag? */
                        ND_TCHECK_LEN(sp + 4, 4);
 


@@ -93,13 +90,11 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
                        ND_PRINT(" SA-Request");
 
                        /* Reserved */
                        ND_PRINT(" SA-Request");
 
                        /* Reserved */

-                       if (len < 4)
-                               goto trunc;
+                       ND_ICHECK_U(len, <, 4);

                        ND_TCHECK_1(sp + 3);
 
                        /* Group Address */
                        ND_TCHECK_1(sp + 3);
 
                        /* Group Address */

-                       if (len < 8)
-                               goto trunc;
+                       ND_ICHECK_U(len, <, 8);

                        if (len != 8)
                                ND_PRINT("[len=%u] ", len);
                        ND_PRINT(" for %s", GET_IPADDR_STRING(sp + 4));
                        if (len != 8)
                                ND_PRINT("[len=%u] ", len);
                        ND_PRINT(" for %s", GET_IPADDR_STRING(sp + 4));


@@ -121,6 +116,8 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
                length -= len;
        }
        return;
                length -= len;
        }
        return;

-trunc:
-       nd_print_trunc(ndo);
+
+invalid:
+   nd_print_invalid(ndo);
+

 }
 }