default update adjacency function deos not return multicast adjacency

[vpp.git] / src / vnet / ipsec / ipsec_if.c

diff --git a/src/vnet/ipsec/ipsec_if.c b/src/vnet/ipsec/ipsec_if.c
index ca6b009..9359a3b 100644 (file)
--- a/src/vnet/ipsec/ipsec_if.c
+++ b/src/vnet/ipsec/ipsec_if.c
@@ -63,11 +63,11 @@ ipsec_admin_up_down_function (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
       if (err)
        return err;
 
-      vnet_sw_interface_set_flags (vnm, hi->sw_if_index,
+      vnet_hw_interface_set_flags (vnm, hw_if_index,
                                   VNET_HW_INTERFACE_FLAG_LINK_UP);
     }
   else
-    vnet_sw_interface_set_flags (vnm, hi->sw_if_index, 0 /* down */ );
+    vnet_hw_interface_set_flags (vnm, hw_if_index, 0 /* down */ );
 
   return /* no error */ 0;
 }
@@ -88,20 +88,17 @@ VNET_HW_INTERFACE_CLASS (ipsec_hw_class) =
 {
   .name = "IPSec",
   .build_rewrite = default_build_rewrite,
+  .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P,
 };
 /* *INDENT-ON* */
 
-static int
-ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm,
-                                 ipsec_add_del_tunnel_args_t * args);
-
 static int
 ipsec_add_del_tunnel_if_rpc_callback (ipsec_add_del_tunnel_args_t * a)
 {
   vnet_main_t *vnm = vnet_get_main ();
-  ASSERT (os_get_cpu_number () == 0);
+  ASSERT (vlib_get_thread_index () == 0);
 
-  return ipsec_add_del_tunnel_if_internal (vnm, a);
+  return ipsec_add_del_tunnel_if_internal (vnm, a, NULL);
 }
 
 int
@@ -114,11 +111,12 @@ ipsec_add_del_tunnel_if (ipsec_add_del_tunnel_args_t * args)
 
 int
 ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm,
-                                 ipsec_add_del_tunnel_args_t * args)
+                                 ipsec_add_del_tunnel_args_t * args,
+                                 u32 * sw_if_index)
 {
   ipsec_tunnel_if_t *t;
   ipsec_main_t *im = &ipsec_main;
-  vnet_hw_interface_t *hi;
+  vnet_hw_interface_t *hi = NULL;
   u32 hw_if_index = ~0;
   uword *p;
   ipsec_sa_t *sa;
@@ -209,10 +207,10 @@ ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm,
                                     t - im->tunnel_interfaces,
                                     ipsec_hw_class.index,
                                     t - im->tunnel_interfaces);
-
-         hi = vnet_get_hw_interface (vnm, hw_if_index);
-         hi->output_node_index = ipsec_if_output_node.index;
        }
+
+      hi = vnet_get_hw_interface (vnm, hw_if_index);
+      hi->output_node_index = ipsec_if_output_node.index;
       t->hw_if_index = hw_if_index;
 
       /*1st interface, register protocol */
@@ -220,10 +218,11 @@ ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm,
        ip4_register_protocol (IP_PROTOCOL_IPSEC_ESP,
                               ipsec_if_input_node.index);
 
-      return hw_if_index;
     }
   else
     {
+      vnet_interface_main_t *vim = &vnm->interface_main;
+
       /* check if exists */
       if (!p)
        return VNET_API_ERROR_INVALID_VALUE;
@@ -233,6 +232,13 @@ ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm,
       vnet_sw_interface_set_flags (vnm, hi->sw_if_index, 0);   /* admin down */
       vec_add1 (im->free_tunnel_if_indices, t->hw_if_index);
 
+      vnet_interface_counter_lock (vim);
+      vlib_zero_combined_counter (vim->combined_sw_if_counters +
+                                 VNET_INTERFACE_COUNTER_TX, hi->sw_if_index);
+      vlib_zero_combined_counter (vim->combined_sw_if_counters +
+                                 VNET_INTERFACE_COUNTER_RX, hi->sw_if_index);
+      vnet_interface_counter_unlock (vim);
+
       /* delete input and output SA */
       sa = pool_elt_at_index (im->sad, t->input_sa_index);
 
@@ -253,6 +259,10 @@ ipsec_add_del_tunnel_if_internal (vnet_main_t * vnm,
       hash_unset (im->ipsec_if_pool_index_by_key, key);
       pool_put (im->tunnel_interfaces, t);
     }
+
+  if (sw_if_index)
+    *sw_if_index = hi->sw_if_index;
+
   return 0;
 }