*: 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>

1 files changed, 110 insertions, 0 deletions

diff --git a/bgpd/bgp_memory.c b/bgpd/bgp_memory.c
new file mode 100644
index 000000000..166400b74
--- /dev/null
+++ b/bgpd/bgp_memory.c
@@ -0,0 +1,110 @@
+/* bgpd 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 "bgp_memory.h"
+
+/* this file is temporary in nature;  definitions should be moved to the
+ * files they're used in */
+
+DEFINE_MGROUP(BGPD, "bgpd")
+DEFINE_MTYPE(BGPD, BGP,			"BGP instance")
+DEFINE_MTYPE(BGPD, BGP_LISTENER,		"BGP listen socket details")
+DEFINE_MTYPE(BGPD, BGP_PEER,		"BGP peer")
+DEFINE_MTYPE(BGPD, BGP_PEER_HOST,		"BGP peer hostname")
+DEFINE_MTYPE(BGPD, BGP_PEER_IFNAME,	"BGP peer ifname")
+DEFINE_MTYPE(BGPD, PEER_GROUP,		"Peer group")
+DEFINE_MTYPE(BGPD, PEER_GROUP_HOST,	"BGP Peer group hostname")
+DEFINE_MTYPE(BGPD, PEER_DESC,		"Peer description")
+DEFINE_MTYPE(BGPD, PEER_PASSWORD,		"Peer password string")
+DEFINE_MTYPE(BGPD, BGP_PEER_AF,		"BGP peer af")
+DEFINE_MTYPE(BGPD, BGP_UPDGRP,		"BGP update group")
+DEFINE_MTYPE(BGPD, BGP_UPD_SUBGRP,	"BGP update subgroup")
+DEFINE_MTYPE(BGPD, BGP_PACKET, 	        "BGP packet")
+DEFINE_MTYPE(BGPD, ATTR,			"BGP attribute")
+DEFINE_MTYPE(BGPD, ATTR_EXTRA,		"BGP extra attributes")
+DEFINE_MTYPE(BGPD, AS_PATH,		"BGP aspath")
+DEFINE_MTYPE(BGPD, AS_SEG,			"BGP aspath seg")
+DEFINE_MTYPE(BGPD, AS_SEG_DATA,		"BGP aspath segment data")
+DEFINE_MTYPE(BGPD, AS_STR,			"BGP aspath str")
+
+DEFINE_MTYPE(BGPD, BGP_TABLE,		"BGP table")
+DEFINE_MTYPE(BGPD, BGP_NODE,		"BGP node")
+DEFINE_MTYPE(BGPD, BGP_ROUTE,		"BGP route")
+DEFINE_MTYPE(BGPD, BGP_ROUTE_EXTRA,	"BGP ancillary route info")
+DEFINE_MTYPE(BGPD, BGP_CONN,		"BGP connected")
+DEFINE_MTYPE(BGPD, BGP_STATIC,		"BGP static")
+DEFINE_MTYPE(BGPD, BGP_ADVERTISE_ATTR,	"BGP adv attr")
+DEFINE_MTYPE(BGPD, BGP_ADVERTISE,		"BGP adv")
+DEFINE_MTYPE(BGPD, BGP_SYNCHRONISE,	"BGP synchronise")
+DEFINE_MTYPE(BGPD, BGP_ADJ_IN,		"BGP adj in")
+DEFINE_MTYPE(BGPD, BGP_ADJ_OUT,		"BGP adj out")
+DEFINE_MTYPE(BGPD, BGP_MPATH_INFO,		"BGP multipath info")
+
+DEFINE_MTYPE(BGPD, AS_LIST,		"BGP AS list")
+DEFINE_MTYPE(BGPD, AS_FILTER,		"BGP AS filter")
+DEFINE_MTYPE(BGPD, AS_FILTER_STR,		"BGP AS filter str")
+
+DEFINE_MTYPE(BGPD, COMMUNITY,		"community")
+DEFINE_MTYPE(BGPD, COMMUNITY_VAL,		"community val")
+DEFINE_MTYPE(BGPD, COMMUNITY_STR,		"community str")
+
+DEFINE_MTYPE(BGPD, ECOMMUNITY,		"extcommunity")
+DEFINE_MTYPE(BGPD, ECOMMUNITY_VAL,		"extcommunity val")
+DEFINE_MTYPE(BGPD, ECOMMUNITY_STR,		"extcommunity str")
+
+DEFINE_MTYPE(BGPD, COMMUNITY_LIST,		"community-list")
+DEFINE_MTYPE(BGPD, COMMUNITY_LIST_NAME,	"community-list name")
+DEFINE_MTYPE(BGPD, COMMUNITY_LIST_ENTRY,	"community-list entry")
+DEFINE_MTYPE(BGPD, COMMUNITY_LIST_CONFIG,	"community-list config")
+DEFINE_MTYPE(BGPD, COMMUNITY_LIST_HANDLER,	"community-list handler")
+
+DEFINE_MTYPE(BGPD, CLUSTER,		"Cluster list")
+DEFINE_MTYPE(BGPD, CLUSTER_VAL,		"Cluster list val")
+
+DEFINE_MTYPE(BGPD, BGP_PROCESS_QUEUE,	"BGP Process queue")
+DEFINE_MTYPE(BGPD, BGP_CLEAR_NODE_QUEUE,	"BGP node clear queue")
+
+DEFINE_MTYPE(BGPD, TRANSIT,		"BGP transit attr")
+DEFINE_MTYPE(BGPD, TRANSIT_VAL,		"BGP transit val")
+
+DEFINE_MTYPE(BGPD, BGP_DEBUG_FILTER,	"BGP debug filter")
+DEFINE_MTYPE(BGPD, BGP_DEBUG_STR,	"BGP debug filter string")
+
+DEFINE_MTYPE(BGPD, BGP_DISTANCE,		"BGP distance")
+DEFINE_MTYPE(BGPD, BGP_NEXTHOP_CACHE,	"BGP nexthop")
+DEFINE_MTYPE(BGPD, BGP_CONFED_LIST,	"BGP confed list")
+DEFINE_MTYPE(BGPD, PEER_UPDATE_SOURCE,	"BGP peer update interface")
+DEFINE_MTYPE(BGPD, PEER_CONF_IF,	"BGP peer config interface")
+DEFINE_MTYPE(BGPD, BGP_DAMP_INFO,		"Dampening info")
+DEFINE_MTYPE(BGPD, BGP_DAMP_ARRAY,		"BGP Dampening array")
+DEFINE_MTYPE(BGPD, BGP_REGEXP,		"BGP regexp")
+DEFINE_MTYPE(BGPD, BGP_AGGREGATE,		"BGP aggregate")
+DEFINE_MTYPE(BGPD, BGP_ADDR,		"BGP own address")
+
+DEFINE_MTYPE(BGPD, BGP_REDIST,		"BGP redistribution")
+DEFINE_MTYPE(BGPD, BGP_FILTER_NAME,	"BGP Filter Information")
+DEFINE_MTYPE(BGPD, BGP_DUMP_STR,	"BGP Dump String Information")
+DEFINE_MTYPE(BGPD, ENCAP_TLV,		"ENCAP TLV")