From f13830ce76873390e7d3080e66d5ddb5234754f0 Mon Sep 17 00:00:00 2001 From: Chenmin Sun Date: Wed, 26 Feb 2020 19:22:35 +0800 Subject: flow: add vlan tagged types for IPv4/IPv6 5-tuple flows Add new flow type IP4_N_TUPLE_TAGGED and IP6_N_TUPLE_TAGGED for vlan tag sensitive flows The original IP4_N_TUPLE and IP6_N_TUPLE will not match VLAN anymore Type: feature Signed-off-by: Chenmin Sun Change-Id: Ie511e9a64126440fe81f29665a56ca060061662d --- src/vnet/flow/flow.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/vnet/flow/flow.h') diff --git a/src/vnet/flow/flow.h b/src/vnet/flow/flow.h index 5def01a08ef..bd62135649b 100644 --- a/src/vnet/flow/flow.h +++ b/src/vnet/flow/flow.h @@ -29,6 +29,8 @@ /* l4 flow*/ \ _(IP4_N_TUPLE, ip4_n_tuple, "ipv4-n-tuple") \ _(IP6_N_TUPLE, ip6_n_tuple, "ipv6-n-tuple") \ + _(IP4_N_TUPLE_TAGGED, ip4_n_tuple_tagged, "ipv4-n-tuple-tagged") \ + _(IP6_N_TUPLE_TAGGED, ip6_n_tuple_tagged, "ipv6-n-tuple-tagged") \ /* L4 tunnel flow*/ \ _(IP4_VXLAN, ip4_vxlan, "ipv4-vxlan") \ _(IP6_VXLAN, ip6_vxlan, "ipv6-vxlan") \ @@ -58,6 +60,21 @@ _fe(ip_port_and_mask_t, dst_port) \ _fe(ip_protocol_t, protocol) +#define foreach_flow_entry_ip4_n_tuple_tagged \ + _fe(ip4_address_and_mask_t, src_addr) \ + _fe(ip4_address_and_mask_t, dst_addr) \ + _fe(ip_port_and_mask_t, src_port) \ + _fe(ip_port_and_mask_t, dst_port) \ + _fe(ip_protocol_t, protocol) + +#define foreach_flow_entry_ip6_n_tuple_tagged \ + _fe(ip6_address_and_mask_t, src_addr) \ + _fe(ip6_address_and_mask_t, dst_addr) \ + _fe(ip_port_and_mask_t, src_port) \ + _fe(ip_port_and_mask_t, dst_port) \ + _fe(ip_protocol_t, protocol) + + #define foreach_flow_entry_ip4_vxlan \ _fe(ip4_address_t, src_addr) \ _fe(ip4_address_t, dst_addr) \ -- cgit 1.2.3-korg