From 25fd8ad03e6ef321604437fe8fc56ab2b3858cd7 Mon Sep 17 00:00:00 2001
From: Filip Varga <fivarga@cisco.com>
Date: Mon, 9 Nov 2020 12:24:03 +0100
Subject: nat: cleanup & reorganization

Fixed compatibility issue between
nat ei and nat ed modes. Moved nat
syslogging to nat librarry. Deprecating
apis that will be integrated in upcoming
candidate configuration patch.

Type: refactor

Change-Id: I334b1b05b81b74667c5c76a05f768442e0dcf7e8
Signed-off-by: Filip Varga <fivarga@cisco.com>
---
 src/plugins/nat/nat.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/plugins/nat/nat.c')

diff --git a/src/plugins/nat/nat.c b/src/plugins/nat/nat.c
index 39dd1db650a..74adae9ce34 100644
--- a/src/plugins/nat/nat.c
+++ b/src/plugins/nat/nat.c
@@ -22,10 +22,10 @@
 #include <nat/nat.h>
 #include <nat/nat_dpo.h>
 #include <nat/lib/ipfix_logging.h>
+#include <nat/lib/nat_syslog.h>
 #include <nat/nat_inlines.h>
 #include <nat/nat44/inlines.h>
 #include <nat/nat_affinity.h>
-#include <nat/nat_syslog.h>
 #include <nat/nat_ha.h>
 #include <vnet/fib/fib_table.h>
 #include <vnet/fib/ip4_fib.h>
@@ -1379,7 +1379,7 @@ nat44_add_del_lb_static_mapping (ip4_address_t e_addr, u16 e_port,
   uword *bitmap = 0;
 
   if (!sm->endpoint_dependent)
-    return VNET_API_ERROR_FEATURE_DISABLED;
+    return VNET_API_ERROR_UNSUPPORTED;
 
   init_nat_k (&kv, e_addr, e_port, 0, proto);
   if (clib_bihash_search_8_8 (&sm->static_mapping_by_external, &kv, &value))
@@ -2875,10 +2875,7 @@ nat44_plugin_enable (nat44_config_t c)
   sm->alloc_addr_and_port = nat_alloc_addr_and_port_default;
   sm->addr_and_port_alloc_alg = NAT_ADDR_AND_PORT_ALLOC_ALG_DEFAULT;
   //
-  sm->udp_timeout = SNAT_UDP_TIMEOUT;
-  sm->icmp_timeout = SNAT_ICMP_TIMEOUT;
-  sm->tcp_transitory_timeout = SNAT_TCP_TRANSITORY_TIMEOUT;
-  sm->tcp_established_timeout = SNAT_TCP_ESTABLISHED_TIMEOUT;
+  nat_reset_timeouts (&sm->timeouts);
 
   // nat44 feature configuration
   sm->endpoint_dependent = c.endpoint_dependent;
-- 
cgit 1.2.3-korg