Add some additional bounds checking.

[tcpdump] / print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index 67e974bb36122790f8b490786384e9c7bb5f7633..a6de5cf12f5a56463bf425925cbb507faee487b2 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -27,8 +27,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.7 2003-05-08 15:05:41 hannes Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.12 2004-06-14 14:47:58 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -44,20 +44,7 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "interface.h"
 #include "extract.h"                   /* must come after interface.h */
-
-#define LABEL_MASK     0xfffff000
-#define LABEL_SHIFT    12
-#define        EXP_MASK        0x00000e00
-#define EXP_SHIFT      9
-#define        STACK_MASK      0x00000100
-#define STACK_SHIFT    8
-#define TTL_MASK       0x000000ff
-#define TTL_SHIFT      0
-
-#define MPLS_LABEL(x)  (((x) & LABEL_MASK) >> LABEL_SHIFT)
-#define MPLS_EXP(x)    (((x) & EXP_MASK) >> EXP_SHIFT)
-#define MPLS_STACK(x)  (((x) & STACK_MASK) >> STACK_SHIFT)
-#define MPLS_TTL(x)    (((x) & TTL_MASK) >> TTL_SHIFT)
+#include "mpls.h"
 
 static const char *mpls_labelname[] = {
 /*0*/  "IPv4 explicit NULL", "router alert", "IPv6 explicit NULL",
@@ -168,7 +155,7 @@ mpls_print(const u_char *bp, u_int length)
                     case 0x83:
                        if (vflag>0) {
                             printf("\n\t");
-                            isoclns_print(p, length - (p - bp), length - (p - bp), NULL, NULL);
+                            isoclns_print(p, length - (p - bp), length - (p - bp));
                            }
                        else printf(", OSI, length: %u",length);
                         break;
@@ -183,14 +170,3 @@ mpls_print(const u_char *bp, u_int length)
 trunc:
        printf("[|MPLS]");
 }
-
-/*
- * draft-ietf-mpls-lsp-ping-02.txt
- */
-void
-mpls_lsp_ping_print(const u_char *pptr, u_int length)
-{
-    printf("UDP, LSP-PING, length: %u", length);
-    if (vflag >1)
-       print_unknown_data(pptr,"\n\t  ", length);
-}