diff options
| author | Tom Herbert <tom@herbertland.com> | 2015-09-01 18:24:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-02 00:06:23 +0200 |
| commit | 823b96939578eae67b9d6c0e33a39d6a7b6401e7 (patch) | |
| tree | f0e2c41a24615366c953416d27762658d7a68c30 /net/core | |
| parent | flow_dissector: Add flag to stop parsing when an IPv6 flow label is seen (diff) | |
| download | linux-823b96939578eae67b9d6c0e33a39d6a7b6401e7.tar.xz linux-823b96939578eae67b9d6c0e33a39d6a7b6401e7.zip | |
flow_dissector: Add control/reporting of encapsulation
Add an input flag to flow dissector on rather dissection should stop
when encapsulation is detected (IP/IP or GRE). Also, add a key_control
flag that indicates encapsulation was encountered during the
dissection.
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/flow_dissector.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 094e34354627..8d890132e2d7 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -397,6 +397,11 @@ ip_proto_again: proto = eth->h_proto; nhoff += sizeof(*eth); } + + key_control->encapsulation = 1; + if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP) + goto out_good; + goto again; } case NEXTHDR_HOP: @@ -444,9 +449,19 @@ ip_proto_again: } case IPPROTO_IPIP: proto = htons(ETH_P_IP); + + key_control->encapsulation = 1; + if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP) + goto out_good; + goto ip; case IPPROTO_IPV6: proto = htons(ETH_P_IPV6); + + key_control->encapsulation = 1; + if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP) + goto out_good; + goto ipv6; case IPPROTO_MPLS: proto = htons(ETH_P_MPLS_UC); |