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: nat44-ed sm fix
[vpp.git]
/
src
/
plugins
/
nat
/
nat44-ed
/
nat44_ed_in2out.c
diff --git
a/src/plugins/nat/nat44-ed/nat44_ed_in2out.c
b/src/plugins/nat/nat44-ed/nat44_ed_in2out.c
index
f7257db
..
523d262
100644
(file)
--- a/
src/plugins/nat/nat44-ed/nat44_ed_in2out.c
+++ b/
src/plugins/nat/nat44-ed/nat44_ed_in2out.c
@@
-342,7
+342,7
@@
slow_path_ed (vlib_main_t *vm, snat_main_t *sm, vlib_buffer_t *b,
ip4_address_t outside_addr;
u16 outside_port;
u32 outside_fib_index;
ip4_address_t outside_addr;
u16 outside_port;
u32 outside_fib_index;
- u8 is_identity_nat;
+ u8 is_identity_nat
= 0
;
u32 nat_proto = ip_proto_to_nat_proto (proto);
snat_session_t *s = NULL;
u32 nat_proto = ip_proto_to_nat_proto (proto);
snat_session_t *s = NULL;
@@
-350,17
+350,6
@@
slow_path_ed (vlib_main_t *vm, snat_main_t *sm, vlib_buffer_t *b,
ip4_address_t daddr = r_addr;
u16 dport = r_port;
ip4_address_t daddr = r_addr;
u16 dport = r_port;
- if (PREDICT_TRUE (nat_proto == NAT_PROTOCOL_TCP))
- {
- if (PREDICT_FALSE
- (!tcp_flags_is_init
- (vnet_buffer (b)->ip.reass.icmp_type_or_tcp_flags)))
- {
- b->error = node->errors[NAT_IN2OUT_ED_ERROR_NON_SYN];
- return NAT_NEXT_DROP;
- }
- }
-
if (PREDICT_FALSE
(nat44_ed_maximum_sessions_exceeded (sm, rx_fib_index, thread_index)))
{
if (PREDICT_FALSE
(nat44_ed_maximum_sessions_exceeded (sm, rx_fib_index, thread_index)))
{
@@
-402,13
+391,22
@@
slow_path_ed (vlib_main_t *vm, snat_main_t *sm, vlib_buffer_t *b,
}
else
{
}
else
{
+ if (PREDICT_FALSE (is_identity_nat))
+ {
+ *sessionp = NULL;
+ return next;
+ }
is_sm = 1;
}
is_sm = 1;
}
- if (PREDICT_
FALSE (is_sm && is_identity_nat
))
+ if (PREDICT_
TRUE (nat_proto == NAT_PROTOCOL_TCP
))
{
{
- *sessionp = NULL;
- return next;
+ if (PREDICT_FALSE (!tcp_flags_is_init (
+ vnet_buffer (b)->ip.reass.icmp_type_or_tcp_flags)))
+ {
+ b->error = node->errors[NAT_IN2OUT_ED_ERROR_NON_SYN];
+ return NAT_NEXT_DROP;
+ }
}
s = nat_ed_session_alloc (sm, thread_index, now, proto);
}
s = nat_ed_session_alloc (sm, thread_index, now, proto);