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

[tcpdump] / print-lspping.c

diff --git a/print-lspping.c b/print-lspping.c
index b51a3738afbcd5a81f628c45a2af72ca23da68c9..4c5fc4e8cc21a3f80c436b48e16b5d1529a59001 100644 (file)
--- a/print-lspping.c
+++ b/print-lspping.c
@@ -15,7 +15,7 @@
 
 /* \summary: MPLS LSP PING printer */
 
 
 /* \summary: MPLS LSP PING printer */
 

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

 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>


@@ -23,9 +23,11 @@
 
 #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 +70,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 +498,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 {


@@ -589,16 +589,15 @@ lspping_print(netdissect_options *ndo,
            GET_BE_U_4(lspping_com_header->sender_handle),
            GET_BE_U_4(lspping_com_header->seq_number));
 
            GET_BE_U_4(lspping_com_header->sender_handle),
            GET_BE_U_4(lspping_com_header->seq_number));
 

-    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: ");
     ND_PRINT("\n\t  Sender Timestamp: ");

-    ts_print(ndo, &timestamp);
+    p_ntp_time(ndo, &lspping_com_header->ts_sent);
+    ND_PRINT(" ");

 
 

-    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);
+    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("Receiver Timestamp: ");
     ND_PRINT("Receiver Timestamp: ");

-    if ((timestamp.tv_sec != 0) && (timestamp.tv_usec != 0))
-        ts_print(ndo, &timestamp);
+    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,9 +609,6 @@ 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_type=GET_BE_U_2(lspping_tlv_header->type);
         lspping_tlv_len=GET_BE_U_2(lspping_tlv_header->length);
         lspping_tlv_header = (const struct lspping_tlv_header *)tptr;
         lspping_tlv_type=GET_BE_U_2(lspping_tlv_header->type);
         lspping_tlv_len=GET_BE_U_2(lspping_tlv_header->length);


@@ -650,8 +646,6 @@ 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;


@@ -1028,8 +1022,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", GET_BE_U_4(tptr));
+                ND_PRINT("\n\t    BFD Discriminator 0x%08x", GET_BE_U_4(tlv_tptr));

             }
             break;
 
             }
             break;
 


@@ -1042,7 +1035,6 @@ 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 = GET_BE_U_4(tlv_tptr);
                 ND_PRINT("\n\t    Vendor: %s (0x%04x)",
                        tok2str(smi_values, "Unknown", vendor_id),
                 vendor_id = GET_BE_U_4(tlv_tptr);
                 ND_PRINT("\n\t    Vendor: %s (0x%04x)",
                        tok2str(smi_values, "Unknown", vendor_id),


@@ -1085,8 +1077,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;

 }
 }