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

[tcpdump] / print-ptp.c

diff --git a/print-ptp.c b/print-ptp.c
index 36001c106f6d9ce8c4dc8993dab8f75080533ff5..f4ccbe9d03a0d3198d06a8ce4ea5f33366c88179 100644 (file)
--- a/print-ptp.c
+++ b/print-ptp.c
@@ -24,7 +24,6 @@
 #include "netdissect-stdinc.h"
 #include "netdissect.h"
 #include "extract.h"
 #include "netdissect-stdinc.h"
 #include "netdissect.h"
 #include "extract.h"

-#include <string.h>

 
 /*
  * PTP header
 
 /*
  * PTP header


@@ -259,9 +258,9 @@ static const struct tok ptp_flag_values[] = {
             ND_PRINT("(%s)", tok2str(ptp_msg_type, "unknown", e)); \
         }
 
             ND_PRINT("(%s)", tok2str(ptp_msg_type, "unknown", e)); \
         }
 

-const char *p_porigin_ts = "preciseOriginTimeStamp";
-const char *p_origin_ts = "originTimeStamp";
-const char *p_recv_ts = "receiveTimeStamp";
+static const char *p_porigin_ts = "preciseOriginTimeStamp";
+static const char *p_origin_ts = "originTimeStamp";
+static const char *p_recv_ts = "receiveTimeStamp";

 
 #define PTP_VER_1 0x1
 #define PTP_VER_2 0x2
 
 #define PTP_VER_1 0x1
 #define PTP_VER_2 0x2


@@ -340,7 +339,8 @@ ptp_print_1(netdissect_options *ndo)
     ND_PRINT(" (not implemented)");
 }
 
     ND_PRINT(" (not implemented)");
 }
 

-static void ptp_print_2(netdissect_options *ndo, const u_char *bp, u_int length)
+static void
+ptp_print_2(netdissect_options *ndo, const u_char *bp, u_int length)

 {
     u_int len = length;
     uint16_t msg_len, flags, port_id, seq_id;
 {
     u_int len = length;
     uint16_t msg_len, flags, port_id, seq_id;


@@ -431,14 +431,12 @@ static void ptp_print_2(netdissect_options *ndo, const u_char *bp, u_int length)
  * PTP general message
  */
 void
  * PTP general message
  */
 void

-ptp_print(netdissect_options *ndo, const u_char *bp, u_int len)
+ptp_print(netdissect_options *ndo, const u_char *bp, u_int length)

 {
     u_int vers;
 
     ndo->ndo_protocol = "ptp";
 {
     u_int vers;
 
     ndo->ndo_protocol = "ptp";

-    if (len < PTP_HDR_LEN) {
-        goto trunc;
-    }
+    ND_LCHECK_U(length, PTP_HDR_LEN);

     vers = GET_BE_U_2(bp) & PTP_VERS_MASK;
     ND_PRINT("PTPv%u",vers);
     switch(vers) {
     vers = GET_BE_U_2(bp) & PTP_VERS_MASK;
     ND_PRINT("PTPv%u",vers);
     switch(vers) {


@@ -446,7 +444,7 @@ ptp_print(netdissect_options *ndo, const u_char *bp, u_int len)
             ptp_print_1(ndo);
             break;
         case PTP_VER_2:
             ptp_print_1(ndo);
             break;
         case PTP_VER_2:

-            ptp_print_2(ndo, bp, len);
+            ptp_print_2(ndo, bp, length);

             break;
         default:
             //ND_PRINT("ERROR: unknown-version\n");
             break;
         default:
             //ND_PRINT("ERROR: unknown-version\n");


@@ -454,9 +452,8 @@ ptp_print(netdissect_options *ndo, const u_char *bp, u_int len)
     }
     return;
 
     }
     return;
 

-trunc:
-    nd_print_trunc(ndo);
-    return;
+invalid:
+    nd_print_invalid(ndo);

 }
 
 static void
 }
 
 static void