Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 22:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

flow_dissector: Add control/reporting of fragmentation

Browse Source 
Add an input flag to flow dissector on rather dissection should be
attempted on a first fragment. Also add key_control flags to indicate
that a packet is a fragment or first fragment.

Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tom Herbert 2015-09-01 09:24:28 -07:00 committed by David S. Miller
parent cd79a2382a
commit 807e165dc4
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/flow_dissector.h
View File

@ -12,6 +12,8 @@
struct flow_dissector_key_control { struct flow_dissector_key_control {
u16 thoff; u16 thoff;
u16 addr_type; u16 addr_type;
u32 is_fragment:1;
u32 first_frag:1;
}; };
/** /**
@ -122,6 +124,8 @@ enum flow_dissector_key_id {
FLOW_DISSECTOR_KEY_MAX, FLOW_DISSECTOR_KEY_MAX,
}; };
#define FLOW_DISSECTOR_F_PARSE_1ST_FRAG BIT(0)
struct flow_dissector_key { struct flow_dissector_key {
enum flow_dissector_key_id key_id; enum flow_dissector_key_id key_id;
size_t offset; /* offset of struct flow_dissector_key_* size_t offset; /* offset of struct flow_dissector_key_*

15
net/core/flow_dissector.c
View File

@ -177,8 +177,6 @@ ip:
nhoff += iph->ihl * 4; nhoff += iph->ihl * 4;
ip_proto = iph->protocol; ip_proto = iph->protocol;
if (ip_is_fragment(iph))
ip_proto = 0;
if (!skb_flow_dissector_uses_key(flow_dissector, if (!skb_flow_dissector_uses_key(flow_dissector,
FLOW_DISSECTOR_KEY_IPV4_ADDRS)) FLOW_DISSECTOR_KEY_IPV4_ADDRS))
@ -189,6 +187,19 @@ ip:
memcpy(&key_addrs->v4addrs, &iph->saddr, memcpy(&key_addrs->v4addrs, &iph->saddr,
sizeof(key_addrs->v4addrs)); sizeof(key_addrs->v4addrs));
key_control->addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS; key_control->addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;
if (ip_is_fragment(iph)) {
key_control->is_fragment = 1;
if (iph->frag_off & htons(IP_OFFSET)) {
goto out_good;
} else {
key_control->first_frag = 1;
if (!(flags & FLOW_DISSECTOR_F_PARSE_1ST_FRAG))
goto out_good;
}
}
break; break;
} }
case htons(ETH_P_IPV6): { case htons(ETH_P_IPV6): {