NAT: VPP-1552 code migration from old multiarch scheme

[vpp.git] / src / plugins / nat / nat_det_in2out.c

diff --git a/src/plugins/nat/nat_det_in2out.c b/src/plugins/nat/nat_det_in2out.c
index 1366c2f..918e1f5 100644 (file)
--- a/src/plugins/nat/nat_det_in2out.c
+++ b/src/plugins/nat/nat_det_in2out.c
@@ -63,8 +63,6 @@ static char *nat_det_in2out_error_strings[] = {
 #undef _
 };
 
-vlib_node_registration_t snat_det_in2out_node;
-
 static u8 *
 format_nat_det_in2out_trace (u8 * s, va_list * args)
 {
@@ -78,6 +76,7 @@ format_nat_det_in2out_trace (u8 * s, va_list * args)
   return s;
 }
 
+#ifndef CLIB_MARCH_VARIANT
 /**
  * Get address and port values to be used for ICMP packet translation
  * and create session if needed
@@ -202,7 +201,8 @@ icmp_match_in2out_det (snat_main_t * sm, vlib_node_runtime_t * node,
            continue;
 
          ses0 =
-           snat_det_ses_create (dm0, &in_addr, echo0->identifier, &key0);
+           snat_det_ses_create (thread_index, dm0,
+                                &in_addr, echo0->identifier, &key0);
          break;
        }
       if (PREDICT_FALSE (!ses0))
@@ -241,10 +241,11 @@ out:
     *(snat_det_map_t **) e = dm0;
   return next0;
 }
+#endif
 
-static uword
-snat_det_in2out_node_fn (vlib_main_t * vm,
-                        vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (snat_det_in2out_node) (vlib_main_t * vm,
+                                    vlib_node_runtime_t * node,
+                                    vlib_frame_t * frame)
 {
   u32 n_left_from, *from, *to_next;
   nat_det_in2out_next_t next_index;
@@ -374,8 +375,8 @@ snat_det_in2out_node_fn (vlib_main_t * vm,
                    continue;
 
                  ses0 =
-                   snat_det_ses_create (dm0, &ip0->src_address, tcp0->src,
-                                        &key0);
+                   snat_det_ses_create (thread_index, dm0, &ip0->src_address,
+                                        tcp0->src, &key0);
                  break;
                }
              if (PREDICT_FALSE (!ses0))
@@ -538,8 +539,8 @@ snat_det_in2out_node_fn (vlib_main_t * vm,
                    continue;
 
                  ses1 =
-                   snat_det_ses_create (dm1, &ip1->src_address, tcp1->src,
-                                        &key1);
+                   snat_det_ses_create (thread_index, dm1, &ip1->src_address,
+                                        tcp1->src, &key1);
                  break;
                }
              if (PREDICT_FALSE (!ses1))
@@ -738,8 +739,8 @@ snat_det_in2out_node_fn (vlib_main_t * vm,
                    continue;
 
                  ses0 =
-                   snat_det_ses_create (dm0, &ip0->src_address, tcp0->src,
-                                        &key0);
+                   snat_det_ses_create (thread_index, dm0, &ip0->src_address,
+                                        tcp0->src, &key0);
                  break;
                }
              if (PREDICT_FALSE (!ses0))
@@ -848,7 +849,7 @@ snat_det_in2out_node_fn (vlib_main_t * vm,
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
 
-  vlib_node_increment_counter (vm, snat_det_in2out_node.index,
+  vlib_node_increment_counter (vm, sm->det_in2out_node_index,
                               NAT_DET_IN2OUT_ERROR_IN2OUT_PACKETS,
                               pkts_processed);
   return frame->n_vectors;
@@ -856,7 +857,6 @@ snat_det_in2out_node_fn (vlib_main_t * vm,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (snat_det_in2out_node) = {
-  .function = snat_det_in2out_node_fn,
   .name = "nat44-det-in2out",
   .vector_size = sizeof (u32),
   .format_trace = format_nat_det_in2out_trace,
@@ -873,8 +873,6 @@ VLIB_REGISTER_NODE (snat_det_in2out_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (snat_det_in2out_node, snat_det_in2out_node_fn);
-
 /*
  * fd.io coding-style-patch-verification: ON
  *