X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fflow%2Fflow_cli.c;fp=src%2Fvnet%2Fflow%2Fflow_cli.c;h=364b475dc3e935603aafb6d66ac975107deaec35;hb=8b43aaaf16addaa96b4ad91de332382eaabf9de8;hp=772f89a9b247e183d6c55bef6713c66dae3a4f58;hpb=f539578bac8b64886b57c460c9d74273e6613f8b;p=vpp.git

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: