summaryrefslogtreecommitdiffstats
path: root/lib/memtypes.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/memtypes.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/memtypes.c')
-rw-r--r--lib/memtypes.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/lib/memtypes.c b/lib/memtypes.c
index 05d93225..fd99136c 100644
--- a/lib/memtypes.c
+++ b/lib/memtypes.c
@@ -1,4 +1,6 @@
/*
+ * Portions Copyright (c) 2008 Everton da Silva Marques <everton.marques@gmail.com>
+ *
* Memory type definitions. This file is parsed by memtypes.awk to extract
* MTYPE_ and memory_list_.. information in order to autogenerate
* memtypes.h.
@@ -244,6 +246,21 @@ struct memory_list memory_list_isis[] =
{ -1, NULL },
};
+struct memory_list memory_list_pim[] =
+{
+ { MTYPE_PIM_CHANNEL_OIL, "PIM SSM (S,G) channel OIL" },
+ { MTYPE_PIM_INTERFACE, "PIM interface" },
+ { MTYPE_PIM_IGMP_JOIN, "PIM interface IGMP static join" },
+ { MTYPE_PIM_IGMP_SOCKET, "PIM interface IGMP socket" },
+ { MTYPE_PIM_IGMP_GROUP, "PIM interface IGMP group" },
+ { MTYPE_PIM_IGMP_GROUP_SOURCE, "PIM interface IGMP source" },
+ { MTYPE_PIM_NEIGHBOR, "PIM interface neighbor" },
+ { MTYPE_PIM_IFCHANNEL, "PIM interface (S,G) state" },
+ { MTYPE_PIM_UPSTREAM, "PIM upstream (S,G) state" },
+ { MTYPE_PIM_SSMPINGD, "PIM sspimgd socket" },
+ { -1, NULL },
+};
+
struct memory_list memory_list_vtysh[] =
{
{ MTYPE_VTYSH_CONFIG, "Vtysh configuration", },
@@ -260,5 +277,6 @@ struct mlist mlists[] __attribute__ ((unused)) = {
{ memory_list_ospf6, "OSPF6" },
{ memory_list_isis, "ISIS" },
{ memory_list_bgp, "BGP" },
+ { memory_list_pim, "PIM" },
{ NULL, NULL},
};