NAT64: Move IPv6-IPv4 virtual reassembly code from MAP-T to common library (VPP-708)

[vpp.git] / src / vnet / sr / sr_localsid.c

diff --git a/src/vnet/sr/sr_localsid.c b/src/vnet/sr/sr_localsid.c
index 2e3d56d..32fc5f8 100755 (executable)
--- a/src/vnet/sr/sr_localsid.c
+++ b/src/vnet/sr/sr_localsid.c
@@ -93,9 +93,9 @@ sr_cli_localsid (char is_del, ip6_address_t * localsid_addr,
                        }
          };
 
-         fib_table_entry_delete (fib_table_id_find_fib_index
-                                 (FIB_PROTOCOL_IP6, fib_table), &pfx,
-                                 FIB_SOURCE_SR);
+         fib_table_entry_delete (fib_table_find (FIB_PROTOCOL_IP6,
+                                                 fib_table),
+                                 &pfx, FIB_SOURCE_SR);
 
          /* In case it is a Xconnect iface remove the (OIF, NHOP) adj */
          if (ls->behavior == SR_BEHAVIOR_X || ls->behavior == SR_BEHAVIOR_DX6
@@ -135,7 +135,7 @@ sr_cli_localsid (char is_del, ip6_address_t * localsid_addr,
   pfx.fp_addr.as_u64[1] = localsid_addr->as_u64[1];
 
   /* Lookup the FIB index associated to the table id provided */
-  u32 fib_index = fib_table_id_find_fib_index (FIB_PROTOCOL_IP6, fib_table);
+  u32 fib_index = fib_table_find (FIB_PROTOCOL_IP6, fib_table);
   if (fib_index == ~0)
     return -3;
 
@@ -887,7 +887,7 @@ sr_localsid_d_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   from = vlib_frame_vector_args (from_frame);
   n_left_from = from_frame->n_vectors;
   next_index = node->cached_next_index;
-  u32 cpu_index = os_get_cpu_number ();
+  u32 thread_index = vlib_get_thread_index ();
 
   while (n_left_from > 0)
     {
@@ -974,26 +974,26 @@ sr_localsid_d_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
          vlib_increment_combined_counter
            (((next0 ==
               SR_LOCALSID_NEXT_ERROR) ? &(sm->sr_ls_invalid_counters) :
-             &(sm->sr_ls_valid_counters)), cpu_index, ls0 - sm->localsids, 1,
-            vlib_buffer_length_in_chain (vm, b0));
+             &(sm->sr_ls_valid_counters)), thread_index, ls0 - sm->localsids,
+            1, vlib_buffer_length_in_chain (vm, b0));
 
          vlib_increment_combined_counter
            (((next1 ==
               SR_LOCALSID_NEXT_ERROR) ? &(sm->sr_ls_invalid_counters) :
-             &(sm->sr_ls_valid_counters)), cpu_index, ls1 - sm->localsids, 1,
-            vlib_buffer_length_in_chain (vm, b1));
+             &(sm->sr_ls_valid_counters)), thread_index, ls1 - sm->localsids,
+            1, vlib_buffer_length_in_chain (vm, b1));
 
          vlib_increment_combined_counter
            (((next2 ==
               SR_LOCALSID_NEXT_ERROR) ? &(sm->sr_ls_invalid_counters) :
-             &(sm->sr_ls_valid_counters)), cpu_index, ls2 - sm->localsids, 1,
-            vlib_buffer_length_in_chain (vm, b2));
+             &(sm->sr_ls_valid_counters)), thread_index, ls2 - sm->localsids,
+            1, vlib_buffer_length_in_chain (vm, b2));
 
          vlib_increment_combined_counter
            (((next3 ==
               SR_LOCALSID_NEXT_ERROR) ? &(sm->sr_ls_invalid_counters) :
-             &(sm->sr_ls_valid_counters)), cpu_index, ls3 - sm->localsids, 1,
-            vlib_buffer_length_in_chain (vm, b3));
+             &(sm->sr_ls_valid_counters)), thread_index, ls3 - sm->localsids,
+            1, vlib_buffer_length_in_chain (vm, b3));
 
          vlib_validate_buffer_enqueue_x4 (vm, node, next_index, to_next,
                                           n_left_to_next, bi0, bi1, bi2, bi3,
@@ -1062,8 +1062,8 @@ sr_localsid_d_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
          vlib_increment_combined_counter
            (((next0 ==
               SR_LOCALSID_NEXT_ERROR) ? &(sm->sr_ls_invalid_counters) :
-             &(sm->sr_ls_valid_counters)), cpu_index, ls0 - sm->localsids, 1,
-            vlib_buffer_length_in_chain (vm, b0));
+             &(sm->sr_ls_valid_counters)), thread_index, ls0 - sm->localsids,
+            1, vlib_buffer_length_in_chain (vm, b0));
 
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
                                           n_left_to_next, bi0, next0);
@@ -1103,7 +1103,7 @@ sr_localsid_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   from = vlib_frame_vector_args (from_frame);
   n_left_from = from_frame->n_vectors;
   next_index = node->cached_next_index;
-  u32 cpu_index = os_get_cpu_number ();
+  u32 thread_index = vlib_get_thread_index ();
 
   while (n_left_from > 0)
     {
@@ -1205,26 +1205,26 @@ sr_localsid_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
          vlib_increment_combined_counter
            (((next0 ==
               SR_LOCALSID_NEXT_ERROR) ? &(sm->sr_ls_invalid_counters) :
-             &(sm->sr_ls_valid_counters)), cpu_index, ls0 - sm->localsids, 1,
-            vlib_buffer_length_in_chain (vm, b0));
+             &(sm->sr_ls_valid_counters)), thread_index, ls0 - sm->localsids,
+            1, vlib_buffer_length_in_chain (vm, b0));
 
          vlib_increment_combined_counter
            (((next1 ==
               SR_LOCALSID_NEXT_ERROR) ? &(sm->sr_ls_invalid_counters) :
-             &(sm->sr_ls_valid_counters)), cpu_index, ls1 - sm->localsids, 1,
-            vlib_buffer_length_in_chain (vm, b1));
+             &(sm->sr_ls_valid_counters)), thread_index, ls1 - sm->localsids,
+            1, vlib_buffer_length_in_chain (vm, b1));
 
          vlib_increment_combined_counter
            (((next2 ==
               SR_LOCALSID_NEXT_ERROR) ? &(sm->sr_ls_invalid_counters) :
-             &(sm->sr_ls_valid_counters)), cpu_index, ls2 - sm->localsids, 1,
-            vlib_buffer_length_in_chain (vm, b2));
+             &(sm->sr_ls_valid_counters)), thread_index, ls2 - sm->localsids,
+            1, vlib_buffer_length_in_chain (vm, b2));
 
          vlib_increment_combined_counter
            (((next3 ==
               SR_LOCALSID_NEXT_ERROR) ? &(sm->sr_ls_invalid_counters) :
-             &(sm->sr_ls_valid_counters)), cpu_index, ls3 - sm->localsids, 1,
-            vlib_buffer_length_in_chain (vm, b3));
+             &(sm->sr_ls_valid_counters)), thread_index, ls3 - sm->localsids,
+            1, vlib_buffer_length_in_chain (vm, b3));
 
          vlib_validate_buffer_enqueue_x4 (vm, node, next_index, to_next,
                                           n_left_to_next, bi0, bi1, bi2, bi3,
@@ -1295,8 +1295,8 @@ sr_localsid_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
          vlib_increment_combined_counter
            (((next0 ==
               SR_LOCALSID_NEXT_ERROR) ? &(sm->sr_ls_invalid_counters) :
-             &(sm->sr_ls_valid_counters)), cpu_index, ls0 - sm->localsids, 1,
-            vlib_buffer_length_in_chain (vm, b0));
+             &(sm->sr_ls_valid_counters)), thread_index, ls0 - sm->localsids,
+            1, vlib_buffer_length_in_chain (vm, b0));
 
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
                                           n_left_to_next, bi0, next0);