NAT44: fix nat44_user_session_dump and nat44_del_session crash with one worker (VPP...

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

diff --git a/src/plugins/nat/nat44_cli.c b/src/plugins/nat/nat44_cli.c
index 0aac1c0..f61f59b 100644 (file)
--- a/src/plugins/nat/nat44_cli.c
+++ b/src/plugins/nat/nat44_cli.c
@@ -371,9 +371,8 @@ snat_feature_command_fn (vlib_main_t * vm,
                {
                  error = clib_error_return (0, "%s %U failed",
                                             is_del ? "del" : "add",
-                                            format_vnet_sw_interface_name,
-                                            vnm, vnet_get_sw_interface (vnm,
-                                                                        sw_if_index));
+                                            format_vnet_sw_if_index_name,
+                                            vnm, sw_if_index);
                  goto done;
                }
            }
@@ -383,9 +382,8 @@ snat_feature_command_fn (vlib_main_t * vm,
                {
                  error = clib_error_return (0, "%s %U failed",
                                             is_del ? "del" : "add",
-                                            format_vnet_sw_interface_name,
-                                            vnm, vnet_get_sw_interface (vnm,
-                                                                        sw_if_index));
+                                            format_vnet_sw_if_index_name,
+                                            vnm, sw_if_index);
                  goto done;
                }
            }
@@ -404,9 +402,8 @@ snat_feature_command_fn (vlib_main_t * vm,
                {
                  error = clib_error_return (0, "%s %U failed",
                                             is_del ? "del" : "add",
-                                            format_vnet_sw_interface_name,
-                                            vnm, vnet_get_sw_interface (vnm,
-                                                                        sw_if_index));
+                                            format_vnet_sw_if_index_name,
+                                            vnm, sw_if_index);
                  goto done;
                }
            }
@@ -416,9 +413,8 @@ snat_feature_command_fn (vlib_main_t * vm,
                {
                  error = clib_error_return (0, "%s %U failed",
                                             is_del ? "del" : "add",
-                                            format_vnet_sw_interface_name,
-                                            vnm, vnet_get_sw_interface (vnm,
-                                                                        sw_if_index));
+                                            format_vnet_sw_if_index_name,
+                                            vnm, sw_if_index);
                  goto done;
                }
            }
@@ -445,8 +441,8 @@ nat44_show_interfaces_command_fn (vlib_main_t * vm, unformat_input_t * input,
   /* *INDENT-OFF* */
   pool_foreach (i, sm->interfaces,
   ({
-    vlib_cli_output (vm, " %U %s", format_vnet_sw_interface_name, vnm,
-                     vnet_get_sw_interface (vnm, i->sw_if_index),
+    vlib_cli_output (vm, " %U %s", format_vnet_sw_if_index_name, vnm,
+                     i->sw_if_index,
                      (nat_interface_is_inside(i) &&
                       nat_interface_is_outside(i)) ? "in out" :
                      (nat_interface_is_inside(i) ? "in" : "out"));
@@ -455,8 +451,8 @@ nat44_show_interfaces_command_fn (vlib_main_t * vm, unformat_input_t * input,
   pool_foreach (i, sm->output_feature_interfaces,
   ({
     vlib_cli_output (vm, " %U output-feature %s",
-                     format_vnet_sw_interface_name, vnm,
-                     vnet_get_sw_interface (vnm, i->sw_if_index),
+                     format_vnet_sw_if_index_name, vnm,
+                     i->sw_if_index,
                      (nat_interface_is_inside(i) &&
                       nat_interface_is_outside(i)) ? "in out" :
                      (nat_interface_is_inside(i) ? "in" : "out"));
@@ -543,7 +539,7 @@ add_static_mapping_command_fn (vlib_main_t * vm,
 
   rv = snat_add_static_mapping (l_addr, e_addr, (u16) l_port, (u16) e_port,
                                vrf_id, addr_only, sw_if_index, proto, is_add,
-                               twice_nat, out2in_only);
+                               twice_nat, out2in_only, 0);
 
   switch (rv)
     {
@@ -618,7 +614,7 @@ add_identity_mapping_command_fn (vlib_main_t * vm,
 
   rv = snat_add_static_mapping (addr, addr, (u16) port, (u16) port,
                                vrf_id, addr_only, sw_if_index, proto, is_add,
-                               0, 0);
+                               0, 0, 0);
 
   switch (rv)
     {
@@ -715,7 +711,7 @@ add_lb_static_mapping_command_fn (vlib_main_t * vm,
 
   rv = nat44_add_del_lb_static_mapping (e_addr, (u16) e_port, proto, vrf_id,
                                        locals, is_add, twice_nat,
-                                       out2in_only);
+                                       out2in_only, 0);
 
   switch (rv)
     {
@@ -830,14 +826,14 @@ nat44_show_interface_address_command_fn (vlib_main_t * vm,
   vlib_cli_output (vm, "NAT44 pool address interfaces:");
   vec_foreach (sw_if_index, sm->auto_add_sw_if_indices)
     {
-      vlib_cli_output (vm, " %U", format_vnet_sw_interface_name, vnm,
-                       vnet_get_sw_interface (vnm, *sw_if_index));
+      vlib_cli_output (vm, " %U", format_vnet_sw_if_index_name, vnm,
+                       *sw_if_index);
     }
   vlib_cli_output (vm, "NAT44 twice-nat pool address interfaces:");
   vec_foreach (sw_if_index, sm->auto_add_sw_if_indices_twice_nat)
     {
-      vlib_cli_output (vm, " %U", format_vnet_sw_interface_name, vnm,
-                       vnet_get_sw_interface (vnm, *sw_if_index));
+      vlib_cli_output (vm, " %U", format_vnet_sw_if_index_name, vnm,
+                       *sw_if_index);
     }
   /* *INDENT-ON* */