CHANGES: Add/move change(s) backported to 4.99

[tcpdump] / print-msdp.c

diff --git a/print-msdp.c b/print-msdp.c
index 4fe9eb87c4a4229999cf8351cc4510bed4b6d4b0..1d01233c6551407bc9531902e567e27d14b092fa 100644 (file)
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -15,88 +15,112 @@
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  */
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  */

-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-msdp.c,v 1.2 2001-12-10 08:06:40 guy Exp $";
-#endif

 
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: Multicast Source Discovery Protocol (MSDP) printer */

 
 

-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <config.h>

 
 

-#include <netinet/in.h>
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect-stdinc.h"

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "extract.h"
 
 #define MSDP_TYPE_MAX  7
 
 void
 #include "addrtoname.h"
 #include "extract.h"
 
 #define MSDP_TYPE_MAX  7
 
 void

-msdp_print(const unsigned char *sp, u_int length)
+msdp_print(netdissect_options *ndo, const u_char *sp, u_int length)

 {
        unsigned int type, len;
 
 {
        unsigned int type, len;
 

-       TCHECK2(*sp, 3);
+       ndo->ndo_protocol = "msdp";
+       ND_PRINT(": ");
+       nd_print_protocol(ndo);

        /* 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_16BITS(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 */

-       (void)printf(" msdp:");
-       while (length > 0) {
-               TCHECK2(*sp, 3);
-               type = *sp;
-               len = EXTRACT_16BITS(sp + 1);
-               if (len > 1400 || vflag)
-                       printf(" [len %d]", len);
+       while (length != 0) {
+               unsigned int entry_count;
+
+               if (length < 3)
+                       goto trunc;
+               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 (len < 3)
                        goto trunc;

-               sp += 3;
-               length -= 3;
+               if (length < len)
+                       goto trunc;

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

-                               (void)printf(" SA");
+                               ND_PRINT(" SA");

                        else
                        else

-                               (void)printf(" SA-Response");
-                       TCHECK(*sp);
-                       (void)printf(" %d entries", *sp);
-                       if (*sp * 12 + 8 < len) {
-                               (void)printf(" [w/data]");
-                               if (vflag > 1) {
-                                       (void)printf(" ");
-                                       ip_print(sp + *sp * 12 + 8 - 3,
-                                                len - (*sp * 12 + 8));
+                               ND_PRINT(" SA-Response");
+
+                       /* Entry Count */
+                       if (len < 4)
+                               goto trunc;
+                       entry_count = GET_U_1(sp + 3);
+                       ND_PRINT(" %u entries", entry_count);
+
+                       /* RP Address */
+                       if (len < 8)
+                               goto trunc;
+                       /* XXX -print this based on ndo_vflag? */
+                       ND_TCHECK_LEN(sp + 4, 4);
+
+                       /* Entries */
+                       ND_TCHECK_LEN(sp + 8, entry_count*12);
+
+                       if (len > (8 + entry_count*12)) {
+                               /* Encapsulated IP packet */
+                               ND_PRINT(" [w/data]");
+                               if (ndo->ndo_vflag > 1) {
+                                       ND_PRINT(" ");
+                                       ip_print(ndo, sp + (8 + entry_count*12),
+                                           len - (8 + entry_count*12));

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

-                       (void)printf(" SA-Request");
-                       TCHECK2(*sp, 5);
-                       (void)printf(" for %s", ipaddr_string(sp + 1));
+                       /* draft-ietf-msdp-spec-13 */
+                       ND_PRINT(" SA-Request");
+
+                       /* Reserved */
+                       if (len < 4)
+                               goto trunc;
+                       ND_TCHECK_1(sp + 3);
+
+                       /* Group Address */
+                       if (len < 8)
+                               goto trunc;
+                       if (len != 8)
+                               ND_PRINT("[len=%u] ", len);
+                       ND_PRINT(" for %s", GET_IPADDR_STRING(sp + 4));

                        break;
                case 4:
                        break;
                case 4:

-                       (void)printf(" Keepalive");
+                       ND_PRINT(" Keepalive");

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

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

                        break;
                case 5:
                        break;
                case 5:

-                       (void)printf(" Notification");
+                       ND_PRINT(" Notification");

                        break;
                default:
                        break;
                default:

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

                        break;
                }
                        break;
                }

-               sp += (len - 3);
-               length -= (len - 3);
+               ND_TCHECK_LEN(sp, len);
+               sp += len;
+               length -= len;

        }
        return;
 trunc:
        }
        return;
 trunc:

-       (void)printf(" [|msdp]");
+       nd_print_trunc(ndo);

 }
 }