include extended_timestamp (nS wallclock UTC) in the export when it is supplied with PSAMPLE and DROPMON

Author: sflow

hsflowd.spec

@@ -1,6 +1,6 @@
 Summary: host sFlow daemon
 Name: hsflowd
-Version: 2.1.17
+Version: 2.1.18
 Release: 1
 License: http://sflow.net/license.html
 Group: Applications/Internet

src/Linux/hsflowd.h

@@ -482,6 +482,7 @@ extern "C" {
     uint32_t egressQ_id;
     uint64_t egressQ_byts;
     uint64_t transit_nS;
+    uint64_t timestamp_nS;
     uint32_t hdr_len;
     u_char *hdr;
   } HSPPSample;

src/Linux/mod_dropmon.c

@@ -728,6 +728,7 @@ That would allow everything to stay on the stack as it does here, which has nice
     SFLFlow_sample_element fnElem = { .tag=SFLFLOW_EX_FUNCTION };
     SFLFlow_sample_element hwElem = { .tag=SFLFLOW_EX_HW_TRAP };
     SFLFlow_sample_element rnElem = { .tag=SFLFLOW_EX_LINUX_REASON };
+    SFLFlow_sample_element tsElem = { .tag=SFLFLOW_EX_TIMESTAMP };
 
     // and some parameters to pick up for cross-check below
     uint32_t trunc_len=0;
@@ -737,6 +738,7 @@ That would allow everything to stay on the stack as it does here, which has nice
     char *hw_name=NULL;
     char *sw_symbol=NULL;
     char *reason=NULL;
+    uint64_t timestamp_nS=0;
 
     // increment counter for threshold check
     mdata->totalDrops_thisTick++;
@@ -793,7 +795,8 @@ That would allow everything to stay on the stack as it does here, which has nice
 	}
 	break;
       case NET_DM_ATTR_TIMESTAMP:
-	EVDebug(mod, 4, "u64=TIMESTAMP=%"PRIu64, *(uint64_t *)datap);
+	timestamp_nS = *(uint64_t *)datap;
+	EVDebug(mod, 4, "u64=TIMESTAMP=%"PRIu64, timestamp_nS);
 	break;
       case NET_DM_ATTR_PROTO:
 	skb_protocol = *(uint16_t *)datap;
@@ -957,7 +960,10 @@ That would allow everything to stay on the stack as it does here, which has nice
       rnElem.flowType.linux_reason.reason.len = my_strlen(reason);
       SFLADD_ELEMENT(&discard, &rnElem);
     }
-
+    if(timestamp_nS) {
+      tsElem.flowType.timestamp.nanoseconds = timestamp_nS;
+      SFLADD_ELEMENT(&discard, &tsElem);
+    }
     HSPPendingEvtSample es = { .notifier = notifier, .discard = &discard };
     if(mdata->evt_intf_es)
       EVEventTx(mod, mdata->evt_intf_es, &es, sizeof(es));

src/Linux/mod_psample.c

@@ -302,6 +302,16 @@ extern "C" {
 	  ADD_TO_LIST(ext_elems, transit);
 	}
 	break;
+      case HSP_PSAMPLE_ATTR_TIMESTAMP:
+	{
+	  // wall clock timestamp - unixtime UTC (nS)
+	  SFLFlow_sample_element *tstamp = my_calloc(sizeof(SFLFlow_sample_element));
+	  tstamp->tag = SFLFLOW_EX_TIMESTAMP;
+	  psmp.timestamp_nS = *(uint64_t *)datap;
+	  tstamp->flowType.timestamp.nanoseconds = psmp.timestamp_nS;
+	  ADD_TO_LIST(ext_elems, tstamp);
+	}
+	break;
       }
     }
 

src/sflow/sflow.h

@@ -509,6 +509,16 @@ typedef struct {
 } SFLExtended_queue_depth;
 #define XDRSIZ_SFLEXTENDED_Q_DEPTH 4
 
+/* 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 */
@@ -543,6 +553,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, /* server socket */
   SFLFLOW_EX_SOCKET6        = 2101, /* server socket */
   SFLFLOW_EX_PROXY_SOCKET4  = 2102, /* back-end (client) socket */
@@ -590,6 +601,7 @@ typedef union _SFLFlow_type {
   SFLExtended_transit_delay transit_delay;
   SFLExtended_hw_trap hw_trap;
   SFLExtended_linux_reason linux_reason;
+  SFLExtended_timestamp timestamp;
 } SFLFlow_type;
 
 typedef struct _SFLFlow_sample_element {

src/sflow/sflow_receiver.c

@@ -375,6 +375,7 @@ static int xdr_enc_flow_sample_elements(SFDBuf *pktsmp, SFLFlow_sample_element *
     case SFLFLOW_EX_Q_DEPTH: sfd_xdr_enc_int32(pktsmp, elem->flowType.queue_depth.depth); break;
     case SFLFLOW_EX_HW_TRAP: xdr_enc_hw_trap(pktsmp, &elem->flowType.hw_trap); break;
     case SFLFLOW_EX_LINUX_REASON: xdr_enc_sflstring(pktsmp, &elem->flowType.linux_reason.reason); break;
+    case SFLFLOW_EX_TIMESTAMP: sfd_xdr_enc_int64(pktsmp, elem->flowType.timestamp.nanoseconds); break;
     default:
       return -1;
     }