diff options
Diffstat (limited to 'src/vnet/flow')
| -rw-r--r-- | src/vnet/flow/flow.h | 7 | ||||
| -rw-r--r-- | src/vnet/flow/flow_cli.c | 19 |
2 files changed, 24 insertions, 2 deletions
diff --git a/src/vnet/flow/flow.h b/src/vnet/flow/flow.h index d6850b282d7..a880b8a69be 100644 --- a/src/vnet/flow/flow.h +++ b/src/vnet/flow/flow.h @@ -31,6 +31,8 @@ _(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") \ + /* IP tunnel flow */ \ + _(IP4_L2TPV3OIP, ip4_l2tpv3oip, "ipv4-l2tpv3oip") \ /* L4 tunnel flow*/ \ _(IP4_VXLAN, ip4_vxlan, "ipv4-vxlan") \ _(IP6_VXLAN, ip6_vxlan, "ipv6-vxlan") \ @@ -74,6 +76,11 @@ _fe(ip_port_and_mask_t, dst_port) \ _fe(ip_protocol_t, protocol) +#define foreach_flow_entry_ip4_l2tpv3oip \ + _fe(ip4_address_and_mask_t, src_addr) \ + _fe(ip4_address_and_mask_t, dst_addr) \ + _fe(ip_protocol_t, protocol) \ + _fe(u32, session_id) #define foreach_flow_entry_ip4_vxlan \ _fe(ip4_address_t, src_addr) \ diff --git a/src/vnet/flow/flow_cli.c b/src/vnet/flow/flow_cli.c index 772f89a9b24..364b475dc3e 100644 --- a/src/vnet/flow/flow_cli.c +++ b/src/vnet/flow/flow_cli.c @@ -276,10 +276,11 @@ test_flow (vlib_main_t * vm, unformat_input_t * input, } action = FLOW_UNKNOWN_ACTION; u32 hw_if_index = ~0, flow_index = ~0; int rv; - u32 prot = 0, teid = 0; + u32 prot = 0, teid = 0, session_id = 0; vnet_flow_type_t type = VNET_FLOW_TYPE_IP4_N_TUPLE; bool is_gtpc_set = false; bool is_gtpu_set = false; + bool is_l2tpv3oip_set = false; vnet_flow_type_t outer_type = VNET_FLOW_TYPE_UNKNOWN; vnet_flow_type_t inner_type = VNET_FLOW_TYPE_UNKNOWN; bool outer_ip4_set = false, inner_ip4_set = false; @@ -357,6 +358,11 @@ test_flow (vlib_main_t * vm, unformat_input_t * input, is_gtpc_set = true; else if (unformat (line_input, "gtpu teid %u", &teid)) is_gtpu_set = true; + else if (unformat (line_input, "session id %u", &session_id)) + { + if (prot == IP_PROTOCOL_L2TP) + is_l2tpv3oip_set = true; + } else if (unformat (line_input, "index %u", &flow_index)) ; else if (unformat (line_input, "next-node %U", unformat_vlib_node, vm, @@ -481,6 +487,8 @@ test_flow (vlib_main_t * vm, unformat_input_t * input, type = VNET_FLOW_TYPE_IP4_GTPC; else if (is_gtpu_set) type = VNET_FLOW_TYPE_IP4_GTPU; + else if (is_l2tpv3oip_set) + type = VNET_FLOW_TYPE_IP4_L2TPV3OIP; } else if (inner_type == VNET_FLOW_TYPE_IP4_N_TUPLE) { @@ -523,7 +531,14 @@ test_flow (vlib_main_t * vm, unformat_input_t * input, memset (&flow.ethernet, 0, sizeof (flow.ethernet)); flow.ethernet.eth_hdr.type = eth_type; break; - + case VNET_FLOW_TYPE_IP4_L2TPV3OIP: + clib_memcpy (&flow.ip4_l2tpv3oip.src_addr, &ip4s, + sizeof (ip4_address_and_mask_t)); + clib_memcpy (&flow.ip4_l2tpv3oip.dst_addr, &ip4d, + sizeof (ip4_address_and_mask_t)); + flow.ip4_l2tpv3oip.protocol = prot; + flow.ip4_l2tpv3oip.session_id = session_id; + break; case VNET_FLOW_TYPE_IP4_N_TUPLE: case VNET_FLOW_TYPE_IP4_GTPC: case VNET_FLOW_TYPE_IP4_GTPU: |