util-ebpf: create flow from bypassed flows

diff --git a/src/util-ebpf.c b/src/util-ebpf.c
index 6485ad73aade894db48a9f6dc879699abfcae5e4..8bc5e8fa43aa6091ab1ad088b2db74c29ce0525b 100644 (file)
--- a/src/util-ebpf.c
+++ b/src/util-ebpf.c
@@ -456,13 +456,32 @@ int EBPFSetupXDP(const char *iface, int fd, uint8_t flags)
 }
 
 static int EBPFCreateFlowForKey(struct flows_stats *flowstats, FlowKey *flow_key,
-                               uint32_t hash, uint64_t pkts_cnt, uint64_t bytes_cnt)
+                                uint32_t hash, struct timespec *ctime,
+                                uint64_t pkts_cnt, uint64_t bytes_cnt)
 {
+    Flow *f = FlowGetFromFlowKey(flow_key, ctime, hash);
+    if (f == NULL)
+        return 0;
+
+    FlowUpdateState(f, FLOW_STATE_CAPTURE_BYPASSED);
+    /* set accounting, we can't know the direction, so let's just start to
+     * server then if we already have something in to server to client. We need
+     * these numbers as we will use it to see if we have new traffic coming
+     * on the flow */
+    if (f->todstbytecnt == 0) {
+        f->todstpktcnt = pkts_cnt;
+        f->todstbytecnt = bytes_cnt;
+    } else {
+        f->tosrcpktcnt = pkts_cnt;
+        f->tosrcbytecnt = bytes_cnt;
+    }
+    FLOWLOCK_UNLOCK(f);
     return 0;
 }
 
 static int EBPFUpdateFlowForKey(struct flows_stats *flowstats, FlowKey *flow_key,
-                               uint32_t hash, uint64_t pkts_cnt, uint64_t bytes_cnt)
+                                uint32_t hash, struct timespec *ctime,
+                                uint64_t pkts_cnt, uint64_t bytes_cnt)
 {
     Flow *f = FlowGetExistingFlowFromHash(flow_key, hash);
     if (f != NULL) {
@@ -507,7 +526,7 @@ static int EBPFForEachFlowV4Table(LiveDevice *dev, const char *name,
                                   struct flows_stats *flowstats,
                                   struct timespec *ctime,
                                   struct ebpf_timeout_config *tcfg,
-                                  int (*EBPFOpFlowForKey)(struct flows_stats *flowstats, FlowKey *flow_key, uint32_t hash, uint64_t pkts_cnt, uint64_t bytes_cnt)
+                                  int (*EBPFOpFlowForKey)(struct flows_stats *flowstats, FlowKey *flow_key, uint32_t hash, struct timespec *ctime, uint64_t pkts_cnt, uint64_t bytes_cnt)
                                   )
 {
     int mapfd = EBPFGetMapFDByName(dev->dev, name);
@@ -568,7 +587,7 @@ static int EBPFForEachFlowV4Table(LiveDevice *dev, const char *name,
         flow_key.proto = next_key.ip_proto;
         flow_key.recursion_level = 0;
         pkts_cnt = EBPFOpFlowForKey(flowstats, &flow_key, values_array[0].hash,
-                                        pkts_cnt, bytes_cnt);
+                                    ctime, pkts_cnt, bytes_cnt);
         if (pkts_cnt > 0) {
             SC_ATOMIC_ADD(dev->bypassed, pkts_cnt);
             EBPFDeleteKey(mapfd, &next_key);
@@ -595,7 +614,7 @@ static int EBPFForEachFlowV6Table(LiveDevice *dev, const char *name,
                                   struct flows_stats *flowstats,
                                   struct timespec *ctime,
                                   struct ebpf_timeout_config *tcfg,
-                                  int (*EBPFOpFlowForKey)(struct flows_stats *flowstats, FlowKey *flow_key, uint32_t hash, uint64_t pkts_cnt, uint64_t bytes_cnt)
+                                  int (*EBPFOpFlowForKey)(struct flows_stats *flowstats, FlowKey *flow_key, uint32_t hash, struct timespec *ctime, uint64_t pkts_cnt, uint64_t bytes_cnt)
                                   )
 {
     int mapfd = EBPFGetMapFDByName(dev->dev, name);
@@ -655,7 +674,7 @@ static int EBPFForEachFlowV6Table(LiveDevice *dev, const char *name,
         flow_key.proto = next_key.ip_proto;
         flow_key.recursion_level = 0;
         pkts_cnt = EBPFOpFlowForKey(flowstats, &flow_key, values_array[0].hash,
-                                        pkts_cnt, bytes_cnt);
+                                    ctime, pkts_cnt, bytes_cnt);
         if (pkts_cnt > 0) {
             SC_ATOMIC_ADD(dev->bypassed, pkts_cnt);
             EBPFDeleteKey(mapfd, &next_key);