Revert partially the commit 21b1273

[tcpdump] / print-msdp.c

diff --git a/print-msdp.c b/print-msdp.c
index 59a0a092ff8ddf95ada47ad3525ce03e30d0548b..545f452a6671238a1f34d147d6ec2bac5ed6bab9 100644 (file)
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -19,10 +19,10 @@
 /* \summary: Multicast Source Discovery Protocol (MSDP) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: Multicast Source Discovery Protocol (MSDP) printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

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


@@ -35,56 +35,56 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
 {
        unsigned int type, len;
 
 {
        unsigned int type, len;
 

-       ND_TCHECK_3(sp);
+       ndo->ndo_protocol = "msdp";

        /* See if we think we're at the beginning of a compound packet */
        /* See if we think we're at the beginning of a compound packet */

-       type = *sp;
-       len = EXTRACT_BE_U_2(sp + 1);
+       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 */
        if (len > 1500 || len < 3 || type == 0 || type > MSDP_TYPE_MAX)
                goto trunc;     /* not really truncated, but still not decodable */

-       ND_PRINT((ndo, " msdp:"));
-       while (length > 0) {
-               ND_TCHECK_3(sp);
-               type = *sp;
-               len = EXTRACT_BE_U_2(sp + 1);
+       ND_PRINT(" msdp:");
+       while (length != 0) {
+               type = GET_U_1(sp);
+               len = GET_BE_U_2(sp + 1);

                if (len > 1400 || ndo->ndo_vflag)
                if (len > 1400 || ndo->ndo_vflag)

-                       ND_PRINT((ndo, " [len %u]", len));
+                       ND_PRINT(" [len %u]", len);

                if (len < 3)
                        goto trunc;
                if (len < 3)
                        goto trunc;

+               if (length < len)
+                       goto trunc;

                sp += 3;
                length -= 3;
                switch (type) {
                case 1: /* IPv4 Source-Active */
                case 3: /* IPv4 Source-Active Response */
                        if (type == 1)
                sp += 3;
                length -= 3;
                switch (type) {
                case 1: /* IPv4 Source-Active */
                case 3: /* IPv4 Source-Active Response */
                        if (type == 1)

-                               ND_PRINT((ndo, " SA"));
+                               ND_PRINT(" SA");

                        else
                        else

-                               ND_PRINT((ndo, " SA-Response"));
-                       ND_TCHECK(*sp);
-                       ND_PRINT((ndo, " %u entries", EXTRACT_U_1(sp)));
-                       if ((u_int)((*sp * 12) + 8) < len) {
-                               ND_PRINT((ndo, " [w/data]"));
+                               ND_PRINT(" SA-Response");
+                       ND_PRINT(" %u entries", GET_U_1(sp));
+                       if ((u_int)((GET_U_1(sp) * 12) + 8) < len) {
+                               ND_PRINT(" [w/data]");

                                if (ndo->ndo_vflag > 1) {
                                if (ndo->ndo_vflag > 1) {

-                                       ND_PRINT((ndo, " "));
-                                       ip_print(ndo, sp + *sp * 12 + 8 - 3,
-                                                len - (*sp * 12 + 8));
+                                       ND_PRINT(" ");
+                                       ip_print(ndo, sp +
+                                                GET_U_1(sp) * 12 + 8 - 3,
+                                                len - (GET_U_1(sp) * 12 + 8));

                                }
                        }
                        break;
                case 2:
                                }
                        }
                        break;
                case 2:

-                       ND_PRINT((ndo, " SA-Request"));
-                       ND_TCHECK_5(sp);
-                       ND_PRINT((ndo, " for %s", ipaddr_string(ndo, sp + 1)));
+                       ND_PRINT(" SA-Request");
+                       ND_PRINT(" for %s", GET_IPADDR_STRING(sp + 1));

                        break;
                case 4:
                        break;
                case 4:

-                       ND_PRINT((ndo, " Keepalive"));
+                       ND_PRINT(" Keepalive");

                        if (len != 3)
                        if (len != 3)

-                               ND_PRINT((ndo, "[len=%d] ", len));
+                               ND_PRINT("[len=%u] ", len);

                        break;
                case 5:
                        break;
                case 5:

-                       ND_PRINT((ndo, " Notification"));
+                       ND_PRINT(" Notification");

                        break;
                default:
                        break;
                default:

-                       ND_PRINT((ndo, " [type=%d len=%d]", type, len));
+                       ND_PRINT(" [type=%u len=%u]", type, len);

                        break;
                }
                sp += (len - 3);
                        break;
                }
                sp += (len - 3);


@@ -92,12 +92,5 @@ msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)
        }
        return;
 trunc:
        }
        return;
 trunc:

-       ND_PRINT((ndo, " [|msdp]"));
+       nd_print_trunc(ndo);

 }
 }

-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */