CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-lspping.c

diff --git a/print-lspping.c b/print-lspping.c
index 077f07b1de96c767c3d18c4e4718787a4073db60..04a4b21a588f2086f09fbf10038cb525ea6d30c0 100644 (file)
--- a/print-lspping.c
+++ b/print-lspping.c
@@ -15,17 +15,17 @@
 
 /* \summary: MPLS LSP PING printer */
 
 
 /* \summary: MPLS LSP PING printer */
 

-/* specification: RFC 4349 */
+/* specification: RFC 4379 */

 
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #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"

+#include "ntp.h"

 
 #include "l2vpn.h"
 #include "oui.h"
 
 #include "l2vpn.h"
 #include "oui.h"


@@ -68,10 +68,8 @@ struct lspping_common_header {
     nd_uint8_t  return_subcode;
     nd_uint32_t sender_handle;
     nd_uint32_t seq_number;
     nd_uint8_t  return_subcode;
     nd_uint32_t sender_handle;
     nd_uint32_t seq_number;

-    nd_uint32_t ts_sent_sec;
-    nd_uint32_t ts_sent_usec;
-    nd_uint32_t ts_rcvd_sec;
-    nd_uint32_t ts_rcvd_usec;
+    struct l_fixedpt ts_sent;
+    struct l_fixedpt ts_rcvd;

 };
 
 #define LSPPING_VERSION            1
 };
 
 #define LSPPING_VERSION            1


@@ -498,7 +496,7 @@ lspping_print(netdissect_options *ndo,
     u_int tlen,lspping_tlv_len,lspping_tlv_type,tlv_tlen;
     int tlv_hexdump,subtlv_hexdump;
     u_int lspping_subtlv_len,lspping_subtlv_type;
     u_int tlen,lspping_tlv_len,lspping_tlv_type,tlv_tlen;
     int tlv_hexdump,subtlv_hexdump;
     u_int lspping_subtlv_len,lspping_subtlv_type;

-    struct timeval timestamp;
+    uint32_t int_part, fraction;

     u_int address_type;
 
     union {
     u_int address_type;
 
     union {


@@ -534,18 +532,18 @@ lspping_print(netdissect_options *ndo,
     /*
      * Sanity checking of the header.
      */
     /*
      * Sanity checking of the header.
      */

-    if (EXTRACT_BE_U_2(lspping_com_header->version) != LSPPING_VERSION) {
+    if (GET_BE_U_2(lspping_com_header->version) != LSPPING_VERSION) {

        ND_PRINT("LSP-PING version %u packet not supported",
        ND_PRINT("LSP-PING version %u packet not supported",

-               EXTRACT_BE_U_2(lspping_com_header->version));
+               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) {
         ND_PRINT("LSP-PINGv%u, %s, seq %u, length: %u",
        return;
     }
 
     /* in non-verbose mode just lets print the basic Message Type*/
     if (ndo->ndo_vflag < 1) {
         ND_PRINT("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),
+               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;
     }
                len);
         return;
     }


@@ -555,19 +553,19 @@ lspping_print(netdissect_options *ndo,
     tlen=len;
 
     ND_PRINT("\n\tLSP-PINGv%u, msg-type: %s (%u), length: %u\n\t  reply-mode: %s (%u)",
     tlen=len;
 
     ND_PRINT("\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),
+           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 ||
     if (return_code == 3 ||
         return_code == 4 ||
         return_code == 8 ||


@@ -586,19 +584,17 @@ lspping_print(netdissect_options *ndo,
                return_subcode);
 
     ND_PRINT("\n\t  Sender Handle: 0x%08x, Sequence: %u",
                return_subcode);
 
     ND_PRINT("\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));
-
-    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("\n\t  Sender 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("Receiver Timestamp: ");
-    if ((timestamp.tv_sec != 0) && (timestamp.tv_usec != 0))
-        ts_print(ndo, &timestamp);
+           GET_BE_U_4(lspping_com_header->sender_handle),
+           GET_BE_U_4(lspping_com_header->seq_number));
+
+    ND_PRINT("\n\t  TimeStamp Sent: ");
+    p_ntp_time(ndo, &lspping_com_header->ts_sent);
+
+    int_part=GET_BE_U_4(lspping_com_header->ts_rcvd.int_part);
+    fraction=GET_BE_U_4(lspping_com_header->ts_rcvd.fraction);
+    ND_PRINT("\n\t  TimeStamp Received: ");
+    if (! (int_part == 0 && fraction == 0))
+        p_ntp_time(ndo, &lspping_com_header->ts_rcvd);

     else
         ND_PRINT("no timestamp");
 
     else
         ND_PRINT("no timestamp");
 


@@ -610,12 +606,9 @@ lspping_print(netdissect_options *ndo,
         if (tlen < sizeof(struct lspping_tlv_header))
             goto tooshort;
 
         if (tlen < sizeof(struct lspping_tlv_header))
             goto tooshort;
 

-        /* did we capture enough for fully decoding the tlv header ? */
-        ND_TCHECK_LEN(tptr, sizeof(struct lspping_tlv_header));
-

         lspping_tlv_header = (const struct lspping_tlv_header *)tptr;
         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("\n\t  %s TLV (%u), length: %u",
                tok2str(lspping_tlv_values,
 
         ND_PRINT("\n\t  %s TLV (%u), length: %u",
                tok2str(lspping_tlv_values,


@@ -650,13 +643,11 @@ lspping_print(netdissect_options *ndo,
                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }
                     tlv_hexdump = TRUE;
                     goto tlv_tooshort;
                 }

-                /* did we capture enough for fully decoding the subtlv header ? */
-                ND_TCHECK_LEN(tlv_tptr, sizeof(struct lspping_tlv_header));

                 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? */
                 subtlv_tptr=tlv_tptr+sizeof(struct lspping_tlv_header);
 
                 /* Does the subTLV go past the end of the TLV? */


@@ -687,8 +678,8 @@ lspping_print(netdissect_options *ndo,
                         subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4 =
                             (const struct lspping_tlv_targetfec_subtlv_ldp_ipv4_t *)subtlv_tptr;
                         ND_PRINT("\n\t      %s/%u",
                         subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4 =
                             (const struct lspping_tlv_targetfec_subtlv_ldp_ipv4_t *)subtlv_tptr;
                         ND_PRINT("\n\t      %s/%u",

-                               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_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix),
+                               GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv4->prefix_len));

                     }
                     break;
 
                     }
                     break;
 


@@ -701,8 +692,8 @@ lspping_print(netdissect_options *ndo,
                         subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6 =
                             (const struct lspping_tlv_targetfec_subtlv_ldp_ipv6_t *)subtlv_tptr;
                         ND_PRINT("\n\t      %s/%u",
                         subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6 =
                             (const struct lspping_tlv_targetfec_subtlv_ldp_ipv6_t *)subtlv_tptr;
                         ND_PRINT("\n\t      %s/%u",

-                               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_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix),
+                               GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_ldp_ipv6->prefix_len));

                     }
                     break;
 
                     }
                     break;
 


@@ -715,8 +706,8 @@ lspping_print(netdissect_options *ndo,
                         subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4 =
                             (const struct lspping_tlv_targetfec_subtlv_bgp_ipv4_t *)subtlv_tptr;
                         ND_PRINT("\n\t      %s/%u",
                         subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4 =
                             (const struct lspping_tlv_targetfec_subtlv_bgp_ipv4_t *)subtlv_tptr;
                         ND_PRINT("\n\t      %s/%u",

-                               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_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix),
+                               GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv4->prefix_len));

                     }
                     break;
 
                     }
                     break;
 


@@ -729,8 +720,8 @@ lspping_print(netdissect_options *ndo,
                         subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6 =
                             (const struct lspping_tlv_targetfec_subtlv_bgp_ipv6_t *)subtlv_tptr;
                         ND_PRINT("\n\t      %s/%u",
                         subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6 =
                             (const struct lspping_tlv_targetfec_subtlv_bgp_ipv6_t *)subtlv_tptr;
                         ND_PRINT("\n\t      %s/%u",

-                               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_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix),
+                               GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_bgp_ipv6->prefix_len));

                     }
                     break;
 
                     }
                     break;
 


@@ -744,11 +735,11 @@ lspping_print(netdissect_options *ndo,
                             (const struct lspping_tlv_targetfec_subtlv_rsvp_ipv4_t *)subtlv_tptr;
                         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",
                             (const struct lspping_tlv_targetfec_subtlv_rsvp_ipv4_t *)subtlv_tptr;
                         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),
-                               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_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_endpoint),
+                               GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->tunnel_sender),
+                               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),
+                               GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv4->extended_tunnel_id));

                     }
                     break;
 
                     }
                     break;
 


@@ -762,11 +753,11 @@ lspping_print(netdissect_options *ndo,
                             (const struct lspping_tlv_targetfec_subtlv_rsvp_ipv6_t *)subtlv_tptr;
                         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",
                             (const struct lspping_tlv_targetfec_subtlv_rsvp_ipv6_t *)subtlv_tptr;
                         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),
-                               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_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_endpoint),
+                               GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->tunnel_sender),
+                               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),
+                               GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_rsvp_ipv6->extended_tunnel_id));

                     }
                     break;
 
                     }
                     break;
 


@@ -780,8 +771,8 @@ lspping_print(netdissect_options *ndo,
                             (const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv4_t *)subtlv_tptr;
                         ND_PRINT("\n\t      RD: %s, %s/%u",
                                bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->rd),
                             (const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv4_t *)subtlv_tptr;
                         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),
-                               EXTRACT_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix_len));
+                               GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix),
+                               GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv4->prefix_len));

                     }
                     break;
 
                     }
                     break;
 


@@ -795,8 +786,8 @@ lspping_print(netdissect_options *ndo,
                             (const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv6_t *)subtlv_tptr;
                         ND_PRINT("\n\t      RD: %s, %s/%u",
                                bgp_vpn_rd_print(ndo, subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->rd),
                             (const struct lspping_tlv_targetfec_subtlv_l3vpn_ipv6_t *)subtlv_tptr;
                         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),
-                               EXTRACT_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix_len));
+                               GET_IP6ADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix),
+                               GET_U_1(subtlv_ptr.lspping_tlv_targetfec_subtlv_l3vpn_ipv6->prefix_len));

                     }
                     break;
 
                     }
                     break;
 


@@ -811,12 +802,12 @@ lspping_print(netdissect_options *ndo,
                         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),
                         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),

-                               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;
 


@@ -831,12 +822,12 @@ lspping_print(netdissect_options *ndo,
                             (const struct lspping_tlv_targetfec_subtlv_fec_128_pw_old *)subtlv_tptr;
                         ND_PRINT("\n\t      Remote PE: %s"
                                "\n\t      PW ID: 0x%08x, PW Type: %s (%u)",
                             (const struct lspping_tlv_targetfec_subtlv_fec_128_pw_old *)subtlv_tptr;
                         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),
-                               EXTRACT_BE_U_4(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->pw_id),
+                               GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid_old->remote_pe_address),
+                               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;
 
                     }
                     break;
 


@@ -850,13 +841,13 @@ lspping_print(netdissect_options *ndo,
                             (const struct lspping_tlv_targetfec_subtlv_fec_128_pw *)subtlv_tptr;
                         ND_PRINT("\n\t      Sender PE: %s, Remote PE: %s"
                                "\n\t      PW ID: 0x%08x, PW Type: %s (%u)",
                             (const struct lspping_tlv_targetfec_subtlv_fec_128_pw *)subtlv_tptr;
                         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),
-                               EXTRACT_BE_U_4(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->pw_id),
+                               GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->sender_pe_address),
+                               GET_IPADDR_STRING(subtlv_ptr.lspping_tlv_targetfec_subtlv_l2vpn_vcid->remote_pe_address),
+                               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;
 


@@ -902,9 +893,9 @@ lspping_print(netdissect_options *ndo,
              * 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. */
 
              * 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);
+            address_type = GET_U_1(tlv_ptr.lspping_tlv_downstream_map->address_type);

             ND_PRINT("\n\t    MTU: %u, Address-Type: %s (%u)",
             ND_PRINT("\n\t    MTU: %u, Address-Type: %s (%u)",

-                   EXTRACT_BE_U_2(tlv_ptr.lspping_tlv_downstream_map->mtu),
+                   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),


@@ -927,8 +918,8 @@ lspping_print(netdissect_options *ndo,
                     (const struct lspping_tlv_downstream_map_ipv4_t *)tlv_tptr;
                 ND_PRINT("\n\t    Downstream IP: %s"
                        "\n\t    Downstream Interface IP: %s",
                     (const struct lspping_tlv_downstream_map_ipv4_t *)tlv_tptr;
                 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),
-                       ipaddr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_interface));
+                       GET_IPADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv4->downstream_ip),
+                       GET_IPADDR_STRING(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;
                 tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv4_t);
                 tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv4_t);
                 break;


@@ -947,8 +938,8 @@ lspping_print(netdissect_options *ndo,
                     (const struct lspping_tlv_downstream_map_ipv4_unmb_t *)tlv_tptr;
                 ND_PRINT("\n\t    Downstream IP: %s"
                        "\n\t    Downstream Interface Index: 0x%08x",
                     (const struct lspping_tlv_downstream_map_ipv4_unmb_t *)tlv_tptr;
                 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),
-                       EXTRACT_BE_U_4(tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_interface));
+                       GET_IPADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv4_unmb->downstream_ip),
+                       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;
                 tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t);
                 tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv4_unmb_t);
                 break;


@@ -967,8 +958,8 @@ lspping_print(netdissect_options *ndo,
                     (const struct lspping_tlv_downstream_map_ipv6_t *)tlv_tptr;
                 ND_PRINT("\n\t    Downstream IP: %s"
                        "\n\t    Downstream Interface IP: %s",
                     (const struct lspping_tlv_downstream_map_ipv6_t *)tlv_tptr;
                 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),
-                       ip6addr_string(ndo, tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_interface));
+                       GET_IP6ADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv6->downstream_ip),
+                       GET_IP6ADDR_STRING(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;
                 tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_ipv6_t);
                 tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_ipv6_t);
                 break;


@@ -987,8 +978,8 @@ lspping_print(netdissect_options *ndo,
                    (const struct lspping_tlv_downstream_map_ipv6_unmb_t *)tlv_tptr;
                 ND_PRINT("\n\t    Downstream IP: %s"
                        "\n\t    Downstream Interface Index: 0x%08x",
                    (const struct lspping_tlv_downstream_map_ipv6_unmb_t *)tlv_tptr;
                 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),
-                       EXTRACT_BE_U_4(tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_interface));
+                       GET_IP6ADDR_STRING(tlv_ptr.lspping_tlv_downstream_map_ipv6_unmb->downstream_ip),
+                       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;


@@ -1013,9 +1004,6 @@ lspping_print(netdissect_options *ndo,
 
             /* FIXME add hash-key type, depth limit, multipath processing */
 
 
             /* FIXME add hash-key type, depth limit, multipath processing */
 

-            tlv_tptr+=sizeof(struct lspping_tlv_downstream_map_info_t);
-            tlv_tlen-=sizeof(struct lspping_tlv_downstream_map_info_t);
-

             /* FIXME print downstream labels */
 
             tlv_hexdump=TRUE; /* dump the TLV until code complete */
             /* FIXME print downstream labels */
 
             tlv_hexdump=TRUE; /* dump the TLV until code complete */


@@ -1028,8 +1016,7 @@ lspping_print(netdissect_options *ndo,
                 tlv_hexdump = TRUE;
                 goto tlv_tooshort;
             } else {
                 tlv_hexdump = TRUE;
                 goto tlv_tooshort;
             } else {

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

             }
             break;
 
             }
             break;
 


@@ -1042,8 +1029,7 @@ lspping_print(netdissect_options *ndo,
                 tlv_hexdump = TRUE;
                 goto tlv_tooshort;
             } else {
                 tlv_hexdump = TRUE;
                 goto tlv_tooshort;
             } else {

-                ND_TCHECK_LEN(tptr, LSPPING_TLV_VENDOR_ENTERPRISE_LEN);
-                vendor_id = EXTRACT_BE_U_4(tlv_tptr);
+                vendor_id = GET_BE_U_4(tlv_tptr);

                 ND_PRINT("\n\t    Vendor: %s (0x%04x)",
                        tok2str(smi_values, "Unknown", vendor_id),
                        vendor_id);
                 ND_PRINT("\n\t    Vendor: %s (0x%04x)",
                        tok2str(smi_values, "Unknown", vendor_id),
                        vendor_id);


@@ -1085,8 +1071,4 @@ lspping_print(netdissect_options *ndo,
     return;
 tooshort:
     ND_PRINT("\n\t\t packet is too short");
     return;
 tooshort:
     ND_PRINT("\n\t\t packet is too short");

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

 }
 }