From: David Lamparter Date: Fri, 21 Jun 2019 06:44:11 +0000 (+0200) Subject: ripngd: use MTYPE_STATIC X-Git-Tag: base_7.2~203^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F4573%2Fhead;p=mirror%2Ffrr.git ripngd: use MTYPE_STATIC Signed-off-by: David Lamparter --- diff --git a/ripngd/ripng_memory.c b/ripngd/ripng_memory.c deleted file mode 100644 index f459566bed..0000000000 --- a/ripngd/ripng_memory.c +++ /dev/null @@ -1,35 +0,0 @@ -/* ripngd 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 this program; see the file COPYING; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "ripng_memory.h" - -DEFINE_MGROUP(RIPNGD, "ripngd") -DEFINE_MTYPE(RIPNGD, RIPNG, "RIPng structure") -DEFINE_MTYPE(RIPNGD, RIPNG_VRF_NAME, "RIPng VRF name") -DEFINE_MTYPE(RIPNGD, RIPNG_ROUTE, "RIPng route info") -DEFINE_MTYPE(RIPNGD, RIPNG_AGGREGATE, "RIPng aggregate") -DEFINE_MTYPE(RIPNGD, RIPNG_PEER, "RIPng peer") -DEFINE_MTYPE(RIPNGD, RIPNG_OFFSET_LIST, "RIPng offset lst") -DEFINE_MTYPE(RIPNGD, RIPNG_RTE_DATA, "RIPng rte data") diff --git a/ripngd/ripng_memory.h b/ripngd/ripng_memory.h deleted file mode 100644 index 3dfc57b3ff..0000000000 --- a/ripngd/ripng_memory.h +++ /dev/null @@ -1,36 +0,0 @@ -/* ripngd memory type declarations - * - * 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 this program; see the file COPYING; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _QUAGGA_RIPNG_MEMORY_H -#define _QUAGGA_RIPNG_MEMORY_H - -#include "memory.h" - -DECLARE_MGROUP(RIPNGD) -DECLARE_MTYPE(RIPNG) -DECLARE_MTYPE(RIPNG_VRF_NAME) -DECLARE_MTYPE(RIPNG_ROUTE) -DECLARE_MTYPE(RIPNG_AGGREGATE) -DECLARE_MTYPE(RIPNG_PEER) -DECLARE_MTYPE(RIPNG_OFFSET_LIST) -DECLARE_MTYPE(RIPNG_RTE_DATA) - -#endif /* _QUAGGA_RIPNG_MEMORY_H */ diff --git a/ripngd/ripng_nexthop.c b/ripngd/ripng_nexthop.c index 882c2fbc8c..ba6e52fdda 100644 --- a/ripngd/ripng_nexthop.c +++ b/ripngd/ripng_nexthop.c @@ -39,6 +39,8 @@ #include "ripngd/ripng_debug.h" #include "ripngd/ripng_nexthop.h" +DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_RTE_DATA, "RIPng rte data") + #define DEBUG 1 #define min(a, b) ((a) < (b) ? (a) : (b)) diff --git a/ripngd/ripng_offset.c b/ripngd/ripng_offset.c index fe95ccfc2b..0094c993ad 100644 --- a/ripngd/ripng_offset.c +++ b/ripngd/ripng_offset.c @@ -33,6 +33,8 @@ #include "ripngd/ripngd.h" +DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_OFFSET_LIST, "RIPng offset lst") + #define OFFSET_LIST_IN_NAME(O) ((O)->direct[RIPNG_OFFSET_LIST_IN].alist_name) #define OFFSET_LIST_IN_METRIC(O) ((O)->direct[RIPNG_OFFSET_LIST_IN].metric) diff --git a/ripngd/ripng_peer.c b/ripngd/ripng_peer.c index 5376007747..109524e212 100644 --- a/ripngd/ripng_peer.c +++ b/ripngd/ripng_peer.c @@ -34,6 +34,8 @@ #include "ripngd/ripngd.h" #include "ripngd/ripng_nexthop.h" +DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_PEER, "RIPng peer") + static struct ripng_peer *ripng_peer_new(void) { return XCALLOC(MTYPE_RIPNG_PEER, sizeof(struct ripng_peer)); diff --git a/ripngd/ripng_route.c b/ripngd/ripng_route.c index 1bf1007fec..ed9d77a378 100644 --- a/ripngd/ripng_route.c +++ b/ripngd/ripng_route.c @@ -30,6 +30,8 @@ #include "ripngd/ripngd.h" #include "ripngd/ripng_route.h" +DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_AGGREGATE, "RIPng aggregate") + static struct ripng_aggregate *ripng_aggregate_new(void) { struct ripng_aggregate *new; diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index 71bc43049a..3314892e74 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -43,6 +43,11 @@ #include "ripngd/ripng_debug.h" #include "ripngd/ripng_nexthop.h" +DEFINE_MGROUP(RIPNGD, "ripngd") +DEFINE_MTYPE_STATIC(RIPNGD, RIPNG, "RIPng structure") +DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_VRF_NAME, "RIPng VRF name") +DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_ROUTE, "RIPng route info") + enum { ripng_all_route, ripng_changed_route, }; diff --git a/ripngd/ripngd.h b/ripngd/ripngd.h index a2686304fc..5a0d350a84 100644 --- a/ripngd/ripngd.h +++ b/ripngd/ripngd.h @@ -26,8 +26,7 @@ #include #include #include - -#include "ripng_memory.h" +#include /* RIPng version and port number. */ #define RIPNG_V1 1 @@ -87,6 +86,8 @@ #define RIPNG_INSTANCE "/frr-ripngd:ripngd/instance" #define RIPNG_IFACE "/frr-interface:lib/interface/frr-ripngd:ripng" +DECLARE_MGROUP(RIPNGD) + /* RIPng structure. */ struct ripng { RB_ENTRY(ripng) entry; diff --git a/ripngd/subdir.am b/ripngd/subdir.am index ea0ccf1482..eac0d67313 100644 --- a/ripngd/subdir.am +++ b/ripngd/subdir.am @@ -17,7 +17,6 @@ ripngd_libripng_a_SOURCES = \ ripngd/ripng_cli.c \ ripngd/ripng_debug.c \ ripngd/ripng_interface.c \ - ripngd/ripng_memory.c \ ripngd/ripng_nexthop.c \ ripngd/ripng_offset.c \ ripngd/ripng_northbound.c \ @@ -34,7 +33,6 @@ ripngd/ripng_cli.$(OBJEXT): ripngd/ripng_cli_clippy.c noinst_HEADERS += \ ripngd/ripng_cli.h \ ripngd/ripng_debug.h \ - ripngd/ripng_memory.h \ ripngd/ripng_nexthop.h \ ripngd/ripng_route.h \ ripngd/ripngd.h \