Pack flow id

netobserv · Dec 18, 2024 · 65886f7 · 65886f7
1 parent 0cc19d8
commit 65886f7
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 14 deletions.
diff --git a/bpf/types.h b/bpf/types.h
@@ -161,7 +161,7 @@ typedef struct flow_id_t {
     u8 icmp_code;
     // OS interface index
     u32 if_index;
-} flow_id;
+} __attribute__((packed)) flow_id;
 
 // Force emitting enums/structs into the ELF
 const struct flow_id_t *unused7 __attribute__((unused));

diff --git a/pkg/ebpf/bpf_arm64_bpfel.go b/pkg/ebpf/bpf_arm64_bpfel.go
diff --git a/pkg/ebpf/bpf_arm64_bpfel.o b/pkg/ebpf/bpf_arm64_bpfel.o
diff --git a/pkg/ebpf/bpf_powerpc_bpfel.go b/pkg/ebpf/bpf_powerpc_bpfel.go
diff --git a/pkg/ebpf/bpf_powerpc_bpfel.o b/pkg/ebpf/bpf_powerpc_bpfel.o
diff --git a/pkg/ebpf/bpf_s390_bpfeb.go b/pkg/ebpf/bpf_s390_bpfeb.go
diff --git a/pkg/ebpf/bpf_s390_bpfeb.o b/pkg/ebpf/bpf_s390_bpfeb.o
diff --git a/pkg/ebpf/bpf_x86_bpfel.go b/pkg/ebpf/bpf_x86_bpfel.go
diff --git a/pkg/ebpf/bpf_x86_bpfel.o b/pkg/ebpf/bpf_x86_bpfel.o
diff --git a/pkg/model/record_test.go b/pkg/model/record_test.go
@@ -19,14 +19,13 @@ func TestRecordBinaryEncoding(t *testing.T) {
 		0x03,                                                                                           // u8 direction
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x06, 0x07, 0x08, 0x09, // network: u8[16] src_ip
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x0b, 0x0c, 0x0d, // network: u8[16] dst_ip
-		0x00,       // 1 byte padding
 		0x0e, 0x0f, // transport: u16 src_port
 		0x10, 0x11, // transport: u16 dst_port
-		0x12,             // transport: u8 transport_protocol
-		0x00,             // icmp: u8 icmp_type
-		0x00,             // icmp: u8 icmp_code
-		0x00, 0x00, 0x00, // 3 bytes padding
+		0x12,                   // transport: u8 transport_protocol
+		0x00,                   // icmp: u8 icmp_type
+		0x00,                   // icmp: u8 icmp_code
 		0x13, 0x14, 0x15, 0x16, // interface index
+		0x00, 0x00, 0x00, 0x00, // 4 bytes padding
 		// Metrics
 		0x00, 0x00, 0x00, 0x00, // u32 lock
 		0x01, 0x02, // u16 eth_protocol