ikev2: add support for custom ipsec-over-udp port

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

diff --git a/src/vnet/cop/ip4_whitelist.c b/src/vnet/cop/ip4_whitelist.c
index ccb9dc0..484ad36 100644 (file)
--- a/src/vnet/cop/ip4_whitelist.c
+++ b/src/vnet/cop/ip4_whitelist.c
@@ -33,8 +33,6 @@ static u8 * format_ip4_cop_whitelist_trace (u8 * s, va_list * args)
   return s;
 }
 
-vlib_node_registration_t ip4_cop_whitelist_node;
-
 #define foreach_ip4_cop_whitelist_error                         \
 _(DROPPED, "ip4 cop whitelist packets dropped")
 
@@ -51,8 +49,7 @@ static char * ip4_cop_whitelist_error_strings[] = {
 #undef _
 };
 
-static uword
-ip4_cop_whitelist_node_fn (vlib_main_t * vm,
+VLIB_NODE_FN (ip4_cop_whitelist_node) (vlib_main_t * vm,
                  vlib_node_runtime_t * node,
                  vlib_frame_t * frame)
 {
@@ -60,7 +57,7 @@ ip4_cop_whitelist_node_fn (vlib_main_t * vm,
   cop_feature_type_t next_index;
   cop_main_t *cm = &cop_main;
   vlib_combined_counter_main_t * vcm = &load_balance_main.lbm_via_counters;
-  u32 cpu_index = vm->cpu_index;
+  u32 thread_index = vm->thread_index;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -127,9 +124,6 @@ ip4_cop_whitelist_node_fn (vlib_main_t * vm,
 
           leaf0 = ip4_fib_mtrie_lookup_step_one (mtrie0, &ip0->src_address);
 
-         leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0,
-                                             &ip0->src_address, 1);
-
          leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0,
                                              &ip0->src_address, 2);
 
@@ -166,9 +160,6 @@ ip4_cop_whitelist_node_fn (vlib_main_t * vm,
 
           leaf1 = ip4_fib_mtrie_lookup_step_one (mtrie1, &ip1->src_address);
 
-         leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1,
-                                             &ip1->src_address, 1);
-
          leaf1 = ip4_fib_mtrie_lookup_step (mtrie1, leaf1,
                                              &ip1->src_address, 2);
 
@@ -183,12 +174,12 @@ ip4_cop_whitelist_node_fn (vlib_main_t * vm,
           dpo1 = load_balance_get_bucket_i(lb1, 0);
 
           vlib_increment_combined_counter
-              (vcm, cpu_index, lb_index0, 1,
+              (vcm, thread_index, lb_index0, 1,
                vlib_buffer_length_in_chain (vm, b0)
                + sizeof(ethernet_header_t));
 
           vlib_increment_combined_counter
-              (vcm, cpu_index, lb_index1, 1,
+              (vcm, thread_index, lb_index1, 1,
                vlib_buffer_length_in_chain (vm, b1)
                + sizeof(ethernet_header_t));
 
@@ -263,9 +254,6 @@ ip4_cop_whitelist_node_fn (vlib_main_t * vm,
 
           leaf0 = ip4_fib_mtrie_lookup_step_one (mtrie0, &ip0->src_address);
 
-         leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, 
-                                             &ip0->src_address, 1);
-
          leaf0 = ip4_fib_mtrie_lookup_step (mtrie0, leaf0, 
                                              &ip0->src_address, 2);
 
@@ -282,7 +270,7 @@ ip4_cop_whitelist_node_fn (vlib_main_t * vm,
           dpo0 = load_balance_get_bucket_i(lb0, 0);
 
           vlib_increment_combined_counter 
-              (vcm, cpu_index, lb_index0, 1,
+              (vcm, thread_index, lb_index0, 1,
                vlib_buffer_length_in_chain (vm, b0) 
                + sizeof(ethernet_header_t));
 
@@ -313,7 +301,6 @@ ip4_cop_whitelist_node_fn (vlib_main_t * vm,
 }
 
 VLIB_REGISTER_NODE (ip4_cop_whitelist_node) = {
-  .function = ip4_cop_whitelist_node_fn,
   .name = "ip4-cop-whitelist",
   .vector_size = sizeof (u32),
   .format_trace = format_ip4_cop_whitelist_trace,
@@ -336,8 +323,6 @@ VLIB_REGISTER_NODE (ip4_cop_whitelist_node) = {
   },
 };
 
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_cop_whitelist_node, ip4_cop_whitelist_node_fn)
-
 static clib_error_t *
 ip4_whitelist_init (vlib_main_t * vm)
 {