Skip to content

Commit 39d467c

Browse files
authored
Merge pull request #1098 from LibreQoE/revert-1096-codex/netflow-v9-ipv4-byte-order
Revert "Fix NetFlow v9 IPv4 byte order"
2 parents e6adbbe + 30985a0 commit 39d467c

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

  • src/rust/lqosd/src/throughput_tracker/flow_data/netflow9/protocol

src/rust/lqosd/src/throughput_tracker/flow_data/netflow9/protocol/field_encoder.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,12 @@ fn encode_ipv4(direction: usize, key: &FlowbeeKey, target: &mut Vec<u8>) -> anyh
5252
let local = key.local_ip.as_ip();
5353
let remote = key.remote_ip.as_ip();
5454
if let (IpAddr::V4(local), IpAddr::V4(remote)) = (local, remote) {
55+
let src_ip = u32::from_ne_bytes(local.octets());
56+
let dst_ip = u32::from_ne_bytes(remote.octets());
5557
if direction == 0 {
56-
target.extend_from_slice(&local.octets());
58+
target.extend_from_slice(&src_ip.to_be_bytes());
5759
} else {
58-
target.extend_from_slice(&remote.octets());
60+
target.extend_from_slice(&dst_ip.to_be_bytes());
5961
}
6062
} else {
6163
anyhow::bail!("Expected IPv4 addresses, got {:?}", (local, remote));

0 commit comments

Comments
 (0)