proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospf6d: kill ospf6_memory.h, use MTYPE_STATIC

Browse Source 
Same as other commits -- convert most DEFINE_MTYPE into the _STATIC
variant, and move the remaining non-static ones to appropriate places.

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2021-03-22 19:31:56 +01:00
parent 771e1fbee0
commit 30043e4ce2
15 changed files with 30 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ospf6d/ospf6_area.c
View File

@ -46,6 +46,7 @@
#include "ospf6d.h"
#include "lib/json.h"
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_AREA, "OSPF6 area");
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_PLISTNAME, "Prefix list name");
int ospf6_area_cmp(void *va, void *vb)

4
ospf6d/ospf6_asbr.c
View File

@ -49,6 +49,10 @@
#include "ospf6d.h"
#include "lib/json.h"
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_EXTERNAL_INFO, "OSPF6 ext. info");
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_DIST_ARGS, "OSPF6 Distribute arguments");
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_REDISTRIBUTE, "OSPF6 Redistribute arguments");
static void ospf6_asbr_redistribute_set(int type, vrf_id_t vrf_id);
static void ospf6_asbr_redistribute_unset(struct ospf6 *ospf6,
struct ospf6_redist *red, int type);

1
ospf6d/ospf6_interface.c
View File

@ -45,6 +45,7 @@
#include "ospf6_zebra.h"
#include "lib/json.h"
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_IF, "OSPF6 interface");
DEFINE_MTYPE_STATIC(OSPF6D, CFG_PLIST_NAME, "configured prefix list names");
DEFINE_QOBJ_TYPE(ospf6_interface);
DEFINE_HOOK(ospf6_interface_change,

6
ospf6d/ospf6_lsa.c
View File

@ -43,6 +43,10 @@
#include "ospf6_flood.h"
#include "ospf6d.h"
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_LSA, "OSPF6 LSA");
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_LSA_HEADER, "OSPF6 LSA header");
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_LSA_SUMMARY, "OSPF6 LSA summary");
vector ospf6_lsa_handler_vector;
struct ospf6 *ospf6_get_by_lsdb(struct ospf6_lsa *lsa)
@ -659,6 +663,8 @@ void ospf6_lsa_show(struct vty *vty, struct ospf6_lsa *lsa,
struct ospf6_lsa *ospf6_lsa_alloc(size_t lsa_length)
{
struct ospf6_lsa *lsa;
lsa = XCALLOC(MTYPE_OSPF6_LSA, sizeof(struct ospf6_lsa));
lsa->header = XMALLOC(MTYPE_OSPF6_LSA_HEADER, lsa_length);

2
ospf6d/ospf6_lsdb.c
View File

@ -34,6 +34,8 @@
#include "ospf6d.h"
#include "bitfield.h"
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_LSDB, "OSPF6 LSA database");
struct ospf6_lsdb *ospf6_lsdb_create(void *data)
{
struct ospf6_lsdb *lsdb;

47
ospf6d/ospf6_memory.c
View File

@ -1,47 +0,0 @@
/* ospf6d 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 "ospf6_memory.h"
DEFINE_MGROUP(OSPF6D, "ospf6d");
DEFINE_MTYPE(OSPF6D, OSPF6_TOP, "OSPF6 top");
DEFINE_MTYPE(OSPF6D, OSPF6_AREA, "OSPF6 area");
DEFINE_MTYPE(OSPF6D, OSPF6_IF, "OSPF6 interface");
DEFINE_MTYPE(OSPF6D, OSPF6_NEIGHBOR, "OSPF6 neighbor");
DEFINE_MTYPE(OSPF6D, OSPF6_ROUTE, "OSPF6 route");
DEFINE_MTYPE(OSPF6D, OSPF6_PREFIX, "OSPF6 prefix");
DEFINE_MTYPE(OSPF6D, OSPF6_MESSAGE, "OSPF6 message");
DEFINE_MTYPE(OSPF6D, OSPF6_LSA, "OSPF6 LSA");
DEFINE_MTYPE(OSPF6D, OSPF6_LSA_HEADER, "OSPF6 LSA header");
DEFINE_MTYPE(OSPF6D, OSPF6_LSA_SUMMARY, "OSPF6 LSA summary");
DEFINE_MTYPE(OSPF6D, OSPF6_LSDB, "OSPF6 LSA database");
DEFINE_MTYPE(OSPF6D, OSPF6_VERTEX, "OSPF6 vertex");
DEFINE_MTYPE(OSPF6D, OSPF6_SPFTREE, "OSPF6 SPF tree");
DEFINE_MTYPE(OSPF6D, OSPF6_NEXTHOP, "OSPF6 nexthop");
DEFINE_MTYPE(OSPF6D, OSPF6_EXTERNAL_INFO, "OSPF6 ext. info");
DEFINE_MTYPE(OSPF6D, OSPF6_PATH, "OSPF6 Path");
DEFINE_MTYPE(OSPF6D, OSPF6_DIST_ARGS, "OSPF6 Distribute arguments");
DEFINE_MTYPE(OSPF6D, OSPF6_OTHER, "OSPF6 other");
DEFINE_MTYPE(OSPF6D, OSPF6_REDISTRIBUTE, "OSPF6 Redistribute arguments");

48
ospf6d/ospf6_memory.h
View File

@ -1,48 +0,0 @@
/* ospf6d 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_OSPF6_MEMORY_H
#define _QUAGGA_OSPF6_MEMORY_H
#include "memory.h"
DECLARE_MGROUP(OSPF6D);
DECLARE_MTYPE(OSPF6_TOP);
DECLARE_MTYPE(OSPF6_AREA);
DECLARE_MTYPE(OSPF6_IF);
DECLARE_MTYPE(OSPF6_NEIGHBOR);
DECLARE_MTYPE(OSPF6_ROUTE);
DECLARE_MTYPE(OSPF6_PREFIX);
DECLARE_MTYPE(OSPF6_MESSAGE);
DECLARE_MTYPE(OSPF6_LSA);
DECLARE_MTYPE(OSPF6_LSA_HEADER);
DECLARE_MTYPE(OSPF6_LSA_SUMMARY);
DECLARE_MTYPE(OSPF6_LSDB);
DECLARE_MTYPE(OSPF6_VERTEX);
DECLARE_MTYPE(OSPF6_SPFTREE);
DECLARE_MTYPE(OSPF6_NEXTHOP);
DECLARE_MTYPE(OSPF6_EXTERNAL_INFO);
DECLARE_MTYPE(OSPF6_PATH);
DECLARE_MTYPE(OSPF6_DIST_ARGS);
DECLARE_MTYPE(OSPF6_REDISTRIBUTE);
DECLARE_MTYPE(OSPF6_OTHER);
#endif /* _QUAGGA_OSPF6_MEMORY_H */

2
ospf6d/ospf6_message.c
View File

@ -49,6 +49,8 @@
#include <netinet/ip6.h>
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_MESSAGE, "OSPF6 message");
unsigned char conf_debug_ospf6_message[6] = {0x03, 0, 0, 0, 0, 0};
static const struct message ospf6_message_type_str[] = {
{OSPF6_MESSAGE_TYPE_HELLO, "Hello"},

2
ospf6d/ospf6_neighbor.c
View File

@ -46,6 +46,8 @@
#include "ospf6_zebra.h"
#include "lib/json.h"
DEFINE_MTYPE(OSPF6D, OSPF6_NEIGHBOR, "OSPF6 neighbor");
DEFINE_HOOK(ospf6_neighbor_change,
(struct ospf6_neighbor * on, int state, int next_state),
(on, state, next_state));

4
ospf6d/ospf6_route.c
View File

@ -38,6 +38,10 @@
#include "ospf6d.h"
#include "ospf6_zebra.h"
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_ROUTE, "OSPF6 route");
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_NEXTHOP, "OSPF6 nexthop");
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_PATH, "OSPF6 Path");
unsigned char conf_debug_ospf6_route = 0;
static char *ospf6_route_table_name(struct ospf6_route_table *table)

2
ospf6d/ospf6_spf.c
View File

@ -43,6 +43,8 @@
#include "ospf6d.h"
#include "ospf6_abr.h"
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_VERTEX, "OSPF6 vertex");
unsigned char conf_debug_ospf6_spf = 0;
static void ospf6_spf_copy_nexthops_to_route(struct ospf6_route *rt,

2
ospf6d/ospf6_top.c
View File

@ -53,6 +53,8 @@
#include "ospf6d.h"
#include "lib/json.h"
DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_TOP, "OSPF6 top");
DEFINE_QOBJ_TYPE(ospf6);
FRR_CFG_DEFAULT_BOOL(OSPF6_LOG_ADJACENCY_CHANGES,

2
ospf6d/ospf6d.c
View File

@ -46,6 +46,8 @@
#include "ospf6_bfd.h"
#include "lib/json.h"
DEFINE_MGROUP(OSPF6D, "ospf6d");
struct route_node *route_prev(struct route_node *node)
{
struct route_node *end;

3
ospf6d/ospf6d.h
View File

@ -23,8 +23,9 @@
#include "libospf.h"
#include "thread.h"
#include "memory.h"
#include "ospf6_memory.h"
DECLARE_MGROUP(OSPF6D);
/* global variables */
extern struct thread_master *master;

2
ospf6d/subdir.am
View File

@ -40,7 +40,6 @@ ospf6d_libospf6_a_SOURCES = \
ospf6d/ospf6_intra.c \
ospf6d/ospf6_lsa.c \
ospf6d/ospf6_lsdb.c \
ospf6d/ospf6_memory.c \
ospf6d/ospf6_message.c \
ospf6d/ospf6_neighbor.c \
ospf6d/ospf6_network.c \
@ -62,7 +61,6 @@ noinst_HEADERS += \
ospf6d/ospf6_intra.h \
ospf6d/ospf6_lsa.h \
ospf6d/ospf6_lsdb.h \
ospf6d/ospf6_memory.h \
ospf6d/ospf6_message.h \
ospf6d/ospf6_neighbor.h \
ospf6d/ospf6_network.h \