Merge branch 'master' of git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump

[tcpdump] / print-mpls.c

diff --git a/print-mpls.c b/print-mpls.c
index 8d5e7a4a1b576396109586f0b18595624c043631..d97cce5278b4871cf31df384c8122d2b3a55d7a9 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -27,42 +27,24 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.3 2002-05-07 18:35:39 fenner Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-mpls.c,v 1.14 2005-07-05 09:38:19 hannes Exp $ (LBL)";

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

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>

 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <unistd.h>

 
 #include "addrtoname.h"
 #include "interface.h"
 #include "extract.h"                   /* must come after interface.h */
 
 #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",
 
 static const char *mpls_labelname[] = {
 /*0*/  "IPv4 explicit NULL", "router alert", "IPv6 explicit NULL",


@@ -72,6 +54,13 @@ static const char *mpls_labelname[] = {
 /*15*/ "rsvd",
 };
 
 /*15*/ "rsvd",
 };
 

+enum mpls_packet_type {
+       PT_UNKNOWN,
+       PT_IPV4,
+       PT_IPV6,
+       PT_OSI
+};
+

 /*
  * RFC3032: MPLS label stack encoding
  */
 /*
  * RFC3032: MPLS label stack encoding
  */


@@ -79,46 +68,160 @@ void
 mpls_print(const u_char *bp, u_int length)
 {
        const u_char *p;
 mpls_print(const u_char *bp, u_int length)
 {
        const u_char *p;

-       u_int32_t v;
+       u_int32_t label_entry;
+       u_int16_t label_stack_depth = 0;
+       enum mpls_packet_type pt = PT_UNKNOWN;

 
        p = bp;
        printf("MPLS");
        do {
 
        p = bp;
        printf("MPLS");
        do {

-               TCHECK2(*p, sizeof(v));
-               v = EXTRACT_32BITS(p);
-               printf(" (");   /*)*/
-               printf("label 0x%x", MPLS_LABEL(v));
+               TCHECK2(*p, sizeof(label_entry));
+               label_entry = EXTRACT_32BITS(p);
+               printf("%s(label %u",
+                      (label_stack_depth && vflag) ? "\n\t" : " ",
+                              MPLS_LABEL(label_entry));
+               label_stack_depth++;

                if (vflag &&
                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 0x%x", MPLS_EXP(v));
-               if (MPLS_STACK(v))
-                       printf("[S]");
-               printf(" TTL %u", MPLS_TTL(v));
-               /*(*/
-               printf(")");
-
-               p += sizeof(v);
-       } while (!MPLS_STACK(v));
-
-       switch (MPLS_LABEL(v)) {
+                   MPLS_LABEL(label_entry) < sizeof(mpls_labelname) / sizeof(mpls_labelname[0]))
+                       printf(" (%s)", mpls_labelname[MPLS_LABEL(label_entry)]);
+               printf(", exp %u", MPLS_EXP(label_entry));
+               if (MPLS_STACK(label_entry))
+                       printf(", [S]");
+               printf(", ttl %u)", MPLS_TTL(label_entry));
+
+               p += sizeof(label_entry);
+       } while (!MPLS_STACK(label_entry));
+
+       /*
+        * Try to figure out the packet type.
+        */
+       switch (MPLS_LABEL(label_entry)) {
+

        case 0: /* IPv4 explicit NULL label */
        case 0: /* IPv4 explicit NULL label */

-               ip_print(p, length - (p - bp));
+       case 3: /* IPv4 implicit NULL label */
+               pt = PT_IPV4;

                break;
                break;

-#ifdef INET6
+

        case 2: /* IPv6 explicit NULL label */
        case 2: /* IPv6 explicit NULL label */

-               ip6_print(p, length - (p - bp));
+               pt = PT_IPV6;

                break;
                break;

-#endif
+

        default:
                /*
        default:
                /*

-                * Since there's no indication of protocol in MPLS label
-                * encoding, we can print nothing further.
+                * Generally there's no indication of protocol in MPLS label
+                * encoding.
+                *
+                * However, draft-hsmit-isis-aal5mux-00.txt describes a
+                * technique for encapsulating IS-IS and IP traffic on the
+                * same ATM virtual circuit; you look at the first payload
+                * byte to determine the network layer protocol, based on
+                * the fact that
+                *
+                *      1) the first byte of an IP header is 0x45-0x4f
+                *         for IPv4 and 0x60-0x6f for IPv6;
+                *
+                *      2) the first byte of an OSI CLNP packet is 0x81,
+                *         the first byte of an OSI ES-IS packet is 0x82,
+                *         and the first byte of an OSI IS-IS packet is
+                *         0x83;
+                *
+                * so the network layer protocol can be inferred from the
+                * first byte of the packet, if the protocol is one of the
+                * ones listed above.
+                *
+                * Cisco sends control-plane traffic MPLS-encapsulated in
+                * this fashion.

                 */
                 */

+               switch(*p) {
+
+               case 0x45:
+               case 0x46:
+               case 0x47:
+               case 0x48:
+               case 0x49:
+               case 0x4a:
+               case 0x4b:
+               case 0x4c:
+               case 0x4d:
+               case 0x4e:
+               case 0x4f:
+                       pt = PT_IPV4;
+                       break;
+                               
+               case 0x60:
+               case 0x61:
+               case 0x62:
+               case 0x63:
+               case 0x64:
+               case 0x65:
+               case 0x66:
+               case 0x67:
+               case 0x68:
+               case 0x69:
+               case 0x6a:
+               case 0x6b:
+               case 0x6c:
+               case 0x6d:
+               case 0x6e:
+               case 0x6f:
+                       pt = PT_IPV6;
+                       break;
+
+               case 0x81:
+               case 0x82:
+               case 0x83:
+                       pt = PT_OSI;
+                       break;
+
+               default:
+                       /* ok bail out - we did not figure out what it is*/
+                       break;
+               }
+       }
+
+       /*
+        * Print the payload.
+        */
+       if (pt == PT_UNKNOWN) {
+               if (!suppress_default_print)
+                       default_print(p, length - (p - bp));

                return;
        }
                return;
        }

+       if (vflag)
+               printf("\n\t");
+       else
+               printf(" ");
+       switch (pt) {
+
+       case PT_IPV4:
+               ip_print(gndo, p, length - (p - bp));
+               break;
+
+       case PT_IPV6:
+#ifdef INET6
+               ip6_print(gndo, p, length - (p - bp));
+#else
+               printf("IPv6, length: %u", length);
+#endif
+               break;
+
+       case PT_OSI:
+               isoclns_print(p, length - (p - bp), length - (p - bp));
+               break;
+
+       default:
+               break;
+       }
+       return;

 
 trunc:
        printf("[|MPLS]");
 }
 
 trunc:
        printf("[|MPLS]");
 }

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