diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2015-05-29 05:48:31 +0200 | 
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-09-19 16:31:04 -0400 | 
| commit | 4a1ab8e4050a141d3d7a80b5f8bb27dfd045dae8 (patch) | |
| tree | 14b33d958cb88df6195994c78ee74b781e7968a6 /pimd/pim_memory.c | |
| parent | fc7948fafee457874a21aa955c56a617b563f85c (diff) | |
*: split & distribute memtypes and stop (re|ab)using lib/ MTYPEs
This is a rather large mechanical commit that splits up the memory types
defined in lib/memtypes.c and distributes them into *_memory.[ch] files
in the individual daemons.
The zebra change is slightly annoying because there is no nice place to
put the #include "zebra_memory.h" statement.
bgpd, ospf6d, isisd and some tests were reusing MTYPEs defined in the
library for its own use.  This is bad practice and would break when the
memtype are made static.
Acked-by: Vincent JARDIN <vincent.jardin@6wind.com>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
[CF: rebased for cmaster-next]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Diffstat (limited to 'pimd/pim_memory.c')
| -rw-r--r-- | pimd/pim_memory.c | 41 | 
1 files changed, 41 insertions, 0 deletions
diff --git a/pimd/pim_memory.c b/pimd/pim_memory.c new file mode 100644 index 0000000000..6014725020 --- /dev/null +++ b/pimd/pim_memory.c @@ -0,0 +1,41 @@ +/* pimd memory type definitions + * + * Copyright (C) 2015  David Lamparter + * + * This file is part of Quagga. + * + * Quagga is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2, or (at your option) any + * later version. + * + * Quagga is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Quagga; see the file COPYING.  If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "pim_memory.h" + +DEFINE_MGROUP(PIMD, "pimd") +DEFINE_MTYPE(PIMD, PIM_CHANNEL_OIL,       "PIM SSM (S,G) channel OIL") +DEFINE_MTYPE(PIMD, PIM_INTERFACE,         "PIM interface") +DEFINE_MTYPE(PIMD, PIM_IGMP_JOIN,         "PIM interface IGMP static join") +DEFINE_MTYPE(PIMD, PIM_IGMP_SOCKET,       "PIM interface IGMP socket") +DEFINE_MTYPE(PIMD, PIM_IGMP_GROUP,        "PIM interface IGMP group") +DEFINE_MTYPE(PIMD, PIM_IGMP_GROUP_SOURCE, "PIM interface IGMP source") +DEFINE_MTYPE(PIMD, PIM_NEIGHBOR,          "PIM interface neighbor") +DEFINE_MTYPE(PIMD, PIM_IFCHANNEL,         "PIM interface (S,G) state") +DEFINE_MTYPE(PIMD, PIM_UPSTREAM,          "PIM upstream (S,G) state") +DEFINE_MTYPE(PIMD, PIM_SSMPINGD,          "PIM sspimgd socket") +DEFINE_MTYPE(PIMD, PIM_STATIC_ROUTE,      "PIM Static Route") +DEFINE_MTYPE(PIMD, PIM_BR,                "PIM Bridge Router info")  | 
