ipsec: IPSec protection for multi-point tunnel interfaces

[vpp.git] / src / vnet / cop / ip6_whitelist.c

diff --git a/src/vnet/cop/ip6_whitelist.c b/src/vnet/cop/ip6_whitelist.c
index f3fe62e..3342ed6 100644 (file)
--- a/src/vnet/cop/ip6_whitelist.c
+++ b/src/vnet/cop/ip6_whitelist.c
@@ -33,8 +33,6 @@ static u8 * format_ip6_cop_whitelist_trace (u8 * s, va_list * args)
   return s;
 }
 
-vlib_node_registration_t ip6_cop_whitelist_node;
-
 #define foreach_ip6_cop_whitelist_error                         \
 _(DROPPED, "ip6 cop whitelist packets dropped")
 
@@ -51,15 +49,13 @@ static char * ip6_cop_whitelist_error_strings[] = {
 #undef _
 };
 
-static uword
-ip6_cop_whitelist_node_fn (vlib_main_t * vm,
+VLIB_NODE_FN (ip6_cop_whitelist_node) (vlib_main_t * vm,
                  vlib_node_runtime_t * node,
                  vlib_frame_t * frame)
 {
   u32 n_left_from, * from, * to_next;
   cop_feature_type_t next_index;
   cop_main_t *cm = &cop_main;
-  ip6_main_t * im6 = &ip6_main;
   vlib_combined_counter_main_t * vcm = &load_balance_main.lbm_via_counters;
   u32 thread_index = vm->thread_index;
 
@@ -122,7 +118,7 @@ ip6_cop_whitelist_node_fn (vlib_main_t * vm,
                &next0,
                sizeof (c0[0]));
 
-          lb_index0 = ip6_fib_table_fwding_lookup (im6, c0->fib_index, 
+          lb_index0 = ip6_fib_table_fwding_lookup (c0->fib_index, 
                                                    &ip0->src_address);
          lb0 = load_balance_get (lb_index0);
           dpo0 = load_balance_get_bucket_i(lb0, 0);
@@ -146,7 +142,7 @@ ip6_cop_whitelist_node_fn (vlib_main_t * vm,
                &next1,
                sizeof (c1[0]));
 
-          lb_index1 = ip6_fib_table_fwding_lookup (im6, c1->fib_index, 
+          lb_index1 = ip6_fib_table_fwding_lookup (c1->fib_index, 
                                                    &ip1->src_address);
 
          lb1 = load_balance_get (lb_index1);
@@ -226,7 +222,7 @@ ip6_cop_whitelist_node_fn (vlib_main_t * vm,
                &next0,
                sizeof (c0[0]));
 
-          lb_index0 = ip6_fib_table_fwding_lookup (im6, c0->fib_index, 
+          lb_index0 = ip6_fib_table_fwding_lookup (c0->fib_index, 
                                                    &ip0->src_address);
 
          lb0 = load_balance_get (lb_index0);
@@ -264,7 +260,6 @@ ip6_cop_whitelist_node_fn (vlib_main_t * vm,
 }
 
 VLIB_REGISTER_NODE (ip6_cop_whitelist_node) = {
-  .function = ip6_cop_whitelist_node_fn,
   .name = "ip6-cop-whitelist",
   .vector_size = sizeof (u32),
   .format_trace = format_ip6_cop_whitelist_trace,
@@ -287,8 +282,6 @@ VLIB_REGISTER_NODE (ip6_cop_whitelist_node) = {
   },
 };
 
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_cop_whitelist_node, ip6_cop_whitelist_node_fn)
-
 static clib_error_t *
 ip6_whitelist_init (vlib_main_t * vm)
 {