summaryrefslogtreecommitdiffstats
path: root/lib/memory.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2010-02-04 03:41:06 +0100
committerDavid Lamparter <equinox@diac24.net>2010-02-04 03:41:06 +0100
commit447a9a8dbde95fc6ce92691491ac193f0199e2cd (patch)
tree4bfce47ead136e60cc91df50c3e79e75ddd4c83d /lib/memory.c
parent08e2c2ee9044a14f2cd9d382eec8f96189520160 (diff)
parent168595ff42c4046167b0fbae2770c037c854abd0 (diff)
downloadquagga-447a9a8dbde95fc6ce92691491ac193f0199e2cd.tar.bz2
quagga-447a9a8dbde95fc6ce92691491ac193f0199e2cd.tar.xz
Merge branch 'merged/pimd' into dn42
Conflicts: lib/route_types.txt
Diffstat (limited to 'lib/memory.c')
-rw-r--r--lib/memory.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/memory.c b/lib/memory.c
index dc09d8a6..6291bf0d 100644
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -1,6 +1,7 @@
/*
* Memory management routine
* Copyright (C) 1998 Kunihiro Ishiguro
+ * Portions Copyright (c) 2008 Everton da Silva Marques <everton.marques@gmail.com>
*
* This file is part of GNU Zebra.
*
@@ -482,6 +483,17 @@ DEFUN (show_memory_isis,
return CMD_SUCCESS;
}
+DEFUN (show_memory_pim,
+ show_memory_pim_cmd,
+ "show memory pim",
+ SHOW_STR
+ "Memory statistics\n"
+ "PIM memory\n")
+{
+ show_memory_vty (vty, memory_list_pim);
+ return CMD_SUCCESS;
+}
+
void
memory_init (void)
{
@@ -504,6 +516,7 @@ memory_init (void)
install_element (VIEW_NODE, &show_memory_ospf_cmd);
install_element (VIEW_NODE, &show_memory_ospf6_cmd);
install_element (VIEW_NODE, &show_memory_isis_cmd);
+ install_element (VIEW_NODE, &show_memory_pim_cmd);
install_element (ENABLE_NODE, &show_memory_cmd);
install_element (ENABLE_NODE, &show_memory_all_cmd);
@@ -514,7 +527,7 @@ memory_init (void)
install_element (ENABLE_NODE, &show_memory_bgp_cmd);
install_element (ENABLE_NODE, &show_memory_ospf_cmd);
install_element (ENABLE_NODE, &show_memory_ospf6_cmd);
- install_element (ENABLE_NODE, &show_memory_isis_cmd);
+ install_element (ENABLE_NODE, &show_memory_pim_cmd);
}
/* Stats querying from users */