flow: add l2tpv3oip flow

[vpp.git] / src / vnet / flow / flow_cli.c

diff --git a/src/vnet/flow/flow_cli.c b/src/vnet/flow/flow_cli.c
index 500f16b..364b475 100644 (file)
--- 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;
@@ -296,6 +297,8 @@ test_flow (vlib_main_t * vm, unformat_input_t * input,
   ip_port_and_mask_t dport = { };
   u16 eth_type;
   bool ethernet_set = false;
+  u8 *rss_type[3] = { };
+  u8 *type_str = NULL;
 
   clib_memset (&flow, 0, sizeof (vnet_flow_t));
   flow.index = ~0;
@@ -355,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,
@@ -370,6 +378,65 @@ test_flow (vlib_main_t * vm, unformat_input_t * input,
        flow.actions |= VNET_FLOW_ACTION_REDIRECT_TO_QUEUE;
       else if (unformat (line_input, "drop"))
        flow.actions |= VNET_FLOW_ACTION_DROP;
+      else if (unformat (line_input, "rss function"))
+       {
+         if (0)
+           ;
+#undef _
+#define _(f, s)                                 \
+        else if (unformat (line_input, s)) \
+          flow.rss_fun = VNET_RSS_FUNC_##f;
+
+         foreach_rss_function
+#undef _
+           else
+           {
+             return clib_error_return (0, "unknown input `%U'",
+                                       format_unformat_error, line_input);
+           }
+
+         flow.actions |= VNET_FLOW_ACTION_RSS;
+       }
+      else if (unformat (line_input, "rss types"))
+       {
+         rss_type[0] = NULL;
+         rss_type[1] = NULL;
+         rss_type[2] = NULL;
+         type_str = NULL;
+
+         if (unformat (line_input, "%s use %s and %s",
+                       &rss_type[0], &rss_type[1], &rss_type[2]))
+           ;
+         else
+           if (unformat
+               (line_input, "%s use %s", &rss_type[0], &rss_type[1]))
+           ;
+         else if (unformat (line_input, "%s", &rss_type[0]))
+           ;
+
+#undef _
+#define _(a,b,c)     \
+        else if (!clib_strcmp(c, (const char *)type_str)) \
+          flow.rss_types |= (1ULL<<a);
+
+#define check_rss_types(_str)     \
+        if (_str != NULL) {\
+          type_str = _str;\
+          if (0) \
+                 ; \
+          foreach_flow_rss_types \
+          else \
+          { \
+            return clib_error_return (0, "parse error: '%U'", \
+              format_unformat_error, line_input); \
+          } \
+        }
+
+         check_rss_types (rss_type[0])
+           check_rss_types (rss_type[1]) check_rss_types (rss_type[2])
+#undef _
+           flow.actions |= VNET_FLOW_ACTION_RSS;
+       }
       else if (unformat (line_input, "%U", unformat_vnet_hw_interface, vnm,
                         &hw_if_index))
        ;
@@ -420,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)
            {
@@ -462,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:
@@ -545,7 +621,7 @@ test_flow (vlib_main_t * vm, unformat_input_t * input,
 
          if (flow.ip6_n_tuple.protocol == (ip_protocol_t) ~ 0)
            return clib_error_return (0, "Please specify ip protocol");
-         if ((type != VNET_FLOW_TYPE_IP4_N_TUPLE) &&
+         if ((type != VNET_FLOW_TYPE_IP6_N_TUPLE) &&
              (flow.ip6_n_tuple.protocol != IP_PROTOCOL_UDP))
            return clib_error_return (0,
                                      "For GTP related flow, ip protocol must be UDP");