Default to first interface from pcap_findalldevs()

[tcpdump] / print-cfm.c

diff --git a/print-cfm.c b/print-cfm.c
index 7f4360f0178901bac2d83bef18c32f6d0abcae00..2d67e84c7000ebf8b8b3b1cb47e1e95ce5bf426c 100644 (file)
--- a/print-cfm.c
+++ b/print-cfm.c
@@ -17,31 +17,26 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cfm.c,v 1.1 2006-10-12 10:26:12 hannes Exp $";
-#endif
-

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

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 #include <stdio.h>
 
 #include <stdio.h>

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

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 #include "ether.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "ether.h"
 #include "addrtoname.h"

+#include "oui.h"
+#include "af.h"

 
 struct cfm_common_header_t {
 
 struct cfm_common_header_t {

-    u_int8_t mdlevel_version;
-    u_int8_t opcode;
-    u_int8_t flags;
-    u_int8_t first_tlv_offset;
+    uint8_t mdlevel_version;
+    uint8_t opcode;
+    uint8_t flags;
+    uint8_t first_tlv_offset;

 };
 
 #define        CFM_VERSION 0
 };
 
 #define        CFM_VERSION 0


@@ -67,13 +62,13 @@ static const struct tok cfm_opcode_values[] = {
  * Message Formats.
  */
 struct cfm_ccm_t {
  * Message Formats.
  */
 struct cfm_ccm_t {

-    u_int8_t sequence[4];
-    u_int8_t ma_epi[2];
-    u_int8_t md_nameformat;
-    u_int8_t md_namelength;
-    u_int8_t md_name[46]; /* md name and short ma name */
-    u_int8_t reserved_itu[16];
-    u_int8_t reserved[6];
+    uint8_t sequence[4];
+    uint8_t ma_epi[2];
+    uint8_t md_nameformat;
+    uint8_t md_namelength;
+    uint8_t md_name[46]; /* md name and short ma name */
+    uint8_t reserved_itu[16];
+    uint8_t reserved[6];

 };
 
 /*
 };
 
 /*


@@ -118,37 +113,48 @@ static const struct tok cfm_ma_nameformat_values[] = {
 };
 
 struct cfm_lbm_t {
 };
 
 struct cfm_lbm_t {

-    u_int8_t transaction_id[4];
-    u_int8_t reserved[4];
+    uint8_t transaction_id[4];
+    uint8_t reserved[4];

 };
 
 struct cfm_ltm_t {
 };
 
 struct cfm_ltm_t {

-    u_int8_t transaction_id[4];
-    u_int8_t egress_id[8];
-    u_int8_t ttl;
-    u_int8_t original_mac[ETHER_ADDR_LEN];
-    u_int8_t target_mac[ETHER_ADDR_LEN];
-    u_int8_t reserved[3];
+    uint8_t transaction_id[4];
+    uint8_t egress_id[8];
+    uint8_t ttl;
+    uint8_t original_mac[ETHER_ADDR_LEN];
+    uint8_t target_mac[ETHER_ADDR_LEN];
+    uint8_t reserved[3];
+};
+
+static const struct tok cfm_ltm_flag_values[] = {
+    { 0x80, "Use Forwarding-DB only"},
+    { 0, NULL}

 };
 
 struct cfm_ltr_t {
 };
 
 struct cfm_ltr_t {

-    u_int8_t transaction_id[4];
-    u_int8_t last_egress_id[8];
-    u_int8_t next_egress_id[8];
-    u_int8_t ttl;
-    u_int8_t replay_action;
-    u_int8_t reserved[6];
+    uint8_t transaction_id[4];
+    uint8_t last_egress_id[8];
+    uint8_t next_egress_id[8];
+    uint8_t ttl;
+    uint8_t replay_action;
+    uint8_t reserved[6];

 };
 
 };
 

-/*
- * TLVs
- */
+static const struct tok cfm_ltr_flag_values[] = {
+    { 0x80, "UseFDB Only"},
+    { 0x40, "FwdYes"},
+    { 0x20, "Terminal MEP"},
+    { 0, NULL}
+};

 
 

-struct cfm_tlv_header_t {
-    u_int8_t type;
-    u_int8_t length[2];
+static const struct tok cfm_ltr_replay_action_values[] = {
+    { 1, "Exact Match"},
+    { 2, "Filtering DB"},
+    { 3, "MIP CCM DB"},
+    { 0, NULL}

 };
 
 };
 

+

 #define CFM_TLV_END 0
 #define CFM_TLV_SENDER_ID 1
 #define CFM_TLV_PORT_STATUS 2
 #define CFM_TLV_END 0
 #define CFM_TLV_SENDER_ID 1
 #define CFM_TLV_PORT_STATUS 2


@@ -170,15 +176,115 @@ static const struct tok cfm_tlv_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

+/*
+ * TLVs
+ */
+
+struct cfm_tlv_header_t {
+    uint8_t type;
+    uint8_t length[2];
+};
+

 /* FIXME define TLV formats */
 
 /* FIXME define TLV formats */
 

-void
-cfm_print(register const u_char *pptr, register u_int length) {
+static const struct tok cfm_tlv_port_status_values[] = {
+    { 1, "Blocked"},
+    { 2, "Up"},
+    { 0, NULL}
+};
+
+static const struct tok cfm_tlv_interface_status_values[] = {
+    { 1, "Up"},
+    { 2, "Down"},
+    { 3, "Testing"},
+    { 5, "Dormant"},
+    { 6, "not present"},
+    { 7, "lower Layer down"},
+    { 0, NULL}
+};
+
+#define CFM_CHASSIS_ID_CHASSIS_COMPONENT 1
+#define CFM_CHASSIS_ID_INTERFACE_ALIAS 2
+#define CFM_CHASSIS_ID_PORT_COMPONENT 3
+#define CFM_CHASSIS_ID_MAC_ADDRESS 4
+#define CFM_CHASSIS_ID_NETWORK_ADDRESS 5
+#define CFM_CHASSIS_ID_INTERFACE_NAME 6
+#define CFM_CHASSIS_ID_LOCAL 7
+
+static const struct tok cfm_tlv_senderid_chassisid_values[] = {
+    { 0, "Reserved"},
+    { CFM_CHASSIS_ID_CHASSIS_COMPONENT, "Chassis component"},
+    { CFM_CHASSIS_ID_INTERFACE_ALIAS, "Interface alias"},
+    { CFM_CHASSIS_ID_PORT_COMPONENT, "Port component"},
+    { CFM_CHASSIS_ID_MAC_ADDRESS, "MAC address"},
+    { CFM_CHASSIS_ID_NETWORK_ADDRESS, "Network address"},
+    { CFM_CHASSIS_ID_INTERFACE_NAME, "Interface name"},
+    { CFM_CHASSIS_ID_LOCAL, "Locally assigned"},
+    { 0, NULL}
+};
+
+
+static int
+cfm_mgmt_addr_print(netdissect_options *ndo,
+                    register const u_char *tptr)
+{
+    u_int mgmt_addr_type;
+    u_int hexdump =  FALSE;

 
 

+    /*
+     * Altough AFIs are tpically 2 octects wide,
+     * 802.1ab specifies that this field width
+     * is only once octet
+     */
+    mgmt_addr_type = *tptr;
+    ND_PRINT((ndo, "\n\t  Management Address Type %s (%u)",
+           tok2str(af_values, "Unknown", mgmt_addr_type),
+           mgmt_addr_type));
+
+    /*
+     * Resolve the passed in Address.
+     */
+    switch(mgmt_addr_type) {
+    case AFNUM_INET:
+        ND_PRINT((ndo, ", %s", ipaddr_string(ndo, tptr + 1)));
+        break;
+
+    case AFNUM_INET6:
+        ND_PRINT((ndo, ", %s", ip6addr_string(ndo, tptr + 1)));
+        break;
+
+    default:
+        hexdump = TRUE;
+        break;
+    }
+
+    return hexdump;
+}
+
+/*
+ * The egress-ID string is a 16-Bit string plus a MAC address.
+ */
+static const char *
+cfm_egress_id_string(netdissect_options *ndo, register const u_char *tptr)
+{
+    static char egress_id_buffer[80];
+
+    snprintf(egress_id_buffer, sizeof(egress_id_buffer),
+             "MAC 0x%4x-%s",
+             EXTRACT_16BITS(tptr),
+             etheraddr_string(ndo, tptr+2));
+
+    return egress_id_buffer;
+}
+
+void
+cfm_print(netdissect_options *ndo,
+          register const u_char *pptr, register u_int length)
+{

     const struct cfm_common_header_t *cfm_common_header;
     const struct cfm_tlv_header_t *cfm_tlv_header;
     const struct cfm_common_header_t *cfm_common_header;
     const struct cfm_tlv_header_t *cfm_tlv_header;

-    const u_int8_t *tptr, *tlv_tptr, *ma_name, *ma_nameformat, *ma_namelength;
-    u_int tlen, cfm_tlv_len, cfm_tlv_type, tlv_tlen, ccm_interval;
+    const uint8_t *tptr, *tlv_ptr, *ma_name, *ma_nameformat, *ma_namelength;
+    u_int hexdump, tlen, cfm_tlv_len, cfm_tlv_type, ccm_interval;

 
 
     union {
 
 
     union {


@@ -190,32 +296,31 @@ cfm_print(register const u_char *pptr, register u_int length) {
 
     tptr=pptr;
     cfm_common_header = (const struct cfm_common_header_t *)pptr;
 
     tptr=pptr;
     cfm_common_header = (const struct cfm_common_header_t *)pptr;

-    TCHECK(*cfm_common_header);
+    ND_TCHECK(*cfm_common_header);

 
     /*
      * Sanity checking of the header.
      */
     if (CFM_EXTRACT_VERSION(cfm_common_header->mdlevel_version) != CFM_VERSION) {
 
     /*
      * Sanity checking of the header.
      */
     if (CFM_EXTRACT_VERSION(cfm_common_header->mdlevel_version) != CFM_VERSION) {

-       printf("CFMv%u not supported, length %u",
-               CFM_EXTRACT_VERSION(cfm_common_header->mdlevel_version), length);
+       ND_PRINT((ndo, "CFMv%u not supported, length %u",
+               CFM_EXTRACT_VERSION(cfm_common_header->mdlevel_version), length));

        return;
     }
 
        return;
     }
 

-    printf("CFMv%u %s, length %u",
+    ND_PRINT((ndo, "CFMv%u %s, MD Level %u, length %u",

            CFM_EXTRACT_VERSION(cfm_common_header->mdlevel_version),
            tok2str(cfm_opcode_values, "unknown (%u)", cfm_common_header->opcode),
            CFM_EXTRACT_VERSION(cfm_common_header->mdlevel_version),
            tok2str(cfm_opcode_values, "unknown (%u)", cfm_common_header->opcode),

-           length);
+           CFM_EXTRACT_MD_LEVEL(cfm_common_header->mdlevel_version),
+           length));

 
     /*
 
     /*

-     * In non-verbose mode just lets print the opcode and bail.
+     * In non-verbose mode just print the opcode and md-level.

      */
      */

-    if (vflag < 1) {
+    if (ndo->ndo_vflag < 1) {

         return;
     }
 
         return;
     }
 

-    printf("\n\tMD Level %u, First TLV offset %u",
-           CFM_EXTRACT_MD_LEVEL(cfm_common_header->mdlevel_version),
-           cfm_common_header->first_tlv_offset);
+    ND_PRINT((ndo, "\n\tFirst TLV offset %u", cfm_common_header->first_tlv_offset));

 
     tptr += sizeof(const struct cfm_common_header_t);
     tlen = length - sizeof(struct cfm_common_header_t);
 
     tptr += sizeof(const struct cfm_common_header_t);
     tlen = length - sizeof(struct cfm_common_header_t);


@@ -225,49 +330,53 @@ cfm_print(register const u_char *pptr, register u_int length) {
         msg_ptr.cfm_ccm = (const struct cfm_ccm_t *)tptr;
 
         ccm_interval = CFM_EXTRACT_CCM_INTERVAL(cfm_common_header->flags);
         msg_ptr.cfm_ccm = (const struct cfm_ccm_t *)tptr;
 
         ccm_interval = CFM_EXTRACT_CCM_INTERVAL(cfm_common_header->flags);

-        printf(", Flags [CCM Interval %u%s]",
+        ND_PRINT((ndo, ", Flags [CCM Interval %u%s]",

                ccm_interval,
                cfm_common_header->flags & CFM_CCM_RDI_FLAG ?
                ccm_interval,
                cfm_common_header->flags & CFM_CCM_RDI_FLAG ?

-               ", RDI" : "");
+               ", RDI" : ""));

 
         /*
          * Resolve the CCM interval field.
          */
         if (ccm_interval) {
 
         /*
          * Resolve the CCM interval field.
          */
         if (ccm_interval) {

-            printf("\n\t  CCM Interval %.3fs"
+            ND_PRINT((ndo, "\n\t  CCM Interval %.3fs"

                    ", min CCM Lifetime %.3fs, max CCM Lifetime %.3fs",
                    ccm_interval_base[ccm_interval],
                    ccm_interval_base[ccm_interval] * CCM_INTERVAL_MIN_MULTIPLIER,
                    ", min CCM Lifetime %.3fs, max CCM Lifetime %.3fs",
                    ccm_interval_base[ccm_interval],
                    ccm_interval_base[ccm_interval] * CCM_INTERVAL_MIN_MULTIPLIER,

-                   ccm_interval_base[ccm_interval] * CCM_INTERVAL_MAX_MULTIPLIER);
+                   ccm_interval_base[ccm_interval] * CCM_INTERVAL_MAX_MULTIPLIER));

         }
 
         }
 

-        printf("\n\t  Sequence Number 0x%08x, MA-End-Point-ID 0x%04x",
+        ND_PRINT((ndo, "\n\t  Sequence Number 0x%08x, MA-End-Point-ID 0x%04x",

                EXTRACT_32BITS(msg_ptr.cfm_ccm->sequence),
                EXTRACT_32BITS(msg_ptr.cfm_ccm->sequence),

-               EXTRACT_16BITS(msg_ptr.cfm_ccm->ma_epi));
+               EXTRACT_16BITS(msg_ptr.cfm_ccm->ma_epi)));

 
 
         /*
          * Resolve the MD fields.
          */
 
 
         /*
          * Resolve the MD fields.
          */

-        printf("\n\t  MD Name Format %s (%u), MD Name length %u",
+        ND_PRINT((ndo, "\n\t  MD Name Format %s (%u), MD Name length %u",

                tok2str(cfm_md_nameformat_values, "Unknown",
                        msg_ptr.cfm_ccm->md_nameformat),
                msg_ptr.cfm_ccm->md_nameformat,
                tok2str(cfm_md_nameformat_values, "Unknown",
                        msg_ptr.cfm_ccm->md_nameformat),
                msg_ptr.cfm_ccm->md_nameformat,

-               msg_ptr.cfm_ccm->md_namelength);
+               msg_ptr.cfm_ccm->md_namelength));

 
         if (msg_ptr.cfm_ccm->md_nameformat != CFM_CCM_MD_FORMAT_NONE) {
 
         if (msg_ptr.cfm_ccm->md_nameformat != CFM_CCM_MD_FORMAT_NONE) {

-            printf("\n\t  MD Name: ");
+            ND_PRINT((ndo, "\n\t  MD Name: "));

             switch (msg_ptr.cfm_ccm->md_nameformat) {
             case CFM_CCM_MD_FORMAT_DNS:
             case CFM_CCM_MD_FORMAT_CHAR:
             switch (msg_ptr.cfm_ccm->md_nameformat) {
             case CFM_CCM_MD_FORMAT_DNS:
             case CFM_CCM_MD_FORMAT_CHAR:

-                safeputs(msg_ptr.cfm_ccm->md_name, msg_ptr.cfm_ccm->md_namelength);
+                safeputs(ndo, msg_ptr.cfm_ccm->md_name, msg_ptr.cfm_ccm->md_namelength);
+                break;
+
+            case CFM_CCM_MD_FORMAT_MAC:
+                ND_PRINT((ndo, "\n\t  MAC %s", etheraddr_string(ndo,
+                           msg_ptr.cfm_ccm->md_name)));

                 break;
 
                 /* FIXME add printers for those MD formats - hexdump for now */
             case CFM_CCM_MA_FORMAT_8021:
                 break;
 
                 /* FIXME add printers for those MD formats - hexdump for now */
             case CFM_CCM_MA_FORMAT_8021:

-            case CFM_CCM_MD_FORMAT_MAC:

             default:
             default:

-                print_unknown_data(msg_ptr.cfm_ccm->md_name, "\n\t    ",
+                print_unknown_data(ndo, msg_ptr.cfm_ccm->md_name, "\n\t    ",

                                    msg_ptr.cfm_ccm->md_namelength);
             }
         }
                                    msg_ptr.cfm_ccm->md_namelength);
             }
         }


@@ -280,16 +389,16 @@ cfm_print(register const u_char *pptr, register u_int length) {
         ma_namelength = msg_ptr.cfm_ccm->md_name + msg_ptr.cfm_ccm->md_namelength + 1;
         ma_name = msg_ptr.cfm_ccm->md_name + msg_ptr.cfm_ccm->md_namelength + 2;
 
         ma_namelength = msg_ptr.cfm_ccm->md_name + msg_ptr.cfm_ccm->md_namelength + 1;
         ma_name = msg_ptr.cfm_ccm->md_name + msg_ptr.cfm_ccm->md_namelength + 2;
 

-        printf("\n\t  MA Name-Format %s (%u), MA name length %u",
+        ND_PRINT((ndo, "\n\t  MA Name-Format %s (%u), MA name length %u",

                tok2str(cfm_ma_nameformat_values, "Unknown",
                        *ma_nameformat),
                *ma_nameformat,
                tok2str(cfm_ma_nameformat_values, "Unknown",
                        *ma_nameformat),
                *ma_nameformat,

-               *ma_namelength);        
+               *ma_namelength));

 
 

-        printf("\n\t  MA Name: ");
+        ND_PRINT((ndo, "\n\t  MA Name: "));

         switch (*ma_nameformat) {
         case CFM_CCM_MA_FORMAT_CHAR:
         switch (*ma_nameformat) {
         case CFM_CCM_MA_FORMAT_CHAR:

-            safeputs(ma_name, *ma_namelength);
+            safeputs(ndo, ma_name, *ma_namelength);

             break;
 
             /* FIXME add printers for those MA formats - hexdump for now */
             break;
 
             /* FIXME add printers for those MA formats - hexdump for now */


@@ -298,21 +407,56 @@ cfm_print(register const u_char *pptr, register u_int length) {
         case CFM_CCM_MA_FORMAT_INT:
         case CFM_CCM_MA_FORMAT_VPN:
         default:
         case CFM_CCM_MA_FORMAT_INT:
         case CFM_CCM_MA_FORMAT_VPN:
         default:

-            print_unknown_data(ma_name, "\n\t    ", *ma_namelength);
+            print_unknown_data(ndo, ma_name, "\n\t    ", *ma_namelength);

         }
         break;
 
         }
         break;
 

+    case CFM_OPCODE_LTM:
+        msg_ptr.cfm_ltm = (const struct cfm_ltm_t *)tptr;
+
+        ND_PRINT((ndo, ", Flags [%s]",
+               bittok2str(cfm_ltm_flag_values, "none", cfm_common_header->flags)));
+
+        ND_PRINT((ndo, "\n\t  Transaction-ID 0x%08x, Egress-ID %s, ttl %u",
+               EXTRACT_32BITS(msg_ptr.cfm_ltm->transaction_id),
+               cfm_egress_id_string(ndo, msg_ptr.cfm_ltm->egress_id),
+               msg_ptr.cfm_ltm->ttl));
+
+        ND_PRINT((ndo, "\n\t  Original-MAC %s, Target-MAC %s",
+               etheraddr_string(ndo, msg_ptr.cfm_ltm->original_mac),
+               etheraddr_string(ndo, msg_ptr.cfm_ltm->target_mac)));
+        break;
+
+    case CFM_OPCODE_LTR:
+        msg_ptr.cfm_ltr = (const struct cfm_ltr_t *)tptr;
+
+        ND_PRINT((ndo, ", Flags [%s]",
+               bittok2str(cfm_ltr_flag_values, "none", cfm_common_header->flags)));
+
+        ND_PRINT((ndo, "\n\t  Transaction-ID 0x%08x, Last-Egress-ID %s",
+               EXTRACT_32BITS(msg_ptr.cfm_ltr->transaction_id),
+               cfm_egress_id_string(ndo, msg_ptr.cfm_ltr->last_egress_id)));
+
+        ND_PRINT((ndo, "\n\t  Next-Egress-ID %s, ttl %u",
+               cfm_egress_id_string(ndo, msg_ptr.cfm_ltr->next_egress_id),
+               msg_ptr.cfm_ltr->ttl));
+
+        ND_PRINT((ndo, "\n\t  Replay-Action %s (%u)",
+               tok2str(cfm_ltr_replay_action_values,
+                       "Unknown",
+                       msg_ptr.cfm_ltr->replay_action),
+               msg_ptr.cfm_ltr->replay_action));
+        break;
+

         /*
          * No message decoder yet.
          * Hexdump everything up until the start of the TLVs
          */
     case CFM_OPCODE_LBR:
     case CFM_OPCODE_LBM:
         /*
          * No message decoder yet.
          * Hexdump everything up until the start of the TLVs
          */
     case CFM_OPCODE_LBR:
     case CFM_OPCODE_LBM:

-    case CFM_OPCODE_LTR:
-    case CFM_OPCODE_LTM:

     default:
         if (tlen > cfm_common_header->first_tlv_offset) {
     default:
         if (tlen > cfm_common_header->first_tlv_offset) {

-            print_unknown_data(tptr, "\n\t  ",
+            print_unknown_data(ndo, tptr, "\n\t  ",

                                tlen -  cfm_common_header->first_tlv_offset);
         }
         break;
                                tlen -  cfm_common_header->first_tlv_offset);
         }
         break;


@@ -327,63 +471,164 @@ cfm_print(register const u_char *pptr, register u_int length) {
 
     tptr += cfm_common_header->first_tlv_offset;
     tlen -= cfm_common_header->first_tlv_offset;
 
     tptr += cfm_common_header->first_tlv_offset;
     tlen -= cfm_common_header->first_tlv_offset;

-    
-    while (tlen > 0) {
-        /* did we capture enough for fully decoding the object header ? */
-        TCHECK2(*tptr, sizeof(struct cfm_tlv_header_t));

 
 

+    while (tlen > 0) {

         cfm_tlv_header = (const struct cfm_tlv_header_t *)tptr;
         cfm_tlv_header = (const struct cfm_tlv_header_t *)tptr;

-        cfm_tlv_len=EXTRACT_16BITS(&cfm_tlv_header->length);
+
+        /* Enough to read the tlv type ? */
+        ND_TCHECK2(*tptr, 1);

         cfm_tlv_type=cfm_tlv_header->type;
 
         cfm_tlv_type=cfm_tlv_header->type;
 

-        if (cfm_tlv_len < sizeof(struct cfm_tlv_header_t) ||
-            cfm_tlv_len > tlen) {
-            print_unknown_data(tptr+sizeof(sizeof(struct cfm_tlv_header_t)),"\n\t    ",tlen);
-            return;
+        if (cfm_tlv_type != CFM_TLV_END) {
+            /* did we capture enough for fully decoding the object header ? */
+            ND_TCHECK2(*tptr, sizeof(struct cfm_tlv_header_t));
+            cfm_tlv_len=EXTRACT_16BITS(&cfm_tlv_header->length);
+        } else {
+            cfm_tlv_len = 0;

         }
 
         }
 

-        printf("\n\t  %s TLV (0x%04x), length: %u",
-               tok2str(cfm_tlv_values,
-                       "Unknown",
-                       cfm_tlv_type),
+        ND_PRINT((ndo, "\n\t%s TLV (0x%02x), length %u",
+               tok2str(cfm_tlv_values, "Unknown", cfm_tlv_type),

                cfm_tlv_type,
                cfm_tlv_type,

-               cfm_tlv_len);
+               cfm_tlv_len));
+
+        /* sanity check for not walking off and infinite loop check. */
+        if ((cfm_tlv_type != CFM_TLV_END) &&
+            ((cfm_tlv_len + sizeof(struct cfm_tlv_header_t) > tlen) ||
+             (!cfm_tlv_len))) {
+            print_unknown_data(ndo, tptr, "\n\t  ", tlen);
+            return;
+        }

 
 

-        tlv_tptr=tptr+sizeof(struct cfm_tlv_header_t);
-        tlv_tlen=cfm_tlv_len-sizeof(struct cfm_tlv_header_t);
+        tptr += sizeof(struct cfm_tlv_header_t);
+        tlen -= sizeof(struct cfm_tlv_header_t);
+        tlv_ptr = tptr;

 
         /* did we capture enough for fully decoding the object ? */
 
         /* did we capture enough for fully decoding the object ? */

-        TCHECK2(*tptr, cfm_tlv_len);
+        if (cfm_tlv_type != CFM_TLV_END) {
+            ND_TCHECK2(*tptr, cfm_tlv_len);
+        }
+        hexdump = FALSE;

 
         switch(cfm_tlv_type) {
 
         switch(cfm_tlv_type) {

+        case CFM_TLV_END:
+            /* we are done - bail out */
+            return;
+
+        case CFM_TLV_PORT_STATUS:
+            ND_PRINT((ndo, ", Status: %s (%u)",
+                   tok2str(cfm_tlv_port_status_values, "Unknown", *tptr),
+                   *tptr));
+            break;
+
+        case CFM_TLV_INTERFACE_STATUS:
+            ND_PRINT((ndo, ", Status: %s (%u)",
+                   tok2str(cfm_tlv_interface_status_values, "Unknown", *tptr),
+                   *tptr));
+            break;
+
+        case CFM_TLV_PRIVATE:
+            ND_PRINT((ndo, ", Vendor: %s (%u), Sub-Type %u",
+                   tok2str(oui_values,"Unknown", EXTRACT_24BITS(tptr)),
+                   EXTRACT_24BITS(tptr),
+                   *(tptr + 3)));
+            hexdump = TRUE;
+            break;
+
+        case CFM_TLV_SENDER_ID:
+        {
+            u_int chassis_id_type, chassis_id_length;
+            u_int mgmt_addr_length;
+
+            /*
+             * Check if there is a Chassis-ID.
+             */
+            chassis_id_length = *tptr;
+            if (chassis_id_length > tlen) {
+                hexdump = TRUE;
+                break;
+            }
+
+            tptr++;
+            tlen--;
+
+            if (chassis_id_length) {
+                chassis_id_type = *tptr;
+                ND_PRINT((ndo, "\n\t  Chassis-ID Type %s (%u), Chassis-ID length %u",
+                       tok2str(cfm_tlv_senderid_chassisid_values,
+                               "Unknown",
+                               chassis_id_type),
+                       chassis_id_type,
+                       chassis_id_length));
+
+                switch (chassis_id_type) {
+                case CFM_CHASSIS_ID_MAC_ADDRESS:
+                    ND_PRINT((ndo, "\n\t  MAC %s", etheraddr_string(ndo, tptr + 1)));
+                    break;
+
+                case CFM_CHASSIS_ID_NETWORK_ADDRESS:
+                    hexdump |= cfm_mgmt_addr_print(ndo, tptr);
+                    break;
+
+                case CFM_CHASSIS_ID_INTERFACE_NAME: /* fall through */
+                case CFM_CHASSIS_ID_INTERFACE_ALIAS:
+                case CFM_CHASSIS_ID_LOCAL:
+                case CFM_CHASSIS_ID_CHASSIS_COMPONENT:
+                case CFM_CHASSIS_ID_PORT_COMPONENT:
+                    safeputs(ndo, tptr + 1, chassis_id_length);
+                    break;
+
+                default:
+                    hexdump = TRUE;
+                    break;
+                }
+            }
+
+            tptr += chassis_id_length;
+            tlen -= chassis_id_length;
+
+            /*
+             * Check if there is a Management Address.
+             */
+            mgmt_addr_length = *tptr;
+            if (mgmt_addr_length > tlen) {
+                hexdump = TRUE;
+                break;
+            }
+
+            tptr++;
+            tlen--;
+
+            if (mgmt_addr_length) {
+                hexdump |= cfm_mgmt_addr_print(ndo, tptr);
+            }
+
+            tptr += mgmt_addr_length;
+            tlen -= mgmt_addr_length;
+
+        }
+        break;

 
             /*
              * FIXME those are the defined TLVs that lack a decoder
              * you are welcome to contribute code ;-)
              */
 
 
             /*
              * FIXME those are the defined TLVs that lack a decoder
              * you are welcome to contribute code ;-)
              */
 

-        case CFM_TLV_END:
-        case CFM_TLV_SENDER_ID:
-        case CFM_TLV_PORT_STATUS:
-        case CFM_TLV_INTERFACE_STATUS:

         case CFM_TLV_DATA:
         case CFM_TLV_REPLY_INGRESS:
         case CFM_TLV_REPLY_EGRESS:
         case CFM_TLV_DATA:
         case CFM_TLV_REPLY_INGRESS:
         case CFM_TLV_REPLY_EGRESS:

-        case CFM_TLV_PRIVATE:

         default:
         default:

-            if (vflag <= 1)
-                print_unknown_data(tlv_tptr,"\n\t    ",tlv_tlen);
+            hexdump = TRUE;

             break;
         }
         /* do we want to see an additional hexdump ? */
             break;
         }
         /* do we want to see an additional hexdump ? */

-        if (vflag > 1)
-            print_unknown_data(tptr+sizeof(sizeof(struct cfm_tlv_header_t)),"\n\t    ",
-                               cfm_tlv_len-sizeof(struct cfm_tlv_header_t));
+        if (hexdump || ndo->ndo_vflag > 1)
+            print_unknown_data(ndo, tlv_ptr, "\n\t  ", cfm_tlv_len);

 
         tptr+=cfm_tlv_len;
         tlen-=cfm_tlv_len;
     }
     return;
 trunc:
 
         tptr+=cfm_tlv_len;
         tlen-=cfm_tlv_len;
     }
     return;
 trunc:

-    printf("\n\t\t packet exceeded snapshot");
+    ND_PRINT((ndo, "\n\t\t packet exceeded snapshot"));

 }
 }