mod_sonic remap ifIndex namespace

sflow · Jul 3, 2020 · 5bbd86d · 5bbd86d
1 parent ad31104
commit 5bbd86d
Show file tree

Hide file tree

Showing 7 changed files with 319 additions and 40 deletions.
diff --git a/hsflowd.spec b/hsflowd.spec
@@ -1,6 +1,6 @@
 Summary: host sFlow daemon
 Name: hsflowd
-Version: 2.0.27
+Version: 2.0.28
 Release: 1
 License: http://sflow.net/license.html
 Group: Applications/Internet

diff --git a/src/Linux/hsflowd.h b/src/Linux/hsflowd.h
@@ -358,6 +358,7 @@ extern "C" {
 
 // The generic start,tick,tock,final,end events are defined in evbus.h
 #define HSPEVENT_HOST_COUNTER_SAMPLE "csample"   // (csample *) building counter-sample
+#define HSPEVENT_INTF_COUNTER_SAMPLE "icsample"  // (csample *) building intf counter-sample
 #define HSPEVENT_FLOW_SAMPLE "flow_sample"       // (HSPPendingSample *) building flow-sample
 #define HSPEVENT_CONFIG_START "config_start"     // begin config lines
 #define HSPEVENT_CONFIG_LINE "config_line"       // (line)...next config line
@@ -389,15 +390,24 @@ extern "C" {
     bool localTest:1;
     bool localSrc:1;
     bool localDst:1;
+    bool suppress:1;
   } HSPPendingSample;
 
+  typedef struct _HSPPendingCSample {
+    SFL_COUNTERS_SAMPLE_TYPE *cs;
+    SFLPoller *poller;
+    bool suppress:1;
+  } HSPPendingCSample;
+
   typedef enum {
     HSP_TELEMETRY_FLOW_SAMPLES=0,
     HSP_TELEMETRY_COUNTER_SAMPLES,
     HSP_TELEMETRY_RTMETRIC_SAMPLES,
     HSP_TELEMETRY_RTFLOW_SAMPLES,
     HSP_TELEMETRY_DATAGRAMS,
     HSP_TELEMETRY_DROPPED_SAMPLES,
+    HSP_TELEMETRY_FLOW_SAMPLES_SUPPRESSED,
+    HSP_TELEMETRY_COUNTER_SAMPLES_SUPPRESSED,
     HSP_TELEMETRY_NUM_COUNTERS
   } EnumHSPTelemetry;
 
@@ -408,7 +418,9 @@ extern "C" {
     "rtmetric_samples",
     "rtflow_samples",
     "datagrams",
-    "dropped_samples"
+    "dropped_samples",
+    "flow_samples_suppressed",
+    "counter_samples_suppressed"
   };
 #endif