diff options
author | Maria Matejka <mq@ucw.cz> | 2022-11-07 10:28:01 +0100 |
---|---|---|
committer | Maria Matejka <mq@ucw.cz> | 2022-11-07 10:28:01 +0100 |
commit | 7bbd0b5a3b670cfbe72df21054465b71a632962f (patch) | |
tree | 5b1ca17e997224af1f5837b5ef2b1900366ea1dd /nest | |
parent | 40bae8e1b788a535466ac673629fc93b6a258576 (diff) | |
parent | 37b644413723670928f6b54f2abe0c852eb0b652 (diff) |
Merge commit '37b64441' into thread-next
Diffstat (limited to 'nest')
-rw-r--r-- | nest/cmds.c | 1 | ||||
-rw-r--r-- | nest/config.Y | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nest/cmds.c b/nest/cmds.c index 8a5bbdd4..6717be0c 100644 --- a/nest/cmds.c +++ b/nest/cmds.c @@ -118,6 +118,7 @@ cmd_show_memory(void) print_size("Routing tables:", rmemsize(rt_table_pool)); print_size("Route attributes:", rmemsize(rta_pool)); print_size("Protocols:", rmemsize(proto_pool)); + print_size("Current config:", rmemsize(config_pool)); struct resmem total = rmemsize(&root_pool); #ifdef HAVE_MMAP int pk = atomic_load_explicit(&pages_kept, memory_order_relaxed) diff --git a/nest/config.Y b/nest/config.Y index f2904882..dc174b7b 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -656,7 +656,7 @@ CF_CLI(SHOW INTERFACES SUMMARY,,, [[Show summary of network interfaces]]) { if_show_summary(); } ; CF_CLI_HELP(SHOW ROUTE, ..., [[Show routing table]]) -CF_CLI(SHOW ROUTE, r_args, [[[<prefix>|for <prefix>|for <ip>] [table <t>] [filter <f>|where <cond>] [all] [primary] [filtered] [(export|preexport|noexport) <p>] [protocol <p>] [stats|count]]], [[Show routing table]]) +CF_CLI(SHOW ROUTE, r_args, [[[<prefix>|for <prefix>|for <ip>] [table <t>] [(import|export) table <p>.<c>] [filter <f>|where <cond>] [all] [primary] [filtered] [(export|preexport|noexport) <p>] [protocol <p>] [stats|count]]], [[Show routing table]]) { rt_show($3); } ; r_args: |