moving structs to common file

Signed-off-by: Atul-source <atulprajapati6031@gmail.com>
l3af-project · Sep 10, 2024 · 968cc81 · 968cc81
1 parent 1ee2342
commit 968cc81
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 60 deletions.
diff --git a/ipfix-flow-exporter/bpf_ipfix_egress.bpf.c b/ipfix-flow-exporter/bpf_ipfix_egress.bpf.c
@@ -71,17 +71,6 @@ static u32 flow_key_hash (const flow_key_t f) {
     return hash_val;
 }
 
-struct update_flow_record_args {
-    flow_record_t *flow_rec_from_map;
-    flow_key_t flow_key;
-    u16 pckt_size;
-    u16 control_bit;
-    u8 tos;
-    u16 icmp_type;
-    u8 ttl;
-    u32 hash_key;
-};
-
 static void update_flow_record(struct update_flow_record_args *args)
 {
     flow_record_t flow_rec ;
@@ -110,16 +99,6 @@ static void update_flow_record(struct update_flow_record_args *args)
     return;
 }
 
-struct create_flow_record_args {
-    flow_key_t flow_key;
-    u16 pckt_size;
-    u16 control_bit;
-    u8 tos;
-    u16 icmp_type;
-    u8 ttl;
-    u32 hash_key;
-};
-
 static void create_flow_record(struct create_flow_record_args *args)
 {
     flow_record_t flow_rec ;
@@ -196,15 +175,6 @@ static void parse_icmp_type(void *icmp_data,void *data_end, u16 *icmp_type){
     return;
 }
 
-struct parse_port_args {
-    void *trans_data;
-    void *data_end;
-    u8 proto;
-    u32 *dport;
-    u32 *sport;
-    u16 *control_bit;
-};
-
 static void parse_port(struct parse_port_args *args)
 {
     struct udphdr *udph;

diff --git a/ipfix-flow-exporter/bpf_ipfix_ingress.bpf.c b/ipfix-flow-exporter/bpf_ipfix_ingress.bpf.c
@@ -72,17 +72,6 @@ static u32 flow_key_hash (const flow_key_t f) {
     return hash_val;
 }
 
-struct update_flow_record_args {
-    flow_record_t *flow_rec_from_map;
-    flow_key_t flow_key;
-    u16 pckt_size;
-    u16 control_bit;
-    u8 tos;
-    u16 icmp_type;
-    u8 ttl;
-    u32 hash_key;
-};
-
 static void update_flow_record(struct update_flow_record_args *args)
 {
     flow_record_t flow_rec ;
@@ -111,16 +100,6 @@ static void update_flow_record(struct update_flow_record_args *args)
     return;
 }
 
-struct create_flow_record_args {
-    flow_key_t flow_key;
-    u16 pckt_size;
-    u16 control_bit;
-    u8 tos;
-    u16 icmp_type;
-    u8 ttl;
-    u32 hash_key;
-};
-
 static void create_flow_record(struct create_flow_record_args *args)
 {
     flow_record_t flow_rec ;
@@ -196,15 +175,6 @@ static void parse_icmp_type(void *icmp_data,void *data_end, u16 *icmp_type){
     return;
 }
 
-struct parse_port_args {
-    void *trans_data;
-    void *data_end;
-    u8 proto;
-    u32 *dport;
-    u32 *sport;
-    u16 *control_bit;
-};
-
 static void parse_port(struct parse_port_args *args)
 {
     struct udphdr *udph;

diff --git a/ipfix-flow-exporter/bpf_ipfix_kern_common.h b/ipfix-flow-exporter/bpf_ipfix_kern_common.h
@@ -46,3 +46,33 @@ void *memset(void *b, int c, unsigned long len)
 #define flow_key_hash_mask 0x000fffff
 
 #endif
+
+struct update_flow_record_args {
+    flow_record_t *flow_rec_from_map;
+    flow_key_t flow_key;
+    u16 pckt_size;
+    u16 control_bit;
+    u8 tos;
+    u16 icmp_type;
+    u8 ttl;
+    u32 hash_key;
+};
+
+struct create_flow_record_args {
+    flow_key_t flow_key;
+    u16 pckt_size;
+    u16 control_bit;
+    u8 tos;
+    u16 icmp_type;
+    u8 ttl;
+    u32 hash_key;
+};
+
+struct parse_port_args {
+    void *trans_data;
+    void *data_end;
+    u8 proto;
+    u32 *dport;
+    u32 *sport;
+    u16 *control_bit;
+};