Use nd_ types, add EXTRACT_ calls, use %u for unsigned values.

[tcpdump] / print-msdp.c

diff --git a/print-msdp.c b/print-msdp.c
index 4fe9eb87c4a4229999cf8351cc4510bed4b6d4b0..f1769de04a9807f9a7fcf39e1f6f178612efcd24 100644 (file)
--- a/print-msdp.c
+++ b/print-msdp.c
@@ -15,45 +15,39 @@
  * 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
+
+/* \summary: Multicast Source Discovery Protocol (MSDP) printer */

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

-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <netinet/in.h>
+#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);
+       ND_TCHECK_3(sp);

        /* 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 = EXTRACT_U_1(sp);
+       len = EXTRACT_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:");
+       ND_PRINT((ndo, " msdp:"));

        while (length > 0) {
        while (length > 0) {

-               TCHECK2(*sp, 3);
-               type = *sp;
-               len = EXTRACT_16BITS(sp + 1);
-               if (len > 1400 || vflag)
-                       printf(" [len %d]", len);
+               ND_TCHECK_3(sp);
+               type = EXTRACT_U_1(sp);
+               len = EXTRACT_BE_U_2(sp + 1);
+               if (len > 1400 || ndo->ndo_vflag)
+                       ND_PRINT((ndo, " [len %u]", len));

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


@@ -62,35 +56,36 @@ msdp_print(const unsigned char *sp, u_int length)
                case 1: /* IPv4 Source-Active */
                case 3: /* IPv4 Source-Active Response */
                        if (type == 1)
                case 1: /* IPv4 Source-Active */
                case 3: /* IPv4 Source-Active Response */
                        if (type == 1)

-                               (void)printf(" SA");
+                               ND_PRINT((ndo, " 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((ndo, " SA-Response"));
+                       ND_TCHECK_1(sp);
+                       ND_PRINT((ndo, " %u entries", EXTRACT_U_1(sp)));
+                       if ((u_int)((EXTRACT_U_1(sp) * 12) + 8) < len) {
+                               ND_PRINT((ndo, " [w/data]"));
+                               if (ndo->ndo_vflag > 1) {
+                                       ND_PRINT((ndo, " "));
+                                       ip_print(ndo, sp +
+                                                EXTRACT_U_1(sp) * 12 + 8 - 3,
+                                                len - (EXTRACT_U_1(sp) * 12 + 8));

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

-                       (void)printf(" SA-Request");
-                       TCHECK2(*sp, 5);
-                       (void)printf(" for %s", ipaddr_string(sp + 1));
+                       ND_PRINT((ndo, " SA-Request"));
+                       ND_TCHECK_5(sp);
+                       ND_PRINT((ndo, " for %s", ipaddr_string(ndo, sp + 1)));

                        break;
                case 4:
                        break;
                case 4:

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

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

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

                        break;
                case 5:
                        break;
                case 5:

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

                        break;
                default:
                        break;
                default:

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

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


@@ -98,5 +93,12 @@ msdp_print(const unsigned char *sp, u_int length)
        }
        return;
 trunc:
        }
        return;
 trunc:

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

 }
 }

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