remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print-lmp.c

diff --git a/print-lmp.c b/print-lmp.c
index aee81644dd8dd6d1d3de09f10e1f75f2f68cd9d4..525b12c6b42acbe87ce9085889ebad47fcac892a 100644 (file)
--- a/print-lmp.c
+++ b/print-lmp.c
@@ -10,27 +10,27 @@
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *

- * Original code by Hannes Gredler ([email protected])
+ * Original code by Hannes Gredler ([email protected])
+ * Support for LMP service discovery extensions (defined by OIF UNI 1.0)
+ * added by Manu Pathak ([email protected]), May 2005

  */
 
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-lmp.c,v 1.2 2004-04-23 18:29:44 hannes Exp $";
-#endif
+/* \summary: Link Management Protocol (LMP) printer */
+
+/* specification: RFC 4204 */
+/* OIF UNI 1.0: https://web.archive.org/web/20160401194747/http://www.oiforum.com/public/documents/OIF-UNI-01.0.pdf */

 
 #ifdef HAVE_CONFIG_H
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

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

 
 

-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "interface.h"
+#include "netdissect.h"

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

+#include "gmpls.h"
+

 
 /*
  * LMP common header
 
 /*
  * LMP common header


@@ -45,18 +45,18 @@ static const char rcsid[] _U_ =
  */
 
 struct lmp_common_header {
  */
 
 struct lmp_common_header {

-    u_int8_t version_res[2];
-    u_int8_t flags;   
-    u_int8_t msg_type;
-    u_int8_t length[2];
-    u_int8_t reserved[2];
+    nd_uint16_t version_res;
+    nd_uint8_t  flags;
+    nd_uint8_t  msg_type;
+    nd_uint16_t length;
+    nd_byte     reserved[2];

 };
 
 #define LMP_VERSION            1
 };
 
 #define LMP_VERSION            1

-#define        LMP_EXTRACT_VERSION(x) (((x)&0xf0)>>4) 
+#define        LMP_EXTRACT_VERSION(x) (((x)&0xf000)>>12)

 
 static const struct tok lmp_header_flag_values[] = {
 
 static const struct tok lmp_header_flag_values[] = {

-    { 0x00, "Control Channel Down"},
+    { 0x01, "Control Channel Down"},

     { 0x02, "LMP restart"},
     { 0, NULL}
 };
     { 0x02, "LMP restart"},
     { 0, NULL}
 };


@@ -74,6 +74,80 @@ static const struct tok lmp_obj_data_link_flag_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

+static const struct tok lmp_obj_channel_status_values[] = {
+    { 1, "Signal Okay"},
+    { 2, "Signal Degraded"},
+    { 3, "Signal Fail"},
+    { 0, NULL}
+};
+
+static const struct tok lmp_obj_begin_verify_flag_values[] = {
+    { 0x0001, "Verify all links"},
+    { 0x0002, "Data link type"},
+    { 0, NULL}
+};
+
+static const struct tok lmp_obj_begin_verify_error_values[] = {
+    { 0x01, "Link Verification Procedure Not supported"},
+    { 0x02, "Unwilling to verify"},
+    { 0x04, "Unsupported verification transport mechanism"},
+    { 0x08, "Link-Id configuration error"},
+    { 0x10, "Unknown object c-type"},
+    { 0, NULL}
+};
+
+static const struct tok lmp_obj_link_summary_error_values[] = {
+    { 0x01, "Unacceptable non-negotiable LINK-SUMMARY parameters"},
+    { 0x02, "Renegotiate LINK-SUMMARY parameters"},
+    { 0x04, "Invalid TE-LINK Object"},
+    { 0x08, "Invalid DATA-LINK Object"},
+    { 0x10, "Unknown TE-LINK Object c-type"},
+    { 0x20, "Unknown DATA-LINK Object c-type"},
+    { 0, NULL}
+};
+
+/* Service Config Supported Protocols Flags */
+static const struct tok lmp_obj_service_config_sp_flag_values[] = {
+    { 0x01, "RSVP Supported"},
+    { 0x02, "LDP Supported"},
+    { 0, NULL}
+};
+
+/* Service Config Client Port Service Attribute Transparency Flags */
+static const struct tok lmp_obj_service_config_cpsa_tp_flag_values[] = {
+    { 0x01, "Path/VC Overhead Transparency Supported"},
+    { 0x02, "Line/MS Overhead Transparency Supported"},
+    { 0x04, "Section/RS Overhead Transparency Supported"},
+    { 0, NULL}
+};
+
+/* Service Config Client Port Service Attribute Contiguous Concatenation Types Flags */
+static const struct tok lmp_obj_service_config_cpsa_cct_flag_values[] = {
+    { 0x01, "Contiguous Concatenation Types Supported"},
+    { 0, NULL}
+};
+
+/* Service Config Network Service Attributes Transparency Flags */
+static const struct tok lmp_obj_service_config_nsa_transparency_flag_values[] = {
+    { 0x01, "Standard SOH/RSOH Transparency Supported"},
+    { 0x02, "Standard LOH/MSOH Transparency Supported"},
+    { 0, NULL}
+};
+
+/* Service Config Network Service Attributes TCM Monitoring Flags */
+static const struct tok lmp_obj_service_config_nsa_tcm_flag_values[] = {
+    { 0x01, "Transparent Tandem Connection Monitoring Supported"},
+    { 0, NULL}
+};
+
+/* Network Service Attributes Network Diversity Flags */
+static const struct tok lmp_obj_service_config_nsa_network_diversity_flag_values[] = {
+    { 0x01, "Node Diversity Supported"},
+    { 0x02, "Link Diversity Supported"},
+    { 0x04, "SRLG Diversity Supported"},
+    { 0, NULL}
+};
+

 #define        LMP_MSGTYPE_CONFIG                 1
 #define        LMP_MSGTYPE_CONFIG_ACK             2
 #define        LMP_MSGTYPE_CONFIG_NACK            3
 #define        LMP_MSGTYPE_CONFIG                 1
 #define        LMP_MSGTYPE_CONFIG_ACK             2
 #define        LMP_MSGTYPE_CONFIG_NACK            3


@@ -94,6 +168,10 @@ static const struct tok lmp_obj_data_link_flag_values[] = {
 #define        LMP_MSGTYPE_CHANNEL_STATUS_ACK    18
 #define        LMP_MSGTYPE_CHANNEL_STATUS_REQ    19
 #define        LMP_MSGTYPE_CHANNEL_STATUS_RESP   20
 #define        LMP_MSGTYPE_CHANNEL_STATUS_ACK    18
 #define        LMP_MSGTYPE_CHANNEL_STATUS_REQ    19
 #define        LMP_MSGTYPE_CHANNEL_STATUS_RESP   20

+/* LMP Service Discovery message types defined by UNI 1.0 */
+#define LMP_MSGTYPE_SERVICE_CONFIG        50
+#define LMP_MSGTYPE_SERVICE_CONFIG_ACK    51
+#define LMP_MSGTYPE_SERVICE_CONFIG_NACK   52

 
 static const struct tok lmp_msg_type_values[] = {
     { LMP_MSGTYPE_CONFIG, "Config"},
 
 static const struct tok lmp_msg_type_values[] = {
     { LMP_MSGTYPE_CONFIG, "Config"},


@@ -116,10 +194,13 @@ static const struct tok lmp_msg_type_values[] = {
     { LMP_MSGTYPE_CHANNEL_STATUS_ACK, "Channel Status ACK"},
     { LMP_MSGTYPE_CHANNEL_STATUS_REQ, "Channel Status Request"},
     { LMP_MSGTYPE_CHANNEL_STATUS_RESP, "Channel Status Response"},
     { LMP_MSGTYPE_CHANNEL_STATUS_ACK, "Channel Status ACK"},
     { LMP_MSGTYPE_CHANNEL_STATUS_REQ, "Channel Status Request"},
     { LMP_MSGTYPE_CHANNEL_STATUS_RESP, "Channel Status Response"},

+    { LMP_MSGTYPE_SERVICE_CONFIG, "Service Config"},
+    { LMP_MSGTYPE_SERVICE_CONFIG_ACK, "Service Config ACK"},
+    { LMP_MSGTYPE_SERVICE_CONFIG_NACK, "Service Config NACK"},

     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-/* 
+/*

  * LMP object header
  *
  *  0                   1                   2                   3
  * LMP object header
  *
  *  0                   1                   2                   3


@@ -130,20 +211,20 @@ static const struct tok lmp_msg_type_values[] = {
  * |                                                               |
  * //                       (object contents)                     //
  * |                                                               |
  * |                                                               |
  * //                       (object contents)                     //
  * |                                                               |

- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

  */
 
 struct lmp_object_header {
  */
 
 struct lmp_object_header {

-    u_int8_t ctype;
-    u_int8_t class_num;
-    u_int8_t length[2];
+    nd_uint8_t  ctype;
+    nd_uint8_t  class_num;
+    nd_uint16_t length;

 };
 
 #define        LMP_OBJ_CC_ID                 1
 #define        LMP_OBJ_NODE_ID               2
 #define        LMP_OBJ_LINK_ID               3
 #define        LMP_OBJ_INTERFACE_ID          4
 };
 
 #define        LMP_OBJ_CC_ID                 1
 #define        LMP_OBJ_NODE_ID               2
 #define        LMP_OBJ_LINK_ID               3
 #define        LMP_OBJ_INTERFACE_ID          4

-#define        LMP_OBJ_MESSAGE_ID            5 
+#define        LMP_OBJ_MESSAGE_ID            5

 #define        LMP_OBJ_CONFIG                6
 #define        LMP_OBJ_HELLO                 7
 #define        LMP_OBJ_VERIFY_BEGIN          8
 #define        LMP_OBJ_CONFIG                6
 #define        LMP_OBJ_HELLO                 7
 #define        LMP_OBJ_VERIFY_BEGIN          8


@@ -153,7 +234,9 @@ struct lmp_object_header {
 #define LMP_OBJ_DATA_LINK            12
 #define LMP_OBJ_CHANNEL_STATUS       13
 #define LMP_OBJ_CHANNEL_STATUS_REQ   14
 #define LMP_OBJ_DATA_LINK            12
 #define LMP_OBJ_CHANNEL_STATUS       13
 #define LMP_OBJ_CHANNEL_STATUS_REQ   14

-#define LMP_OBJ_ERROR_CODE           15
+#define LMP_OBJ_ERROR_CODE           20
+
+#define LMP_OBJ_SERVICE_CONFIG       51 /* defined in UNI 1.0 */

 
 static const struct tok lmp_obj_values[] = {
     { LMP_OBJ_CC_ID, "Control Channel ID" },
 
 static const struct tok lmp_obj_values[] = {
     { LMP_OBJ_CC_ID, "Control Channel ID" },


@@ -171,6 +254,17 @@ static const struct tok lmp_obj_values[] = {
     { LMP_OBJ_CHANNEL_STATUS, "Channel Status" },
     { LMP_OBJ_CHANNEL_STATUS_REQ, "Channel Status Request" },
     { LMP_OBJ_ERROR_CODE, "Error Code" },
     { LMP_OBJ_CHANNEL_STATUS, "Channel Status" },
     { LMP_OBJ_CHANNEL_STATUS_REQ, "Channel Status Request" },
     { LMP_OBJ_ERROR_CODE, "Error Code" },

+    { LMP_OBJ_SERVICE_CONFIG, "Service Config" },
+
+    { 0, NULL}
+};
+
+#define INT_SWITCHING_TYPE_SUBOBJ 1
+#define WAVELENGTH_SUBOBJ         2
+
+static const struct tok lmp_data_link_subobj[] = {
+    { INT_SWITCHING_TYPE_SUBOBJ, "Interface Switching Type" },
+    { WAVELENGTH_SUBOBJ        , "Wavelength" },

     { 0, NULL}
 };
 
     { 0, NULL}
 };
 


@@ -180,13 +274,13 @@ static const struct tok lmp_obj_values[] = {
 #define        LMP_CTYPE_LOC        1
 #define        LMP_CTYPE_RMT        2
 #define        LMP_CTYPE_UNMD       3
 #define        LMP_CTYPE_LOC        1
 #define        LMP_CTYPE_RMT        2
 #define        LMP_CTYPE_UNMD       3

- 
+

 #define        LMP_CTYPE_IPV4_LOC   1
 #define        LMP_CTYPE_IPV4_RMT   2
 #define        LMP_CTYPE_IPV6_LOC   3
 #define        LMP_CTYPE_IPV6_RMT   4
 #define        LMP_CTYPE_IPV4_LOC   1
 #define        LMP_CTYPE_IPV4_RMT   2
 #define        LMP_CTYPE_IPV6_LOC   3
 #define        LMP_CTYPE_IPV6_RMT   4

-#define        LMP_CTYPE_UNMD_LOC   5  
-#define        LMP_CTYPE_UNMD_RMT   6 
+#define        LMP_CTYPE_UNMD_LOC   5
+#define        LMP_CTYPE_UNMD_RMT   6

 
 #define        LMP_CTYPE_1          1
 #define        LMP_CTYPE_2          2
 
 #define        LMP_CTYPE_1          1
 #define        LMP_CTYPE_2          2


@@ -194,8 +288,21 @@ static const struct tok lmp_obj_values[] = {
 #define LMP_CTYPE_HELLO_CONFIG  1
 #define LMP_CTYPE_HELLO         1
 
 #define LMP_CTYPE_HELLO_CONFIG  1
 #define LMP_CTYPE_HELLO         1
 

-#define FALSE 0
-#define TRUE  1
+#define LMP_CTYPE_BEGIN_VERIFY_ERROR 1
+#define LMP_CTYPE_LINK_SUMMARY_ERROR 2
+
+/* C-Types for Service Config Object */
+#define LMP_CTYPE_SERVICE_CONFIG_SP                   1
+#define LMP_CTYPE_SERVICE_CONFIG_CPSA                 2
+#define LMP_CTYPE_SERVICE_CONFIG_TRANSPARENCY_TCM     3
+#define LMP_CTYPE_SERVICE_CONFIG_NETWORK_DIVERSITY    4
+
+/*
+ * Different link types allowed in the Client Port Service Attributes
+ * subobject defined for LMP Service Discovery in the UNI 1.0 spec
+ */
+#define LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SDH     5 /* UNI 1.0 Sec 9.4.2 */
+#define LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SONET   6 /* UNI 1.0 Sec 9.4.2 */

 
 /*
  * the ctypes are not globally unique so for
 
 /*
  * the ctypes are not globally unique so for


@@ -241,94 +348,192 @@ static const struct tok lmp_ctype_values[] = {
     { 256*LMP_OBJ_CHANNEL_STATUS_REQ+LMP_CTYPE_UNMD, "Unnumbered" },
     { 256*LMP_OBJ_ERROR_CODE+LMP_CTYPE_1, "1" },
     { 256*LMP_OBJ_ERROR_CODE+LMP_CTYPE_2, "2" },
     { 256*LMP_OBJ_CHANNEL_STATUS_REQ+LMP_CTYPE_UNMD, "Unnumbered" },
     { 256*LMP_OBJ_ERROR_CODE+LMP_CTYPE_1, "1" },
     { 256*LMP_OBJ_ERROR_CODE+LMP_CTYPE_2, "2" },

+    { 256*LMP_OBJ_SERVICE_CONFIG+LMP_CTYPE_SERVICE_CONFIG_SP, "1" },
+    { 256*LMP_OBJ_SERVICE_CONFIG+LMP_CTYPE_SERVICE_CONFIG_CPSA, "2" },
+    { 256*LMP_OBJ_SERVICE_CONFIG+LMP_CTYPE_SERVICE_CONFIG_TRANSPARENCY_TCM, "3" },
+    { 256*LMP_OBJ_SERVICE_CONFIG+LMP_CTYPE_SERVICE_CONFIG_NETWORK_DIVERSITY, "4" },

     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-void
-lmp_print(register const u_char *pptr, register u_int len) {
+static int
+lmp_print_data_link_subobjs(netdissect_options *ndo, const u_char *obj_tptr,
+                            int total_subobj_len, int offset)
+{
+    int hexdump = FALSE;
+    int subobj_type, subobj_len;
+
+    union { /* int to float conversion buffer */
+        float f;
+        uint32_t i;
+    } bw;
+
+    while (total_subobj_len > 0 && hexdump == FALSE ) {
+       subobj_type = GET_U_1(obj_tptr + offset);
+       subobj_len  = GET_U_1(obj_tptr + offset + 1);
+       ND_PRINT("\n\t    Subobject, Type: %s (%u), Length: %u",
+               tok2str(lmp_data_link_subobj,
+                       "Unknown",
+                       subobj_type),
+                       subobj_type,
+                       subobj_len);
+       if (subobj_len < 4) {
+           ND_PRINT(" (too short)");
+           break;
+       }
+       if ((subobj_len % 4) != 0) {
+           ND_PRINT(" (not a multiple of 4)");
+           break;
+       }
+       if (total_subobj_len < subobj_len) {
+           ND_PRINT(" (goes past the end of the object)");
+           break;
+       }
+       switch(subobj_type) {
+       case INT_SWITCHING_TYPE_SUBOBJ:
+           ND_PRINT("\n\t      Switching Type: %s (%u)",
+               tok2str(gmpls_switch_cap_values,
+                       "Unknown",
+                       GET_U_1(obj_tptr + offset + 2)),
+               GET_U_1(obj_tptr + offset + 2));
+           ND_PRINT("\n\t      Encoding Type: %s (%u)",
+               tok2str(gmpls_encoding_values,
+                       "Unknown",
+                       GET_U_1(obj_tptr + offset + 3)),
+               GET_U_1(obj_tptr + offset + 3));
+           bw.i = GET_BE_U_4(obj_tptr + offset + 4);
+           ND_PRINT("\n\t      Min Reservable Bandwidth: %.3f Mbps",
+                bw.f*8/1000000);
+           bw.i = GET_BE_U_4(obj_tptr + offset + 8);
+           ND_PRINT("\n\t      Max Reservable Bandwidth: %.3f Mbps",
+                bw.f*8/1000000);
+           break;
+       case WAVELENGTH_SUBOBJ:
+           ND_PRINT("\n\t      Wavelength: %u",
+               GET_BE_U_4(obj_tptr + offset + 4));
+           break;
+       default:
+           /* Any Unknown Subobject ==> Exit loop */
+           hexdump=TRUE;
+           break;
+       }
+       total_subobj_len-=subobj_len;
+       offset+=subobj_len;
+    }
+    return (hexdump);
+}

 
 

+void
+lmp_print(netdissect_options *ndo,
+          const u_char *pptr, u_int length)
+{

     const struct lmp_common_header *lmp_com_header;
     const struct lmp_object_header *lmp_obj_header;
     const u_char *tptr,*obj_tptr;
     const struct lmp_common_header *lmp_com_header;
     const struct lmp_object_header *lmp_obj_header;
     const u_char *tptr,*obj_tptr;

-    u_short tlen,lmp_obj_len,lmp_obj_ctype,obj_tlen;
+    u_int version_res, tlen, lmp_obj_len, lmp_obj_ctype, obj_tlen;

     int hexdump;
     int hexdump;

-    
+    u_int offset;
+    u_int link_type;
+
+    union { /* int to float conversion buffer */
+        float f;
+        uint32_t i;
+    } bw;
+
+    ndo->ndo_protocol = "lmp";

     tptr=pptr;
     lmp_com_header = (const struct lmp_common_header *)pptr;
     tptr=pptr;
     lmp_com_header = (const struct lmp_common_header *)pptr;

-    TCHECK(*lmp_com_header);
+    ND_TCHECK_SIZE(lmp_com_header);
+
+    version_res = GET_BE_U_2(lmp_com_header->version_res);

 
     /*
      * Sanity checking of the header.
      */
 
     /*
      * Sanity checking of the header.
      */

-    if (LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]) != LMP_VERSION) {
-       printf("LMP version %u packet not supported",
-               LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]));
+    if (LMP_EXTRACT_VERSION(version_res) != LMP_VERSION) {
+       ND_PRINT("LMP version %u packet not supported",
+               LMP_EXTRACT_VERSION(version_res));

        return;
     }
 
     /* in non-verbose mode just lets print the basic Message Type*/
        return;
     }
 
     /* in non-verbose mode just lets print the basic Message Type*/

-    if (vflag < 1) {
-        printf("LMPv%u %s Message, length: %u",
-               LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]),
-               tok2str(lmp_msg_type_values, "unknown (%u)",lmp_com_header->msg_type),
-               len);
+    if (ndo->ndo_vflag < 1) {
+        ND_PRINT("LMPv%u %s Message, length: %u",
+               LMP_EXTRACT_VERSION(version_res),
+               tok2str(lmp_msg_type_values, "unknown (%u)",GET_U_1(lmp_com_header->msg_type)),
+               length);

         return;
     }
 
     /* ok they seem to want to know everything - lets fully decode it */
 
         return;
     }
 
     /* ok they seem to want to know everything - lets fully decode it */
 

-    tlen=EXTRACT_16BITS(lmp_com_header->length);
+    tlen=GET_BE_U_2(lmp_com_header->length);

 
 

-    printf("\n\tLMPv%u, msg-type: %s, Flags: [%s], length: %u",
-           LMP_EXTRACT_VERSION(lmp_com_header->version_res[0]),
-           tok2str(lmp_msg_type_values, "unknown, type: %u",lmp_com_header->msg_type),
-           bittok2str(lmp_header_flag_values,"none",lmp_com_header->flags),
+    ND_PRINT("\n\tLMPv%u, msg-type: %s, Flags: [%s], length: %u",
+           LMP_EXTRACT_VERSION(version_res),
+           tok2str(lmp_msg_type_values, "unknown, type: %u",GET_U_1(lmp_com_header->msg_type)),
+           bittok2str(lmp_header_flag_values,"none",GET_U_1(lmp_com_header->flags)),

            tlen);
            tlen);

+    if (tlen < sizeof(struct lmp_common_header)) {
+        ND_PRINT(" (too short)");
+        return;
+    }
+    if (tlen > length) {
+        ND_PRINT(" (too long)");
+        tlen = length;
+    }

 
 

-    tptr+=sizeof(const struct lmp_common_header);
-    tlen-=sizeof(const struct lmp_common_header);
+    tptr+=sizeof(struct lmp_common_header);
+    tlen-=sizeof(struct lmp_common_header);

 
     while(tlen>0) {
         /* did we capture enough for fully decoding the object header ? */
 
     while(tlen>0) {
         /* did we capture enough for fully decoding the object header ? */

-        if (!TTEST2(*tptr, sizeof(struct lmp_object_header)))
-            goto trunc;
+        ND_TCHECK_LEN(tptr, sizeof(struct lmp_object_header));

 
         lmp_obj_header = (const struct lmp_object_header *)tptr;
 
         lmp_obj_header = (const struct lmp_object_header *)tptr;

-        lmp_obj_len=EXTRACT_16BITS(lmp_obj_header->length);
-        lmp_obj_ctype=(lmp_obj_header->ctype)&0x7f;
+        lmp_obj_len=GET_BE_U_2(lmp_obj_header->length);
+        lmp_obj_ctype=GET_U_1(lmp_obj_header->ctype)&0x7f;

 
 

-        if(lmp_obj_len % 4 || lmp_obj_len < 4)
-            return;
-
-        printf("\n\t  %s Object (%u), Class-Type: %s (%u) Flags: [%snegotiable], length: %u",
+        ND_PRINT("\n\t  %s Object (%u), Class-Type: %s (%u) Flags: [%snegotiable], length: %u",

                tok2str(lmp_obj_values,
                        "Unknown",
                tok2str(lmp_obj_values,
                        "Unknown",

-                       lmp_obj_header->class_num),
-               lmp_obj_header->class_num,
+                       GET_U_1(lmp_obj_header->class_num)),
+               GET_U_1(lmp_obj_header->class_num),

                tok2str(lmp_ctype_values,
                        "Unknown",
                tok2str(lmp_ctype_values,
                        "Unknown",

-                       ((lmp_obj_header->class_num)<<8)+lmp_obj_ctype),
+                       (GET_U_1(lmp_obj_header->class_num)<<8)+lmp_obj_ctype),

                lmp_obj_ctype,
                lmp_obj_ctype,

-               (lmp_obj_header->ctype)&0x80 ? "" : "non-",
+               GET_U_1(lmp_obj_header->ctype)&0x80 ? "" : "non-",

                lmp_obj_len);
 
                lmp_obj_len);
 

+        if (lmp_obj_len < 4) {
+            ND_PRINT(" (too short)");
+            return;
+        }
+        if ((lmp_obj_len % 4) != 0) {
+            ND_PRINT(" (not a multiple of 4)");
+            return;
+        }
+

         obj_tptr=tptr+sizeof(struct lmp_object_header);
         obj_tlen=lmp_obj_len-sizeof(struct lmp_object_header);
 
         /* did we capture enough for fully decoding the object ? */
         obj_tptr=tptr+sizeof(struct lmp_object_header);
         obj_tlen=lmp_obj_len-sizeof(struct lmp_object_header);
 
         /* did we capture enough for fully decoding the object ? */

-        if (!TTEST2(*tptr, lmp_obj_len))
-            goto trunc;
+        ND_TCHECK_LEN(tptr, lmp_obj_len);

         hexdump=FALSE;
 
         hexdump=FALSE;
 

-        switch(lmp_obj_header->class_num) {
+        switch(GET_U_1(lmp_obj_header->class_num)) {

 
         case LMP_OBJ_CC_ID:
             switch(lmp_obj_ctype) {
             case LMP_CTYPE_LOC:
             case LMP_CTYPE_RMT:
 
         case LMP_OBJ_CC_ID:
             switch(lmp_obj_ctype) {
             case LMP_CTYPE_LOC:
             case LMP_CTYPE_RMT:

-                printf("\n\t    Control Channel ID: %u (0x%08x)",
-                       EXTRACT_32BITS(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr));
+                if (obj_tlen != 4) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+                ND_PRINT("\n\t    Control Channel ID: %u (0x%08x)",
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

                 break;
 
             default:
                 break;
 
             default:


@@ -341,23 +546,33 @@ lmp_print(register const u_char *pptr, register u_int len) {
             switch(lmp_obj_ctype) {
             case LMP_CTYPE_IPV4_LOC:
             case LMP_CTYPE_IPV4_RMT:
             switch(lmp_obj_ctype) {
             case LMP_CTYPE_IPV4_LOC:
             case LMP_CTYPE_IPV4_RMT:

-                printf("\n\t    IPv4 Link ID: %s (0x%08x)",
-                       ipaddr_string(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr));
+                if (obj_tlen != 4) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+                ND_PRINT("\n\t    IPv4 Link ID: %s (0x%08x)",
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

                 break;
                 break;

-#ifdef INET6

             case LMP_CTYPE_IPV6_LOC:
             case LMP_CTYPE_IPV6_RMT:
             case LMP_CTYPE_IPV6_LOC:
             case LMP_CTYPE_IPV6_RMT:

-                printf("\n\t    IPv6 Link ID: %s (0x%08x)",
-                       ip6addr_string(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr));
+                if (obj_tlen != 16) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+                ND_PRINT("\n\t    IPv6 Link ID: %s (0x%08x)",
+                       GET_IP6ADDR_STRING(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

                 break;
                 break;

-#endif

             case LMP_CTYPE_UNMD_LOC:
             case LMP_CTYPE_UNMD_RMT:
             case LMP_CTYPE_UNMD_LOC:
             case LMP_CTYPE_UNMD_RMT:

-                printf("\n\t    Link ID: %u (0x%08x)",
-                       EXTRACT_32BITS(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr));
+                if (obj_tlen != 4) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+                ND_PRINT("\n\t    Link ID: %u (0x%08x)",
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

                 break;
             default:
                 hexdump=TRUE;
                 break;
             default:
                 hexdump=TRUE;


@@ -367,14 +582,22 @@ lmp_print(register const u_char *pptr, register u_int len) {
         case LMP_OBJ_MESSAGE_ID:
             switch(lmp_obj_ctype) {
             case LMP_CTYPE_1:
         case LMP_OBJ_MESSAGE_ID:
             switch(lmp_obj_ctype) {
             case LMP_CTYPE_1:

-                printf("\n\t    Message ID: %u (0x%08x)",
-                       EXTRACT_32BITS(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr));
+                if (obj_tlen != 4) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+                ND_PRINT("\n\t    Message ID: %u (0x%08x)",
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

                 break;
             case LMP_CTYPE_2:
                 break;
             case LMP_CTYPE_2:

-                printf("\n\t    Message ID Ack: %u (0x%08x)",
-                       EXTRACT_32BITS(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr));
+                if (obj_tlen != 4) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+                ND_PRINT("\n\t    Message ID Ack: %u (0x%08x)",
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

                 break;
             default:
                 hexdump=TRUE;
                 break;
             default:
                 hexdump=TRUE;


@@ -385,9 +608,13 @@ lmp_print(register const u_char *pptr, register u_int len) {
             switch(lmp_obj_ctype) {
             case LMP_CTYPE_LOC:
             case LMP_CTYPE_RMT:
             switch(lmp_obj_ctype) {
             case LMP_CTYPE_LOC:
             case LMP_CTYPE_RMT:

-                printf("\n\t    Node ID: %s (0x%08x)",
-                       ipaddr_string(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr));
+                if (obj_tlen != 4) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+                ND_PRINT("\n\t    Node ID: %s (0x%08x)",
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

                 break;
 
             default:
                 break;
 
             default:


@@ -395,110 +622,521 @@ lmp_print(register const u_char *pptr, register u_int len) {
             }
             break;
 
             }
             break;
 

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

         case LMP_OBJ_CONFIG:
             switch(lmp_obj_ctype) {
             case LMP_CTYPE_HELLO_CONFIG:
         case LMP_OBJ_CONFIG:
             switch(lmp_obj_ctype) {
             case LMP_CTYPE_HELLO_CONFIG:

-                printf("\n\t    Hello Interval: %u\n\t    Hello Dead Interval: %u",
-                       EXTRACT_16BITS(obj_tptr),
-                       EXTRACT_16BITS(obj_tptr+2));
+                if (obj_tlen != 4) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+                ND_PRINT("\n\t    Hello Interval: %u\n\t    Hello Dead Interval: %u",
+                       GET_BE_U_2(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 2));

                 break;
 
             default:
                 hexdump=TRUE;
             }
             break;
                 break;
 
             default:
                 hexdump=TRUE;
             }
             break;

-       
+

         case LMP_OBJ_HELLO:
             switch(lmp_obj_ctype) {
            case LMP_CTYPE_HELLO:
         case LMP_OBJ_HELLO:
             switch(lmp_obj_ctype) {
            case LMP_CTYPE_HELLO:

-                printf("\n\t    TxSeqNum: %u\n\t    RcvSeqNum: %u",
-                       EXTRACT_32BITS(obj_tptr),
-                       EXTRACT_32BITS(obj_tptr+4));
+                if (obj_tlen != 8) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+                ND_PRINT("\n\t    Tx Seq: %u, Rx Seq: %u",
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr + 4));

                 break;
 
             default:
                 hexdump=TRUE;
             }
                 break;
 
             default:
                 hexdump=TRUE;
             }

-            break;      
-           
+            break;
+

         case LMP_OBJ_TE_LINK:
         case LMP_OBJ_TE_LINK:

-               printf("\n\t    Flags: [%s]",
-               bittok2str(lmp_obj_te_link_flag_values,
-                       "none",
-                       EXTRACT_16BITS(obj_tptr)>>8));
-            

            switch(lmp_obj_ctype) {
            case LMP_CTYPE_IPV4:
            switch(lmp_obj_ctype) {
            case LMP_CTYPE_IPV4:

-               printf("\n\t    Local Link-ID: %s (0x%08x) \
-                       \n\t    Remote Link-ID: %s (0x%08x)",
-                       ipaddr_string(obj_tptr+4),
-                       EXTRACT_32BITS(obj_tptr+4),
-                       ipaddr_string(obj_tptr+8),
-                       EXTRACT_32BITS(obj_tptr+8));
+                if (obj_tlen != 12) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+               ND_PRINT("\n\t    Flags: [%s]",
+                   bittok2str(lmp_obj_te_link_flag_values,
+                       "none",
+                       GET_U_1(obj_tptr)));
+
+               ND_PRINT("\n\t    Local Link-ID: %s (0x%08x)"
+                      "\n\t    Remote Link-ID: %s (0x%08x)",
+                       GET_IPADDR_STRING(obj_tptr+4),
+                       GET_BE_U_4(obj_tptr + 4),
+                       GET_IPADDR_STRING(obj_tptr+8),
+                       GET_BE_U_4(obj_tptr + 8));

                break;
                break;

-               
-#ifdef INET6
+

            case LMP_CTYPE_IPV6:
            case LMP_CTYPE_IPV6:

-#endif
+                if (obj_tlen != 36) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+               ND_PRINT("\n\t    Flags: [%s]",
+                   bittok2str(lmp_obj_te_link_flag_values,
+                       "none",
+                       GET_U_1(obj_tptr)));
+
+               ND_PRINT("\n\t    Local Link-ID: %s (0x%08x)"
+                      "\n\t    Remote Link-ID: %s (0x%08x)",
+                       GET_IP6ADDR_STRING(obj_tptr+4),
+                       GET_BE_U_4(obj_tptr + 4),
+                       GET_IP6ADDR_STRING(obj_tptr+20),
+                       GET_BE_U_4(obj_tptr + 20));
+                break;
+

            case LMP_CTYPE_UNMD:
            case LMP_CTYPE_UNMD:

+                if (obj_tlen != 12) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+               ND_PRINT("\n\t    Flags: [%s]",
+                   bittok2str(lmp_obj_te_link_flag_values,
+                       "none",
+                       GET_U_1(obj_tptr)));
+
+               ND_PRINT("\n\t    Local Link-ID: %u (0x%08x)"
+                      "\n\t    Remote Link-ID: %u (0x%08x)",
+                       GET_BE_U_4(obj_tptr + 4),
+                       GET_BE_U_4(obj_tptr + 4),
+                       GET_BE_U_4(obj_tptr + 8),
+                       GET_BE_U_4(obj_tptr + 8));
+               break;
+

             default:
                 hexdump=TRUE;
             }
             break;
             default:
                 hexdump=TRUE;
             }
             break;

-       
+

         case LMP_OBJ_DATA_LINK:
         case LMP_OBJ_DATA_LINK:

-               printf("\n\t    Flags: [%s]",
-               bittok2str(lmp_obj_data_link_flag_values,
-                       "none",
-                       EXTRACT_16BITS(obj_tptr)>>8));
-            

            switch(lmp_obj_ctype) {
            case LMP_CTYPE_IPV4:
            switch(lmp_obj_ctype) {
            case LMP_CTYPE_IPV4:

-           case LMP_CTYPE_UNMD:
-                printf("\n\t    Local Interface ID: %s (0x%08x) \
-                       \n\t    Remote Interface ID: %s (0x%08x)",
-                       ipaddr_string(obj_tptr+4),
-                       EXTRACT_32BITS(obj_tptr+4),
-                       ipaddr_string(obj_tptr+8),
-                       EXTRACT_32BITS(obj_tptr+8));
-               
-               /* FIXME: Missing Data link Subobjects decoder */
-               
+                if (obj_tlen < 12) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+               ND_PRINT("\n\t    Flags: [%s]",
+                   bittok2str(lmp_obj_data_link_flag_values,
+                       "none",
+                       GET_U_1(obj_tptr)));
+                ND_PRINT("\n\t    Local Interface ID: %s (0x%08x)"
+                       "\n\t    Remote Interface ID: %s (0x%08x)",
+                       GET_IPADDR_STRING(obj_tptr+4),
+                       GET_BE_U_4(obj_tptr + 4),
+                       GET_IPADDR_STRING(obj_tptr+8),
+                       GET_BE_U_4(obj_tptr + 8));
+
+               if (lmp_print_data_link_subobjs(ndo, obj_tptr, obj_tlen - 12, 12))
+                   hexdump=TRUE;

                break;
                break;

-#ifdef INET6   
+

            case LMP_CTYPE_IPV6:
            case LMP_CTYPE_IPV6:

-#endif
+                if (obj_tlen < 36) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+               ND_PRINT("\n\t    Flags: [%s]",
+                   bittok2str(lmp_obj_data_link_flag_values,
+                       "none",
+                       GET_U_1(obj_tptr)));
+                ND_PRINT("\n\t    Local Interface ID: %s (0x%08x)"
+                       "\n\t    Remote Interface ID: %s (0x%08x)",
+                       GET_IP6ADDR_STRING(obj_tptr+4),
+                       GET_BE_U_4(obj_tptr + 4),
+                       GET_IP6ADDR_STRING(obj_tptr+20),
+                       GET_BE_U_4(obj_tptr + 20));
+
+               if (lmp_print_data_link_subobjs(ndo, obj_tptr, obj_tlen - 36, 36))
+                   hexdump=TRUE;
+               break;
+
+           case LMP_CTYPE_UNMD:
+                if (obj_tlen < 12) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+               ND_PRINT("\n\t    Flags: [%s]",
+                   bittok2str(lmp_obj_data_link_flag_values,
+                       "none",
+                       GET_U_1(obj_tptr)));
+                ND_PRINT("\n\t    Local Interface ID: %u (0x%08x)"
+                       "\n\t    Remote Interface ID: %u (0x%08x)",
+                       GET_BE_U_4(obj_tptr + 4),
+                       GET_BE_U_4(obj_tptr + 4),
+                       GET_BE_U_4(obj_tptr + 8),
+                       GET_BE_U_4(obj_tptr + 8));
+
+               if (lmp_print_data_link_subobjs(ndo, obj_tptr, obj_tlen - 12, 12))
+                   hexdump=TRUE;
+               break;
+

             default:
                 hexdump=TRUE;
             }
             default:
                 hexdump=TRUE;
             }

-            break;      
-           
+            break;
+

         case LMP_OBJ_VERIFY_BEGIN:
         case LMP_OBJ_VERIFY_BEGIN:

+           switch(lmp_obj_ctype) {
+            case LMP_CTYPE_1:
+                if (obj_tlen != 20) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+               ND_PRINT("\n\t    Flags: %s",
+               bittok2str(lmp_obj_begin_verify_flag_values,
+                       "none",
+                       GET_BE_U_2(obj_tptr)));
+               ND_PRINT("\n\t    Verify Interval: %u",
+                       GET_BE_U_2(obj_tptr + 2));
+               ND_PRINT("\n\t    Data links: %u",
+                       GET_BE_U_4(obj_tptr + 4));
+                ND_PRINT("\n\t    Encoding type: %s",
+                       tok2str(gmpls_encoding_values, "Unknown", GET_U_1((obj_tptr + 8))));
+                ND_PRINT("\n\t    Verify Transport Mechanism: %u (0x%x)%s",
+                       GET_BE_U_2(obj_tptr + 10),
+                       GET_BE_U_2(obj_tptr + 10),
+                       GET_BE_U_2(obj_tptr + 10)&8000 ? " (Payload test messages capable)" : "");
+                bw.i = GET_BE_U_4(obj_tptr + 12);
+               ND_PRINT("\n\t    Transmission Rate: %.3f Mbps",bw.f*8/1000000);
+               ND_PRINT("\n\t    Wavelength: %u",
+                       GET_BE_U_4(obj_tptr + 16));
+               break;
+
+            default:
+                hexdump=TRUE;
+            }
+            break;
+

         case LMP_OBJ_VERIFY_BEGIN_ACK:
         case LMP_OBJ_VERIFY_BEGIN_ACK:

-        case LMP_OBJ_VERIFY_ID:
-        case LMP_OBJ_CHANNEL_STATUS:
-        case LMP_OBJ_CHANNEL_STATUS_REQ:
+           switch(lmp_obj_ctype) {
+            case LMP_CTYPE_1:
+                if (obj_tlen != 4) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+                ND_PRINT("\n\t    Verify Dead Interval: %u"
+                       "\n\t    Verify Transport Response: %u",
+                       GET_BE_U_2(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 2));
+                break;
+
+            default:
+                hexdump=TRUE;
+            }
+            break;
+
+       case LMP_OBJ_VERIFY_ID:
+           switch(lmp_obj_ctype) {
+            case LMP_CTYPE_1:
+                if (obj_tlen != 4) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+                ND_PRINT("\n\t    Verify ID: %u",
+                       GET_BE_U_4(obj_tptr));
+                break;
+
+            default:
+                hexdump=TRUE;
+            }
+            break;
+
+       case LMP_OBJ_CHANNEL_STATUS:
+            switch(lmp_obj_ctype) {
+           case LMP_CTYPE_IPV4:
+               offset = 0;
+               /* Decode pairs: <Interface_ID (4 bytes), Channel_status (4 bytes)> */
+               while (offset+8 <= obj_tlen) {
+                       ND_PRINT("\n\t    Interface ID: %s (0x%08x)",
+                       GET_IPADDR_STRING(obj_tptr+offset),
+                       GET_BE_U_4(obj_tptr + offset));
+
+                       ND_PRINT("\n\t\t    Active: %s (%u)",
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>31) ?
+                               "Allocated" : "Non-allocated",
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>31));
+
+                       ND_PRINT("\n\t\t    Direction: %s (%u)",
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>30)&0x1 ?
+                               "Transmit" : "Receive",
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>30)&0x1);
+
+                       ND_PRINT("\n\t\t    Channel Status: %s (%u)",
+                                       tok2str(lmp_obj_channel_status_values,
+                                       "Unknown",
+                                       GET_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF),
+                                       GET_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF);
+                       offset+=8;
+               }
+                break;
+
+           case LMP_CTYPE_IPV6:
+               offset = 0;
+               /* Decode pairs: <Interface_ID (16 bytes), Channel_status (4 bytes)> */
+               while (offset+20 <= obj_tlen) {
+                       ND_PRINT("\n\t    Interface ID: %s (0x%08x)",
+                       GET_IP6ADDR_STRING(obj_tptr+offset),
+                       GET_BE_U_4(obj_tptr + offset));
+
+                       ND_PRINT("\n\t\t    Active: %s (%u)",
+                               (GET_BE_U_4(obj_tptr + offset + 16)>>31) ?
+                               "Allocated" : "Non-allocated",
+                               (GET_BE_U_4(obj_tptr + offset + 16)>>31));
+
+                       ND_PRINT("\n\t\t    Direction: %s (%u)",
+                               (GET_BE_U_4(obj_tptr + offset + 16)>>30)&0x1 ?
+                               "Transmit" : "Receive",
+                               (GET_BE_U_4(obj_tptr + offset + 16)>>30)&0x1);
+
+                       ND_PRINT("\n\t\t    Channel Status: %s (%u)",
+                                       tok2str(lmp_obj_channel_status_values,
+                                       "Unknown",
+                                       GET_BE_U_4(obj_tptr + offset + 16)&0x3FFFFFF),
+                                       GET_BE_U_4(obj_tptr + offset + 16)&0x3FFFFFF);
+                       offset+=20;
+               }
+                break;
+
+           case LMP_CTYPE_UNMD:
+               offset = 0;
+               /* Decode pairs: <Interface_ID (4 bytes), Channel_status (4 bytes)> */
+               while (offset+8 <= obj_tlen) {
+                       ND_PRINT("\n\t    Interface ID: %u (0x%08x)",
+                       GET_BE_U_4(obj_tptr + offset),
+                       GET_BE_U_4(obj_tptr + offset));
+
+                       ND_PRINT("\n\t\t    Active: %s (%u)",
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>31) ?
+                               "Allocated" : "Non-allocated",
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>31));
+
+                       ND_PRINT("\n\t\t    Direction: %s (%u)",
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>30)&0x1 ?
+                               "Transmit" : "Receive",
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>30)&0x1);
+
+                       ND_PRINT("\n\t\t    Channel Status: %s (%u)",
+                                       tok2str(lmp_obj_channel_status_values,
+                                       "Unknown",
+                                       GET_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF),
+                                       GET_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF);
+                       offset+=8;
+               }
+                break;
+
+            default:
+                hexdump=TRUE;
+            }
+            break;
+
+       case LMP_OBJ_CHANNEL_STATUS_REQ:
+            switch(lmp_obj_ctype) {
+           case LMP_CTYPE_IPV4:
+               offset = 0;
+               while (offset+4 <= obj_tlen) {
+                       ND_PRINT("\n\t    Interface ID: %s (0x%08x)",
+                       GET_IPADDR_STRING(obj_tptr+offset),
+                       GET_BE_U_4(obj_tptr + offset));
+                       offset+=4;
+               }
+                break;
+
+           case LMP_CTYPE_IPV6:
+               offset = 0;
+               while (offset+16 <= obj_tlen) {
+                       ND_PRINT("\n\t    Interface ID: %s (0x%08x)",
+                       GET_IP6ADDR_STRING(obj_tptr+offset),
+                       GET_BE_U_4(obj_tptr + offset));
+                       offset+=16;
+               }
+                break;
+
+           case LMP_CTYPE_UNMD:
+               offset = 0;
+               while (offset+4 <= obj_tlen) {
+                       ND_PRINT("\n\t    Interface ID: %u (0x%08x)",
+                       GET_BE_U_4(obj_tptr + offset),
+                       GET_BE_U_4(obj_tptr + offset));
+                       offset+=4;
+               }
+                break;
+
+           default:
+                hexdump=TRUE;
+            }
+            break;
+

         case LMP_OBJ_ERROR_CODE:
         case LMP_OBJ_ERROR_CODE:

+           switch(lmp_obj_ctype) {
+            case LMP_CTYPE_BEGIN_VERIFY_ERROR:
+                if (obj_tlen != 4) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+               ND_PRINT("\n\t    Error Code: %s",
+               bittok2str(lmp_obj_begin_verify_error_values,
+                       "none",
+                       GET_BE_U_4(obj_tptr)));
+                break;
+
+            case LMP_CTYPE_LINK_SUMMARY_ERROR:
+                if (obj_tlen != 4) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+               ND_PRINT("\n\t    Error Code: %s",
+               bittok2str(lmp_obj_link_summary_error_values,
+                       "none",
+                       GET_BE_U_4(obj_tptr)));
+                break;
+            default:
+                hexdump=TRUE;
+            }
+            break;
+
+       case LMP_OBJ_SERVICE_CONFIG:
+           switch (lmp_obj_ctype) {
+           case LMP_CTYPE_SERVICE_CONFIG_SP:
+                if (obj_tlen != 4) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+               ND_PRINT("\n\t Flags: %s",
+                      bittok2str(lmp_obj_service_config_sp_flag_values,
+                                 "none",
+                                 GET_U_1(obj_tptr)));
+
+               ND_PRINT("\n\t  UNI Version: %u",
+                      GET_U_1(obj_tptr + 1));
+
+               break;
+
+            case LMP_CTYPE_SERVICE_CONFIG_CPSA:
+                if (obj_tlen != 16) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+
+               link_type = GET_U_1(obj_tptr);
+
+               ND_PRINT("\n\t Link Type: %s (%u)",
+                      tok2str(lmp_sd_service_config_cpsa_link_type_values,
+                              "Unknown", link_type),
+                      link_type);
+
+               switch (link_type) {
+               case LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SDH:
+                   ND_PRINT("\n\t Signal Type: %s (%u)",
+                          tok2str(lmp_sd_service_config_cpsa_signal_type_sdh_values,
+                                  "Unknown",
+                                  GET_U_1(obj_tptr + 1)),
+                          GET_U_1(obj_tptr + 1));
+                   break;
+
+               case LMP_SD_SERVICE_CONFIG_CPSA_LINK_TYPE_SONET:
+                   ND_PRINT("\n\t Signal Type: %s (%u)",
+                          tok2str(lmp_sd_service_config_cpsa_signal_type_sonet_values,
+                                  "Unknown",
+                                  GET_U_1(obj_tptr + 1)),
+                          GET_U_1(obj_tptr + 1));
+                   break;
+               }
+
+               ND_PRINT("\n\t Transparency: %s",
+                      bittok2str(lmp_obj_service_config_cpsa_tp_flag_values,
+                                 "none",
+                                 GET_U_1(obj_tptr + 2)));
+
+               ND_PRINT("\n\t Contiguous Concatenation Types: %s",
+                      bittok2str(lmp_obj_service_config_cpsa_cct_flag_values,
+                                 "none",
+                                 GET_U_1(obj_tptr + 3)));
+
+               ND_PRINT("\n\t Minimum NCC: %u",
+                      GET_BE_U_2(obj_tptr + 4));
+
+               ND_PRINT("\n\t Maximum NCC: %u",
+                      GET_BE_U_2(obj_tptr + 6));
+
+               ND_PRINT("\n\t Minimum NVC:%u",
+                      GET_BE_U_2(obj_tptr + 8));
+
+               ND_PRINT("\n\t Maximum NVC:%u",
+                      GET_BE_U_2(obj_tptr + 10));
+
+               ND_PRINT("\n\t    Local Interface ID: %s (0x%08x)",
+                      GET_IPADDR_STRING(obj_tptr+12),
+                      GET_BE_U_4(obj_tptr + 12));
+
+               break;
+
+           case LMP_CTYPE_SERVICE_CONFIG_TRANSPARENCY_TCM:
+                if (obj_tlen != 8) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+
+               ND_PRINT("\n\t Transparency Flags: %s",
+                      bittok2str(
+                          lmp_obj_service_config_nsa_transparency_flag_values,
+                          "none",
+                          GET_BE_U_4(obj_tptr)));
+
+               ND_PRINT("\n\t TCM Monitoring Flags: %s",
+                      bittok2str(
+                          lmp_obj_service_config_nsa_tcm_flag_values,
+                          "none",
+                          GET_U_1(obj_tptr + 7)));
+
+               break;
+
+           case LMP_CTYPE_SERVICE_CONFIG_NETWORK_DIVERSITY:
+                if (obj_tlen != 4) {
+                    ND_PRINT(" (not correct for object)");
+                    break;
+                }
+
+               ND_PRINT("\n\t Diversity: Flags: %s",
+                      bittok2str(
+                          lmp_obj_service_config_nsa_network_diversity_flag_values,
+                          "none",
+                          GET_U_1(obj_tptr + 3)));
+               break;
+
+           default:
+               hexdump = TRUE;
+           }
+
+       break;

 
         default:
 
         default:

-            if (vflag <= 1)
-                print_unknown_data(obj_tptr,"\n\t    ",obj_tlen);
+            if (ndo->ndo_vflag <= 1)
+                print_unknown_data(ndo,obj_tptr,"\n\t    ",obj_tlen);

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

-        if (vflag > 1 || hexdump==TRUE)
-            print_unknown_data(tptr+sizeof(sizeof(struct lmp_object_header)),"\n\t    ",
+        if (ndo->ndo_vflag > 1 || hexdump==TRUE)
+            print_unknown_data(ndo,tptr+sizeof(struct lmp_object_header),"\n\t    ",

                                lmp_obj_len-sizeof(struct lmp_object_header));
 
                                lmp_obj_len-sizeof(struct lmp_object_header));
 

+        if (tlen < lmp_obj_len) {
+            ND_PRINT(" [remaining objects length %u < %u]", tlen, lmp_obj_len);
+            nd_print_invalid(ndo);
+            break;
+        }

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

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

 }
 }