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: scavenging functionality removed
[vpp.git]
/
src
/
plugins
/
nat
/
nat.h
diff --git
a/src/plugins/nat/nat.h
b/src/plugins/nat/nat.h
index
46dc040
..
46f8b44
100644
(file)
--- a/
src/plugins/nat/nat.h
+++ b/
src/plugins/nat/nat.h
@@
-320,6
+320,10
@@
typedef CLIB_PACKED(struct
u32 per_user_index;
u32 per_user_list_head_index;
u32 per_user_index;
u32 per_user_list_head_index;
+ /* index in global LRU list */
+ u32 global_lru_index;
+ f64 last_lru_update;
+
/* Last heard timer */
f64 last_heard;
/* Last heard timer */
f64 last_heard;
@@
-357,8
+361,6
@@
typedef struct
u32 sessions_per_user_list_head_index;
u32 nsessions;
u32 nstaticsessions;
u32 sessions_per_user_list_head_index;
u32 nsessions;
u32 nstaticsessions;
- /* discovered minimum session timeout time */
- u64 min_session_timeout;
} snat_user_t;
typedef struct
} snat_user_t;
typedef struct
@@
-521,20
+523,16
@@
typedef struct
/* Pool of doubly-linked list elements */
dlist_elt_t *list_pool;
/* Pool of doubly-linked list elements */
dlist_elt_t *list_pool;
+ /* LRU session list - head is stale, tail is fresh */
+ dlist_elt_t *global_lru_pool;
+ u32 global_lru_head_index;
+
/* NAT thread index */
u32 snat_thread_index;
/* real thread index */
u32 thread_index;
/* NAT thread index */
u32 snat_thread_index;
/* real thread index */
u32 thread_index;
- /* discovered minimum session timeout time */
- u64 min_session_timeout;
-
- /* session scavenging */
- u32 cleared;
- u32 cleanup_runs;
- f64 cleanup_timeout;
-
} snat_main_per_thread_data_t;
struct snat_main_s;
} snat_main_per_thread_data_t;
struct snat_main_s;
@@
-703,10
+701,10
@@
typedef struct snat_main_s
u8 out2in_dpo;
u8 endpoint_dependent;
u32 translation_buckets;
u8 out2in_dpo;
u8 endpoint_dependent;
u32 translation_buckets;
- u
32
translation_memory_size;
+ u
word
translation_memory_size;
u32 max_translations;
u32 user_buckets;
u32 max_translations;
u32 user_buckets;
- u
32
user_memory_size;
+ u
word
user_memory_size;
u32 max_translations_per_user;
u32 outside_vrf_id;
u32 outside_fib_index;
u32 max_translations_per_user;
u32 outside_vrf_id;
u32 outside_fib_index;
@@
-714,9
+712,6
@@
typedef struct snat_main_s
u32 inside_fib_index;
/* values of various timeouts */
u32 inside_fib_index;
/* values of various timeouts */
-
- // min timeout of all proto timeouts
- u32 min_timeout;
// proto timeouts
u32 udp_timeout;
u32 tcp_transitory_timeout;
// proto timeouts
u32 udp_timeout;
u32 tcp_transitory_timeout;