Fix rebase issues

netobserv · Dec 20, 2024 · 7c34d61 · 7c34d61
1 parent 43ab1bd
commit 7c34d61
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 19 deletions.
diff --git a/bpf/types.h b/bpf/types.h
@@ -127,7 +127,6 @@ typedef struct additional_metrics_t {
     } pkt_drops;
     u64 flow_rtt;
     u8 network_events[MAX_NETWORK_EVENTS][MAX_EVENT_MD];
-    u16 eth_protocol;
     struct translated_flow_t {
         u8 saddr[IP_MAX_LEN];
         u8 daddr[IP_MAX_LEN];
@@ -140,6 +139,7 @@ typedef struct additional_metrics_t {
         u8 direction;
         u32 if_index;
     } observed_intf[MAX_OBSERVED_INTERFACES];
+    u16 eth_protocol;
     u8 network_events_idx;
     u8 nb_observed_intf;
 } additional_metrics;

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/flow_content_test.go b/pkg/model/flow_content_test.go
@@ -194,7 +194,7 @@ func TestAccumulate(t *testing.T) {
 			{FlowRtt: 500},
 			{PktDrops: ebpf.BpfPktDropsT{Packets: 5, Bytes: 1000, LatestFlags: 1}},
 		},
-		expected: model.BpfFlowContent{
+		expected: BpfFlowContent{
 			BpfFlowMetrics: &ebpf.BpfFlowMetrics{StartMonoTimeTs: 15, EndMonoTimeTs: 25, Flags: 1},
 			AdditionalMetrics: &ebpf.BpfAdditionalMetrics{
 				StartMonoTimeTs: 15,

diff --git a/pkg/model/record_test.go b/pkg/model/record_test.go
@@ -99,8 +99,6 @@ func TestAdditionalMetricsBinaryEncoding(t *testing.T) {
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00,       // 1 byte padding
-		0x03, 0x00, // u16 eth_protocol
 		// translated flow
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -114,9 +112,10 @@ func TestAdditionalMetricsBinaryEncoding(t *testing.T) {
 		0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, // [1]: u8 direction + 3 bytes padding + u32 if_index
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // [2]: u8 direction + 3 bytes padding + u32 if_index
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // [3]: u8 direction + 3 bytes padding + u32 if_index
-		0x01,                               // u8 network_events_idx
-		0x02,                               // u8 nb_observed_intf
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 6 bytes padding
+		0x03, 0x00, // u16 eth_protocol
+		0x01,                   // u8 network_events_idx
+		0x02,                   // u8 nb_observed_intf
+		0x00, 0x00, 0x00, 0x00, // 4 bytes padding
 	}
 	var addmet ebpf.BpfAdditionalMetrics
 	err := binary.Read(bytes.NewReader(b), binary.LittleEndian, &addmet)