diff options
author | Maria Matejka <mq@ucw.cz> | 2022-07-10 14:19:24 +0200 |
---|---|---|
committer | Maria Matejka <mq@ucw.cz> | 2022-07-10 14:19:24 +0200 |
commit | 7e9cede1fd1878fb4c00e793bccd0ca6c18ad452 (patch) | |
tree | a61f837bcbda9aac2c6278d6f3e256e17b41aac3 /nest/config.Y | |
parent | 652be92a21f5575e5f74f6abe98eb4200b86776c (diff) | |
parent | b867c798c3e42c875311a79fe53a36d4a5bfd126 (diff) |
Merge version 2.0.10 into backport
Diffstat (limited to 'nest/config.Y')
-rw-r--r-- | nest/config.Y | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nest/config.Y b/nest/config.Y index 92a80589..27e1682b 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -125,7 +125,7 @@ CF_KEYWORDS(TIMEFORMAT, ISO, SHORT, LONG, ROUTE, PROTOCOL, BASE, LOG, S, MS, US) CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, FLUSH, AS) CF_KEYWORDS(MIN, IDLE, RX, TX, INTERVAL, MULTIPLIER, PASSIVE) CF_KEYWORDS(CHECK, LINK) -CF_KEYWORDS(SORTED, TRIE, MIN, MAX, SETTLE, TIME) +CF_KEYWORDS(SORTED, TRIE, MIN, MAX, SETTLE, TIME, GC, THRESHOLD, PERIOD) /* For r_args_channel */ CF_KEYWORDS(IPV4, IPV4_MC, IPV4_MPLS, IPV6, IPV6_MC, IPV6_MPLS, IPV6_SADR, VPN4, VPN4_MC, VPN4_MPLS, VPN6, VPN6_MC, VPN6_MPLS, ROA4, ROA6, FLOW4, FLOW6, MPLS, PRI, SEC) @@ -229,6 +229,8 @@ table_opt: } | MIN SETTLE TIME expr_us { this_table->min_settle_time = $4; } | MAX SETTLE TIME expr_us { this_table->max_settle_time = $4; } + | GC THRESHOLD expr { this_table->gc_threshold = $3; } + | GC PERIOD expr_us { this_table->gc_period = (uint) $3; if ($3 > 3600 S_) cf_error("GC period must be at most 3600 s"); } ; table_opts: |