fix(bpf): correct order of element assignments in trace_tcp and trace…

…_udp
nullswan · Sep 22, 2024 · 827eb35 · 827eb35
1 parent 28b097a
commit 827eb35
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/bpf/kprobe/trace_tcp.c b/bpf/kprobe/trace_tcp.c
@@ -43,11 +43,11 @@ int trace_tcp_recvmsg(struct tcp_recvmsg_args *ctx) {
   struct network_event e = {};
   e.pid = pid;
   e.cgroup_id = cgroup_id;
+  e.size = size;
   e.saddr = saddr;
   e.daddr = daddr;
   e.sport = sport;
   e.dport = dport;
-  e.size = size;
   e.direction = DIRECTION_INBOUND;
   e.protocol = PROTOCOL_TCP;
 
@@ -94,11 +94,11 @@ int trace_tcp_sendmsg(struct tcp_sendmsg_args *ctx) {
   struct network_event e = {};
   e.pid = pid;
   e.cgroup_id = cgroup_id;
+  e.size = size;
   e.saddr = saddr;
   e.daddr = daddr;
   e.sport = sport;
   e.dport = dport;
-  e.size = size;
   e.direction = DIRECTION_OUTBOUND;
   e.protocol = PROTOCOL_TCP;
 

diff --git a/bpf/kprobe/trace_udp.c b/bpf/kprobe/trace_udp.c
@@ -42,11 +42,11 @@ int trace_udp_recvmsg(struct udp_recvmsg_args *ctx) {
   struct network_event e = {};
   e.pid = pid;
   e.cgroup_id = cgroup_id;
+  e.size = size;
   e.saddr = saddr;
   e.daddr = daddr;
   e.sport = sport;
   e.dport = dport;
-  e.size = size;
   e.direction = DIRECTION_INBOUND;
   e.protocol = PROTOCOL_UDP;
 
@@ -92,14 +92,15 @@ int trace_udp_sendmsg(struct udp_sendmsg_args *ctx) {
   }
 
   struct network_event e = {};
-  e.direction = DIRECTION_OUTBOUND;
-  e.protocol = PROTOCOL_UDP;
   e.pid = pid;
   e.cgroup_id = cgroup_id;
+  e.size = size;
   e.saddr = saddr;
   e.daddr = daddr;
   e.sport = sport;
   e.dport = dport;
+  e.direction = DIRECTION_OUTBOUND;
+  e.protocol = PROTOCOL_UDP;
 
   bpf_ringbuf_output(&network_events_rb, &e, sizeof(e), BPF_RB_FORCE_WAKEUP);
   return 0;