nat: session cleanup fix
[vpp.git] / src / plugins / nat / out2in.c
index 83c099d..6ee1266 100755 (executable)
@@ -29,6 +29,7 @@
 #include <nat/nat_ipfix_logging.h>
 #include <nat/nat_reass.h>
 #include <nat/nat_inlines.h>
+#include <nat/nat44_inlines.h>
 #include <nat/nat_syslog.h>
 #include <nat/nat_ha.h>
 
@@ -189,6 +190,9 @@ create_session_for_static_mapping (snat_main_t * sm,
   udp_header_t *udp0;
   nat44_is_idle_session_ctx_t ctx0;
 
+  nat44_session_try_cleanup (&in2out.addr, in2out.fib_index, thread_index,
+                            now);
+
   if (PREDICT_FALSE (maximum_sessions_exceeded (sm, thread_index)))
     {
       b0->error = node->errors[SNAT_OUT2IN_ERROR_MAX_SESSIONS_EXCEEDED];
@@ -898,10 +902,6 @@ VLIB_NODE_FN (snat_out2in_node) (vlib_main_t * vm,
 
          if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
            {
-             old_port0 = tcp0->dst_port;
-             tcp0->dst_port = s0->in2out.port;
-             new_port0 = tcp0->dst_port;
-
              sum0 = tcp0->checksum;
              sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
                                     ip4_header_t,