Compilation fix

ntop · Nov 14, 2024 · 64469a4 · 64469a4
1 parent 6ee1000
commit 64469a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/sFlowPktInterface.cpp b/src/sFlowPktInterface.cpp
@@ -21,6 +21,7 @@
 
 #include "ntop_includes.h"
 
+#ifndef HAVE_NEDGE
 #include "../third-party/sflow_collect.c"
 
 /* **************************************************** */
@@ -128,3 +129,5 @@ void sFlowPktInterface::shutdown() {
 }
 
 /* **************************************************** */
+
+#endif
diff --git a/third-party/sflow_collect.c b/third-party/sflow_collect.c
@@ -3034,7 +3034,7 @@ static int readFlowSample_v2v4(SFSample *sample)
   -----------------___________________________------------------
 */
 
-static int lengthCheck(SFSample *sample, const char *description, u_char *start, int len) {
+static int lengthCheck(SFSample *sample, const char *description, u_char *start, u_int32_t len) {
   u_int32_t actualLen = (u_char *)sample->datap - start;
 
   if(actualLen != len)
@@ -3773,13 +3773,8 @@ static void handleSflowCountersSample(SFSample *sample) {
 
 /* =============================================================== */
 
-static void update_flow_stats(u_int32_t probe_ipv4_address, u_int32_t source_id, u_int32_t num_flows) {
-
-}
-
-/* =============================================================== */
-
-static void handleSflowSample(sFlowPktInterface *iface, SFSample *sample, int deviceId) {
+static void handleSflowSample(sFlowPktInterface *iface,
+			      SFSample *sample, int deviceId) {
   struct pcap_pkthdr pkthdr;
   u_int32_t msk = 0;