add basic support for Ethernet OAM Frames as per 802.3ah

[tcpdump] / print-juniper.c

diff --git a/print-juniper.c b/print-juniper.c
index 70ee8633e36a0643f13e243ae340fd617deccf2b..9b0a70fd518084d40ac0900d17047f11b9b24cdf 100644 (file)
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-juniper.c,v 1.17 2005-05-22 21:18:17 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-juniper.c,v 1.29 2006-02-01 14:42:17 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -34,19 +34,26 @@ static const char rcsid[] _U_ =
 #include "llc.h"
 #include "nlpid.h"
 #include "ethertype.h"
 #include "llc.h"
 #include "nlpid.h"
 #include "ethertype.h"

+#include "atm.h"

 
 #define JUNIPER_BPF_OUT           0       /* Outgoing packet */
 #define JUNIPER_BPF_IN            1       /* Incoming packet */
 #define JUNIPER_BPF_PKT_IN        0x1     /* Incoming packet */
 #define JUNIPER_BPF_NO_L2         0x2     /* L2 header stripped */
 
 #define JUNIPER_BPF_OUT           0       /* Outgoing packet */
 #define JUNIPER_BPF_IN            1       /* Incoming packet */
 #define JUNIPER_BPF_PKT_IN        0x1     /* Incoming packet */
 #define JUNIPER_BPF_NO_L2         0x2     /* L2 header stripped */

+#define JUNIPER_BPF_IIF           0x4     /* IIF is valid */
+#define JUNIPER_BPF_FILTER        0x40    /* BPF filtering is supported */
+#define JUNIPER_BPF_EXT           0x80    /* extensions present */

 #define JUNIPER_MGC_NUMBER        0x4d4743 /* = "MGC" */
 
 #define JUNIPER_MGC_NUMBER        0x4d4743 /* = "MGC" */
 

+#define JUNIPER_LSQ_COOKIE_RE         (1 << 3)
+#define JUNIPER_LSQ_COOKIE_DIR        (1 << 2)

 #define JUNIPER_LSQ_L3_PROTO_SHIFT     4
 #define JUNIPER_LSQ_L3_PROTO_MASK     (0x17 << JUNIPER_LSQ_L3_PROTO_SHIFT)
 #define JUNIPER_LSQ_L3_PROTO_IPV4     (0 << JUNIPER_LSQ_L3_PROTO_SHIFT)
 #define JUNIPER_LSQ_L3_PROTO_IPV6     (1 << JUNIPER_LSQ_L3_PROTO_SHIFT)
 #define JUNIPER_LSQ_L3_PROTO_MPLS     (2 << JUNIPER_LSQ_L3_PROTO_SHIFT)
 #define JUNIPER_LSQ_L3_PROTO_ISO      (3 << JUNIPER_LSQ_L3_PROTO_SHIFT)
 #define JUNIPER_LSQ_L3_PROTO_SHIFT     4
 #define JUNIPER_LSQ_L3_PROTO_MASK     (0x17 << JUNIPER_LSQ_L3_PROTO_SHIFT)
 #define JUNIPER_LSQ_L3_PROTO_IPV4     (0 << JUNIPER_LSQ_L3_PROTO_SHIFT)
 #define JUNIPER_LSQ_L3_PROTO_IPV6     (1 << JUNIPER_LSQ_L3_PROTO_SHIFT)
 #define JUNIPER_LSQ_L3_PROTO_MPLS     (2 << JUNIPER_LSQ_L3_PROTO_SHIFT)
 #define JUNIPER_LSQ_L3_PROTO_ISO      (3 << JUNIPER_LSQ_L3_PROTO_SHIFT)

+#define AS_PIC_COOKIE_LEN 8

 
 #define JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE 1
 #define JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE 2
 
 #define JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE 1
 #define JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE 2


@@ -69,6 +76,42 @@ static struct tok juniper_direction_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

+/* codepoints for encoding extensions to a .pcap file */
+enum {
+    JUNIPER_EXT_TLV_IFD_IDX = 1,
+    JUNIPER_EXT_TLV_IFD_NAME = 2,
+    JUNIPER_EXT_TLV_IFD_MEDIATYPE = 3,
+    JUNIPER_EXT_TLV_IFL_IDX = 4,
+    JUNIPER_EXT_TLV_IFL_UNIT = 5,
+    JUNIPER_EXT_TLV_IFL_ENCAPS = 6, 
+    JUNIPER_EXT_TLV_TTP_IFD_MEDIATYPE = 7,  
+    JUNIPER_EXT_TLV_TTP_IFL_ENCAPS = 8
+};
+
+/* 1 byte type and 1-byte length */
+#define JUNIPER_EXT_TLV_OVERHEAD 2
+
+struct tok jnx_ext_tlv_values[] = {
+    { JUNIPER_EXT_TLV_IFD_IDX, "Device Interface Index" },
+    { JUNIPER_EXT_TLV_IFD_NAME,"Device Interface Name" },
+    { JUNIPER_EXT_TLV_IFD_MEDIATYPE, "Device Media Type" },
+    { JUNIPER_EXT_TLV_IFL_IDX, "Logical Interface Index" },
+    { JUNIPER_EXT_TLV_IFL_UNIT,"Logical Unit Number" },
+    { JUNIPER_EXT_TLV_IFL_ENCAPS, "Logical Interface Encapsulation" },
+    { JUNIPER_EXT_TLV_TTP_IFD_MEDIATYPE, "TTP derived Device Media Type" },
+    { JUNIPER_EXT_TLV_TTP_IFL_ENCAPS, "TTP derived Logical Interface Encapsulation" },
+    { 0, NULL }
+};
+
+struct tok jnx_flag_values[] = {
+    { JUNIPER_BPF_EXT, "Ext" },
+    { JUNIPER_BPF_FILTER, "Filter" },
+    { JUNIPER_BPF_IIF, "IIF" },
+    { JUNIPER_BPF_NO_L2, "no-L2" },
+    { JUNIPER_BPF_PKT_IN, "In" },
+    { 0, NULL }
+};
+

 struct juniper_cookie_table_t {
     u_int32_t pictype;         /* pic type */
     u_int8_t  cookie_len;       /* cookie len */
 struct juniper_cookie_table_t {
     u_int32_t pictype;         /* pic type */
     u_int8_t  cookie_len;       /* cookie len */


@@ -76,17 +119,40 @@ struct juniper_cookie_table_t {
 };
 
 static struct juniper_cookie_table_t juniper_cookie_table[] = {
 };
 
 static struct juniper_cookie_table_t juniper_cookie_table[] = {

+#ifdef DLT_JUNIPER_ATM1

     { DLT_JUNIPER_ATM1,  4, "ATM1"},
     { DLT_JUNIPER_ATM1,  4, "ATM1"},

+#endif
+#ifdef DLT_JUNIPER_ATM2

     { DLT_JUNIPER_ATM2,  8, "ATM2"},
     { DLT_JUNIPER_ATM2,  8, "ATM2"},

+#endif
+#ifdef DLT_JUNIPER_MLPPP

     { DLT_JUNIPER_MLPPP, 2, "MLPPP"},
     { DLT_JUNIPER_MLPPP, 2, "MLPPP"},

+#endif
+#ifdef DLT_JUNIPER_MLFR

     { DLT_JUNIPER_MLFR,  2, "MLFR"},
     { DLT_JUNIPER_MLFR,  2, "MLFR"},

+#endif
+#ifdef DLT_JUNIPER_MFR

     { DLT_JUNIPER_MFR,   4, "MFR"},
     { DLT_JUNIPER_MFR,   4, "MFR"},

+#endif
+#ifdef DLT_JUNIPER_PPPOE

     { DLT_JUNIPER_PPPOE, 0, "PPPoE"},
     { DLT_JUNIPER_PPPOE, 0, "PPPoE"},

+#endif
+#ifdef DLT_JUNIPER_PPPOE_ATM

     { DLT_JUNIPER_PPPOE_ATM, 0, "PPPoE ATM"},
     { DLT_JUNIPER_PPPOE_ATM, 0, "PPPoE ATM"},

+#endif
+#ifdef DLT_JUNIPER_GGSN

     { DLT_JUNIPER_GGSN, 8, "GGSN"},
     { DLT_JUNIPER_GGSN, 8, "GGSN"},

+#endif
+#ifdef DLT_JUNIPER_MONITOR

     { DLT_JUNIPER_MONITOR, 8, "MONITOR"},
     { DLT_JUNIPER_MONITOR, 8, "MONITOR"},

+#endif
+#ifdef DLT_JUNIPER_SERVICES

     { DLT_JUNIPER_SERVICES, 8, "AS"},
     { DLT_JUNIPER_SERVICES, 8, "AS"},

+#endif
+#ifdef DLT_JUNIPER_ES

     { DLT_JUNIPER_ES, 0, "ES"},
     { DLT_JUNIPER_ES, 0, "ES"},

+#endif
+    { 0, 0, NULL }

 };
 
 struct juniper_l2info_t {
 };
 
 struct juniper_l2info_t {


@@ -100,6 +166,7 @@ struct juniper_l2info_t {
     u_int8_t cookie[8];
     u_int8_t bundle;
     u_int16_t proto;
     u_int8_t cookie[8];
     u_int8_t bundle;
     u_int16_t proto;

+    u_int8_t flags;

 };
 
 #define LS_COOKIE_ID            0x54
 };
 
 #define LS_COOKIE_ID            0x54


@@ -117,6 +184,8 @@ struct juniper_l2info_t {
 #define JUNIPER_PROTO_IPV4          2
 #define JUNIPER_PROTO_IPV6          6
 
 #define JUNIPER_PROTO_IPV4          2
 #define JUNIPER_PROTO_IPV6          6
 

+#define MFR_BE_MASK 0xc0
+

 static struct tok juniper_protocol_values[] = {
     { JUNIPER_PROTO_NULL, "Null" },
     { JUNIPER_PROTO_IPV4, "IPv4" },
 static struct tok juniper_protocol_values[] = {
     { JUNIPER_PROTO_NULL, "Null" },
     { JUNIPER_PROTO_IPV4, "IPv4" },


@@ -126,8 +195,10 @@ static struct tok juniper_protocol_values[] = {
 
 int ip_heuristic_guess(register const u_char *, u_int);
 int juniper_ppp_heuristic_guess(register const u_char *, u_int);
 
 int ip_heuristic_guess(register const u_char *, u_int);
 int juniper_ppp_heuristic_guess(register const u_char *, u_int);

+int juniper_read_tlv_value(const u_char *, u_int, u_int);

 static int juniper_parse_header (const u_char *, const struct pcap_pkthdr *, struct juniper_l2info_t *);
 
 static int juniper_parse_header (const u_char *, const struct pcap_pkthdr *, struct juniper_l2info_t *);
 

+#ifdef DLT_JUNIPER_GGSN

 u_int
 juniper_ggsn_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
 u_int
 juniper_ggsn_print(const struct pcap_pkthdr *h, register const u_char *p)
 {


@@ -171,7 +242,9 @@ juniper_ggsn_print(const struct pcap_pkthdr *h, register const u_char *p)
 
         return l2info.header_len;
 }
 
         return l2info.header_len;
 }

+#endif

 
 

+#ifdef DLT_JUNIPER_ES

 u_int
 juniper_es_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
 u_int
 juniper_es_print(const struct pcap_pkthdr *h, register const u_char *p)
 {


@@ -239,7 +312,9 @@ juniper_es_print(const struct pcap_pkthdr *h, register const u_char *p)
         ip_print(gndo, p, l2info.length);
         return l2info.header_len;
 }
         ip_print(gndo, p, l2info.length);
         return l2info.header_len;
 }

+#endif

 
 

+#ifdef DLT_JUNIPER_MONITOR

 u_int
 juniper_monitor_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
 u_int
 juniper_monitor_print(const struct pcap_pkthdr *h, register const u_char *p)
 {


@@ -270,7 +345,9 @@ juniper_monitor_print(const struct pcap_pkthdr *h, register const u_char *p)
 
         return l2info.header_len;
 }
 
         return l2info.header_len;
 }

+#endif

 
 

+#ifdef DLT_JUNIPER_SERVICES

 u_int
 juniper_services_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
 u_int
 juniper_services_print(const struct pcap_pkthdr *h, register const u_char *p)
 {


@@ -302,7 +379,9 @@ juniper_services_print(const struct pcap_pkthdr *h, register const u_char *p)
 
         return l2info.header_len;
 }
 
         return l2info.header_len;
 }

+#endif

 
 

+#ifdef DLT_JUNIPER_PPPOE

 u_int
 juniper_pppoe_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
 u_int
 juniper_pppoe_print(const struct pcap_pkthdr *h, register const u_char *p)
 {


@@ -317,7 +396,77 @@ juniper_pppoe_print(const struct pcap_pkthdr *h, register const u_char *p)
         ether_print(p, l2info.length, l2info.caplen);
         return l2info.header_len;
 }
         ether_print(p, l2info.length, l2info.caplen);
         return l2info.header_len;
 }

+#endif
+
+#ifdef DLT_JUNIPER_ETHER
+u_int
+juniper_ether_print(const struct pcap_pkthdr *h, register const u_char *p)
+{
+        struct juniper_l2info_t l2info;
+
+        l2info.pictype = DLT_JUNIPER_ETHER;
+        if(juniper_parse_header(p, h, &l2info) == 0)
+            return l2info.header_len;
+
+        p+=l2info.header_len;
+        /* this DLT contains nothing but raw Ethernet frames */
+        ether_print(p, l2info.length, l2info.caplen);
+        return l2info.header_len;
+}
+#endif

 
 

+#ifdef DLT_JUNIPER_PPP
+u_int
+juniper_ppp_print(const struct pcap_pkthdr *h, register const u_char *p)
+{
+        struct juniper_l2info_t l2info;
+
+        l2info.pictype = DLT_JUNIPER_PPP;
+        if(juniper_parse_header(p, h, &l2info) == 0)
+            return l2info.header_len;
+
+        p+=l2info.header_len;
+        /* this DLT contains nothing but raw ppp frames */
+        ppp_print(p, l2info.length);
+        return l2info.header_len;
+}
+#endif
+
+#ifdef DLT_JUNIPER_FRELAY
+u_int
+juniper_frelay_print(const struct pcap_pkthdr *h, register const u_char *p)
+{
+        struct juniper_l2info_t l2info;
+
+        l2info.pictype = DLT_JUNIPER_FRELAY;
+        if(juniper_parse_header(p, h, &l2info) == 0)
+            return l2info.header_len;
+
+        p+=l2info.header_len;
+        /* this DLT contains nothing but raw frame-relay frames */
+        fr_print(p, l2info.length);
+        return l2info.header_len;
+}
+#endif
+
+#ifdef DLT_JUNIPER_CHDLC
+u_int
+juniper_chdlc_print(const struct pcap_pkthdr *h, register const u_char *p)
+{
+        struct juniper_l2info_t l2info;
+
+        l2info.pictype = DLT_JUNIPER_CHDLC;
+        if(juniper_parse_header(p, h, &l2info) == 0)
+            return l2info.header_len;
+
+        p+=l2info.header_len;
+        /* this DLT contains nothing but raw c-hdlc frames */
+        chdlc_print(p, l2info.length);
+        return l2info.header_len;
+}
+#endif
+
+#ifdef DLT_JUNIPER_PPPOE_ATM

 u_int
 juniper_pppoe_atm_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
 u_int
 juniper_pppoe_atm_print(const struct pcap_pkthdr *h, register const u_char *p)
 {


@@ -343,7 +492,9 @@ juniper_pppoe_atm_print(const struct pcap_pkthdr *h, register const u_char *p)
         
         return l2info.header_len;
 }
         
         return l2info.header_len;
 }

+#endif

 
 

+#ifdef DLT_JUNIPER_MLPPP

 u_int
 juniper_mlppp_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
 u_int
 juniper_mlppp_print(const struct pcap_pkthdr *h, register const u_char *p)
 {


@@ -365,11 +516,19 @@ juniper_mlppp_print(const struct pcap_pkthdr *h, register const u_char *p)
         /* first try the LSQ protos */
         switch(l2info.proto) {
         case JUNIPER_LSQ_L3_PROTO_IPV4:
         /* first try the LSQ protos */
         switch(l2info.proto) {
         case JUNIPER_LSQ_L3_PROTO_IPV4:

-            ip_print(gndo, p, l2info.length);
+            /* IP traffic going to the RE would not have a cookie
+             * -> this must be incoming IS-IS over PPP
+             */
+            if (l2info.cookie[4] == (JUNIPER_LSQ_COOKIE_RE|JUNIPER_LSQ_COOKIE_DIR))
+                ppp_print(p, l2info.length);
+            else
+                ip_print(gndo, p, l2info.length);

             return l2info.header_len;
             return l2info.header_len;

+#ifdef INET6

         case JUNIPER_LSQ_L3_PROTO_IPV6:
             ip6_print(p,l2info.length);
             return l2info.header_len;
         case JUNIPER_LSQ_L3_PROTO_IPV6:
             ip6_print(p,l2info.length);
             return l2info.header_len;

+#endif

         case JUNIPER_LSQ_L3_PROTO_MPLS:
             mpls_print(p,l2info.length);
             return l2info.header_len;
         case JUNIPER_LSQ_L3_PROTO_MPLS:
             mpls_print(p,l2info.length);
             return l2info.header_len;


@@ -393,8 +552,10 @@ juniper_mlppp_print(const struct pcap_pkthdr *h, register const u_char *p)
 
         return l2info.header_len;
 }
 
         return l2info.header_len;
 }

+#endif

 
 
 
 

+#ifdef DLT_JUNIPER_MFR

 u_int
 juniper_mfr_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
 u_int
 juniper_mfr_print(const struct pcap_pkthdr *h, register const u_char *p)
 {


@@ -405,6 +566,36 @@ juniper_mfr_print(const struct pcap_pkthdr *h, register const u_char *p)
             return l2info.header_len;
         
         p+=l2info.header_len;
             return l2info.header_len;
         
         p+=l2info.header_len;

+
+        /* child-link ? */
+        if (l2info.cookie_len == 0) {
+            mfr_print(p,l2info.length);
+            return l2info.header_len;
+        }
+
+        /* first try the LSQ protos */
+        if (l2info.cookie_len == AS_PIC_COOKIE_LEN) {
+            switch(l2info.proto) {
+            case JUNIPER_LSQ_L3_PROTO_IPV4:
+                ip_print(gndo, p, l2info.length);
+                return l2info.header_len;
+#ifdef INET6
+            case JUNIPER_LSQ_L3_PROTO_IPV6:
+                ip6_print(p,l2info.length);
+                return l2info.header_len;
+#endif
+            case JUNIPER_LSQ_L3_PROTO_MPLS:
+                mpls_print(p,l2info.length);
+                return l2info.header_len;
+            case JUNIPER_LSQ_L3_PROTO_ISO:
+                isoclns_print(p,l2info.length,l2info.caplen);
+                return l2info.header_len;
+            default:
+                break;
+            }
+            return l2info.header_len;
+        }
+

         /* suppress Bundle-ID if frame was captured on a child-link */
         if (eflag && EXTRACT_32BITS(l2info.cookie) != 1) printf("Bundle-ID %u, ",l2info.bundle);
         switch (l2info.proto) {
         /* suppress Bundle-ID if frame was captured on a child-link */
         if (eflag && EXTRACT_32BITS(l2info.cookie) != 1) printf("Bundle-ID %u, ",l2info.bundle);
         switch (l2info.proto) {


@@ -423,7 +614,9 @@ juniper_mfr_print(const struct pcap_pkthdr *h, register const u_char *p)
 
         return l2info.header_len;
 }
 
         return l2info.header_len;
 }

+#endif

 
 

+#ifdef DLT_JUNIPER_MLFR

 u_int
 juniper_mlfr_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
 u_int
 juniper_mlfr_print(const struct pcap_pkthdr *h, register const u_char *p)
 {


@@ -454,6 +647,7 @@ juniper_mlfr_print(const struct pcap_pkthdr *h, register const u_char *p)
 
         return l2info.header_len;
 }
 
         return l2info.header_len;
 }

+#endif

 
 /*
  *     ATM1 PIC cookie format
 
 /*
  *     ATM1 PIC cookie format


@@ -463,6 +657,7 @@ juniper_mlfr_print(const struct pcap_pkthdr *h, register const u_char *p)
  *     +-----+-------------------------+-------------------------------+
  */
 
  *     +-----+-------------------------+-------------------------------+
  */
 

+#ifdef DLT_JUNIPER_ATM1

 u_int
 juniper_atm1_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
 u_int
 juniper_atm1_print(const struct pcap_pkthdr *h, register const u_char *p)
 {


@@ -477,7 +672,7 @@ juniper_atm1_print(const struct pcap_pkthdr *h, register const u_char *p)
         p+=l2info.header_len;
 
         if (l2info.cookie[0] == 0x80) { /* OAM cell ? */
         p+=l2info.header_len;
 
         if (l2info.cookie[0] == 0x80) { /* OAM cell ? */

-            oam_print(p,l2info.length);
+            oam_print(p,l2info.length,ATM_OAM_NOHEC);

             return l2info.header_len;
         }
 
             return l2info.header_len;
         }
 


@@ -500,6 +695,7 @@ juniper_atm1_print(const struct pcap_pkthdr *h, register const u_char *p)
 
        return l2info.header_len;
 }
 
        return l2info.header_len;
 }

+#endif

 
 /*
  *     ATM2 PIC cookie format
 
 /*
  *     ATM2 PIC cookie format


@@ -509,10 +705,12 @@ juniper_atm1_print(const struct pcap_pkthdr *h, register const u_char *p)
  *     +-------------------------------+---------+---+-----+-----------+
  */
 
  *     +-------------------------------+---------+---+-----+-----------+
  */
 

+#ifdef DLT_JUNIPER_ATM2

 u_int
 juniper_atm2_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
         u_int16_t extracted_ethertype;
 u_int
 juniper_atm2_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
         u_int16_t extracted_ethertype;

+        u_int32_t control_word;

 
         struct juniper_l2info_t l2info;
 
 
         struct juniper_l2info_t l2info;
 


@@ -523,7 +721,13 @@ juniper_atm2_print(const struct pcap_pkthdr *h, register const u_char *p)
         p+=l2info.header_len;
 
         if (l2info.cookie[7] & ATM2_PKT_TYPE_MASK) { /* OAM cell ? */
         p+=l2info.header_len;
 
         if (l2info.cookie[7] & ATM2_PKT_TYPE_MASK) { /* OAM cell ? */

-            oam_print(p,l2info.length);
+            control_word = EXTRACT_32BITS(p);
+            if(control_word == 0 || control_word == 0x08000000) {
+                l2info.header_len += 4;
+                l2info.length -= 4;
+                p += 4;
+            }
+            oam_print(p,l2info.length,ATM_OAM_NOHEC);

             return l2info.header_len;
         }
 
             return l2info.header_len;
         }
 


@@ -555,6 +759,7 @@ juniper_atm2_print(const struct pcap_pkthdr *h, register const u_char *p)
 
        return l2info.header_len;
 }
 
        return l2info.header_len;
 }

+#endif

 
 
 /* try to guess, based on all PPP protos that are supported in
 
 
 /* try to guess, based on all PPP protos that are supported in


@@ -632,11 +837,62 @@ ip_heuristic_guess(register const u_char *p, u_int length) {
     return 1; /* we printed an v4/v6 packet */
 }
 
     return 1; /* we printed an v4/v6 packet */
 }
 

+int
+juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len) {
+
+   int tlv_value;
+
+   /* TLVs < 128 are little endian encoded */
+   if (tlv_type < 128) {
+       switch (tlv_len) {
+       case 1:
+           tlv_value = *p;
+           break;
+       case 2:
+           tlv_value = EXTRACT_LE_16BITS(p);
+           break;
+       case 3:
+           tlv_value = EXTRACT_LE_24BITS(p);
+           break;
+       case 4:
+           tlv_value = EXTRACT_LE_32BITS(p);
+           break;
+       default:
+           tlv_value = -1;
+           break;
+       }
+   } else {
+       /* TLVs >= 128 are big endian encoded */
+       switch (tlv_len) {
+       case 1:
+           tlv_value = *p;
+           break;
+       case 2:
+           tlv_value = EXTRACT_16BITS(p);
+           break;
+       case 3:
+           tlv_value = EXTRACT_24BITS(p);
+           break;
+       case 4:
+           tlv_value = EXTRACT_32BITS(p);
+           break;
+       default:
+           tlv_value = -1;
+           break;
+       }
+   }
+   return tlv_value;
+}
+

 static int
 juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct juniper_l2info_t *l2info) {
 
     struct juniper_cookie_table_t *lp = juniper_cookie_table;
 static int
 juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct juniper_l2info_t *l2info) {
 
     struct juniper_cookie_table_t *lp = juniper_cookie_table;

-    u_int idx;
+    u_int idx, jnx_ext_len, jnx_header_len = 0;
+    u_int8_t tlv_type,tlv_len;
+    int tlv_value;
+    const u_char *tptr;
+

 
     l2info->header_len = 0;
     l2info->cookie_len = 0;
 
     l2info->header_len = 0;
     l2info->cookie_len = 0;


@@ -645,18 +901,91 @@ juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct junip
 
     l2info->length = h->len;
     l2info->caplen = h->caplen;
 
     l2info->length = h->len;
     l2info->caplen = h->caplen;

+    TCHECK2(p[0],4);
+    l2info->flags = p[3];

     l2info->direction = p[3]&JUNIPER_BPF_PKT_IN;
     
     l2info->direction = p[3]&JUNIPER_BPF_PKT_IN;
     

-    TCHECK2(p[0],4);
-    if (EXTRACT_24BITS(p) != JUNIPER_MGC_NUMBER) /* magic number found ? */
+    if (EXTRACT_24BITS(p) != JUNIPER_MGC_NUMBER) { /* magic number found ? */
+        printf("no magic-number found!");

         return 0;
         return 0;

-    else
-        l2info->header_len = 4;
+    } 

 
     if (eflag) /* print direction */
         printf("%3s ",tok2str(juniper_direction_values,"---",l2info->direction));
 
 
     if (eflag) /* print direction */
         printf("%3s ",tok2str(juniper_direction_values,"---",l2info->direction));
 

-    if ((p[3] & JUNIPER_BPF_NO_L2 ) == JUNIPER_BPF_NO_L2 ) {            
+    /* magic number + flags */
+    jnx_header_len = 4;
+
+    if (vflag>1)
+        printf("\n\tJuniper PCAP Flags [%s]",
+               bittok2str(jnx_flag_values, "none", l2info->flags));
+
+    /* extensions present ?  - calculate how much bytes to skip */
+    if ((l2info->flags & JUNIPER_BPF_EXT ) == JUNIPER_BPF_EXT ) {
+
+        tptr = p+jnx_header_len;
+
+        /* ok to read extension length ? */
+        TCHECK2(tptr[0], 2);
+        jnx_ext_len = EXTRACT_16BITS(tptr);
+        jnx_header_len += 2;
+        tptr +=2;
+        
+        /* nail up the total length -
+         * just in case something goes wrong
+         * with TLV parsing */
+        jnx_header_len += jnx_ext_len;
+        
+        if (vflag>1)
+            printf(", PCAP Extension(s) total length %u",
+                   jnx_ext_len);
+        
+        TCHECK2(tptr[0], jnx_ext_len);
+        while (jnx_ext_len > JUNIPER_EXT_TLV_OVERHEAD) {
+            tlv_type = *(tptr++);
+            tlv_len = *(tptr++);
+            tlv_value = 0;
+            
+            /* sanity check */
+            if (tlv_type == 0 || tlv_len == 0)
+                break;
+            
+            if (vflag>1)
+                printf("\n\t  %s Extension TLV #%u, length %u, value ",
+                       tok2str(jnx_ext_tlv_values,"Unknown",tlv_type),
+                       tlv_type,
+                       tlv_len);
+            
+            tlv_value = juniper_read_tlv_value(tptr, tlv_type, tlv_len);
+            switch (tlv_type) {
+            case JUNIPER_EXT_TLV_IFD_NAME:
+                /* FIXME */
+                break;
+                
+            case JUNIPER_EXT_TLV_IFD_MEDIATYPE: /* fall through */
+            case JUNIPER_EXT_TLV_IFL_ENCAPS:
+            case JUNIPER_EXT_TLV_TTP_IFD_MEDIATYPE:
+            case JUNIPER_EXT_TLV_TTP_IFL_ENCAPS:
+            case JUNIPER_EXT_TLV_IFL_IDX:
+            case JUNIPER_EXT_TLV_IFL_UNIT:
+            case JUNIPER_EXT_TLV_IFD_IDX:
+            default:
+                if (tlv_value != -1) {
+                    if (vflag>1)
+                        printf("%u",tlv_value);
+                }
+                break;
+            }
+            
+            tptr+=tlv_len;
+            jnx_ext_len -= tlv_len+JUNIPER_EXT_TLV_OVERHEAD;
+        }
+        
+        if (vflag>1)
+            printf("\n\t-----original packet-----\n\t");
+    } 
+    
+    if ((l2info->flags & JUNIPER_BPF_NO_L2 ) == JUNIPER_BPF_NO_L2 ) {            

         if (eflag)
             printf("no-L2-hdr, ");
 
         if (eflag)
             printf("no-L2-hdr, ");
 


@@ -664,15 +993,15 @@ juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct junip
          * perform the v4/v6 heuristics
          * to figure out what it is
          */
          * perform the v4/v6 heuristics
          * to figure out what it is
          */

-        TCHECK2(p[8],1);
-        if(ip_heuristic_guess(p+8,l2info->length-8) == 0)
+        TCHECK2(p[jnx_header_len+4],1);
+        if(ip_heuristic_guess(p+jnx_header_len+4,l2info->length-(jnx_header_len+4)) == 0)

             printf("no IP-hdr found!");
 
             printf("no IP-hdr found!");
 

-        l2info->header_len+=4;
+        l2info->header_len=jnx_header_len+4;

         return 0; /* stop parsing the output further */
         
     }
         return 0; /* stop parsing the output further */
         
     }

-
+    l2info->header_len = jnx_header_len;

     p+=l2info->header_len;
     l2info->length -= l2info->header_len;
     l2info->caplen -= l2info->header_len;
     p+=l2info->header_len;
     l2info->length -= l2info->header_len;
     l2info->caplen -= l2info->header_len;


@@ -681,19 +1010,16 @@ juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct junip
     while (lp->s != NULL) {
         if (lp->pictype == l2info->pictype) {
 
     while (lp->s != NULL) {
         if (lp->pictype == l2info->pictype) {
 

-            l2info->cookie_len = lp->cookie_len;
-            l2info->header_len += lp->cookie_len;
+            l2info->cookie_len += lp->cookie_len;

 
             switch (p[0]) {
             case LS_COOKIE_ID:
                 l2info->cookie_type = LS_COOKIE_ID;
                 l2info->cookie_len += 2;
 
             switch (p[0]) {
             case LS_COOKIE_ID:
                 l2info->cookie_type = LS_COOKIE_ID;
                 l2info->cookie_len += 2;

-                l2info->header_len += 2;

                 break;
             case AS_COOKIE_ID:
                 l2info->cookie_type = AS_COOKIE_ID;
                 break;
             case AS_COOKIE_ID:
                 l2info->cookie_type = AS_COOKIE_ID;

-                l2info->cookie_len += 6;
-                l2info->header_len += 6;
+                l2info->cookie_len = 8;

                 break;
             
             default:
                 break;
             
             default:


@@ -701,6 +1027,19 @@ juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct junip
                 break;
             }
 
                 break;
             }
 

+
+#ifdef DLT_JUNIPER_MFR
+            /* MFR child links don't carry cookies */
+            if (l2info->pictype == DLT_JUNIPER_MFR &&
+                (p[0] & MFR_BE_MASK) == MFR_BE_MASK) {
+                l2info->cookie_len = 0;
+            }
+#endif
+
+            l2info->header_len += l2info->cookie_len;
+            l2info->length -= l2info->cookie_len;
+            l2info->caplen -= l2info->cookie_len;
+

             if (eflag)
                 printf("%s-PIC, cookie-len %u",
                        lp->s,
             if (eflag)
                 printf("%s-PIC, cookie-len %u",
                        lp->s,


@@ -728,6 +1067,7 @@ juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct junip
 
     /* DLT_ specific parsing */
     switch(l2info->pictype) {
 
     /* DLT_ specific parsing */
     switch(l2info->pictype) {

+#ifdef DLT_JUNIPER_MLPPP

     case DLT_JUNIPER_MLPPP:
         switch (l2info->cookie_type) {
         case LS_COOKIE_ID:
     case DLT_JUNIPER_MLPPP:
         switch (l2info->cookie_type) {
         case LS_COOKIE_ID:


@@ -742,24 +1082,51 @@ juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct junip
             break;
         }
         break;
             break;
         }
         break;

-    case DLT_JUNIPER_MLFR: /* fall through */
+#endif
+#ifdef DLT_JUNIPER_MLFR
+    case DLT_JUNIPER_MLFR:
+        switch (l2info->cookie_type) {
+        case LS_COOKIE_ID:
+            l2info->bundle = l2info->cookie[1];
+            l2info->proto = EXTRACT_16BITS(p);        
+            l2info->header_len += 2;
+            l2info->length -= 2;
+            l2info->caplen -= 2;
+            break;
+        case AS_COOKIE_ID:
+            l2info->bundle = (EXTRACT_16BITS(&l2info->cookie[6])>>3)&0xfff;
+            l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK;
+            break;
+        default:
+            l2info->bundle = l2info->cookie[0];
+            l2info->header_len += 2;
+            l2info->length -= 2;
+            l2info->caplen -= 2;
+            break;
+        }
+        break;
+#endif
+#ifdef DLT_JUNIPER_MFR

     case DLT_JUNIPER_MFR:
         switch (l2info->cookie_type) {
         case LS_COOKIE_ID:
             l2info->bundle = l2info->cookie[1];
     case DLT_JUNIPER_MFR:
         switch (l2info->cookie_type) {
         case LS_COOKIE_ID:
             l2info->bundle = l2info->cookie[1];

+            l2info->proto = EXTRACT_16BITS(p);        
+            l2info->header_len += 2;
+            l2info->length -= 2;
+            l2info->caplen -= 2;

             break;
         case AS_COOKIE_ID:
             l2info->bundle = (EXTRACT_16BITS(&l2info->cookie[6])>>3)&0xfff;
             break;
         case AS_COOKIE_ID:
             l2info->bundle = (EXTRACT_16BITS(&l2info->cookie[6])>>3)&0xfff;

+            l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK;

             break;
         default:
             l2info->bundle = l2info->cookie[0];
             break;
         }
             break;
         default:
             l2info->bundle = l2info->cookie[0];
             break;
         }

-        l2info->proto = EXTRACT_16BITS(p);        
-        l2info->header_len += 2;
-        l2info->length -= 2;
-        l2info->caplen -= 2;

         break;
         break;

+#endif
+#ifdef DLT_JUNIPER_ATM2

     case DLT_JUNIPER_ATM2:
         TCHECK2(p[0],4);
         /* ATM cell relay control word present ? */
     case DLT_JUNIPER_ATM2:
         TCHECK2(p[0],4);
         /* ATM cell relay control word present ? */


@@ -769,8 +1136,30 @@ juniper_parse_header (const u_char *p, const struct pcap_pkthdr *h, struct junip
                 printf("control-word 0x%08x ",EXTRACT_32BITS(p));
         }
         break;
                 printf("control-word 0x%08x ",EXTRACT_32BITS(p));
         }
         break;

+#endif
+#ifdef DLT_JUNIPER_ATM1

     case DLT_JUNIPER_ATM1:
     case DLT_JUNIPER_ATM1:

+        break;
+#endif
+#ifdef DLT_JUNIPER_PPP
+    case DLT_JUNIPER_PPP:
+        break;
+#endif
+#ifdef DLT_JUNIPER_CHDLC
+    case DLT_JUNIPER_CHDLC:
+        break;
+#endif
+#ifdef DLT_JUNIPER_ETHER
+    case DLT_JUNIPER_ETHER:
+        break;
+#endif
+#ifdef DLT_JUNIPER_FRELAY
+    case DLT_JUNIPER_FRELAY:
+        break;
+#endif
+

     default:
     default:

+        printf("Unknown Juniper DLT_ type %u: ", l2info->pictype);

         break;
     }
     
         break;
     }