Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
nat: timed out session scavenging upgrade
[vpp.git]
/
src
/
plugins
/
nat
/
nat_api.c
diff --git
a/src/plugins/nat/nat_api.c
b/src/plugins/nat/nat_api.c
index
d8c2c5f
..
a71c888
100644
(file)
--- a/
src/plugins/nat/nat_api.c
+++ b/
src/plugins/nat/nat_api.c
@@
-247,9
+247,7
@@
vl_api_nat44_session_cleanup_t_handler (vl_api_nat44_session_cleanup_t * mp)
snat_main_t *sm = &snat_main;
vl_api_nat44_session_cleanup_reply_t *rmp;
int rv = 0;
snat_main_t *sm = &snat_main;
vl_api_nat44_session_cleanup_reply_t *rmp;
int rv = 0;
-
- nat44_force_session_cleanup ();
-
+ nat44_force_users_cleanup ();
REPLY_MACRO (VL_API_NAT44_SESSION_CLEANUP_REPLY);
}
REPLY_MACRO (VL_API_NAT44_SESSION_CLEANUP_REPLY);
}
@@
-338,6
+336,8
@@
vl_api_nat_set_timeouts_t_handler (vl_api_nat_set_timeouts_t * mp)
sm->tcp_transitory_timeout = ntohl (mp->tcp_transitory);
sm->icmp_timeout = ntohl (mp->icmp);
sm->tcp_transitory_timeout = ntohl (mp->tcp_transitory);
sm->icmp_timeout = ntohl (mp->icmp);
+ sm->min_timeout = nat44_minimal_timeout (sm);
+
rv = nat64_set_icmp_timeout (ntohl (mp->icmp));
if (rv)
goto send_reply;
rv = nat64_set_icmp_timeout (ntohl (mp->icmp));
if (rv)
goto send_reply;
@@
-747,10
+747,8
@@
vl_api_nat44_del_user_t_handler (vl_api_nat44_del_user_t * mp)
vl_api_nat44_del_user_reply_t *rmp;
ip4_address_t addr;
int rv;
vl_api_nat44_del_user_reply_t *rmp;
ip4_address_t addr;
int rv;
-
memcpy (&addr.as_u8, mp->ip_address, 4);
rv = nat44_user_del (&addr, ntohl (mp->fib_index));
memcpy (&addr.as_u8, mp->ip_address, 4);
rv = nat44_user_del (&addr, ntohl (mp->fib_index));
-
REPLY_MACRO (VL_API_NAT44_DEL_USER_REPLY);
}
REPLY_MACRO (VL_API_NAT44_DEL_USER_REPLY);
}