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: tweak rfc7857 tcp connection tracking
[vpp.git]
/
src
/
plugins
/
nat
/
nat44-ed
/
nat44_ed.h
diff --git
a/src/plugins/nat/nat44-ed/nat44_ed.h
b/src/plugins/nat/nat44-ed/nat44_ed.h
index
05503a4
..
5b5b2ec
100644
(file)
--- a/
src/plugins/nat/nat44-ed/nat44_ed.h
+++ b/
src/plugins/nat/nat44-ed/nat44_ed.h
@@
-123,14
+123,10
@@
typedef enum
typedef enum
{
typedef enum
{
- NAT44_ED_TCP_FLAG_NONE = 0,
- NAT44_ED_TCP_FLAG_FIN,
+ NAT44_ED_TCP_FLAG_FIN = 0,
NAT44_ED_TCP_FLAG_SYN,
NAT44_ED_TCP_FLAG_SYN,
- NAT44_ED_TCP_FLAG_SYNFIN,
NAT44_ED_TCP_FLAG_RST,
NAT44_ED_TCP_FLAG_RST,
- NAT44_ED_TCP_FLAG_FINRST,
- NAT44_ED_TCP_FLAG_SYNRST,
- NAT44_ED_TCP_FLAG_SYNFINRST,
+ NAT44_ED_TCP_FLAG_ACK,
NAT44_ED_TCP_N_FLAG,
} nat44_ed_tcp_flag_e;
NAT44_ED_TCP_N_FLAG,
} nat44_ed_tcp_flag_e;
@@
-145,15
+141,8
@@
typedef enum
typedef enum
{
NAT44_ED_TCP_STATE_CLOSED = 0,
typedef enum
{
NAT44_ED_TCP_STATE_CLOSED = 0,
- NAT44_ED_TCP_STATE_SYN_I2O,
- NAT44_ED_TCP_STATE_SYN_O2I,
NAT44_ED_TCP_STATE_ESTABLISHED,
NAT44_ED_TCP_STATE_ESTABLISHED,
- NAT44_ED_TCP_STATE_FIN_I2O,
- NAT44_ED_TCP_STATE_FIN_O2I,
- NAT44_ED_TCP_STATE_RST_TRANS,
- NAT44_ED_TCP_STATE_FIN_TRANS,
- NAT44_ED_TCP_STATE_FIN_REOPEN_SYN_I2O,
- NAT44_ED_TCP_STATE_FIN_REOPEN_SYN_O2I,
+ NAT44_ED_TCP_STATE_CLOSING,
NAT44_ED_TCP_N_STATE,
} nat44_ed_tcp_state_e;
NAT44_ED_TCP_N_STATE,
} nat44_ed_tcp_state_e;
@@
-336,6
+325,7
@@
typedef CLIB_PACKED(struct
u16 ext_host_nat_port;
/* TCP session state */
u16 ext_host_nat_port;
/* TCP session state */
+ u8 tcp_flags[NAT44_ED_N_DIR];
nat44_ed_tcp_state_e tcp_state;
/* per vrf sessions index */
nat44_ed_tcp_state_e tcp_state;
/* per vrf sessions index */