diff options
| author | David Lamparter <equinox@diac24.net> | 2010-02-04 03:04:36 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-04 03:04:36 +0100 |
| commit | 406aadbf8ec3605115ba9a83d4994c2b61d0f5b3 (patch) | |
| tree | 5d51e649569435ffa45591edededeba58c9d4b9a /lib/memtypes.c | |
| parent | 2d3b742ab0c15303e008cd83f15bea869107fab9 (diff) | |
| parent | 6cf8c261d41624992f55b195aa52f8867c6833c7 (diff) | |
| download | quagga-406aadbf8ec3605115ba9a83d4994c2b61d0f5b3.tar.bz2 quagga-406aadbf8ec3605115ba9a83d4994c2b61d0f5b3.tar.xz | |
Merge remote branch 'qpimd/pim' into merged/pimd
Conflicts:
configure.ac
lib/zebra.h
vtysh/vtysh.c
Diffstat (limited to 'lib/memtypes.c')
| -rw-r--r-- | lib/memtypes.c | 18 |
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}, }; |