ipsec: Support MPLS over IPSec[46] interface

[vpp.git] / src / vnet / ip / ip4_punt_drop.c

diff --git a/src/vnet/ip/ip4_punt_drop.c b/src/vnet/ip/ip4_punt_drop.c
index 4771e8d..94c260a 100644 (file)
--- a/src/vnet/ip/ip4_punt_drop.c
+++ b/src/vnet/ip/ip4_punt_drop.c
@@ -187,10 +187,7 @@ VLIB_REGISTER_NODE (ip4_not_enabled_node) =
   .name = "ip4-not-enabled",
   .vector_size = sizeof (u32),
   .format_trace = format_ip4_forward_next_trace,
-  .n_next_nodes = 1,
-  .next_nodes = {
-    [0] = "error-drop",
-  },
+  .sibling_of = "ip4-drop",
 };
 
 VLIB_REGISTER_NODE (ip4_punt_node) =
@@ -337,9 +334,10 @@ ip4_punt_redirect_cmd (vlib_main_t * vm,
                       vlib_cli_command_t * cmd)
 {
   unformat_input_t _line_input, *line_input = &_line_input;
-  fib_route_path_t *rpaths = NULL, rpath;
+  ip46_address_t nh = { 0 };
   clib_error_t *error = 0;
   u32 rx_sw_if_index = ~0;
+  u32 tx_sw_if_index = ~0;
   vnet_main_t *vnm;
   u8 is_add;
 
@@ -360,9 +358,13 @@ ip4_punt_redirect_cmd (vlib_main_t * vm,
       else if (unformat (line_input, "rx %U",
                         unformat_vnet_sw_interface, vnm, &rx_sw_if_index))
        ;
+      else if (unformat (line_input, "via %U %U",
+                        unformat_ip4_address, &nh.ip4,
+                        unformat_vnet_sw_interface, vnm, &tx_sw_if_index))
+       ;
       else if (unformat (line_input, "via %U",
-                        unformat_fib_route_path, &rpath))
-       vec_add1 (rpaths, rpath);
+                        unformat_vnet_sw_interface, vnm, &tx_sw_if_index))
+       ;
       else
        {
          error = unformat_parse_error (line_input);
@@ -378,8 +380,7 @@ ip4_punt_redirect_cmd (vlib_main_t * vm,
 
   if (is_add)
     {
-      if (vec_len (rpaths))
-       ip4_punt_redirect_add_paths (rx_sw_if_index, rpaths);
+      ip4_punt_redirect_add (rx_sw_if_index, tx_sw_if_index, &nh);
     }
   else
     {