From 36c7e7cb34ba611e020be9f7ad4a93f9e6a8496d Mon Sep 17 00:00:00 2001 From: Filip Varga Date: Wed, 23 Nov 2022 10:47:56 -0800 Subject: nat: fixed return values of enable/disable call NAT44 enable/disable return status was used instead of appropriate VNET_API_ERROR_ code. Type: fix Signed-off-by: Filip Varga Change-Id: If944866bf3061afdc91284c0ad475135e529bdc4 --- src/plugins/nat/nat44-ei/nat44_ei.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/plugins/nat/nat44-ei/nat44_ei.c') diff --git a/src/plugins/nat/nat44-ei/nat44_ei.c b/src/plugins/nat/nat44-ei/nat44_ei.c index 448566d93ce..171ca7dcb4c 100644 --- a/src/plugins/nat/nat44-ei/nat44_ei.c +++ b/src/plugins/nat/nat44-ei/nat44_ei.c @@ -61,7 +61,7 @@ extern vlib_node_registration_t if (PREDICT_FALSE (nm->enabled)) \ { \ nat44_ei_log_err ("plugin enabled"); \ - return 1; \ + return VNET_API_ERROR_FEATURE_ALREADY_ENABLED; \ } \ } \ while (0) @@ -73,7 +73,7 @@ extern vlib_node_registration_t if (PREDICT_FALSE (!nm->enabled)) \ { \ nat44_ei_log_err ("plugin disabled"); \ - return 1; \ + return VNET_API_ERROR_FEATURE_ALREADY_DISABLED; \ } \ } \ while (0) @@ -1221,23 +1221,25 @@ nat44_ei_plugin_disable () nat44_ei_main_per_thread_data_t *tnm; int rc, error = 0; + fail_if_disabled (); + nat_ha_disable (); rc = nat44_ei_del_static_mappings (); if (rc) - error = 1; + error = VNET_API_ERROR_BUG; rc = nat44_ei_del_addresses (); if (rc) - error = 1; + error = VNET_API_ERROR_BUG; rc = nat44_ei_del_interfaces (); if (rc) - error = 1; + error = VNET_API_ERROR_BUG; rc = nat44_ei_del_output_interfaces (); if (rc) - error = 1; + error = VNET_API_ERROR_BUG; if (nm->pat) { -- cgit 1.2.3-korg