On Solaris, for 64-bit builds, use the 64-bit pcap-config.

[tcpdump] / print-lmp.c

diff --git a/print-lmp.c b/print-lmp.c
index 4999e786cb0313fbc7299c9586b5fb1b3ba8cd29..925f3b07f354cbe20dc40cde7d6d56f022e26621 100644 (file)
--- a/print-lmp.c
+++ b/print-lmp.c
@@ -18,7 +18,7 @@
 /* \summary: Link Management Protocol (LMP) printer */
 
 /* specification: RFC 4204 */
 /* \summary: Link Management Protocol (LMP) printer */
 
 /* specification: RFC 4204 */

-/* OIF UNI 1.0: http://www.oiforum.com/public/documents/OIF-UNI-01.0.pdf */
+/* 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
 #include <config.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>


@@ -26,6 +26,7 @@
 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 

+#define ND_LONGJMP_FROM_TCHECK

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


@@ -368,8 +369,8 @@ lmp_print_data_link_subobjs(netdissect_options *ndo, const u_char *obj_tptr,
     } bw;
 
     while (total_subobj_len > 0 && hexdump == FALSE ) {
     } bw;
 
     while (total_subobj_len > 0 && hexdump == FALSE ) {

-       subobj_type = EXTRACT_U_1(obj_tptr + offset);
-       subobj_len  = EXTRACT_U_1(obj_tptr + offset + 1);
+       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",
        ND_PRINT("\n\t    Subobject, Type: %s (%u), Length: %u",
                tok2str(lmp_data_link_subobj,
                        "Unknown",


@@ -393,23 +394,23 @@ lmp_print_data_link_subobjs(netdissect_options *ndo, const u_char *obj_tptr,
            ND_PRINT("\n\t      Switching Type: %s (%u)",
                tok2str(gmpls_switch_cap_values,
                        "Unknown",
            ND_PRINT("\n\t      Switching Type: %s (%u)",
                tok2str(gmpls_switch_cap_values,
                        "Unknown",

-                       EXTRACT_U_1(obj_tptr + offset + 2)),
-               EXTRACT_U_1(obj_tptr + offset + 2));
+                       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",
            ND_PRINT("\n\t      Encoding Type: %s (%u)",
                tok2str(gmpls_encoding_values,
                        "Unknown",

-                       EXTRACT_U_1(obj_tptr + offset + 3)),
-               EXTRACT_U_1(obj_tptr + offset + 3));
-           bw.i = EXTRACT_BE_U_4(obj_tptr + offset + 4);
+                       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);
            ND_PRINT("\n\t      Min Reservable Bandwidth: %.3f Mbps",
                 bw.f*8/1000000);

-           bw.i = EXTRACT_BE_U_4(obj_tptr + offset + 8);
+           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",
            ND_PRINT("\n\t      Max Reservable Bandwidth: %.3f Mbps",
                 bw.f*8/1000000);
            break;
        case WAVELENGTH_SUBOBJ:
            ND_PRINT("\n\t      Wavelength: %u",

-               EXTRACT_BE_U_4(obj_tptr + offset + 4));
+               GET_BE_U_4(obj_tptr + offset + 4));

            break;
        default:
            /* Any Unknown Subobject ==> Exit loop */
            break;
        default:
            /* Any Unknown Subobject ==> Exit loop */


@@ -427,7 +428,6 @@ lmp_print(netdissect_options *ndo,
           const u_char *pptr, u_int length)
 {
     const struct lmp_common_header *lmp_com_header;
           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;
     u_int version_res, tlen, lmp_obj_len, lmp_obj_ctype, obj_tlen;
     int hexdump;
     const u_char *tptr,*obj_tptr;
     u_int version_res, tlen, lmp_obj_len, lmp_obj_ctype, obj_tlen;
     int hexdump;


@@ -444,7 +444,7 @@ lmp_print(netdissect_options *ndo,
     lmp_com_header = (const struct lmp_common_header *)pptr;
     ND_TCHECK_SIZE(lmp_com_header);
 
     lmp_com_header = (const struct lmp_common_header *)pptr;
     ND_TCHECK_SIZE(lmp_com_header);
 

-    version_res = EXTRACT_BE_U_2(lmp_com_header->version_res);
+    version_res = GET_BE_U_2(lmp_com_header->version_res);

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


@@ -459,19 +459,19 @@ lmp_print(netdissect_options *ndo,
     if (ndo->ndo_vflag < 1) {
         ND_PRINT("LMPv%u %s Message, length: %u",
                LMP_EXTRACT_VERSION(version_res),
     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)",EXTRACT_U_1(lmp_com_header->msg_type)),
+               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 */
 
                length);
         return;
     }
 
     /* ok they seem to want to know everything - lets fully decode it */
 

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

 
     ND_PRINT("\n\tLMPv%u, msg-type: %s, Flags: [%s], length: %u",
            LMP_EXTRACT_VERSION(version_res),
 
     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",EXTRACT_U_1(lmp_com_header->msg_type)),
-           bittok2str(lmp_header_flag_values,"none",EXTRACT_U_1(lmp_com_header->flags)),
+           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);
     if (tlen < sizeof(struct lmp_common_header)) {
         ND_PRINT(" (too short)");
            tlen);
     if (tlen < sizeof(struct lmp_common_header)) {
         ND_PRINT(" (too short)");


@@ -486,23 +486,21 @@ lmp_print(netdissect_options *ndo,
     tlen-=sizeof(struct lmp_common_header);
 
     while(tlen>0) {
     tlen-=sizeof(struct lmp_common_header);
 
     while(tlen>0) {

-        /* did we capture enough for fully decoding the object header ? */
-        ND_TCHECK_LEN(tptr, sizeof(struct lmp_object_header));
-
-        lmp_obj_header = (const struct lmp_object_header *)tptr;
-        lmp_obj_len=EXTRACT_BE_U_2(lmp_obj_header->length);
-        lmp_obj_ctype=EXTRACT_U_1(lmp_obj_header->ctype)&0x7f;
+        const struct lmp_object_header *lmp_obj_header =
+            (const struct lmp_object_header *)tptr;
+        lmp_obj_len=GET_BE_U_2(lmp_obj_header->length);
+        lmp_obj_ctype=GET_U_1(lmp_obj_header->ctype)&0x7f;

 
         ND_PRINT("\n\t  %s Object (%u), Class-Type: %s (%u) Flags: [%snegotiable], length: %u",
                tok2str(lmp_obj_values,
                        "Unknown",
 
         ND_PRINT("\n\t  %s Object (%u), Class-Type: %s (%u) Flags: [%snegotiable], length: %u",
                tok2str(lmp_obj_values,
                        "Unknown",

-                       EXTRACT_U_1(lmp_obj_header->class_num)),
-               EXTRACT_U_1(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",

-                       (EXTRACT_U_1(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,

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

                lmp_obj_len);
 
         if (lmp_obj_len < 4) {
                lmp_obj_len);
 
         if (lmp_obj_len < 4) {


@@ -521,7 +519,7 @@ lmp_print(netdissect_options *ndo,
         ND_TCHECK_LEN(tptr, lmp_obj_len);
         hexdump=FALSE;
 
         ND_TCHECK_LEN(tptr, lmp_obj_len);
         hexdump=FALSE;
 

-        switch(EXTRACT_U_1(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_OBJ_CC_ID:
             switch(lmp_obj_ctype) {


@@ -532,8 +530,8 @@ lmp_print(netdissect_options *ndo,
                     break;
                 }
                 ND_PRINT("\n\t    Control Channel ID: %u (0x%08x)",
                     break;
                 }
                 ND_PRINT("\n\t    Control Channel ID: %u (0x%08x)",

-                       EXTRACT_BE_U_4(obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr));
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

                 break;
 
             default:
                 break;
 
             default:


@@ -551,8 +549,8 @@ lmp_print(netdissect_options *ndo,
                     break;
                 }
                 ND_PRINT("\n\t    IPv4 Link ID: %s (0x%08x)",
                     break;
                 }
                 ND_PRINT("\n\t    IPv4 Link ID: %s (0x%08x)",

-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr));
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

                 break;
             case LMP_CTYPE_IPV6_LOC:
             case LMP_CTYPE_IPV6_RMT:
                 break;
             case LMP_CTYPE_IPV6_LOC:
             case LMP_CTYPE_IPV6_RMT:


@@ -561,8 +559,8 @@ lmp_print(netdissect_options *ndo,
                     break;
                 }
                 ND_PRINT("\n\t    IPv6 Link ID: %s (0x%08x)",
                     break;
                 }
                 ND_PRINT("\n\t    IPv6 Link ID: %s (0x%08x)",

-                       ip6addr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr));
+                       GET_IP6ADDR_STRING(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

                 break;
             case LMP_CTYPE_UNMD_LOC:
             case LMP_CTYPE_UNMD_RMT:
                 break;
             case LMP_CTYPE_UNMD_LOC:
             case LMP_CTYPE_UNMD_RMT:


@@ -571,8 +569,8 @@ lmp_print(netdissect_options *ndo,
                     break;
                 }
                 ND_PRINT("\n\t    Link ID: %u (0x%08x)",
                     break;
                 }
                 ND_PRINT("\n\t    Link ID: %u (0x%08x)",

-                       EXTRACT_BE_U_4(obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr));
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

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


@@ -587,8 +585,8 @@ lmp_print(netdissect_options *ndo,
                     break;
                 }
                 ND_PRINT("\n\t    Message ID: %u (0x%08x)",
                     break;
                 }
                 ND_PRINT("\n\t    Message ID: %u (0x%08x)",

-                       EXTRACT_BE_U_4(obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr));
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

                 break;
             case LMP_CTYPE_2:
                 if (obj_tlen != 4) {
                 break;
             case LMP_CTYPE_2:
                 if (obj_tlen != 4) {


@@ -596,8 +594,8 @@ lmp_print(netdissect_options *ndo,
                     break;
                 }
                 ND_PRINT("\n\t    Message ID Ack: %u (0x%08x)",
                     break;
                 }
                 ND_PRINT("\n\t    Message ID Ack: %u (0x%08x)",

-                       EXTRACT_BE_U_4(obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr));
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

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


@@ -613,8 +611,8 @@ lmp_print(netdissect_options *ndo,
                     break;
                 }
                 ND_PRINT("\n\t    Node ID: %s (0x%08x)",
                     break;
                 }
                 ND_PRINT("\n\t    Node ID: %s (0x%08x)",

-                       ipaddr_string(ndo, obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr));
+                       GET_IPADDR_STRING(obj_tptr),
+                       GET_BE_U_4(obj_tptr));

                 break;
 
             default:
                 break;
 
             default:


@@ -630,8 +628,8 @@ lmp_print(netdissect_options *ndo,
                     break;
                 }
                 ND_PRINT("\n\t    Hello Interval: %u\n\t    Hello Dead Interval: %u",
                     break;
                 }
                 ND_PRINT("\n\t    Hello Interval: %u\n\t    Hello Dead Interval: %u",

-                       EXTRACT_BE_U_2(obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 2));
+                       GET_BE_U_2(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 2));

                 break;
 
             default:
                 break;
 
             default:


@@ -647,8 +645,8 @@ lmp_print(netdissect_options *ndo,
                     break;
                 }
                 ND_PRINT("\n\t    Tx Seq: %u, Rx Seq: %u",
                     break;
                 }
                 ND_PRINT("\n\t    Tx Seq: %u, Rx Seq: %u",

-                       EXTRACT_BE_U_4(obj_tptr),
-                       EXTRACT_BE_U_4(obj_tptr + 4));
+                       GET_BE_U_4(obj_tptr),
+                       GET_BE_U_4(obj_tptr + 4));

                 break;
 
             default:
                 break;
 
             default:


@@ -666,14 +664,14 @@ lmp_print(netdissect_options *ndo,
                ND_PRINT("\n\t    Flags: [%s]",
                    bittok2str(lmp_obj_te_link_flag_values,
                        "none",
                ND_PRINT("\n\t    Flags: [%s]",
                    bittok2str(lmp_obj_te_link_flag_values,
                        "none",

-                       EXTRACT_U_1(obj_tptr)));
+                       GET_U_1(obj_tptr)));

 
                ND_PRINT("\n\t    Local Link-ID: %s (0x%08x)"
                       "\n\t    Remote Link-ID: %s (0x%08x)",
 
                ND_PRINT("\n\t    Local Link-ID: %s (0x%08x)"
                       "\n\t    Remote Link-ID: %s (0x%08x)",

-                       ipaddr_string(ndo, obj_tptr+4),
-                       EXTRACT_BE_U_4(obj_tptr + 4),
-                       ipaddr_string(ndo, obj_tptr+8),
-                       EXTRACT_BE_U_4(obj_tptr + 8));
+                       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;
 
            case LMP_CTYPE_IPV6:
                break;
 
            case LMP_CTYPE_IPV6:


@@ -684,14 +682,14 @@ lmp_print(netdissect_options *ndo,
                ND_PRINT("\n\t    Flags: [%s]",
                    bittok2str(lmp_obj_te_link_flag_values,
                        "none",
                ND_PRINT("\n\t    Flags: [%s]",
                    bittok2str(lmp_obj_te_link_flag_values,
                        "none",

-                       EXTRACT_U_1(obj_tptr)));
+                       GET_U_1(obj_tptr)));

 
                ND_PRINT("\n\t    Local Link-ID: %s (0x%08x)"
                       "\n\t    Remote Link-ID: %s (0x%08x)",
 
                ND_PRINT("\n\t    Local Link-ID: %s (0x%08x)"
                       "\n\t    Remote Link-ID: %s (0x%08x)",

-                       ip6addr_string(ndo, obj_tptr+4),
-                       EXTRACT_BE_U_4(obj_tptr + 4),
-                       ip6addr_string(ndo, obj_tptr+20),
-                       EXTRACT_BE_U_4(obj_tptr + 20));
+                       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:
                 break;
 
            case LMP_CTYPE_UNMD:


@@ -702,14 +700,14 @@ lmp_print(netdissect_options *ndo,
                ND_PRINT("\n\t    Flags: [%s]",
                    bittok2str(lmp_obj_te_link_flag_values,
                        "none",
                ND_PRINT("\n\t    Flags: [%s]",
                    bittok2str(lmp_obj_te_link_flag_values,
                        "none",

-                       EXTRACT_U_1(obj_tptr)));
+                       GET_U_1(obj_tptr)));

 
                ND_PRINT("\n\t    Local Link-ID: %u (0x%08x)"
                       "\n\t    Remote Link-ID: %u (0x%08x)",
 
                ND_PRINT("\n\t    Local Link-ID: %u (0x%08x)"
                       "\n\t    Remote Link-ID: %u (0x%08x)",

-                       EXTRACT_BE_U_4(obj_tptr + 4),
-                       EXTRACT_BE_U_4(obj_tptr + 4),
-                       EXTRACT_BE_U_4(obj_tptr + 8),
-                       EXTRACT_BE_U_4(obj_tptr + 8));
+                       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:
                break;
 
             default:


@@ -727,13 +725,13 @@ lmp_print(netdissect_options *ndo,
                ND_PRINT("\n\t    Flags: [%s]",
                    bittok2str(lmp_obj_data_link_flag_values,
                        "none",
                ND_PRINT("\n\t    Flags: [%s]",
                    bittok2str(lmp_obj_data_link_flag_values,
                        "none",

-                       EXTRACT_U_1(obj_tptr)));
+                       GET_U_1(obj_tptr)));

                 ND_PRINT("\n\t    Local Interface ID: %s (0x%08x)"
                        "\n\t    Remote Interface ID: %s (0x%08x)",
                 ND_PRINT("\n\t    Local Interface ID: %s (0x%08x)"
                        "\n\t    Remote Interface ID: %s (0x%08x)",

-                       ipaddr_string(ndo, obj_tptr+4),
-                       EXTRACT_BE_U_4(obj_tptr + 4),
-                       ipaddr_string(ndo, obj_tptr+8),
-                       EXTRACT_BE_U_4(obj_tptr + 8));
+                       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;
 
                if (lmp_print_data_link_subobjs(ndo, obj_tptr, obj_tlen - 12, 12))
                    hexdump=TRUE;


@@ -747,13 +745,13 @@ lmp_print(netdissect_options *ndo,
                ND_PRINT("\n\t    Flags: [%s]",
                    bittok2str(lmp_obj_data_link_flag_values,
                        "none",
                ND_PRINT("\n\t    Flags: [%s]",
                    bittok2str(lmp_obj_data_link_flag_values,
                        "none",

-                       EXTRACT_U_1(obj_tptr)));
+                       GET_U_1(obj_tptr)));

                 ND_PRINT("\n\t    Local Interface ID: %s (0x%08x)"
                        "\n\t    Remote Interface ID: %s (0x%08x)",
                 ND_PRINT("\n\t    Local Interface ID: %s (0x%08x)"
                        "\n\t    Remote Interface ID: %s (0x%08x)",

-                       ip6addr_string(ndo, obj_tptr+4),
-                       EXTRACT_BE_U_4(obj_tptr + 4),
-                       ip6addr_string(ndo, obj_tptr+20),
-                       EXTRACT_BE_U_4(obj_tptr + 20));
+                       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;
 
                if (lmp_print_data_link_subobjs(ndo, obj_tptr, obj_tlen - 36, 36))
                    hexdump=TRUE;


@@ -767,13 +765,13 @@ lmp_print(netdissect_options *ndo,
                ND_PRINT("\n\t    Flags: [%s]",
                    bittok2str(lmp_obj_data_link_flag_values,
                        "none",
                ND_PRINT("\n\t    Flags: [%s]",
                    bittok2str(lmp_obj_data_link_flag_values,
                        "none",

-                       EXTRACT_U_1(obj_tptr)));
+                       GET_U_1(obj_tptr)));

                 ND_PRINT("\n\t    Local Interface ID: %u (0x%08x)"
                        "\n\t    Remote Interface ID: %u (0x%08x)",
                 ND_PRINT("\n\t    Local Interface ID: %u (0x%08x)"
                        "\n\t    Remote Interface ID: %u (0x%08x)",

-                       EXTRACT_BE_U_4(obj_tptr + 4),
-                       EXTRACT_BE_U_4(obj_tptr + 4),
-                       EXTRACT_BE_U_4(obj_tptr + 8),
-                       EXTRACT_BE_U_4(obj_tptr + 8));
+                       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;
 
                if (lmp_print_data_link_subobjs(ndo, obj_tptr, obj_tlen - 12, 12))
                    hexdump=TRUE;


@@ -794,21 +792,21 @@ lmp_print(netdissect_options *ndo,
                ND_PRINT("\n\t    Flags: %s",
                bittok2str(lmp_obj_begin_verify_flag_values,
                        "none",
                ND_PRINT("\n\t    Flags: %s",
                bittok2str(lmp_obj_begin_verify_flag_values,
                        "none",

-                       EXTRACT_BE_U_2(obj_tptr)));
+                       GET_BE_U_2(obj_tptr)));

                ND_PRINT("\n\t    Verify Interval: %u",
                ND_PRINT("\n\t    Verify Interval: %u",

-                       EXTRACT_BE_U_2(obj_tptr + 2));
+                       GET_BE_U_2(obj_tptr + 2));

                ND_PRINT("\n\t    Data links: %u",
                ND_PRINT("\n\t    Data links: %u",

-                       EXTRACT_BE_U_4(obj_tptr + 4));
+                       GET_BE_U_4(obj_tptr + 4));

                 ND_PRINT("\n\t    Encoding type: %s",
                 ND_PRINT("\n\t    Encoding type: %s",

-                       tok2str(gmpls_encoding_values, "Unknown", EXTRACT_U_1((obj_tptr + 8))));
+                       tok2str(gmpls_encoding_values, "Unknown", GET_U_1((obj_tptr + 8))));

                 ND_PRINT("\n\t    Verify Transport Mechanism: %u (0x%x)%s",
                 ND_PRINT("\n\t    Verify Transport Mechanism: %u (0x%x)%s",

-                       EXTRACT_BE_U_2(obj_tptr + 10),
-                       EXTRACT_BE_U_2(obj_tptr + 10),
-                       EXTRACT_BE_U_2(obj_tptr + 10)&8000 ? " (Payload test messages capable)" : "");
-                bw.i = EXTRACT_BE_U_4(obj_tptr + 12);
+                       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",
                ND_PRINT("\n\t    Transmission Rate: %.3f Mbps",bw.f*8/1000000);
                ND_PRINT("\n\t    Wavelength: %u",

-                       EXTRACT_BE_U_4(obj_tptr + 16));
+                       GET_BE_U_4(obj_tptr + 16));

                break;
 
             default:
                break;
 
             default:


@@ -825,8 +823,8 @@ lmp_print(netdissect_options *ndo,
                 }
                 ND_PRINT("\n\t    Verify Dead Interval: %u"
                        "\n\t    Verify Transport Response: %u",
                 }
                 ND_PRINT("\n\t    Verify Dead Interval: %u"
                        "\n\t    Verify Transport Response: %u",

-                       EXTRACT_BE_U_2(obj_tptr),
-                       EXTRACT_BE_U_2(obj_tptr + 2));
+                       GET_BE_U_2(obj_tptr),
+                       GET_BE_U_2(obj_tptr + 2));

                 break;
 
             default:
                 break;
 
             default:


@@ -842,7 +840,7 @@ lmp_print(netdissect_options *ndo,
                     break;
                 }
                 ND_PRINT("\n\t    Verify ID: %u",
                     break;
                 }
                 ND_PRINT("\n\t    Verify ID: %u",

-                       EXTRACT_BE_U_4(obj_tptr));
+                       GET_BE_U_4(obj_tptr));

                 break;
 
             default:
                 break;
 
             default:


@@ -857,24 +855,24 @@ lmp_print(netdissect_options *ndo,
                /* Decode pairs: <Interface_ID (4 bytes), Channel_status (4 bytes)> */
                while (offset+8 <= obj_tlen) {
                        ND_PRINT("\n\t    Interface ID: %s (0x%08x)",
                /* Decode pairs: <Interface_ID (4 bytes), Channel_status (4 bytes)> */
                while (offset+8 <= obj_tlen) {
                        ND_PRINT("\n\t    Interface ID: %s (0x%08x)",

-                       ipaddr_string(ndo, obj_tptr+offset),
-                       EXTRACT_BE_U_4(obj_tptr + offset));
+                       GET_IPADDR_STRING(obj_tptr+offset),
+                       GET_BE_U_4(obj_tptr + offset));

 
                        ND_PRINT("\n\t\t    Active: %s (%u)",
 
                        ND_PRINT("\n\t\t    Active: %s (%u)",

-                               (EXTRACT_BE_U_4(obj_tptr + offset + 4)>>31) ?
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>31) ?

                                "Allocated" : "Non-allocated",
                                "Allocated" : "Non-allocated",

-                               (EXTRACT_BE_U_4(obj_tptr + offset + 4)>>31));
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>31));

 
                        ND_PRINT("\n\t\t    Direction: %s (%u)",
 
                        ND_PRINT("\n\t\t    Direction: %s (%u)",

-                               (EXTRACT_BE_U_4(obj_tptr + offset + 4)>>30)&0x1 ?
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>30)&0x1 ?

                                "Transmit" : "Receive",
                                "Transmit" : "Receive",

-                               (EXTRACT_BE_U_4(obj_tptr + offset + 4)>>30)&0x1);
+                               (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",
 
                        ND_PRINT("\n\t\t    Channel Status: %s (%u)",
                                        tok2str(lmp_obj_channel_status_values,
                                        "Unknown",

-                                       EXTRACT_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF),
-                                       EXTRACT_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF);
+                                       GET_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF),
+                                       GET_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF);

                        offset+=8;
                }
                 break;
                        offset+=8;
                }
                 break;


@@ -884,24 +882,24 @@ lmp_print(netdissect_options *ndo,
                /* Decode pairs: <Interface_ID (16 bytes), Channel_status (4 bytes)> */
                while (offset+20 <= obj_tlen) {
                        ND_PRINT("\n\t    Interface ID: %s (0x%08x)",
                /* Decode pairs: <Interface_ID (16 bytes), Channel_status (4 bytes)> */
                while (offset+20 <= obj_tlen) {
                        ND_PRINT("\n\t    Interface ID: %s (0x%08x)",

-                       ip6addr_string(ndo, obj_tptr+offset),
-                       EXTRACT_BE_U_4(obj_tptr + offset));
+                       GET_IP6ADDR_STRING(obj_tptr+offset),
+                       GET_BE_U_4(obj_tptr + offset));

 
                        ND_PRINT("\n\t\t    Active: %s (%u)",
 
                        ND_PRINT("\n\t\t    Active: %s (%u)",

-                               (EXTRACT_BE_U_4(obj_tptr + offset + 16)>>31) ?
+                               (GET_BE_U_4(obj_tptr + offset + 16)>>31) ?

                                "Allocated" : "Non-allocated",
                                "Allocated" : "Non-allocated",

-                               (EXTRACT_BE_U_4(obj_tptr + offset + 16)>>31));
+                               (GET_BE_U_4(obj_tptr + offset + 16)>>31));

 
                        ND_PRINT("\n\t\t    Direction: %s (%u)",
 
                        ND_PRINT("\n\t\t    Direction: %s (%u)",

-                               (EXTRACT_BE_U_4(obj_tptr + offset + 16)>>30)&0x1 ?
+                               (GET_BE_U_4(obj_tptr + offset + 16)>>30)&0x1 ?

                                "Transmit" : "Receive",
                                "Transmit" : "Receive",

-                               (EXTRACT_BE_U_4(obj_tptr + offset + 16)>>30)&0x1);
+                               (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",
 
                        ND_PRINT("\n\t\t    Channel Status: %s (%u)",
                                        tok2str(lmp_obj_channel_status_values,
                                        "Unknown",

-                                       EXTRACT_BE_U_4(obj_tptr + offset + 16)&0x3FFFFFF),
-                                       EXTRACT_BE_U_4(obj_tptr + offset + 16)&0x3FFFFFF);
+                                       GET_BE_U_4(obj_tptr + offset + 16)&0x3FFFFFF),
+                                       GET_BE_U_4(obj_tptr + offset + 16)&0x3FFFFFF);

                        offset+=20;
                }
                 break;
                        offset+=20;
                }
                 break;


@@ -911,24 +909,24 @@ lmp_print(netdissect_options *ndo,
                /* Decode pairs: <Interface_ID (4 bytes), Channel_status (4 bytes)> */
                while (offset+8 <= obj_tlen) {
                        ND_PRINT("\n\t    Interface ID: %u (0x%08x)",
                /* Decode pairs: <Interface_ID (4 bytes), Channel_status (4 bytes)> */
                while (offset+8 <= obj_tlen) {
                        ND_PRINT("\n\t    Interface ID: %u (0x%08x)",

-                       EXTRACT_BE_U_4(obj_tptr + offset),
-                       EXTRACT_BE_U_4(obj_tptr + offset));
+                       GET_BE_U_4(obj_tptr + offset),
+                       GET_BE_U_4(obj_tptr + offset));

 
                        ND_PRINT("\n\t\t    Active: %s (%u)",
 
                        ND_PRINT("\n\t\t    Active: %s (%u)",

-                               (EXTRACT_BE_U_4(obj_tptr + offset + 4)>>31) ?
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>31) ?

                                "Allocated" : "Non-allocated",
                                "Allocated" : "Non-allocated",

-                               (EXTRACT_BE_U_4(obj_tptr + offset + 4)>>31));
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>31));

 
                        ND_PRINT("\n\t\t    Direction: %s (%u)",
 
                        ND_PRINT("\n\t\t    Direction: %s (%u)",

-                               (EXTRACT_BE_U_4(obj_tptr + offset + 4)>>30)&0x1 ?
+                               (GET_BE_U_4(obj_tptr + offset + 4)>>30)&0x1 ?

                                "Transmit" : "Receive",
                                "Transmit" : "Receive",

-                               (EXTRACT_BE_U_4(obj_tptr + offset + 4)>>30)&0x1);
+                               (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",
 
                        ND_PRINT("\n\t\t    Channel Status: %s (%u)",
                                        tok2str(lmp_obj_channel_status_values,
                                        "Unknown",

-                                       EXTRACT_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF),
-                                       EXTRACT_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF);
+                                       GET_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF),
+                                       GET_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF);

                        offset+=8;
                }
                 break;
                        offset+=8;
                }
                 break;


@@ -944,8 +942,8 @@ lmp_print(netdissect_options *ndo,
                offset = 0;
                while (offset+4 <= obj_tlen) {
                        ND_PRINT("\n\t    Interface ID: %s (0x%08x)",
                offset = 0;
                while (offset+4 <= obj_tlen) {
                        ND_PRINT("\n\t    Interface ID: %s (0x%08x)",

-                       ipaddr_string(ndo, obj_tptr+offset),
-                       EXTRACT_BE_U_4(obj_tptr + offset));
+                       GET_IPADDR_STRING(obj_tptr+offset),
+                       GET_BE_U_4(obj_tptr + offset));

                        offset+=4;
                }
                 break;
                        offset+=4;
                }
                 break;


@@ -954,8 +952,8 @@ lmp_print(netdissect_options *ndo,
                offset = 0;
                while (offset+16 <= obj_tlen) {
                        ND_PRINT("\n\t    Interface ID: %s (0x%08x)",
                offset = 0;
                while (offset+16 <= obj_tlen) {
                        ND_PRINT("\n\t    Interface ID: %s (0x%08x)",

-                       ip6addr_string(ndo, obj_tptr+offset),
-                       EXTRACT_BE_U_4(obj_tptr + offset));
+                       GET_IP6ADDR_STRING(obj_tptr+offset),
+                       GET_BE_U_4(obj_tptr + offset));

                        offset+=16;
                }
                 break;
                        offset+=16;
                }
                 break;


@@ -964,8 +962,8 @@ lmp_print(netdissect_options *ndo,
                offset = 0;
                while (offset+4 <= obj_tlen) {
                        ND_PRINT("\n\t    Interface ID: %u (0x%08x)",
                offset = 0;
                while (offset+4 <= obj_tlen) {
                        ND_PRINT("\n\t    Interface ID: %u (0x%08x)",

-                       EXTRACT_BE_U_4(obj_tptr + offset),
-                       EXTRACT_BE_U_4(obj_tptr + offset));
+                       GET_BE_U_4(obj_tptr + offset),
+                       GET_BE_U_4(obj_tptr + offset));

                        offset+=4;
                }
                 break;
                        offset+=4;
                }
                 break;


@@ -985,7 +983,7 @@ lmp_print(netdissect_options *ndo,
                ND_PRINT("\n\t    Error Code: %s",
                bittok2str(lmp_obj_begin_verify_error_values,
                        "none",
                ND_PRINT("\n\t    Error Code: %s",
                bittok2str(lmp_obj_begin_verify_error_values,
                        "none",

-                       EXTRACT_BE_U_4(obj_tptr)));
+                       GET_BE_U_4(obj_tptr)));

                 break;
 
             case LMP_CTYPE_LINK_SUMMARY_ERROR:
                 break;
 
             case LMP_CTYPE_LINK_SUMMARY_ERROR:


@@ -996,7 +994,7 @@ lmp_print(netdissect_options *ndo,
                ND_PRINT("\n\t    Error Code: %s",
                bittok2str(lmp_obj_link_summary_error_values,
                        "none",
                ND_PRINT("\n\t    Error Code: %s",
                bittok2str(lmp_obj_link_summary_error_values,
                        "none",

-                       EXTRACT_BE_U_4(obj_tptr)));
+                       GET_BE_U_4(obj_tptr)));

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


@@ -1013,10 +1011,10 @@ lmp_print(netdissect_options *ndo,
                ND_PRINT("\n\t Flags: %s",
                       bittok2str(lmp_obj_service_config_sp_flag_values,
                                  "none",
                ND_PRINT("\n\t Flags: %s",
                       bittok2str(lmp_obj_service_config_sp_flag_values,
                                  "none",

-                                 EXTRACT_U_1(obj_tptr)));
+                                 GET_U_1(obj_tptr)));

 
                ND_PRINT("\n\t  UNI Version: %u",
 
                ND_PRINT("\n\t  UNI Version: %u",

-                      EXTRACT_U_1(obj_tptr + 1));
+                      GET_U_1(obj_tptr + 1));

 
                break;
 
 
                break;
 


@@ -1026,7 +1024,7 @@ lmp_print(netdissect_options *ndo,
                     break;
                 }
 
                     break;
                 }
 

-               link_type = EXTRACT_U_1(obj_tptr);
+               link_type = GET_U_1(obj_tptr);

 
                ND_PRINT("\n\t Link Type: %s (%u)",
                       tok2str(lmp_sd_service_config_cpsa_link_type_values,
 
                ND_PRINT("\n\t Link Type: %s (%u)",
                       tok2str(lmp_sd_service_config_cpsa_link_type_values,


@@ -1038,44 +1036,44 @@ lmp_print(netdissect_options *ndo,
                    ND_PRINT("\n\t Signal Type: %s (%u)",
                           tok2str(lmp_sd_service_config_cpsa_signal_type_sdh_values,
                                   "Unknown",
                    ND_PRINT("\n\t Signal Type: %s (%u)",
                           tok2str(lmp_sd_service_config_cpsa_signal_type_sdh_values,
                                   "Unknown",

-                                  EXTRACT_U_1(obj_tptr + 1)),
-                          EXTRACT_U_1(obj_tptr + 1));
+                                  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",
                    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",

-                                  EXTRACT_U_1(obj_tptr + 1)),
-                          EXTRACT_U_1(obj_tptr + 1));
+                                  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",
                    break;
                }
 
                ND_PRINT("\n\t Transparency: %s",
                       bittok2str(lmp_obj_service_config_cpsa_tp_flag_values,
                                  "none",

-                                 EXTRACT_U_1(obj_tptr + 2)));
+                                 GET_U_1(obj_tptr + 2)));

 
                ND_PRINT("\n\t Contiguous Concatenation Types: %s",
                       bittok2str(lmp_obj_service_config_cpsa_cct_flag_values,
                                  "none",
 
                ND_PRINT("\n\t Contiguous Concatenation Types: %s",
                       bittok2str(lmp_obj_service_config_cpsa_cct_flag_values,
                                  "none",

-                                 EXTRACT_U_1(obj_tptr + 3)));
+                                 GET_U_1(obj_tptr + 3)));

 
                ND_PRINT("\n\t Minimum NCC: %u",
 
                ND_PRINT("\n\t Minimum NCC: %u",

-                      EXTRACT_BE_U_2(obj_tptr + 4));
+                      GET_BE_U_2(obj_tptr + 4));

 
                ND_PRINT("\n\t Maximum NCC: %u",
 
                ND_PRINT("\n\t Maximum NCC: %u",

-                      EXTRACT_BE_U_2(obj_tptr + 6));
+                      GET_BE_U_2(obj_tptr + 6));

 
                ND_PRINT("\n\t Minimum NVC:%u",
 
                ND_PRINT("\n\t Minimum NVC:%u",

-                      EXTRACT_BE_U_2(obj_tptr + 8));
+                      GET_BE_U_2(obj_tptr + 8));

 
                ND_PRINT("\n\t Maximum NVC:%u",
 
                ND_PRINT("\n\t Maximum NVC:%u",

-                      EXTRACT_BE_U_2(obj_tptr + 10));
+                      GET_BE_U_2(obj_tptr + 10));

 
                ND_PRINT("\n\t    Local Interface ID: %s (0x%08x)",
 
                ND_PRINT("\n\t    Local Interface ID: %s (0x%08x)",

-                      ipaddr_string(ndo, obj_tptr+12),
-                      EXTRACT_BE_U_4(obj_tptr + 12));
+                      GET_IPADDR_STRING(obj_tptr+12),
+                      GET_BE_U_4(obj_tptr + 12));

 
                break;
 
 
                break;
 


@@ -1089,13 +1087,13 @@ lmp_print(netdissect_options *ndo,
                       bittok2str(
                           lmp_obj_service_config_nsa_transparency_flag_values,
                           "none",
                       bittok2str(
                           lmp_obj_service_config_nsa_transparency_flag_values,
                           "none",

-                          EXTRACT_BE_U_4(obj_tptr)));
+                          GET_BE_U_4(obj_tptr)));

 
                ND_PRINT("\n\t TCM Monitoring Flags: %s",
                       bittok2str(
                           lmp_obj_service_config_nsa_tcm_flag_values,
                           "none",
 
                ND_PRINT("\n\t TCM Monitoring Flags: %s",
                       bittok2str(
                           lmp_obj_service_config_nsa_tcm_flag_values,
                           "none",

-                          EXTRACT_U_1(obj_tptr + 7)));
+                          GET_U_1(obj_tptr + 7)));

 
                break;
 
 
                break;
 


@@ -1109,7 +1107,7 @@ lmp_print(netdissect_options *ndo,
                       bittok2str(
                           lmp_obj_service_config_nsa_network_diversity_flag_values,
                           "none",
                       bittok2str(
                           lmp_obj_service_config_nsa_network_diversity_flag_values,
                           "none",

-                          EXTRACT_U_1(obj_tptr + 3)));
+                          GET_U_1(obj_tptr + 3)));

                break;
 
            default:
                break;
 
            default:


@@ -1136,7 +1134,4 @@ lmp_print(netdissect_options *ndo,
         tptr+=lmp_obj_len;
         tlen-=lmp_obj_len;
     }
         tptr+=lmp_obj_len;
         tlen-=lmp_obj_len;
     }

-    return;
-trunc:
-    nd_print_trunc(ndo);

 }
 }