the failed/passed count was not kept in the right place

[tcpdump] / print-lspping.c

diff --git a/print-lspping.c b/print-lspping.c
index 58f48cacd72439a0e332fe5877ee0c3d9fc311dc..cf2abb2b2081c7b92f3632d39f21ed7b543af752 100644 (file)
--- a/print-lspping.c
+++ b/print-lspping.c
@@ -18,10 +18,10 @@
 /* specification: RFC 4349 */
 
 #ifdef HAVE_CONFIG_H
 /* specification: RFC 4349 */
 
 #ifdef HAVE_CONFIG_H

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

 #endif
 
 #endif
 

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

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


@@ -30,6 +30,7 @@
 #include "l2vpn.h"
 #include "oui.h"
 
 #include "l2vpn.h"
 #include "oui.h"
 

+

 /*
  * LSPPING common header
  *
 /*
  * LSPPING common header
  *


@@ -523,28 +524,29 @@ lspping_print(netdissect_options *ndo,
         const struct lspping_tlv_targetfec_subtlv_bgp_ipv6_t *lspping_tlv_targetfec_subtlv_bgp_ipv6;
     } subtlv_ptr;
 
         const struct lspping_tlv_targetfec_subtlv_bgp_ipv6_t *lspping_tlv_targetfec_subtlv_bgp_ipv6;
     } subtlv_ptr;
 

+    ndo->ndo_protocol = "lspping";

     tptr=pptr;
     lspping_com_header = (const struct lspping_common_header *)pptr;
     if (len < sizeof(struct lspping_common_header))
         goto tooshort;
     tptr=pptr;
     lspping_com_header = (const struct lspping_common_header *)pptr;
     if (len < sizeof(struct lspping_common_header))
         goto tooshort;

-    ND_TCHECK(*lspping_com_header);
+    ND_TCHECK_SIZE(lspping_com_header);

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

-    if (EXTRACT_BE_U_2(lspping_com_header->version) != LSPPING_VERSION) {
-       ND_PRINT((ndo, "LSP-PING version %u packet not supported",
-               EXTRACT_BE_U_2(lspping_com_header->version)));
+    if (GET_BE_U_2(lspping_com_header->version) != LSPPING_VERSION) {
+       ND_PRINT("LSP-PING version %u packet not supported",
+               GET_BE_U_2(lspping_com_header->version));

        return;
     }
 
     /* in non-verbose mode just lets print the basic Message Type*/
     if (ndo->ndo_vflag < 1) {
        return;
     }
 
     /* in non-verbose mode just lets print the basic Message Type*/
     if (ndo->ndo_vflag < 1) {

-        ND_PRINT((ndo, "LSP-PINGv%u, %s, seq %u, length: %u",
-               EXTRACT_BE_U_2(lspping_com_header->version),
-               tok2str(lspping_msg_type_values, "unknown (%u)",EXTRACT_U_1(lspping_com_header->msg_type)),
-               EXTRACT_BE_U_4(lspping_com_header->seq_number),
-               len));
+        ND_PRINT("LSP-PINGv%u, %s, seq %u, length: %u",
+               GET_BE_U_2(lspping_com_header->version),
+               tok2str(lspping_msg_type_values, "unknown (%u)",GET_U_1(lspping_com_header->msg_type)),
+               GET_BE_U_4(lspping_com_header->seq_number),
+               len);

         return;
     }
 
         return;
     }
 


@@ -552,53 +554,53 @@ lspping_print(netdissect_options *ndo,
 
     tlen=len;
 
 
     tlen=len;
 

-    ND_PRINT((ndo, "\n\tLSP-PINGv%u, msg-type: %s (%u), length: %u\n\t  reply-mode: %s (%u)",
-           EXTRACT_BE_U_2(lspping_com_header->version),
-           tok2str(lspping_msg_type_values, "unknown",EXTRACT_U_1(lspping_com_header->msg_type)),
-           EXTRACT_U_1(lspping_com_header->msg_type),
+    ND_PRINT("\n\tLSP-PINGv%u, msg-type: %s (%u), length: %u\n\t  reply-mode: %s (%u)",
+           GET_BE_U_2(lspping_com_header->version),
+           tok2str(lspping_msg_type_values, "unknown",GET_U_1(lspping_com_header->msg_type)),
+           GET_U_1(lspping_com_header->msg_type),

            len,
            len,

-           tok2str(lspping_reply_mode_values, "unknown",EXTRACT_U_1(lspping_com_header->reply_mode)),
-           EXTRACT_U_1(lspping_com_header->reply_mode)));
+           tok2str(lspping_reply_mode_values, "unknown",GET_U_1(lspping_com_header->reply_mode)),
+           GET_U_1(lspping_com_header->reply_mode));

 
     /*
      *  the following return codes require that the subcode is attached
      *  at the end of the translated token output
      */
 
     /*
      *  the following return codes require that the subcode is attached
      *  at the end of the translated token output
      */

-    return_code = EXTRACT_U_1(lspping_com_header->return_code);
-    return_subcode = EXTRACT_U_1(lspping_com_header->return_subcode);
+    return_code = GET_U_1(lspping_com_header->return_code);
+    return_subcode = GET_U_1(lspping_com_header->return_subcode);

     if (return_code == 3 ||
         return_code == 4 ||
         return_code == 8 ||
         return_code == 10 ||
         return_code == 11 ||
         return_code == 12 )
     if (return_code == 3 ||
         return_code == 4 ||
         return_code == 8 ||
         return_code == 10 ||
         return_code == 11 ||
         return_code == 12 )

-        ND_PRINT((ndo, "\n\t  Return Code: %s %u (%u)\n\t  Return Subcode: (%u)",
+        ND_PRINT("\n\t  Return Code: %s %u (%u)\n\t  Return Subcode: (%u)",

                tok2str(lspping_return_code_values, "unknown",return_code),
                return_subcode,
                return_code,
                tok2str(lspping_return_code_values, "unknown",return_code),
                return_subcode,
                return_code,

-               return_subcode));
+               return_subcode);

     else
     else

-        ND_PRINT((ndo, "\n\t  Return Code: %s (%u)\n\t  Return Subcode: (%u)",
+        ND_PRINT("\n\t  Return Code: %s (%u)\n\t  Return Subcode: (%u)",

                tok2str(lspping_return_code_values, "unknown",return_code),
                return_code,
                tok2str(lspping_return_code_values, "unknown",return_code),
                return_code,

-               return_subcode));
+               return_subcode);

 
 

-    ND_PRINT((ndo, "\n\t  Sender Handle: 0x%08x, Sequence: %u",
-           EXTRACT_BE_U_4(lspping_com_header->sender_handle),
-           EXTRACT_BE_U_4(lspping_com_header->seq_number)));
+    ND_PRINT("\n\t  Sender Handle: 0x%08x, Sequence: %u",
+           GET_BE_U_4(lspping_com_header->sender_handle),
+           GET_BE_U_4(lspping_com_header->seq_number));

 
 

-    timestamp.tv_sec=EXTRACT_BE_U_4(lspping_com_header->ts_sent_sec);
-    timestamp.tv_usec=EXTRACT_BE_U_4(lspping_com_header->ts_sent_usec);
-    ND_PRINT((ndo, "\n\t  Sender Timestamp: "));
+    timestamp.tv_sec=GET_BE_U_4(lspping_com_header->ts_sent_sec);
+    timestamp.tv_usec=GET_BE_U_4(lspping_com_header->ts_sent_usec);
+    ND_PRINT("\n\t  Sender Timestamp: ");

     ts_print(ndo, &timestamp);
 
     ts_print(ndo, &timestamp);
 

-    timestamp.tv_sec=EXTRACT_BE_U_4(lspping_com_header->ts_rcvd_sec);
-    timestamp.tv_usec=EXTRACT_BE_U_4(lspping_com_header->ts_rcvd_usec);
-    ND_PRINT((ndo, "Receiver Timestamp: "));
+    timestamp.tv_sec=GET_BE_U_4(lspping_com_header->ts_rcvd_sec);
+    timestamp.tv_usec=GET_BE_U_4(lspping_com_header->ts_rcvd_usec);
+    ND_PRINT("Receiver Timestamp: ");

     if ((timestamp.tv_sec != 0) && (timestamp.tv_usec != 0))
         ts_print(ndo, &timestamp);
     else
     if ((timestamp.tv_sec != 0) && (timestamp.tv_usec != 0))
         ts_print(ndo, &timestamp);
     else

-        ND_PRINT((ndo, "no timestamp"));
+        ND_PRINT("no timestamp");

 
     tptr+=sizeof(struct lspping_common_header);
     tlen-=sizeof(struct lspping_common_header);
 
     tptr+=sizeof(struct lspping_common_header);
     tlen-=sizeof(struct lspping_common_header);


@@ -612,15 +614,15 @@ lspping_print(netdissect_options *ndo,
         ND_TCHECK_LEN(tptr, sizeof(struct lspping_tlv_header));
 
         lspping_tlv_header = (const struct lspping_tlv_header *)tptr;
         ND_TCHECK_LEN(tptr, sizeof(struct lspping_tlv_header));
 
         lspping_tlv_header = (const struct lspping_tlv_header *)tptr;

-        lspping_tlv_type=EXTRACT_BE_U_2(lspping_tlv_header->type);
-        lspping_tlv_len=EXTRACT_BE_U_2(lspping_tlv_header->length);
+        lspping_tlv_type=GET_BE_U_2(lspping_tlv_header->type);
+        lspping_tlv_len=GET_BE_U_2(lspping_tlv_header->length);

 
 

-        ND_PRINT((ndo, "\n\t  %s TLV (%u), length: %u",
+        ND_PRINT("\n\t  %s TLV (%u), length: %u",

                tok2str(lspping_tlv_values,
                        "Unknown",
                        lspping_tlv_type),
                lspping_tlv_type,
                tok2str(lspping_tlv_values,
                        "Unknown",
                        lspping_tlv_type),
                lspping_tlv_type,

-               lspping_tlv_len));
+               lspping_tlv_len);

 
         /* some little sanity checking */
         if (lspping_tlv_len == 0) {
 
         /* some little sanity checking */
         if (lspping_tlv_len == 0) {


@@ -644,7 +646,7 @@ lspping_print(netdissect_options *ndo,
             while (tlv_tlen != 0) {
                 /* Does the subTLV header go past the end of the TLV? */
                 if (tlv_tlen < sizeof(struct lspping_tlv_header)) {
             while (tlv_tlen != 0) {
                 /* Does the subTLV header go past the end of the TLV? */
                 if (tlv_tlen < sizeof(struct lspping_tlv_header)) {

-                    ND_PRINT((ndo, "\n\t      TLV is too short"));
+                    ND_PRINT("\n\t      TLV is too short");

                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }
                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }


@@ -653,13 +655,13 @@ lspping_print(netdissect_options *ndo,
                 subtlv_hexdump=FALSE;
 
                 lspping_subtlv_header = (const struct lspping_tlv_header *)tlv_tptr;
                 subtlv_hexdump=FALSE;
 
                 lspping_subtlv_header = (const struct lspping_tlv_header *)tlv_tptr;

-                lspping_subtlv_type=EXTRACT_BE_U_2(lspping_subtlv_header->type);
-                lspping_subtlv_len=EXTRACT_BE_U_2(lspping_subtlv_header->length);
+                lspping_subtlv_type=GET_BE_U_2(lspping_subtlv_header->type);
+                lspping_subtlv_len=GET_BE_U_2(lspping_subtlv_header->length);

                 subtlv_tptr=tlv_tptr+sizeof(struct lspping_tlv_header);
 
                 /* Does the subTLV go past the end of the TLV? */
                 if (tlv_tlen < lspping_subtlv_len+sizeof(struct lspping_tlv_header)) {
                 subtlv_tptr=tlv_tptr+sizeof(struct lspping_tlv_header);
 
                 /* Does the subTLV go past the end of the TLV? */
                 if (tlv_tlen < lspping_subtlv_len+sizeof(struct lspping_tlv_header)) {

-                    ND_PRINT((ndo, "\n\t      TLV is too short"));
+                    ND_PRINT("\n\t      TLV is too short");

                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }
                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }


@@ -667,154 +669,154 @@ lspping_print(netdissect_options *ndo,
                 /* Did we capture enough for fully decoding the subTLV? */
                 ND_TCHECK_LEN(subtlv_tptr, lspping_subtlv_len);
 
                 /* Did we capture enough for fully decoding the subTLV? */
                 ND_TCHECK_LEN(subtlv_tptr, lspping_subtlv_len);
 

-                ND_PRINT((ndo, "\n\t    %s subTLV (%u), length: %u",
+                ND_PRINT("\n\t    %s subTLV (%u), length: %u",

                        tok2str(lspping_tlvtargetfec_subtlv_values,
                                "Unknown",
                                lspping_subtlv_type),
                        lspping_subtlv_type,
                        tok2str(lspping_tlvtargetfec_subtlv_values,
                                "Unknown",
                                lspping_subtlv_type),
                        lspping_subtlv_type,

-                       lspping_subtlv_len));
+                       lspping_subtlv_len);

 
                 switch(lspping_subtlv_type) {
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_LDP_IPV4:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 5) {
 
                 switch(lspping_subtlv_type) {
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_LDP_IPV4:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 5) {

-                        ND_PRINT((ndo, "\n\t      invalid subTLV length, should be 5"));
+                        ND_PRINT("\n\t      invalid subTLV length, should be 5");

                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {
                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {

-                        subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4 = \
+                        subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4 =

                             (const struct lspping_tlv_targetfec_subtlv_ldp_ipv4_t *)subtlv_tptr;
                             (const struct lspping_tlv_targetfec_subtlv_ldp_ipv4_t *)subtlv_tptr;

-                        ND_PRINT((ndo, "\n\t      %s/%u",
+                        ND_PRINT("\n\t      %s/%u",

                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix),
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix),

-                               EXTRACT_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix_len)));
+                               GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix_len));

                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_LDP_IPV6:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 17) {
                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_LDP_IPV6:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 17) {

-                        ND_PRINT((ndo, "\n\t      invalid subTLV length, should be 17"));
+                        ND_PRINT("\n\t      invalid subTLV length, should be 17");

                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {
                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {

-                        subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6 = \
+                        subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6 =

                             (const struct lspping_tlv_targetfec_subtlv_ldp_ipv6_t *)subtlv_tptr;
                             (const struct lspping_tlv_targetfec_subtlv_ldp_ipv6_t *)subtlv_tptr;

-                        ND_PRINT((ndo, "\n\t      %s/%u",
+                        ND_PRINT("\n\t      %s/%u",

                                ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix),
                                ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix),

-                               EXTRACT_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix_len)));
+                               GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix_len));

                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_BGP_IPV4:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 5) {
                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_BGP_IPV4:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 5) {

-                        ND_PRINT((ndo, "\n\t      invalid subTLV length, should be 5"));
+                        ND_PRINT("\n\t      invalid subTLV length, should be 5");

                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {
                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {

-                        subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4 = \
+                        subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4 =

                             (const struct lspping_tlv_targetfec_subtlv_bgp_ipv4_t *)subtlv_tptr;
                             (const struct lspping_tlv_targetfec_subtlv_bgp_ipv4_t *)subtlv_tptr;

-                        ND_PRINT((ndo, "\n\t      %s/%u",
+                        ND_PRINT("\n\t      %s/%u",

                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix),
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix),

-                               EXTRACT_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix_len)));
+                               GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix_len));

                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_BGP_IPV6:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 17) {
                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_BGP_IPV6:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 17) {

-                        ND_PRINT((ndo, "\n\t      invalid subTLV length, should be 17"));
+                        ND_PRINT("\n\t      invalid subTLV length, should be 17");

                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {
                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {

-                        subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6 = \
+                        subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6 =

                             (const struct lspping_tlv_targetfec_subtlv_bgp_ipv6_t *)subtlv_tptr;
                             (const struct lspping_tlv_targetfec_subtlv_bgp_ipv6_t *)subtlv_tptr;

-                        ND_PRINT((ndo, "\n\t      %s/%u",
+                        ND_PRINT("\n\t      %s/%u",

                                ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix),
                                ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix),

-                               EXTRACT_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix_len)));
+                               GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix_len));

                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_RSVP_IPV4:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 20) {
                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_RSVP_IPV4:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 20) {

-                        ND_PRINT((ndo, "\n\t      invalid subTLV length, should be 20"));
+                        ND_PRINT("\n\t      invalid subTLV length, should be 20");

                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {
                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {

-                        subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4 = \
+                        subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4 =

                             (const struct lspping_tlv_targetfec_subtlv_rsvp_ipv4_t *)subtlv_tptr;
                             (const struct lspping_tlv_targetfec_subtlv_rsvp_ipv4_t *)subtlv_tptr;

-                        ND_PRINT((ndo, "\n\t      tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x" \
+                        ND_PRINT("\n\t      tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x"

                                "\n\t      tunnel-id 0x%04x, extended tunnel-id %s",
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_endpoint),
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_sender),
                                "\n\t      tunnel-id 0x%04x, extended tunnel-id %s",
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_endpoint),
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_sender),

-                               EXTRACT_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->lsp_id),
-                               EXTRACT_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_id),
-                               ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->extended_tunnel_id)));
+                               GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->lsp_id),
+                               GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_id),
+                               ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->extended_tunnel_id));

                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_RSVP_IPV6:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 56) {
                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_RSVP_IPV6:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 56) {

-                        ND_PRINT((ndo, "\n\t      invalid subTLV length, should be 56"));
+                        ND_PRINT("\n\t      invalid subTLV length, should be 56");

                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {
                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {

-                        subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6 = \
+                        subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6 =

                             (const struct lspping_tlv_targetfec_subtlv_rsvp_ipv6_t *)subtlv_tptr;
                             (const struct lspping_tlv_targetfec_subtlv_rsvp_ipv6_t *)subtlv_tptr;

-                        ND_PRINT((ndo, "\n\t      tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x" \
+                        ND_PRINT("\n\t      tunnel end-point %s, tunnel sender %s, lsp-id 0x%04x"

                                "\n\t      tunnel-id 0x%04x, extended tunnel-id %s",
                                ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_endpoint),
                                ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_sender),
                                "\n\t      tunnel-id 0x%04x, extended tunnel-id %s",
                                ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_endpoint),
                                ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_sender),

-                               EXTRACT_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->lsp_id),
-                               EXTRACT_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_id),
-                               ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->extended_tunnel_id)));
+                               GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->lsp_id),
+                               GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_id),
+                               ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->extended_tunnel_id));

                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_L3VPN_IPV4:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 13) {
                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_L3VPN_IPV4:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 13) {

-                        ND_PRINT((ndo, "\n\t      invalid subTLV length, should be 13"));
+                        ND_PRINT("\n\t      invalid subTLV length, should be 13");

                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {
                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {

-                        subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4 = \
+                        subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4 =

                             (const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv4_t *)subtlv_tptr;
                             (const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv4_t *)subtlv_tptr;

-                        ND_PRINT((ndo, "\n\t      RD: %s, %s/%u",
+                        ND_PRINT("\n\t      RD: %s, %s/%u",

                                bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->rd),
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix),
                                bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->rd),
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix),

-                               EXTRACT_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix_len)));
+                               GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix_len));

                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_L3VPN_IPV6:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 25) {
                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_L3VPN_IPV6:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 25) {

-                        ND_PRINT((ndo, "\n\t      invalid subTLV length, should be 25"));
+                        ND_PRINT("\n\t      invalid subTLV length, should be 25");

                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {
                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {

-                        subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6 = \
+                        subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6 =

                             (const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv6_t *)subtlv_tptr;
                             (const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv6_t *)subtlv_tptr;

-                        ND_PRINT((ndo, "\n\t      RD: %s, %s/%u",
+                        ND_PRINT("\n\t      RD: %s, %s/%u",

                                bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->rd),
                                ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix),
                                bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->rd),
                                ip6addr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix),

-                               EXTRACT_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix_len)));
+                               GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix_len));

                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_L2VPN_ENDPT:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 14) {
                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_L2VPN_ENDPT:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 14) {

-                        ND_PRINT((ndo, "\n\t      invalid subTLV length, should be 14"));
+                        ND_PRINT("\n\t      invalid subTLV length, should be 14");

                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {
                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {

-                        subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt = \
+                        subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt =

                             (const struct lspping_tlv_targetfec_subtlv_l2vpn_endpt_t *)subtlv_tptr;
                             (const struct lspping_tlv_targetfec_subtlv_l2vpn_endpt_t *)subtlv_tptr;

-                        ND_PRINT((ndo, "\n\t      RD: %s, Sender VE ID: %u, Receiver VE ID: %u" \
+                        ND_PRINT("\n\t      RD: %s, Sender VE ID: %u, Receiver VE ID: %u"

                                "\n\t      Encapsulation Type: %s (%u)",
                                bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->rd),
                                "\n\t      Encapsulation Type: %s (%u)",
                                bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->rd),

-                               EXTRACT_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->sender_ve_id),
-                               EXTRACT_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->receiver_ve_id),
+                               GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->sender_ve_id),
+                               GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->receiver_ve_id),

                                tok2str(mpls_pw_types_values,
                                        "unknown",
                                tok2str(mpls_pw_types_values,
                                        "unknown",

-                                       EXTRACT_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->encapsulation)),
-                               EXTRACT_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->encapsulation)));
+                                       GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->encapsulation)),
+                               GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_endpt->encapsulation));

                     }
                     break;
 
                     }
                     break;
 


@@ -822,39 +824,39 @@ lspping_print(netdissect_options *ndo,
                 case LSPPING_TLV_TARGETFEC_SUBTLV_FEC_128_PW_OLD:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 10) {
                 case LSPPING_TLV_TARGETFEC_SUBTLV_FEC_128_PW_OLD:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 10) {

-                        ND_PRINT((ndo, "\n\t      invalid subTLV length, should be 10"));
+                        ND_PRINT("\n\t      invalid subTLV length, should be 10");

                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {
                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {

-                        subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old = \
+                        subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old =

                             (const struct lspping_tlv_targetfec_subtlv_fec_128_pw_old *)subtlv_tptr;
                             (const struct lspping_tlv_targetfec_subtlv_fec_128_pw_old *)subtlv_tptr;

-                        ND_PRINT((ndo, "\n\t      Remote PE: %s" \
+                        ND_PRINT("\n\t      Remote PE: %s"

                                "\n\t      PW ID: 0x%08x, PW Type: %s (%u)",
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->remote_pe_address),
                                "\n\t      PW ID: 0x%08x, PW Type: %s (%u)",
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->remote_pe_address),

-                               EXTRACT_BE_U_4(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_id),
+                               GET_BE_U_4(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_id),

                                tok2str(mpls_pw_types_values,
                                        "unknown",
                                tok2str(mpls_pw_types_values,
                                        "unknown",

-                                       EXTRACT_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_type)),
-                               EXTRACT_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_type)));
+                                       GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_type)),
+                               GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_type));

                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_FEC_128_PW:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 14) {
                     }
                     break;
 
                 case LSPPING_TLV_TARGETFEC_SUBTLV_FEC_128_PW:
                     /* Is the subTLV length correct? */
                     if (lspping_subtlv_len != 14) {

-                        ND_PRINT((ndo, "\n\t      invalid subTLV length, should be 14"));
+                        ND_PRINT("\n\t      invalid subTLV length, should be 14");

                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {
                         subtlv_hexdump=TRUE; /* unknown subTLV just hexdump it */
                     } else {

-                        subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid = \
+                        subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid =

                             (const struct lspping_tlv_targetfec_subtlv_fec_128_pw *)subtlv_tptr;
                             (const struct lspping_tlv_targetfec_subtlv_fec_128_pw *)subtlv_tptr;

-                        ND_PRINT((ndo, "\n\t      Sender PE: %s, Remote PE: %s" \
+                        ND_PRINT("\n\t      Sender PE: %s, Remote PE: %s"

                                "\n\t      PW ID: 0x%08x, PW Type: %s (%u)",
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->sender_pe_address),
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->remote_pe_address),
                                "\n\t      PW ID: 0x%08x, PW Type: %s (%u)",
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->sender_pe_address),
                                ipaddr_string(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->remote_pe_address),

-                               EXTRACT_BE_U_4(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_id),
+                               GET_BE_U_4(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_id),

                                tok2str(mpls_pw_types_values,
                                        "unknown",
                                tok2str(mpls_pw_types_values,
                                        "unknown",

-                                       EXTRACT_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_type)),
-                               EXTRACT_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_type)));
+                                       GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_type)),
+                               GET_BE_U_2(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_type));

                     }
                     break;
 
                     }
                     break;
 


@@ -864,7 +866,7 @@ lspping_print(netdissect_options *ndo,
                 }
                 /* do we want to see an additionally subtlv hexdump ? */
                 if (ndo->ndo_vflag > 1 || subtlv_hexdump==TRUE)
                 }
                 /* do we want to see an additionally subtlv hexdump ? */
                 if (ndo->ndo_vflag > 1 || subtlv_hexdump==TRUE)

-                    print_unknown_data(ndo, tlv_tptr+sizeof(struct lspping_tlv_header), \
+                    print_unknown_data(ndo, tlv_tptr+sizeof(struct lspping_tlv_header),

                                        "\n\t      ",
                                        lspping_subtlv_len);
 
                                        "\n\t      ",
                                        lspping_subtlv_len);
 


@@ -873,7 +875,7 @@ lspping_print(netdissect_options *ndo,
                     lspping_subtlv_len += 4 - (lspping_subtlv_len % 4);
                     /* Does the subTLV, including padding, go past the end of the TLV? */
                     if (tlv_tlen < lspping_subtlv_len+sizeof(struct lspping_tlv_header)) {
                     lspping_subtlv_len += 4 - (lspping_subtlv_len % 4);
                     /* Does the subTLV, including padding, go past the end of the TLV? */
                     if (tlv_tlen < lspping_subtlv_len+sizeof(struct lspping_tlv_header)) {

-                        ND_PRINT((ndo, "\n\t\t TLV is too short"));
+                        ND_PRINT("\n\t\t TLV is too short");

                         return;
                     }
                 }
                         return;
                     }
                 }


@@ -885,7 +887,7 @@ lspping_print(netdissect_options *ndo,
         case LSPPING_TLV_DOWNSTREAM_MAPPING:
             /* Does the header go past the end of the TLV? */
             if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_t)) {
         case LSPPING_TLV_DOWNSTREAM_MAPPING:
             /* Does the header go past the end of the TLV? */
             if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_t)) {

-                ND_PRINT((ndo, "\n\t      TLV is too short"));
+                ND_PRINT("\n\t      TLV is too short");

                 tlv_hexdump = TRUE;
                 goto tlv_tooshort;
             }
                 tlv_hexdump = TRUE;
                 goto tlv_tooshort;
             }


@@ -893,27 +895,27 @@ lspping_print(netdissect_options *ndo,
             ND_TCHECK_LEN(tlv_tptr,
                           sizeof(struct lspping_tlv_downstream_map_t));
 
             ND_TCHECK_LEN(tlv_tptr,
                           sizeof(struct lspping_tlv_downstream_map_t));
 

-            tlv_ptr.lspping_tlv_downstream_map= \
+            tlv_ptr.lspping_tlv_downstream_map=

                 (const struct lspping_tlv_downstream_map_t *)tlv_tptr;
 
             /* that strange thing with the downstream map TLV is that until now
              * we do not know if its IPv4 or IPv6 or is unnumbered; after
              * we find the address-type, we recast the tlv_tptr and move on. */
 
                 (const struct lspping_tlv_downstream_map_t *)tlv_tptr;
 
             /* that strange thing with the downstream map TLV is that until now
              * we do not know if its IPv4 or IPv6 or is unnumbered; after
              * we find the address-type, we recast the tlv_tptr and move on. */
 

-            address_type = EXTRACT_U_1(tlv_ptr.lspping_tlv_downstream_map->address_type);
-            ND_PRINT((ndo, "\n\t    MTU: %u, Address-Type: %s (%u)",
-                   EXTRACT_BE_U_2(tlv_ptr.lspping_tlv_downstream_map->mtu),
+            address_type = GET_U_1(tlv_ptr.lspping_tlv_downstream_map->address_type);
+            ND_PRINT("\n\t    MTU: %u, Address-Type: %s (%u)",
+                   GET_BE_U_2(tlv_ptr.lspping_tlv_downstream_map->mtu),

                    tok2str(lspping_tlv_downstream_addr_values,
                            "unknown",
                            address_type),
                    tok2str(lspping_tlv_downstream_addr_values,
                            "unknown",
                            address_type),

-                   address_type));
+                   address_type);

 
             switch(address_type) {
 
             case LSPPING_AFI_IPV4:
                 /* Does the data go past the end of the TLV? */
                 if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_ipv4_t)) {
 
             switch(address_type) {
 
             case LSPPING_AFI_IPV4:
                 /* Does the data go past the end of the TLV? */
                 if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_ipv4_t)) {

-                    ND_PRINT((ndo, "\n\t      TLV is too short"));
+                    ND_PRINT("\n\t      TLV is too short");

                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }
                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }


@@ -921,19 +923,19 @@ lspping_print(netdissect_options *ndo,
                 ND_TCHECK_LEN(tlv_tptr,
                               sizeof(struct lspping_tlv_downstream_map_ipv4_t));
 
                 ND_TCHECK_LEN(tlv_tptr,
                               sizeof(struct lspping_tlv_downstream_map_ipv4_t));
 

-                tlv_ptr.lspping_tlv_downstream_map_ipv4= \
+                tlv_ptr.lspping_tlv_downstream_map_ipv4=

                     (const struct lspping_tlv_downstream_map_ipv4_t *)tlv_tptr;
                     (const struct lspping_tlv_downstream_map_ipv4_t *)tlv_tptr;

-                ND_PRINT((ndo, "\n\t    Downstream IP: %s" \
+                ND_PRINT("\n\t    Downstream IP: %s"

                        "\n\t    Downstream Interface IP: %s",
                        ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_ip),
                        "\n\t    Downstream Interface IP: %s",
                        ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_ip),

-                       ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_interface)));
+                       ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_interface));

                 tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv4_t);
                 tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv4_t);
                 break;
             case LSPPING_AFI_IPV4_UNMB:
                 /* Does the data go past the end of the TLV? */
                 if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t)) {
                 tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv4_t);
                 tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv4_t);
                 break;
             case LSPPING_AFI_IPV4_UNMB:
                 /* Does the data go past the end of the TLV? */
                 if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t)) {

-                    ND_PRINT((ndo, "\n\t      TLV is too short"));
+                    ND_PRINT("\n\t      TLV is too short");

                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }
                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }


@@ -941,19 +943,19 @@ lspping_print(netdissect_options *ndo,
                 ND_TCHECK_LEN(tlv_tptr,
                               sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t));
 
                 ND_TCHECK_LEN(tlv_tptr,
                               sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t));
 

-                tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb= \
+                tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb=

                     (const struct lspping_tlv_downstream_map_ipv4_unmb_t *)tlv_tptr;
                     (const struct lspping_tlv_downstream_map_ipv4_unmb_t *)tlv_tptr;

-                ND_PRINT((ndo, "\n\t    Downstream IP: %s" \
+                ND_PRINT("\n\t    Downstream IP: %s"

                        "\n\t    Downstream Interface Index: 0x%08x",
                        ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_ip),
                        "\n\t    Downstream Interface Index: 0x%08x",
                        ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_ip),

-                       EXTRACT_BE_U_4(tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_interface)));
+                       GET_BE_U_4(tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_interface));

                 tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t);
                 tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t);
                 break;
             case LSPPING_AFI_IPV6:
                 /* Does the data go past the end of the TLV? */
                 if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_ipv6_t)) {
                 tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t);
                 tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t);
                 break;
             case LSPPING_AFI_IPV6:
                 /* Does the data go past the end of the TLV? */
                 if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_ipv6_t)) {

-                    ND_PRINT((ndo, "\n\t      TLV is too short"));
+                    ND_PRINT("\n\t      TLV is too short");

                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }
                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }


@@ -961,19 +963,19 @@ lspping_print(netdissect_options *ndo,
                 ND_TCHECK_LEN(tlv_tptr,
                               sizeof(struct lspping_tlv_downstream_map_ipv6_t));
 
                 ND_TCHECK_LEN(tlv_tptr,
                               sizeof(struct lspping_tlv_downstream_map_ipv6_t));
 

-                tlv_ptr.lspping_tlv_downstream_map_ipv6= \
+                tlv_ptr.lspping_tlv_downstream_map_ipv6=

                     (const struct lspping_tlv_downstream_map_ipv6_t *)tlv_tptr;
                     (const struct lspping_tlv_downstream_map_ipv6_t *)tlv_tptr;

-                ND_PRINT((ndo, "\n\t    Downstream IP: %s" \
+                ND_PRINT("\n\t    Downstream IP: %s"

                        "\n\t    Downstream Interface IP: %s",
                        ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_ip),
                        "\n\t    Downstream Interface IP: %s",
                        ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_ip),

-                       ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_interface)));
+                       ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_interface));

                 tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv6_t);
                 tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv6_t);
                 break;
              case LSPPING_AFI_IPV6_UNMB:
                 /* Does the data go past the end of the TLV? */
                 if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t)) {
                 tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv6_t);
                 tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv6_t);
                 break;
              case LSPPING_AFI_IPV6_UNMB:
                 /* Does the data go past the end of the TLV? */
                 if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t)) {

-                    ND_PRINT((ndo, "\n\t      TLV is too short"));
+                    ND_PRINT("\n\t      TLV is too short");

                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }
                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }


@@ -981,12 +983,12 @@ lspping_print(netdissect_options *ndo,
                 ND_TCHECK_LEN(tlv_tptr,
                               sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t));
 
                 ND_TCHECK_LEN(tlv_tptr,
                               sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t));
 

-                tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb= \
+                tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb=

                    (const struct lspping_tlv_downstream_map_ipv6_unmb_t *)tlv_tptr;
                    (const struct lspping_tlv_downstream_map_ipv6_unmb_t *)tlv_tptr;

-                ND_PRINT((ndo, "\n\t    Downstream IP: %s" \
+                ND_PRINT("\n\t    Downstream IP: %s"

                        "\n\t    Downstream Interface Index: 0x%08x",
                        ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_ip),
                        "\n\t    Downstream Interface Index: 0x%08x",
                        ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_ip),

-                       EXTRACT_BE_U_4(tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_interface)));
+                       GET_BE_U_4(tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_interface));

                 tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t);
                 tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t);
                 break;
                 tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t);
                 tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv6_unmb_t);
                 break;


@@ -998,7 +1000,7 @@ lspping_print(netdissect_options *ndo,
 
             /* Does the data go past the end of the TLV? */
             if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_info_t)) {
 
             /* Does the data go past the end of the TLV? */
             if (tlv_tlen < sizeof(struct lspping_tlv_downstream_map_info_t)) {

-                ND_PRINT((ndo, "\n\t      TLV is too short"));
+                ND_PRINT("\n\t      TLV is too short");

                 tlv_hexdump = TRUE;
                 goto tlv_tooshort;
             }
                 tlv_hexdump = TRUE;
                 goto tlv_tooshort;
             }


@@ -1006,7 +1008,7 @@ lspping_print(netdissect_options *ndo,
             ND_TCHECK_LEN(tlv_tptr,
                           sizeof(struct lspping_tlv_downstream_map_info_t));
 
             ND_TCHECK_LEN(tlv_tptr,
                           sizeof(struct lspping_tlv_downstream_map_info_t));
 

-            tlv_ptr.lspping_tlv_downstream_map_info= \
+            tlv_ptr.lspping_tlv_downstream_map_info=

                 (const struct lspping_tlv_downstream_map_info_t *)tlv_tptr;
 
             /* FIXME add hash-key type, depth limit, multipath processing */
                 (const struct lspping_tlv_downstream_map_info_t *)tlv_tptr;
 
             /* FIXME add hash-key type, depth limit, multipath processing */


@@ -1022,12 +1024,12 @@ lspping_print(netdissect_options *ndo,
 
         case LSPPING_TLV_BFD_DISCRIMINATOR:
             if (tlv_tlen < LSPPING_TLV_BFD_DISCRIMINATOR_LEN) {
 
         case LSPPING_TLV_BFD_DISCRIMINATOR:
             if (tlv_tlen < LSPPING_TLV_BFD_DISCRIMINATOR_LEN) {

-                ND_PRINT((ndo, "\n\t      TLV is too short"));
+                ND_PRINT("\n\t      TLV is too short");

                 tlv_hexdump = TRUE;
                 goto tlv_tooshort;
             } else {
                 ND_TCHECK_LEN(tptr, LSPPING_TLV_BFD_DISCRIMINATOR_LEN);
                 tlv_hexdump = TRUE;
                 goto tlv_tooshort;
             } else {
                 ND_TCHECK_LEN(tptr, LSPPING_TLV_BFD_DISCRIMINATOR_LEN);

-                ND_PRINT((ndo, "\n\t    BFD Discriminator 0x%08x", EXTRACT_BE_U_4(tptr)));
+                ND_PRINT("\n\t    BFD Discriminator 0x%08x", GET_BE_U_4(tptr));

             }
             break;
 
             }
             break;
 


@@ -1036,15 +1038,15 @@ lspping_print(netdissect_options *ndo,
             uint32_t vendor_id;
 
             if (tlv_tlen < LSPPING_TLV_VENDOR_ENTERPRISE_LEN) {
             uint32_t vendor_id;
 
             if (tlv_tlen < LSPPING_TLV_VENDOR_ENTERPRISE_LEN) {

-                ND_PRINT((ndo, "\n\t      TLV is too short"));
+                ND_PRINT("\n\t      TLV is too short");

                 tlv_hexdump = TRUE;
                 goto tlv_tooshort;
             } else {
                 ND_TCHECK_LEN(tptr, LSPPING_TLV_VENDOR_ENTERPRISE_LEN);
                 tlv_hexdump = TRUE;
                 goto tlv_tooshort;
             } else {
                 ND_TCHECK_LEN(tptr, LSPPING_TLV_VENDOR_ENTERPRISE_LEN);

-                vendor_id = EXTRACT_BE_U_4(tlv_tptr);
-                ND_PRINT((ndo, "\n\t    Vendor: %s (0x%04x)",
+                vendor_id = GET_BE_U_4(tlv_tptr);
+                ND_PRINT("\n\t    Vendor: %s (0x%04x)",

                        tok2str(smi_values, "Unknown", vendor_id),
                        tok2str(smi_values, "Unknown", vendor_id),

-                       vendor_id));
+                       vendor_id);

             }
         }
             break;
             }
         }
             break;


@@ -1082,15 +1084,9 @@ lspping_print(netdissect_options *ndo,
     }
     return;
 tooshort:
     }
     return;
 tooshort:

-    ND_PRINT((ndo, "\n\t\t packet is too short"));
+    ND_PRINT("\n\t\t packet is too short");

     return;
 trunc:
     return;
 trunc:

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

     return;
 }
     return;
 }

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