add extended_timestamp

Author: sflow

configure.ac

@@ -2,7 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.71])
-AC_INIT([sflowtool],[6.08])
+# change version in spec file too
+AC_INIT([sflowtool],[6.09])
 AC_CONFIG_SRCDIR([src/sflowtool.c])
 AM_INIT_AUTOMAKE
 AC_PROG_CC

sflowtool.spec

@@ -1,6 +1,6 @@
 Summary: tool to ascii-print or forward sFlow datagrams
 Name: sflowtool
-Version: 6.07
+Version: 6.09
 Release: 1%{?dist}
 License: https://www.inmon.com/technology/sflowlicense.txt
 Group: Productivity/Networking/Diagnostic

src/sflow.h

@@ -661,6 +661,16 @@ typedef struct _SFLExtended_linux_reason {
 } SFLExtended_linux_reason;
 #define SFL_MAX_LINUX_REASON_LEN 64
 
+/* Precision Timestamp */
+/* opaque = flow_data; enterprise = 0; format = 1043 */
+/* Time in relative to the UNIX epoch starting in 1970 using the
+   Coordinated Universal Time (UTC). Agent should report most accurate
+   synchronized time available, e.g. Atomic, PTP, NTP, etc. */
+
+typedef struct  {
+  uint64_t nanoseconds;
+} SFLExtended_timestamp;
+
 enum SFLFlow_type_tag {
   /* enterprise = 0, format = ... */
   SFLFLOW_HEADER    = 1,      /* Packet headers are sampled */
@@ -700,6 +710,7 @@ enum SFLFlow_type_tag {
   SFLFLOW_EX_Q_DEPTH           = 1040,
   SFLFLOW_EX_HW_TRAP           = 1041,
   SFLFLOW_EX_LINUX_REASON      = 1042,
+  SFLFLOW_EX_TIMESTAMP         = 1043,
   SFLFLOW_EX_SOCKET4       = 2100,
   SFLFLOW_EX_SOCKET6       = 2101,
   SFLFLOW_EX_PROXYSOCKET4  = 2102,
@@ -752,6 +763,7 @@ typedef union _SFLFlow_type {
   SFLExtended_egress_queue egress_queue;
   SFLExtended_queue_depth queue_depth;
   SFLExtended_transit_delay transit_delay;
+  SFLExtended_timestamp timestamp;
 } SFLFlow_type;
 
 typedef struct _SFLFlow_sample_element {

src/sflowtool.c

@@ -422,6 +422,9 @@ typedef struct _SFSample {
     /* counter blocks */
     uint32_t statsSamplingInterval;
     uint32_t counterBlockVersion;
+
+    /* timetamp */
+    uint64_t timestamp_nS;
   } s;
 
   /* exception handler context */
@@ -1103,6 +1106,17 @@ static char *printTimestamp(time_t ts, SFStr *sb) {
   return SFStr_str(sb);
 }
 
+static char *printTimestamp_nS(uint64_t nS, SFStr *sb) {
+  SFStr_init(sb);
+  uint64_t gig = (uint64_t)1e9;
+  time_t ts = nS / gig;
+  uint64_t fract = nS % gig;
+  SFStr_append_timestamp(sb, ts);
+  SFStr_append(sb, ".");
+  SFStr_append_U64(sb, "%"PRIu64, fract);
+  return SFStr_str(sb);
+}
+
 static char *printOUI(uint8_t *oui, SFStr *sb) {
   SFStr_init(sb);
   SFStr_append_hex(sb, oui, 3, NO, YES, '-');
@@ -3896,6 +3910,20 @@ static void readExtendedLinuxReason(SFSample *sample)
   }
 }
 
+/*_________________----------------------------__________________
+  _________________  readExtendedTimestamp     __________________
+  -----------------____________________________------------------
+*/
+
+static void readExtendedTimestamp(SFSample *sample)
+{
+  SFStr buf;
+  sf_logf(sample, "extendedType", "timestamp");
+  sample->s.timestamp_nS = getData64(sample);
+  sf_logf_U64(sample, "timestamp_nS", sample->s.timestamp_nS);
+  // sf_logf(sample, "timestamp_fmt", printTimestamp_nS(sample->s.timestamp_nS, &buf));
+}
+
 /*_________________---------------------------__________________
   _________________    readFlowSample_v2v4    __________________
   -----------------___________________________------------------
@@ -4091,6 +4119,7 @@ static void readFlowSampleElements(SFSample *sample)
       case SFLFLOW_EX_EGRESS_Q: readExtendedEgressQueue(sample); break;
       case SFLFLOW_EX_TRANSIT: readExtendedTransitDelay(sample); break;
       case SFLFLOW_EX_Q_DEPTH: readExtendedQueueDepth(sample); break;
+      case SFLFLOW_EX_TIMESTAMP: readExtendedTimestamp(sample); break;
 	/* In discard samples, any of the above may appear along with the following. */
       case SFLFLOW_EX_FUNCTION: readExtendedFunction(sample); break;
       case SFLFLOW_EX_HW_TRAP: readExtendedHardwareTrap(sample); break;