Deprecate apcon/vss timestamps

Author: cardigliano

userland/lib/pfring.c

@@ -195,7 +195,6 @@ pfring *pfring_open(const char *device_name, u_int32_t caplen, u_int32_t flags)
   ring->disable_timestamp   = !!(flags & PF_RING_DO_NOT_TIMESTAMP);
   ring->chunk_mode_enabled  = !!(flags & PF_RING_CHUNK_MODE);
   ring->ixia_timestamp_enabled = !!(flags & PF_RING_IXIA_TIMESTAMP);
-  ring->vss_apcon_timestamp_enabled = !!(flags & PF_RING_VSS_APCON_TIMESTAMP);
   ring->force_userspace_bpf = !!(flags & (PF_RING_USERSPACE_BPF|PF_RING_TX_BPF));
   ring->ft_enabled          = !!(flags & PF_RING_L7_FILTERING);
 
@@ -505,13 +504,10 @@ int pfring_loop(pfring *ring, pfringProcesssPacket looper,
 
       if (ring->flags & (
             PF_RING_IXIA_TIMESTAMP | 
-            PF_RING_VSS_APCON_TIMESTAMP |
             PF_RING_METAWATCH_TIMESTAMP |
             PF_RING_ARISTA_TIMESTAMP)) {
         if(ring->ixia_timestamp_enabled)
           pfring_handle_ixia_hw_timestamp(buffer, &hdr);
-        else if(ring->vss_apcon_timestamp_enabled)
-          pfring_handle_vss_apcon_hw_timestamp(buffer, &hdr);
         else if(ring->flags & PF_RING_METAWATCH_TIMESTAMP)
           pfring_handle_metawatch_hw_timestamp(buffer, &hdr);
         else if(ring->flags & PF_RING_ARISTA_TIMESTAMP) {
@@ -585,13 +581,10 @@ int pfring_recv(pfring *ring, u_char** buffer, u_int buffer_len,
 
     if (unlikely(rc > 0 && ring->flags & (
           PF_RING_IXIA_TIMESTAMP | 
-          PF_RING_VSS_APCON_TIMESTAMP |
           PF_RING_METAWATCH_TIMESTAMP |
           PF_RING_ARISTA_TIMESTAMP))) {
       if(ring->ixia_timestamp_enabled)
         pfring_handle_ixia_hw_timestamp(*buffer, hdr);
-      else if(ring->vss_apcon_timestamp_enabled)
-        pfring_handle_vss_apcon_hw_timestamp(*buffer, hdr);
       else if(ring->flags & PF_RING_METAWATCH_TIMESTAMP)
         pfring_handle_metawatch_hw_timestamp(*buffer, hdr);
       else if(ring->flags & PF_RING_ARISTA_TIMESTAMP) {

userland/lib/pfring.h

@@ -202,7 +202,7 @@ struct __pfring {
   u_int8_t disable_timestamp;
   u_int8_t ixia_timestamp_enabled;
 
-  u_int8_t vss_apcon_timestamp_enabled;
+  u_int8_t __padding_0;
   u_int8_t chunk_mode_enabled;
   u_int8_t userspace_bpf;
   u_int8_t force_userspace_bpf;
@@ -351,7 +351,7 @@ struct __pfring {
 
   u_int8_t reentrant;
   u_int8_t break_recv_loop;
-  u_int16_t __padding;
+  u_int16_t __padding_1;
   u_int32_t num_poll_calls;
 
   pfring_rwlock_t rx_lock;
@@ -387,7 +387,7 @@ struct __pfring {
 #define PF_RING_IXIA_TIMESTAMP	       (1 << 12) /**< pfring_open() flag: Enable ixiacom.com hardware timestamp support+stripping. */
 #define PF_RING_USERSPACE_BPF	       (1 << 13) /**< pfring_open() flag: Force userspace bpf even with standard drivers (not only with ZC). */
 #define PF_RING_ZC_NOT_REPROGRAM_RSS   (1 << 14) /**< pfring_open() flag: Do not touch/reprogram hw RSS */ 
-#define PF_RING_VSS_APCON_TIMESTAMP    (1 << 15) /**< pfring_open() flag: Enable apcon.com/vssmonitoring.com hardware timestamp support+stripping. */
+#define PF_RING_VSS_APCON_TIMESTAMP    (1 << 15) /**< pfring_open() flag: Deprecated */
 #define PF_RING_ZC_IPONLY_RSS	       (1 << 16) /**< pfring_open() flag: Compute RSS on src/dst IP only (not 4-tuple) */ 
 #define PF_RING_FLOW_OFFLOAD	       (1 << 17) /**< pfring_open() flag: Enable Flow offload (Flow Manager on Napatech) */ 
 #define PF_RING_FLOW_OFFLOAD_NOUPDATES (1 << 18) /**< pfring_open() flag: Disable periodic updates when PF_RING_FLOW_OFFLOAD is used */
@@ -1343,24 +1343,6 @@ int pfring_read_arista_7150_hw_timestamp(u_char *buffer, u_int32_t buffer_len, u
  */
 int pfring_handle_arista_hw_timestamp(u_char* buffer, struct pfring_pkthdr *hdr);
 
-/**
- * Reads a VSS/APCON-formatted timestamp from an incoming packet and puts it into the timestamp variable.
- * @param buffer            Incoming packet buffer.
- * @param buffer_len        Incoming packet buffer length.
- * @param ts                If found the hardware timestamp will be placed here
- * @return The length of the VSS/APCON timestamp
- */
-int pfring_read_vss_apcon_hw_timestamp(u_char *buffer, u_int32_t buffer_len, struct timespec *ts);
-
-/**
- * Strip an VSS/APCON-formatted timestamp from an incoming packet. If the timestamp is found, the
- * hdr parameter (caplen and len fields) are decreased by the size of the timestamp.
- * @param buffer            Incoming packet buffer.
- * @param hdr               This is an in/out parameter: it is used to read the original packet len, and it is updated (size decreased) if the hw timestamp is found
- * @return 0 on success, a negative value otherwise.
- */
-void pfring_handle_vss_apcon_hw_timestamp(u_char* buffer, struct pfring_pkthdr *hdr);
-
 /**
  * Get interface speed.
  * @param ring

userland/lib/pfring_hw_timestamp.c

@@ -281,32 +281,3 @@ int pfring_handle_arista_hw_timestamp(u_char* buffer, struct pfring_pkthdr *hdr)
 
 /* ********************************* */
 
-int pfring_read_vss_apcon_hw_timestamp(u_char *buffer, u_int32_t buffer_len, struct timespec *ts) {
-  struct vss_apcon_hw_ts* vss_apcon = (struct vss_apcon_hw_ts *)&buffer[buffer_len - VSS_APCON_TS_LEN];
-
-  if(unlikely(thiszone == 0)) thiszone = gmt_to_local(0);    
-  ts->tv_sec = ntohl(vss_apcon->sec) - thiszone;
-  ts->tv_nsec = ntohl(vss_apcon->nsec);
-  return VSS_APCON_TS_LEN;
-}
-
-/* ********************************* */
-
-void pfring_handle_vss_apcon_hw_timestamp(u_char* buffer, struct pfring_pkthdr *hdr) {
-  struct timespec ts;
-  int ts_size;
-
-  if(unlikely(hdr->caplen != hdr->len)) 
-    return; /* full packet only */
-
-  ts_size = pfring_read_vss_apcon_hw_timestamp(buffer, hdr->len, &ts);
-
-  if(likely(ts_size > 0)) {
-    hdr->caplen = hdr->len = hdr->len - ts_size;
-    hdr->ts.tv_sec = ts.tv_sec, hdr->ts.tv_usec = ts.tv_nsec/1000;
-    hdr->extended_hdr.timestamp_ns = (((u_int64_t) ts.tv_sec) * 1000000000) + ts.tv_nsec;
-  }
-}
-
-/* ********************************* */
-

userland/lib/pfring_hw_timestamp.h

@@ -77,12 +77,3 @@ struct arista_7280_pkt_hw_ts {
 
 /* *********************************************** */
 
-#define VSS_APCON_TS_LEN       sizeof(struct vss_apcon_hw_ts)
-
-struct vss_apcon_hw_ts {
-  u_int32_t sec;
-  u_int32_t nsec;
-  u_int32_t crc;
-} __attribute__((__packed__));
-
-/* *********************************************** */