add boundary, infinite loop checks

[tcpdump] / print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index 4e7b3782f1aafb5d963a0a956cf84bcfeb39ca01..a2043eaca114fbacd679d1ea20df8ceb26fefe10 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.5 2002-08-08 19:52:48 hannes Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.13 2005-04-06 21:32:41 mcr 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",
@@ -86,8 +73,7 @@ mpls_print(const u_char *bp, u_int length)
                if (vflag &&
                    MPLS_LABEL(v) < sizeof(mpls_labelname) / sizeof(mpls_labelname[0]))
                        printf(" (%s)", mpls_labelname[MPLS_LABEL(v)]);
-               if (MPLS_EXP(v))
-                       printf(", exp %u", MPLS_EXP(v));
+               printf(", exp %u", MPLS_EXP(v));
                if (MPLS_STACK(v))
                        printf(", [S]");
                printf(", ttl %u", MPLS_TTL(v));
@@ -100,7 +86,7 @@ mpls_print(const u_char *bp, u_int length)
        switch (MPLS_LABEL(v)) {
        case 0: /* IPv4 explicit NULL label */
         case 3:        /* IPv4 implicit NULL label */
-               ip_print(p, length - (p - bp));
+               ip_print(gndo, p, length - (p - bp));
                break;
 #ifdef INET6
        case 2: /* IPv6 explicit NULL label */
@@ -115,7 +101,7 @@ mpls_print(const u_char *bp, u_int length)
                  * bit is set and tries to determine the network layer protocol
                  * 0x45-0x4f is IPv4
                  * 0x60-0x6f is IPv6
-                 * 0x83      is IS-IS
+                 * 0x81-0x83 is OSI (CLNP,ES-IS,IS-IS)
                  * this technique is sometimes known as NULL encapsulation
                  * and decoding is particularly useful for control-plane traffic [BGP]
                  * which cisco by default sends MPLS encapsulated
@@ -134,8 +120,11 @@ mpls_print(const u_char *bp, u_int length)
                     case 0x4d:
                     case 0x4e:
                     case 0x4f:
-                        printf("\n\t");
-                        ip_print(p, length - (p - bp));
+                       if (vflag>0) {
+                            printf("\n\t");
+                            ip_print(gndo, p, length - (p - bp));
+                           }
+                        else printf(", IP, length: %u",length);
                         break;
 #ifdef INET6
                     case 0x60:
@@ -154,13 +143,21 @@ mpls_print(const u_char *bp, u_int length)
                     case 0x6d:
                     case 0x6e:
                     case 0x6f:
-                        printf("\n\t");
-                        ip6_print(p, length - (p - bp));
+                       if (vflag>0) {
+                            printf("\n\t");
+                            ip6_print(p, length - (p - bp));
+                            }
+                       else printf(", IPv6, length: %u",length);
                         break;
 #endif
+                    case 0x81:
+                    case 0x82:
                     case 0x83:
-                        printf("\n\t");
-                        isoclns_print(p, length - (p - bp), length - (p - bp), NULL, NULL);
+                       if (vflag>0) {
+                            printf("\n\t");
+                            isoclns_print(p, length - (p - bp), length - (p - bp));
+                           }
+                       else printf(", OSI, length: %u",length);
                         break;
                     default:
                         /* ok bail out - we did not figure out what it is*/
@@ -174,3 +171,10 @@ trunc:
        printf("[|MPLS]");
 }
 
+
+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */