NAT: VPP-1552 code migration from old multiarch scheme

[vpp.git] / src / plugins / nat / nat66.h

diff --git a/src/plugins/nat/nat66.h b/src/plugins/nat/nat66.h
index d2ddd0c..7b0ffed 100644 (file)
--- a/src/plugins/nat/nat66.h
+++ b/src/plugins/nat/nat66.h
@@ -55,13 +55,19 @@ typedef struct
   clib_bihash_24_8_t sm_e;
   /** Session counters */
   vlib_combined_counter_main_t session_counters;
+  /** node index **/
+  u32 in2out_node_index;
+  u32 out2in_node_index;
+
+  u32 outside_vrf_id;
+  u32 outside_fib_index;
 } nat66_main_t;
 
 extern nat66_main_t nat66_main;
 extern vlib_node_registration_t nat66_in2out_node;
 extern vlib_node_registration_t nat66_out2in_node;
 
-void nat66_init (void);
+void nat66_init (vlib_main_t * vm);
 typedef int (*nat66_interface_walk_fn_t) (snat_interface_t * i, void *ctx);
 void nat66_interfaces_walk (nat66_interface_walk_fn_t fn, void *ctx);
 int nat66_interface_add_del (u32 sw_if_index, u8 is_inside, u8 is_add);
@@ -75,9 +81,6 @@ int nat66_static_mapping_add_del (ip6_address_t * l_addr,
                                  ip6_address_t * e_addr, u32 vrf_id,
                                  u8 is_add);
 
-#define u8_ptr_add(ptr, index) (((u8 *)ptr) + index)
-#define u16_net_add(u, val) clib_host_to_net_u16(clib_net_to_host_u16(u) + (val))
-
 #endif /* __included_nat66_h__ */
 
 /*