aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util-ebpf: fix ebpf bypass

Browse Source 
Fix endian order in eBPF bypass. It has to be updated after the
bypassed flows handling change.
pull/3952/head
Eric Leblond 6 years ago committed by Victor Julien
parent f8aa9ee986
commit efb648aa24
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File

24
src/util-ebpf.c
Unescape Escape View File

@ -635,17 +635,19 @@ static int EBPFForEachFlowV4Table(ThreadVars *th_v, LiveDevice *dev, const char
if (tcfg->mode == AFP_MODE_XDP_BYPASS) { if (tcfg->mode == AFP_MODE_XDP_BYPASS) {
flow_key.sp = ntohs(next_key.port16[0]); flow_key.sp = ntohs(next_key.port16[0]);
flow_key.dp = ntohs(next_key.port16[1]); flow_key.dp = ntohs(next_key.port16[1]);
flow_key.src.addr_data32[0] = next_key.src;
flow_key.dst.addr_data32[0] = next_key.dst;
} else { } else {
flow_key.sp = next_key.port16[0]; flow_key.sp = next_key.port16[0];
flow_key.dp = next_key.port16[1]; flow_key.dp = next_key.port16[1];
flow_key.src.addr_data32[0] = ntohl(next_key.src);
flow_key.dst.addr_data32[0] = ntohl(next_key.dst);
} }
flow_key.src.family = AF_INET; flow_key.src.family = AF_INET;
flow_key.src.addr_data32[0] = next_key.src;
flow_key.src.addr_data32[1] = 0; flow_key.src.addr_data32[1] = 0;
flow_key.src.addr_data32[2] = 0; flow_key.src.addr_data32[2] = 0;
flow_key.src.addr_data32[3] = 0; flow_key.src.addr_data32[3] = 0;
flow_key.dst.family = AF_INET; flow_key.dst.family = AF_INET;
flow_key.dst.addr_data32[0] = next_key.dst;
flow_key.dst.addr_data32[1] = 0; flow_key.dst.addr_data32[1] = 0;
flow_key.dst.addr_data32[2] = 0; flow_key.dst.addr_data32[2] = 0;
flow_key.dst.addr_data32[3] = 0; flow_key.dst.addr_data32[3] = 0;
@ -734,10 +736,6 @@ static int EBPFForEachFlowV6Table(ThreadVars *th_v,
if (tcfg->mode == AFP_MODE_XDP_BYPASS) { if (tcfg->mode == AFP_MODE_XDP_BYPASS) {
flow_key.sp = ntohs(next_key.port16[0]); flow_key.sp = ntohs(next_key.port16[0]);
flow_key.dp = ntohs(next_key.port16[1]); flow_key.dp = ntohs(next_key.port16[1]);
} else {
flow_key.sp = next_key.port16[0];
flow_key.dp = next_key.port16[1];
}
flow_key.src.family = AF_INET6; flow_key.src.family = AF_INET6;
flow_key.src.addr_data32[0] = next_key.src[0]; flow_key.src.addr_data32[0] = next_key.src[0];
flow_key.src.addr_data32[1] = next_key.src[1]; flow_key.src.addr_data32[1] = next_key.src[1];
@ -748,6 +746,20 @@ static int EBPFForEachFlowV6Table(ThreadVars *th_v,
flow_key.dst.addr_data32[1] = next_key.dst[1]; flow_key.dst.addr_data32[1] = next_key.dst[1];
flow_key.dst.addr_data32[2] = next_key.dst[2]; flow_key.dst.addr_data32[2] = next_key.dst[2];
flow_key.dst.addr_data32[3] = next_key.dst[3]; flow_key.dst.addr_data32[3] = next_key.dst[3];
} else {
flow_key.sp = next_key.port16[0];
flow_key.dp = next_key.port16[1];
flow_key.src.family = AF_INET6;
flow_key.src.addr_data32[0] = ntohl(next_key.src[0]);
flow_key.src.addr_data32[1] = ntohl(next_key.src[1]);
flow_key.src.addr_data32[2] = ntohl(next_key.src[2]);
flow_key.src.addr_data32[3] = ntohl(next_key.src[3]);
flow_key.dst.family = AF_INET6;
flow_key.dst.addr_data32[0] = ntohl(next_key.dst[0]);
flow_key.dst.addr_data32[1] = ntohl(next_key.dst[1]);
flow_key.dst.addr_data32[2] = ntohl(next_key.dst[2]);
flow_key.dst.addr_data32[3] = ntohl(next_key.dst[3]);
}
flow_key.vlan_id[0] = next_key.vlan_id[0]; flow_key.vlan_id[0] = next_key.vlan_id[0];
flow_key.vlan_id[1] = next_key.vlan_id[1]; flow_key.vlan_id[1] = next_key.vlan_id[1];
flow_key.proto = next_key.ip_proto; flow_key.proto = next_key.ip_proto;

Write Preview
Loading…
Cancel
Save