Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-05-01 05:57:15 +02:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

*: require semicolon after DEFINE_MTYPE & co

Browse source 
Back when I put this together in 2015, ISO C11 was still reasonably new
and we couldn't require it just yet.  Without ISO C11, there is no
"good" way (only bad hacks) to require a semicolon after a macro that
ends with a function definition.  And if you added one anyway, you'd get
"spurious semicolon" warnings on some compilers...

With C11, `_Static_assert()` at the end of a macro will make it so that
the semicolon is properly required, consumed, and not warned about.

Consistently requiring semicolons after "file-level" macros matches
Linux kernel coding style and helps some editors against mis-syntax'ing
these macros.

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2021-02-21 06:18:10 +01:00
parent 15c05f1edf
commit bf8d3d6aca
176 changed files with 825 additions and 819 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
babeld/babel_interface.c
View file

@ -42,7 +42,7 @@ THE SOFTWARE.
#include "xroute.h" #include "xroute.h"
#include "babel_errors.h" #include "babel_errors.h"
DEFINE_MTYPE_STATIC(BABELD, BABEL_IF, "Babel Interface") DEFINE_MTYPE_STATIC(BABELD, BABEL_IF, "Babel Interface");
#define IS_ENABLE(ifp) (babel_enable_if_lookup(ifp->name) >= 0) #define IS_ENABLE(ifp) (babel_enable_if_lookup(ifp->name) >= 0)

4
babeld/babeld.c
View file

@ -46,8 +46,8 @@ THE SOFTWARE.
#include "babel_zebra.h" #include "babel_zebra.h"
#include "babel_errors.h" #include "babel_errors.h"
DEFINE_MGROUP(BABELD, "babeld") DEFINE_MGROUP(BABELD, "babeld");
DEFINE_MTYPE_STATIC(BABELD, BABEL, "Babel Structure") DEFINE_MTYPE_STATIC(BABELD, BABEL, "Babel Structure");
static int babel_init_routing_process(struct thread *thread); static int babel_init_routing_process(struct thread *thread);
static void babel_get_myid(void); static void babel_get_myid(void);

2
babeld/util.h
View file

@ -29,7 +29,7 @@ THE SOFTWARE.
#include "log.h" #include "log.h"
#include "memory.h" #include "memory.h"
DECLARE_MGROUP(BABELD) DECLARE_MGROUP(BABELD);
#if defined(i386) || defined(__mc68020__) || defined(__x86_64__) #if defined(i386) || defined(__mc68020__) || defined(__x86_64__)
#define DO_NTOHS(_d, _s) do{ _d = ntohs(*(const unsigned short*)(_s)); }while(0) #define DO_NTOHS(_d, _s) do{ _d = ntohs(*(const unsigned short*)(_s)); }while(0)

8
bfdd/bfd.c
View file

@ -32,10 +32,10 @@
#include "bfd.h" #include "bfd.h"
DEFINE_MTYPE_STATIC(BFDD, BFDD_CONFIG, "long-lived configuration memory") DEFINE_MTYPE_STATIC(BFDD, BFDD_CONFIG, "long-lived configuration memory");
DEFINE_MTYPE_STATIC(BFDD, BFDD_PROFILE, "long-lived profile memory") DEFINE_MTYPE_STATIC(BFDD, BFDD_PROFILE, "long-lived profile memory");
DEFINE_MTYPE_STATIC(BFDD, BFDD_SESSION_OBSERVER, "Session observer") DEFINE_MTYPE_STATIC(BFDD, BFDD_SESSION_OBSERVER, "Session observer");
DEFINE_MTYPE_STATIC(BFDD, BFDD_VRF, "BFD VRF") DEFINE_MTYPE_STATIC(BFDD, BFDD_VRF, "BFD VRF");
/* /*
* Prototypes * Prototypes

6
bfdd/bfd.h
View file

@ -41,9 +41,9 @@
#define BFDD_JSON_CONV_OPTIONS (0) #define BFDD_JSON_CONV_OPTIONS (0)
#endif #endif
DECLARE_MGROUP(BFDD) DECLARE_MGROUP(BFDD);
DECLARE_MTYPE(BFDD_CONTROL) DECLARE_MTYPE(BFDD_CONTROL);
DECLARE_MTYPE(BFDD_NOTIFICATION) DECLARE_MTYPE(BFDD_NOTIFICATION);
struct bfd_timers { struct bfd_timers {
uint32_t desired_min_tx; uint32_t desired_min_tx;

6
bfdd/bfdd.c
View file

@ -41,9 +41,9 @@
/* /*
* FRR related code. * FRR related code.
*/ */
DEFINE_MGROUP(BFDD, "Bidirectional Forwarding Detection Daemon") DEFINE_MGROUP(BFDD, "Bidirectional Forwarding Detection Daemon");
DEFINE_MTYPE(BFDD, BFDD_CONTROL, "long-lived control socket memory") DEFINE_MTYPE(BFDD, BFDD_CONTROL, "long-lived control socket memory");
DEFINE_MTYPE(BFDD, BFDD_NOTIFICATION, "short-lived control notification data") DEFINE_MTYPE(BFDD, BFDD_NOTIFICATION, "short-lived control notification data");
/* Master of threads. */ /* Master of threads. */
struct thread_master *master; struct thread_master *master;

2
bfdd/config.c
View file

@ -30,7 +30,7 @@
#include "bfd.h" #include "bfd.h"
DEFINE_MTYPE_STATIC(BFDD, BFDD_LABEL, "long-lived label memory") DEFINE_MTYPE_STATIC(BFDD, BFDD_LABEL, "long-lived label memory");
/* /*
* Definitions * Definitions

3
bfdd/dplane.c
View file

@ -46,7 +46,8 @@
#include "lib/openbsd-queue.h" #include "lib/openbsd-queue.h"
DEFINE_MTYPE_STATIC(BFDD, BFDD_DPLANE_CTX, "Data plane client allocated memory") DEFINE_MTYPE_STATIC(BFDD, BFDD_DPLANE_CTX,
"Data plane client allocated memory");
/** Data plane client socket buffer size. */ /** Data plane client socket buffer size. */
#define BFD_DPLANE_CLIENT_BUF_SIZE 8192 #define BFD_DPLANE_CLIENT_BUF_SIZE 8192

24
bgpd/bgp_bmp.c
View file

@ -59,19 +59,19 @@ static struct bmp_bgp_peer *bmp_bgp_peer_get(struct peer *peer);
static void bmp_active_disconnected(struct bmp_active *ba); static void bmp_active_disconnected(struct bmp_active *ba);
static void bmp_active_put(struct bmp_active *ba); static void bmp_active_put(struct bmp_active *ba);
DEFINE_MGROUP(BMP, "BMP (BGP Monitoring Protocol)") DEFINE_MGROUP(BMP, "BMP (BGP Monitoring Protocol)");
DEFINE_MTYPE_STATIC(BMP, BMP_CONN, "BMP connection state") DEFINE_MTYPE_STATIC(BMP, BMP_CONN, "BMP connection state");
DEFINE_MTYPE_STATIC(BMP, BMP_TARGETS, "BMP targets") DEFINE_MTYPE_STATIC(BMP, BMP_TARGETS, "BMP targets");
DEFINE_MTYPE_STATIC(BMP, BMP_TARGETSNAME, "BMP targets name") DEFINE_MTYPE_STATIC(BMP, BMP_TARGETSNAME, "BMP targets name");
DEFINE_MTYPE_STATIC(BMP, BMP_LISTENER, "BMP listener") DEFINE_MTYPE_STATIC(BMP, BMP_LISTENER, "BMP listener");
DEFINE_MTYPE_STATIC(BMP, BMP_ACTIVE, "BMP active connection config") DEFINE_MTYPE_STATIC(BMP, BMP_ACTIVE, "BMP active connection config");
DEFINE_MTYPE_STATIC(BMP, BMP_ACLNAME, "BMP access-list name") DEFINE_MTYPE_STATIC(BMP, BMP_ACLNAME, "BMP access-list name");
DEFINE_MTYPE_STATIC(BMP, BMP_QUEUE, "BMP update queue item") DEFINE_MTYPE_STATIC(BMP, BMP_QUEUE, "BMP update queue item");
DEFINE_MTYPE_STATIC(BMP, BMP, "BMP instance state") DEFINE_MTYPE_STATIC(BMP, BMP, "BMP instance state");
DEFINE_MTYPE_STATIC(BMP, BMP_MIRRORQ, "BMP route mirroring buffer") DEFINE_MTYPE_STATIC(BMP, BMP_MIRRORQ, "BMP route mirroring buffer");
DEFINE_MTYPE_STATIC(BMP, BMP_PEER, "BMP per BGP peer data") DEFINE_MTYPE_STATIC(BMP, BMP_PEER, "BMP per BGP peer data");
DEFINE_MTYPE_STATIC(BMP, BMP_OPEN, "BMP stored BGP OPEN message") DEFINE_MTYPE_STATIC(BMP, BMP_OPEN, "BMP stored BGP OPEN message");
DEFINE_QOBJ_TYPE(bmp_targets) DEFINE_QOBJ_TYPE(bmp_targets)

2
bgpd/bgp_bmp.h
View file

@ -309,6 +309,6 @@ enum {
BMP_STATS_FRR_NH_INVALID = 65531, BMP_STATS_FRR_NH_INVALID = 65531,
}; };
DECLARE_MGROUP(BMP) DECLARE_MGROUP(BMP);
#endif /*_BGP_BMP_H_*/ #endif /*_BGP_BMP_H_*/

8
bgpd/bgp_labelpool.c
View file

@ -50,10 +50,10 @@ static struct labelpool *lp;
/* request this many labels at a time from zebra */ /* request this many labels at a time from zebra */
#define LP_CHUNK_SIZE 50 #define LP_CHUNK_SIZE 50
DEFINE_MTYPE_STATIC(BGPD, BGP_LABEL_CHUNK, "BGP Label Chunk") DEFINE_MTYPE_STATIC(BGPD, BGP_LABEL_CHUNK, "BGP Label Chunk");
DEFINE_MTYPE_STATIC(BGPD, BGP_LABEL_FIFO, "BGP Label FIFO item") DEFINE_MTYPE_STATIC(BGPD, BGP_LABEL_FIFO, "BGP Label FIFO item");
DEFINE_MTYPE_STATIC(BGPD, BGP_LABEL_CB, "BGP Dynamic Label Assignment") DEFINE_MTYPE_STATIC(BGPD, BGP_LABEL_CB, "BGP Dynamic Label Assignment");
DEFINE_MTYPE_STATIC(BGPD, BGP_LABEL_CBQ, "BGP Dynamic Label Callback") DEFINE_MTYPE_STATIC(BGPD, BGP_LABEL_CBQ, "BGP Dynamic Label Callback");
struct lp_chunk { struct lp_chunk {
uint32_t first; uint32_t first;

186
bgpd/bgp_memory.c
View file

@ -28,112 +28,112 @@
/* this file is temporary in nature; definitions should be moved to the /* this file is temporary in nature; definitions should be moved to the
* files they're used in */ * files they're used in */
DEFINE_MGROUP(BGPD, "bgpd") DEFINE_MGROUP(BGPD, "bgpd");
DEFINE_MTYPE(BGPD, BGP, "BGP instance") DEFINE_MTYPE(BGPD, BGP, "BGP instance");
DEFINE_MTYPE(BGPD, BGP_LISTENER, "BGP listen socket details") DEFINE_MTYPE(BGPD, BGP_LISTENER, "BGP listen socket details");
DEFINE_MTYPE(BGPD, BGP_PEER, "BGP peer") DEFINE_MTYPE(BGPD, BGP_PEER, "BGP peer");
DEFINE_MTYPE(BGPD, BGP_PEER_HOST, "BGP peer hostname") DEFINE_MTYPE(BGPD, BGP_PEER_HOST, "BGP peer hostname");
DEFINE_MTYPE(BGPD, BGP_PEER_IFNAME, "BGP peer ifname") DEFINE_MTYPE(BGPD, BGP_PEER_IFNAME, "BGP peer ifname");
DEFINE_MTYPE(BGPD, PEER_GROUP, "Peer group") DEFINE_MTYPE(BGPD, PEER_GROUP, "Peer group");
DEFINE_MTYPE(BGPD, PEER_GROUP_HOST, "BGP Peer group hostname") DEFINE_MTYPE(BGPD, PEER_GROUP_HOST, "BGP Peer group hostname");
DEFINE_MTYPE(BGPD, PEER_DESC, "Peer description") DEFINE_MTYPE(BGPD, PEER_DESC, "Peer description");
DEFINE_MTYPE(BGPD, PEER_PASSWORD, "Peer password string") DEFINE_MTYPE(BGPD, PEER_PASSWORD, "Peer password string");
DEFINE_MTYPE(BGPD, BGP_PEER_AF, "BGP peer af") DEFINE_MTYPE(BGPD, BGP_PEER_AF, "BGP peer af");
DEFINE_MTYPE(BGPD, BGP_UPDGRP, "BGP update group") DEFINE_MTYPE(BGPD, BGP_UPDGRP, "BGP update group");
DEFINE_MTYPE(BGPD, BGP_UPD_SUBGRP, "BGP update subgroup") DEFINE_MTYPE(BGPD, BGP_UPD_SUBGRP, "BGP update subgroup");
DEFINE_MTYPE(BGPD, BGP_PACKET, "BGP packet") DEFINE_MTYPE(BGPD, BGP_PACKET, "BGP packet");
DEFINE_MTYPE(BGPD, ATTR, "BGP attribute") DEFINE_MTYPE(BGPD, ATTR, "BGP attribute");
DEFINE_MTYPE(BGPD, AS_PATH, "BGP aspath") DEFINE_MTYPE(BGPD, AS_PATH, "BGP aspath");
DEFINE_MTYPE(BGPD, AS_SEG, "BGP aspath seg") DEFINE_MTYPE(BGPD, AS_SEG, "BGP aspath seg");
DEFINE_MTYPE(BGPD, AS_SEG_DATA, "BGP aspath segment data") DEFINE_MTYPE(BGPD, AS_SEG_DATA, "BGP aspath segment data");
DEFINE_MTYPE(BGPD, AS_STR, "BGP aspath str") DEFINE_MTYPE(BGPD, AS_STR, "BGP aspath str");
DEFINE_MTYPE(BGPD, BGP_TABLE, "BGP table") DEFINE_MTYPE(BGPD, BGP_TABLE, "BGP table");
DEFINE_MTYPE(BGPD, BGP_NODE, "BGP node") DEFINE_MTYPE(BGPD, BGP_NODE, "BGP node");
DEFINE_MTYPE(BGPD, BGP_ROUTE, "BGP route") DEFINE_MTYPE(BGPD, BGP_ROUTE, "BGP route");
DEFINE_MTYPE(BGPD, BGP_ROUTE_EXTRA, "BGP ancillary route info") DEFINE_MTYPE(BGPD, BGP_ROUTE_EXTRA, "BGP ancillary route info");
DEFINE_MTYPE(BGPD, BGP_CONN, "BGP connected") DEFINE_MTYPE(BGPD, BGP_CONN, "BGP connected");
DEFINE_MTYPE(BGPD, BGP_STATIC, "BGP static") DEFINE_MTYPE(BGPD, BGP_STATIC, "BGP static");
DEFINE_MTYPE(BGPD, BGP_ADVERTISE_ATTR, "BGP adv attr") DEFINE_MTYPE(BGPD, BGP_ADVERTISE_ATTR, "BGP adv attr");
DEFINE_MTYPE(BGPD, BGP_ADVERTISE, "BGP adv") DEFINE_MTYPE(BGPD, BGP_ADVERTISE, "BGP adv");
DEFINE_MTYPE(BGPD, BGP_SYNCHRONISE, "BGP synchronise") DEFINE_MTYPE(BGPD, BGP_SYNCHRONISE, "BGP synchronise");
DEFINE_MTYPE(BGPD, BGP_ADJ_IN, "BGP adj in") DEFINE_MTYPE(BGPD, BGP_ADJ_IN, "BGP adj in");
DEFINE_MTYPE(BGPD, BGP_ADJ_OUT, "BGP adj out") DEFINE_MTYPE(BGPD, BGP_ADJ_OUT, "BGP adj out");
DEFINE_MTYPE(BGPD, BGP_MPATH_INFO, "BGP multipath info") DEFINE_MTYPE(BGPD, BGP_MPATH_INFO, "BGP multipath info");
DEFINE_MTYPE(BGPD, AS_LIST, "BGP AS list") DEFINE_MTYPE(BGPD, AS_LIST, "BGP AS list");
DEFINE_MTYPE(BGPD, AS_FILTER, "BGP AS filter") DEFINE_MTYPE(BGPD, AS_FILTER, "BGP AS filter");
DEFINE_MTYPE(BGPD, AS_FILTER_STR, "BGP AS filter str") DEFINE_MTYPE(BGPD, AS_FILTER_STR, "BGP AS filter str");
DEFINE_MTYPE(BGPD, COMMUNITY, "community") DEFINE_MTYPE(BGPD, COMMUNITY, "community");
DEFINE_MTYPE(BGPD, COMMUNITY_VAL, "community val") DEFINE_MTYPE(BGPD, COMMUNITY_VAL, "community val");
DEFINE_MTYPE(BGPD, COMMUNITY_STR, "community str") DEFINE_MTYPE(BGPD, COMMUNITY_STR, "community str");
DEFINE_MTYPE(BGPD, ECOMMUNITY, "extcommunity") DEFINE_MTYPE(BGPD, ECOMMUNITY, "extcommunity");
DEFINE_MTYPE(BGPD, ECOMMUNITY_VAL, "extcommunity val") DEFINE_MTYPE(BGPD, ECOMMUNITY_VAL, "extcommunity val");
DEFINE_MTYPE(BGPD, ECOMMUNITY_STR, "extcommunity str") DEFINE_MTYPE(BGPD, ECOMMUNITY_STR, "extcommunity str");
DEFINE_MTYPE(BGPD, COMMUNITY_LIST, "community-list") DEFINE_MTYPE(BGPD, COMMUNITY_LIST, "community-list");
DEFINE_MTYPE(BGPD, COMMUNITY_LIST_NAME, "community-list name") DEFINE_MTYPE(BGPD, COMMUNITY_LIST_NAME, "community-list name");
DEFINE_MTYPE(BGPD, COMMUNITY_LIST_ENTRY, "community-list entry") DEFINE_MTYPE(BGPD, COMMUNITY_LIST_ENTRY, "community-list entry");
DEFINE_MTYPE(BGPD, COMMUNITY_LIST_CONFIG, "community-list config") DEFINE_MTYPE(BGPD, COMMUNITY_LIST_CONFIG, "community-list config");
DEFINE_MTYPE(BGPD, COMMUNITY_LIST_HANDLER, "community-list handler") DEFINE_MTYPE(BGPD, COMMUNITY_LIST_HANDLER, "community-list handler");
DEFINE_MTYPE(BGPD, CLUSTER, "Cluster list") DEFINE_MTYPE(BGPD, CLUSTER, "Cluster list");
DEFINE_MTYPE(BGPD, CLUSTER_VAL, "Cluster list val") DEFINE_MTYPE(BGPD, CLUSTER_VAL, "Cluster list val");
DEFINE_MTYPE(BGPD, BGP_PROCESS_QUEUE, "BGP Process queue") DEFINE_MTYPE(BGPD, BGP_PROCESS_QUEUE, "BGP Process queue");
DEFINE_MTYPE(BGPD, BGP_CLEAR_NODE_QUEUE, "BGP node clear queue") DEFINE_MTYPE(BGPD, BGP_CLEAR_NODE_QUEUE, "BGP node clear queue");
DEFINE_MTYPE(BGPD, TRANSIT, "BGP transit attr") DEFINE_MTYPE(BGPD, TRANSIT, "BGP transit attr");
DEFINE_MTYPE(BGPD, TRANSIT_VAL, "BGP transit val") DEFINE_MTYPE(BGPD, TRANSIT_VAL, "BGP transit val");
DEFINE_MTYPE(BGPD, BGP_DEBUG_FILTER, "BGP debug filter") DEFINE_MTYPE(BGPD, BGP_DEBUG_FILTER, "BGP debug filter");
DEFINE_MTYPE(BGPD, BGP_DEBUG_STR, "BGP debug filter string") DEFINE_MTYPE(BGPD, BGP_DEBUG_STR, "BGP debug filter string");
DEFINE_MTYPE(BGPD, BGP_DISTANCE, "BGP distance") DEFINE_MTYPE(BGPD, BGP_DISTANCE, "BGP distance");
DEFINE_MTYPE(BGPD, BGP_NEXTHOP_CACHE, "BGP nexthop") DEFINE_MTYPE(BGPD, BGP_NEXTHOP_CACHE, "BGP nexthop");
DEFINE_MTYPE(BGPD, BGP_CONFED_LIST, "BGP confed list") DEFINE_MTYPE(BGPD, BGP_CONFED_LIST, "BGP confed list");
DEFINE_MTYPE(BGPD, PEER_UPDATE_SOURCE, "BGP peer update interface") DEFINE_MTYPE(BGPD, PEER_UPDATE_SOURCE, "BGP peer update interface");
DEFINE_MTYPE(BGPD, PEER_CONF_IF, "BGP peer config interface") DEFINE_MTYPE(BGPD, PEER_CONF_IF, "BGP peer config interface");
DEFINE_MTYPE(BGPD, BGP_DAMP_INFO, "Dampening info") DEFINE_MTYPE(BGPD, BGP_DAMP_INFO, "Dampening info");
DEFINE_MTYPE(BGPD, BGP_DAMP_ARRAY, "BGP Dampening array") DEFINE_MTYPE(BGPD, BGP_DAMP_ARRAY, "BGP Dampening array");
DEFINE_MTYPE(BGPD, BGP_DAMP_REUSELIST, "BGP Dampening reuse list") DEFINE_MTYPE(BGPD, BGP_DAMP_REUSELIST, "BGP Dampening reuse list");
DEFINE_MTYPE(BGPD, BGP_REGEXP, "BGP regexp") DEFINE_MTYPE(BGPD, BGP_REGEXP, "BGP regexp");
DEFINE_MTYPE(BGPD, BGP_AGGREGATE, "BGP aggregate") DEFINE_MTYPE(BGPD, BGP_AGGREGATE, "BGP aggregate");
DEFINE_MTYPE(BGPD, BGP_ADDR, "BGP own address") DEFINE_MTYPE(BGPD, BGP_ADDR, "BGP own address");
DEFINE_MTYPE(BGPD, TIP_ADDR, "BGP own tunnel-ip address") DEFINE_MTYPE(BGPD, TIP_ADDR, "BGP own tunnel-ip address");
DEFINE_MTYPE(BGPD, BGP_REDIST, "BGP redistribution") DEFINE_MTYPE(BGPD, BGP_REDIST, "BGP redistribution");
DEFINE_MTYPE(BGPD, BGP_FILTER_NAME, "BGP Filter Information") DEFINE_MTYPE(BGPD, BGP_FILTER_NAME, "BGP Filter Information");
DEFINE_MTYPE(BGPD, BGP_DUMP_STR, "BGP Dump String Information") DEFINE_MTYPE(BGPD, BGP_DUMP_STR, "BGP Dump String Information");
DEFINE_MTYPE(BGPD, ENCAP_TLV, "ENCAP TLV") DEFINE_MTYPE(BGPD, ENCAP_TLV, "ENCAP TLV");
DEFINE_MTYPE(BGPD, BGP_TEA_OPTIONS, "BGP TEA Options") DEFINE_MTYPE(BGPD, BGP_TEA_OPTIONS, "BGP TEA Options");
DEFINE_MTYPE(BGPD, BGP_TEA_OPTIONS_VALUE, "BGP TEA Options Value") DEFINE_MTYPE(BGPD, BGP_TEA_OPTIONS_VALUE, "BGP TEA Options Value");
DEFINE_MTYPE(BGPD, LCOMMUNITY, "Large Community") DEFINE_MTYPE(BGPD, LCOMMUNITY, "Large Community");
DEFINE_MTYPE(BGPD, LCOMMUNITY_STR, "Large Community display string") DEFINE_MTYPE(BGPD, LCOMMUNITY_STR, "Large Community display string");
DEFINE_MTYPE(BGPD, LCOMMUNITY_VAL, "Large Community value") DEFINE_MTYPE(BGPD, LCOMMUNITY_VAL, "Large Community value");
DEFINE_MTYPE(BGPD, BGP_EVPN, "BGP EVPN Information") DEFINE_MTYPE(BGPD, BGP_EVPN, "BGP EVPN Information");
DEFINE_MTYPE(BGPD, BGP_EVPN_MH_INFO, "BGP EVPN MH Information") DEFINE_MTYPE(BGPD, BGP_EVPN_MH_INFO, "BGP EVPN MH Information");
DEFINE_MTYPE(BGPD, BGP_EVPN_ES_VTEP, "BGP EVPN ES VTEP") DEFINE_MTYPE(BGPD, BGP_EVPN_ES_VTEP, "BGP EVPN ES VTEP");
DEFINE_MTYPE(BGPD, BGP_EVPN_PATH_ES_INFO, "BGP EVPN PATH ES Information") DEFINE_MTYPE(BGPD, BGP_EVPN_PATH_ES_INFO, "BGP EVPN PATH ES Information");
DEFINE_MTYPE(BGPD, BGP_EVPN_ES_EVI_VTEP, "BGP EVPN ES-EVI VTEP") DEFINE_MTYPE(BGPD, BGP_EVPN_ES_EVI_VTEP, "BGP EVPN ES-EVI VTEP");
DEFINE_MTYPE(BGPD, BGP_EVPN_ES, "BGP EVPN ESI Information") DEFINE_MTYPE(BGPD, BGP_EVPN_ES, "BGP EVPN ESI Information");
DEFINE_MTYPE(BGPD, BGP_EVPN_ES_EVI, "BGP EVPN ES-per-EVI Information") DEFINE_MTYPE(BGPD, BGP_EVPN_ES_EVI, "BGP EVPN ES-per-EVI Information");
DEFINE_MTYPE(BGPD, BGP_EVPN_ES_VRF, "BGP EVPN ES-per-VRF Information") DEFINE_MTYPE(BGPD, BGP_EVPN_ES_VRF, "BGP EVPN ES-per-VRF Information");
DEFINE_MTYPE(BGPD, BGP_EVPN_IMPORT_RT, "BGP EVPN Import RT") DEFINE_MTYPE(BGPD, BGP_EVPN_IMPORT_RT, "BGP EVPN Import RT");
DEFINE_MTYPE(BGPD, BGP_EVPN_VRF_IMPORT_RT, "BGP EVPN VRF Import RT") DEFINE_MTYPE(BGPD, BGP_EVPN_VRF_IMPORT_RT, "BGP EVPN VRF Import RT");
DEFINE_MTYPE(BGPD, BGP_EVPN_MACIP, "BGP EVPN MAC IP") DEFINE_MTYPE(BGPD, BGP_EVPN_MACIP, "BGP EVPN MAC IP");
DEFINE_MTYPE(BGPD, BGP_FLOWSPEC, "BGP flowspec") DEFINE_MTYPE(BGPD, BGP_FLOWSPEC, "BGP flowspec");
DEFINE_MTYPE(BGPD, BGP_FLOWSPEC_RULE, "BGP flowspec rule") DEFINE_MTYPE(BGPD, BGP_FLOWSPEC_RULE, "BGP flowspec rule");
DEFINE_MTYPE(BGPD, BGP_FLOWSPEC_RULE_STR, "BGP flowspec rule str") DEFINE_MTYPE(BGPD, BGP_FLOWSPEC_RULE_STR, "BGP flowspec rule str");
DEFINE_MTYPE(BGPD, BGP_FLOWSPEC_COMPILED, "BGP flowspec compiled") DEFINE_MTYPE(BGPD, BGP_FLOWSPEC_COMPILED, "BGP flowspec compiled");
DEFINE_MTYPE(BGPD, BGP_FLOWSPEC_NAME, "BGP flowspec name") DEFINE_MTYPE(BGPD, BGP_FLOWSPEC_NAME, "BGP flowspec name");
DEFINE_MTYPE(BGPD, BGP_FLOWSPEC_INDEX, "BGP flowspec index") DEFINE_MTYPE(BGPD, BGP_FLOWSPEC_INDEX, "BGP flowspec index");
DEFINE_MTYPE(BGPD, BGP_SRV6_L3VPN, "BGP prefix-sid srv6 l3vpn servcie") DEFINE_MTYPE(BGPD, BGP_SRV6_L3VPN, "BGP prefix-sid srv6 l3vpn servcie");
DEFINE_MTYPE(BGPD, BGP_SRV6_VPN, "BGP prefix-sid srv6 vpn service") DEFINE_MTYPE(BGPD, BGP_SRV6_VPN, "BGP prefix-sid srv6 vpn service");

186
bgpd/bgp_memory.h
View file

@ -24,115 +24,115 @@
#include "memory.h" #include "memory.h"
DECLARE_MGROUP(BGPD) DECLARE_MGROUP(BGPD);
DECLARE_MTYPE(BGP) DECLARE_MTYPE(BGP);
DECLARE_MTYPE(BGP_LISTENER) DECLARE_MTYPE(BGP_LISTENER);
DECLARE_MTYPE(BGP_PEER) DECLARE_MTYPE(BGP_PEER);
DECLARE_MTYPE(BGP_PEER_HOST) DECLARE_MTYPE(BGP_PEER_HOST);
DECLARE_MTYPE(BGP_PEER_IFNAME) DECLARE_MTYPE(BGP_PEER_IFNAME);
DECLARE_MTYPE(PEER_GROUP) DECLARE_MTYPE(PEER_GROUP);
DECLARE_MTYPE(PEER_GROUP_HOST) DECLARE_MTYPE(PEER_GROUP_HOST);
DECLARE_MTYPE(PEER_DESC) DECLARE_MTYPE(PEER_DESC);
DECLARE_MTYPE(PEER_PASSWORD) DECLARE_MTYPE(PEER_PASSWORD);
DECLARE_MTYPE(BGP_PEER_AF) DECLARE_MTYPE(BGP_PEER_AF);
DECLARE_MTYPE(BGP_UPDGRP) DECLARE_MTYPE(BGP_UPDGRP);
DECLARE_MTYPE(BGP_UPD_SUBGRP) DECLARE_MTYPE(BGP_UPD_SUBGRP);
DECLARE_MTYPE(BGP_PACKET) DECLARE_MTYPE(BGP_PACKET);
DECLARE_MTYPE(ATTR) DECLARE_MTYPE(ATTR);
DECLARE_MTYPE(AS_PATH) DECLARE_MTYPE(AS_PATH);
DECLARE_MTYPE(AS_SEG) DECLARE_MTYPE(AS_SEG);
DECLARE_MTYPE(AS_SEG_DATA) DECLARE_MTYPE(AS_SEG_DATA);
DECLARE_MTYPE(AS_STR) DECLARE_MTYPE(AS_STR);
DECLARE_MTYPE(BGP_TABLE) DECLARE_MTYPE(BGP_TABLE);
DECLARE_MTYPE(BGP_NODE) DECLARE_MTYPE(BGP_NODE);
DECLARE_MTYPE(BGP_ROUTE) DECLARE_MTYPE(BGP_ROUTE);
DECLARE_MTYPE(BGP_ROUTE_EXTRA) DECLARE_MTYPE(BGP_ROUTE_EXTRA);
DECLARE_MTYPE(BGP_CONN) DECLARE_MTYPE(BGP_CONN);
DECLARE_MTYPE(BGP_STATIC) DECLARE_MTYPE(BGP_STATIC);
DECLARE_MTYPE(BGP_ADVERTISE_ATTR) DECLARE_MTYPE(BGP_ADVERTISE_ATTR);
DECLARE_MTYPE(BGP_ADVERTISE) DECLARE_MTYPE(BGP_ADVERTISE);
DECLARE_MTYPE(BGP_SYNCHRONISE) DECLARE_MTYPE(BGP_SYNCHRONISE);
DECLARE_MTYPE(BGP_ADJ_IN) DECLARE_MTYPE(BGP_ADJ_IN);
DECLARE_MTYPE(BGP_ADJ_OUT) DECLARE_MTYPE(BGP_ADJ_OUT);
DECLARE_MTYPE(BGP_MPATH_INFO) DECLARE_MTYPE(BGP_MPATH_INFO);
DECLARE_MTYPE(AS_LIST) DECLARE_MTYPE(AS_LIST);
DECLARE_MTYPE(AS_FILTER) DECLARE_MTYPE(AS_FILTER);
DECLARE_MTYPE(AS_FILTER_STR) DECLARE_MTYPE(AS_FILTER_STR);
DECLARE_MTYPE(COMMUNITY) DECLARE_MTYPE(COMMUNITY);
DECLARE_MTYPE(COMMUNITY_VAL) DECLARE_MTYPE(COMMUNITY_VAL);
DECLARE_MTYPE(COMMUNITY_STR) DECLARE_MTYPE(COMMUNITY_STR);
DECLARE_MTYPE(ECOMMUNITY) DECLARE_MTYPE(ECOMMUNITY);
DECLARE_MTYPE(ECOMMUNITY_VAL) DECLARE_MTYPE(ECOMMUNITY_VAL);
DECLARE_MTYPE(ECOMMUNITY_STR) DECLARE_MTYPE(ECOMMUNITY_STR);
DECLARE_MTYPE(COMMUNITY_LIST) DECLARE_MTYPE(COMMUNITY_LIST);
DECLARE_MTYPE(COMMUNITY_LIST_NAME) DECLARE_MTYPE(COMMUNITY_LIST_NAME);
DECLARE_MTYPE(COMMUNITY_LIST_ENTRY) DECLARE_MTYPE(COMMUNITY_LIST_ENTRY);
DECLARE_MTYPE(COMMUNITY_LIST_CONFIG) DECLARE_MTYPE(COMMUNITY_LIST_CONFIG);
DECLARE_MTYPE(COMMUNITY_LIST_HANDLER) DECLARE_MTYPE(COMMUNITY_LIST_HANDLER);
DECLARE_MTYPE(CLUSTER) DECLARE_MTYPE(CLUSTER);
DECLARE_MTYPE(CLUSTER_VAL) DECLARE_MTYPE(CLUSTER_VAL);
DECLARE_MTYPE(BGP_PROCESS_QUEUE) DECLARE_MTYPE(BGP_PROCESS_QUEUE);
DECLARE_MTYPE(BGP_CLEAR_NODE_QUEUE) DECLARE_MTYPE(BGP_CLEAR_NODE_QUEUE);
DECLARE_MTYPE(TRANSIT) DECLARE_MTYPE(TRANSIT);
DECLARE_MTYPE(TRANSIT_VAL) DECLARE_MTYPE(TRANSIT_VAL);
DECLARE_MTYPE(BGP_DEBUG_FILTER) DECLARE_MTYPE(BGP_DEBUG_FILTER);
DECLARE_MTYPE(BGP_DEBUG_STR) DECLARE_MTYPE(BGP_DEBUG_STR);
DECLARE_MTYPE(BGP_DISTANCE) DECLARE_MTYPE(BGP_DISTANCE);
DECLARE_MTYPE(BGP_NEXTHOP_CACHE) DECLARE_MTYPE(BGP_NEXTHOP_CACHE);
DECLARE_MTYPE(BGP_CONFED_LIST) DECLARE_MTYPE(BGP_CONFED_LIST);
DECLARE_MTYPE(PEER_UPDATE_SOURCE) DECLARE_MTYPE(PEER_UPDATE_SOURCE);
DECLARE_MTYPE(PEER_CONF_IF) DECLARE_MTYPE(PEER_CONF_IF);
DECLARE_MTYPE(BGP_DAMP_INFO) DECLARE_MTYPE(BGP_DAMP_INFO);
DECLARE_MTYPE(BGP_DAMP_ARRAY) DECLARE_MTYPE(BGP_DAMP_ARRAY);
DECLARE_MTYPE(BGP_DAMP_REUSELIST) DECLARE_MTYPE(BGP_DAMP_REUSELIST);
DECLARE_MTYPE(BGP_REGEXP) DECLARE_MTYPE(BGP_REGEXP);
DECLARE_MTYPE(BGP_AGGREGATE) DECLARE_MTYPE(BGP_AGGREGATE);
DECLARE_MTYPE(BGP_ADDR) DECLARE_MTYPE(BGP_ADDR);
DECLARE_MTYPE(TIP_ADDR) DECLARE_MTYPE(TIP_ADDR);
DECLARE_MTYPE(BGP_REDIST) DECLARE_MTYPE(BGP_REDIST);
DECLARE_MTYPE(BGP_FILTER_NAME) DECLARE_MTYPE(BGP_FILTER_NAME);
DECLARE_MTYPE(BGP_DUMP_STR) DECLARE_MTYPE(BGP_DUMP_STR);
DECLARE_MTYPE(ENCAP_TLV) DECLARE_MTYPE(ENCAP_TLV);
DECLARE_MTYPE(BGP_TEA_OPTIONS) DECLARE_MTYPE(BGP_TEA_OPTIONS);
DECLARE_MTYPE(BGP_TEA_OPTIONS_VALUE) DECLARE_MTYPE(BGP_TEA_OPTIONS_VALUE);
DECLARE_MTYPE(LCOMMUNITY) DECLARE_MTYPE(LCOMMUNITY);
DECLARE_MTYPE(LCOMMUNITY_STR) DECLARE_MTYPE(LCOMMUNITY_STR);
DECLARE_MTYPE(LCOMMUNITY_VAL) DECLARE_MTYPE(LCOMMUNITY_VAL);
DECLARE_MTYPE(BGP_EVPN_MH_INFO) DECLARE_MTYPE(BGP_EVPN_MH_INFO);
DECLARE_MTYPE(BGP_EVPN_ES) DECLARE_MTYPE(BGP_EVPN_ES);
DECLARE_MTYPE(BGP_EVPN_ES_EVI) DECLARE_MTYPE(BGP_EVPN_ES_EVI);
DECLARE_MTYPE(BGP_EVPN_ES_VRF) DECLARE_MTYPE(BGP_EVPN_ES_VRF);
DECLARE_MTYPE(BGP_EVPN_ES_VTEP) DECLARE_MTYPE(BGP_EVPN_ES_VTEP);
DECLARE_MTYPE(BGP_EVPN_PATH_ES_INFO) DECLARE_MTYPE(BGP_EVPN_PATH_ES_INFO);
DECLARE_MTYPE(BGP_EVPN_ES_EVI_VTEP) DECLARE_MTYPE(BGP_EVPN_ES_EVI_VTEP);
DECLARE_MTYPE(BGP_EVPN) DECLARE_MTYPE(BGP_EVPN);
DECLARE_MTYPE(BGP_EVPN_IMPORT_RT) DECLARE_MTYPE(BGP_EVPN_IMPORT_RT);
DECLARE_MTYPE(BGP_EVPN_VRF_IMPORT_RT) DECLARE_MTYPE(BGP_EVPN_VRF_IMPORT_RT);
DECLARE_MTYPE(BGP_EVPN_MACIP) DECLARE_MTYPE(BGP_EVPN_MACIP);
DECLARE_MTYPE(BGP_FLOWSPEC) DECLARE_MTYPE(BGP_FLOWSPEC);
DECLARE_MTYPE(BGP_FLOWSPEC_RULE) DECLARE_MTYPE(BGP_FLOWSPEC_RULE);
DECLARE_MTYPE(BGP_FLOWSPEC_RULE_STR) DECLARE_MTYPE(BGP_FLOWSPEC_RULE_STR);
DECLARE_MTYPE(BGP_FLOWSPEC_COMPILED) DECLARE_MTYPE(BGP_FLOWSPEC_COMPILED);
DECLARE_MTYPE(BGP_FLOWSPEC_NAME) DECLARE_MTYPE(BGP_FLOWSPEC_NAME);
DECLARE_MTYPE(BGP_FLOWSPEC_INDEX) DECLARE_MTYPE(BGP_FLOWSPEC_INDEX);
DECLARE_MTYPE(BGP_SRV6_L3VPN) DECLARE_MTYPE(BGP_SRV6_L3VPN);
DECLARE_MTYPE(BGP_SRV6_VPN) DECLARE_MTYPE(BGP_SRV6_VPN);
#endif /* _QUAGGA_BGP_MEMORY_H */ #endif /* _QUAGGA_BGP_MEMORY_H */

12
bgpd/bgp_pbr.c
View file

@ -37,12 +37,12 @@
#include "bgpd/bgp_flowspec_private.h" #include "bgpd/bgp_flowspec_private.h"
#include "bgpd/bgp_errors.h" #include "bgpd/bgp_errors.h"
DEFINE_MTYPE_STATIC(BGPD, PBR_MATCH_ENTRY, "PBR match entry") DEFINE_MTYPE_STATIC(BGPD, PBR_MATCH_ENTRY, "PBR match entry");
DEFINE_MTYPE_STATIC(BGPD, PBR_MATCH, "PBR match") DEFINE_MTYPE_STATIC(BGPD, PBR_MATCH, "PBR match");
DEFINE_MTYPE_STATIC(BGPD, PBR_ACTION, "PBR action") DEFINE_MTYPE_STATIC(BGPD, PBR_ACTION, "PBR action");
DEFINE_MTYPE_STATIC(BGPD, PBR_RULE, "PBR rule") DEFINE_MTYPE_STATIC(BGPD, PBR_RULE, "PBR rule");
DEFINE_MTYPE_STATIC(BGPD, PBR, "BGP PBR Context") DEFINE_MTYPE_STATIC(BGPD, PBR, "BGP PBR Context");
DEFINE_MTYPE_STATIC(BGPD, PBR_VALMASK, "BGP PBR Val Mask Value") DEFINE_MTYPE_STATIC(BGPD, PBR_VALMASK, "BGP PBR Val Mask Value");
/* chain strings too long to fit in one line */ /* chain strings too long to fit in one line */
#define FSPEC_ACTION_EXCEED_LIMIT "flowspec actions exceeds limit" #define FSPEC_ACTION_EXCEED_LIMIT "flowspec actions exceeds limit"

4
bgpd/bgp_rpki.c
View file

@ -60,8 +60,8 @@
#include "bgpd/bgp_rpki_clippy.c" #include "bgpd/bgp_rpki_clippy.c"
#endif #endif
DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_CACHE, "BGP RPKI Cache server") DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_CACHE, "BGP RPKI Cache server");
DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_CACHE_GROUP, "BGP RPKI Cache server group") DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_CACHE_GROUP, "BGP RPKI Cache server group");
#define RPKI_VALID 1 #define RPKI_VALID 1
#define RPKI_NOTFOUND 2 #define RPKI_NOTFOUND 2

54
bgpd/rfapi/bgp_rfapi_cfg.c
View file

@ -52,33 +52,33 @@
#undef BGP_VNC_DEBUG_MATCH_GROUP #undef BGP_VNC_DEBUG_MATCH_GROUP
DEFINE_MGROUP(RFAPI, "rfapi") DEFINE_MGROUP(RFAPI, "rfapi");
DEFINE_MTYPE(RFAPI, RFAPI_CFG, "NVE Configuration") DEFINE_MTYPE(RFAPI, RFAPI_CFG, "NVE Configuration");
DEFINE_MTYPE(RFAPI, RFAPI_GROUP_CFG, "NVE Group Configuration") DEFINE_MTYPE(RFAPI, RFAPI_GROUP_CFG, "NVE Group Configuration");
DEFINE_MTYPE(RFAPI, RFAPI_L2_CFG, "RFAPI L2 Group Configuration") DEFINE_MTYPE(RFAPI, RFAPI_L2_CFG, "RFAPI L2 Group Configuration");
DEFINE_MTYPE(RFAPI, RFAPI_RFP_GROUP_CFG, "RFAPI RFP Group Configuration") DEFINE_MTYPE(RFAPI, RFAPI_RFP_GROUP_CFG, "RFAPI RFP Group Configuration");
DEFINE_MTYPE(RFAPI, RFAPI, "RFAPI Generic") DEFINE_MTYPE(RFAPI, RFAPI, "RFAPI Generic");
DEFINE_MTYPE(RFAPI, RFAPI_DESC, "RFAPI Descriptor") DEFINE_MTYPE(RFAPI, RFAPI_DESC, "RFAPI Descriptor");
DEFINE_MTYPE(RFAPI, RFAPI_IMPORTTABLE, "RFAPI Import Table") DEFINE_MTYPE(RFAPI, RFAPI_IMPORTTABLE, "RFAPI Import Table");
DEFINE_MTYPE(RFAPI, RFAPI_MONITOR, "RFAPI Monitor VPN") DEFINE_MTYPE(RFAPI, RFAPI_MONITOR, "RFAPI Monitor VPN");
DEFINE_MTYPE(RFAPI, RFAPI_MONITOR_ENCAP, "RFAPI Monitor Encap") DEFINE_MTYPE(RFAPI, RFAPI_MONITOR_ENCAP, "RFAPI Monitor Encap");
DEFINE_MTYPE(RFAPI, RFAPI_NEXTHOP, "RFAPI Next Hop") DEFINE_MTYPE(RFAPI, RFAPI_NEXTHOP, "RFAPI Next Hop");
DEFINE_MTYPE(RFAPI, RFAPI_VN_OPTION, "RFAPI VN Option") DEFINE_MTYPE(RFAPI, RFAPI_VN_OPTION, "RFAPI VN Option");
DEFINE_MTYPE(RFAPI, RFAPI_UN_OPTION, "RFAPI UN Option") DEFINE_MTYPE(RFAPI, RFAPI_UN_OPTION, "RFAPI UN Option");
DEFINE_MTYPE(RFAPI, RFAPI_WITHDRAW, "RFAPI Withdraw") DEFINE_MTYPE(RFAPI, RFAPI_WITHDRAW, "RFAPI Withdraw");
DEFINE_MTYPE(RFAPI, RFAPI_RFG_NAME, "RFAPI RFGName") DEFINE_MTYPE(RFAPI, RFAPI_RFG_NAME, "RFAPI RFGName");
DEFINE_MTYPE(RFAPI, RFAPI_ADB, "RFAPI Advertisement Data") DEFINE_MTYPE(RFAPI, RFAPI_ADB, "RFAPI Advertisement Data");
DEFINE_MTYPE(RFAPI, RFAPI_ETI, "RFAPI Export Table Info") DEFINE_MTYPE(RFAPI, RFAPI_ETI, "RFAPI Export Table Info");
DEFINE_MTYPE(RFAPI, RFAPI_NVE_ADDR, "RFAPI NVE Address") DEFINE_MTYPE(RFAPI, RFAPI_NVE_ADDR, "RFAPI NVE Address");
DEFINE_MTYPE(RFAPI, RFAPI_PREFIX_BAG, "RFAPI Prefix Bag") DEFINE_MTYPE(RFAPI, RFAPI_PREFIX_BAG, "RFAPI Prefix Bag");
DEFINE_MTYPE(RFAPI, RFAPI_IT_EXTRA, "RFAPI IT Extra") DEFINE_MTYPE(RFAPI, RFAPI_IT_EXTRA, "RFAPI IT Extra");
DEFINE_MTYPE(RFAPI, RFAPI_INFO, "RFAPI Info") DEFINE_MTYPE(RFAPI, RFAPI_INFO, "RFAPI Info");
DEFINE_MTYPE(RFAPI, RFAPI_ADDR, "RFAPI Addr") DEFINE_MTYPE(RFAPI, RFAPI_ADDR, "RFAPI Addr");
DEFINE_MTYPE(RFAPI, RFAPI_UPDATED_RESPONSE_QUEUE, "RFAPI Updated Rsp Queue") DEFINE_MTYPE(RFAPI, RFAPI_UPDATED_RESPONSE_QUEUE, "RFAPI Updated Rsp Queue");
DEFINE_MTYPE(RFAPI, RFAPI_RECENT_DELETE, "RFAPI Recently Deleted Route") DEFINE_MTYPE(RFAPI, RFAPI_RECENT_DELETE, "RFAPI Recently Deleted Route");
DEFINE_MTYPE(RFAPI, RFAPI_L2ADDR_OPT, "RFAPI L2 Address Option") DEFINE_MTYPE(RFAPI, RFAPI_L2ADDR_OPT, "RFAPI L2 Address Option");
DEFINE_MTYPE(RFAPI, RFAPI_AP, "RFAPI Advertised Prefix") DEFINE_MTYPE(RFAPI, RFAPI_AP, "RFAPI Advertised Prefix");
DEFINE_MTYPE(RFAPI, RFAPI_MONITOR_ETH, "RFAPI Monitor Ethernet") DEFINE_MTYPE(RFAPI, RFAPI_MONITOR_ETH, "RFAPI Monitor Ethernet");
DEFINE_QOBJ_TYPE(rfapi_nve_group_cfg) DEFINE_QOBJ_TYPE(rfapi_nve_group_cfg)
DEFINE_QOBJ_TYPE(rfapi_l2_group_cfg) DEFINE_QOBJ_TYPE(rfapi_l2_group_cfg)

54
bgpd/rfapi/rfapi_private.h
View file

@ -367,33 +367,33 @@ extern int rfapi_extract_l2o(
*/ */
extern time_t rfapi_time(time_t *t); extern time_t rfapi_time(time_t *t);
DECLARE_MGROUP(RFAPI) DECLARE_MGROUP(RFAPI);
DECLARE_MTYPE(RFAPI_CFG) DECLARE_MTYPE(RFAPI_CFG);
DECLARE_MTYPE(RFAPI_GROUP_CFG) DECLARE_MTYPE(RFAPI_GROUP_CFG);
DECLARE_MTYPE(RFAPI_L2_CFG) DECLARE_MTYPE(RFAPI_L2_CFG);
DECLARE_MTYPE(RFAPI_RFP_GROUP_CFG) DECLARE_MTYPE(RFAPI_RFP_GROUP_CFG);
DECLARE_MTYPE(RFAPI) DECLARE_MTYPE(RFAPI);
DECLARE_MTYPE(RFAPI_DESC) DECLARE_MTYPE(RFAPI_DESC);
DECLARE_MTYPE(RFAPI_IMPORTTABLE) DECLARE_MTYPE(RFAPI_IMPORTTABLE);
DECLARE_MTYPE(RFAPI_MONITOR) DECLARE_MTYPE(RFAPI_MONITOR);
DECLARE_MTYPE(RFAPI_MONITOR_ENCAP) DECLARE_MTYPE(RFAPI_MONITOR_ENCAP);
DECLARE_MTYPE(RFAPI_NEXTHOP) DECLARE_MTYPE(RFAPI_NEXTHOP);
DECLARE_MTYPE(RFAPI_VN_OPTION) DECLARE_MTYPE(RFAPI_VN_OPTION);
DECLARE_MTYPE(RFAPI_UN_OPTION) DECLARE_MTYPE(RFAPI_UN_OPTION);
DECLARE_MTYPE(RFAPI_WITHDRAW) DECLARE_MTYPE(RFAPI_WITHDRAW);
DECLARE_MTYPE(RFAPI_RFG_NAME) DECLARE_MTYPE(RFAPI_RFG_NAME);
DECLARE_MTYPE(RFAPI_ADB) DECLARE_MTYPE(RFAPI_ADB);
DECLARE_MTYPE(RFAPI_ETI) DECLARE_MTYPE(RFAPI_ETI);
DECLARE_MTYPE(RFAPI_NVE_ADDR) DECLARE_MTYPE(RFAPI_NVE_ADDR);
DECLARE_MTYPE(RFAPI_PREFIX_BAG) DECLARE_MTYPE(RFAPI_PREFIX_BAG);
DECLARE_MTYPE(RFAPI_IT_EXTRA) DECLARE_MTYPE(RFAPI_IT_EXTRA);
DECLARE_MTYPE(RFAPI_INFO) DECLARE_MTYPE(RFAPI_INFO);
DECLARE_MTYPE(RFAPI_ADDR) DECLARE_MTYPE(RFAPI_ADDR);
DECLARE_MTYPE(RFAPI_UPDATED_RESPONSE_QUEUE) DECLARE_MTYPE(RFAPI_UPDATED_RESPONSE_QUEUE);
DECLARE_MTYPE(RFAPI_RECENT_DELETE) DECLARE_MTYPE(RFAPI_RECENT_DELETE);
DECLARE_MTYPE(RFAPI_L2ADDR_OPT) DECLARE_MTYPE(RFAPI_L2ADDR_OPT);
DECLARE_MTYPE(RFAPI_AP) DECLARE_MTYPE(RFAPI_AP);
DECLARE_MTYPE(RFAPI_MONITOR_ETH) DECLARE_MTYPE(RFAPI_MONITOR_ETH);
/* /*

10
doc/developer/memtypes.rst
View file

@ -15,15 +15,15 @@ Example:
.. code-block:: c .. code-block:: c
:caption: mydaemon.h :caption: mydaemon.h
DECLARE_MGROUP(MYDAEMON) DECLARE_MGROUP(MYDAEMON);
DECLARE_MTYPE(MYNEIGHBOR) DECLARE_MTYPE(MYNEIGHBOR);
.. code-block:: c .. code-block:: c
:caption: mydaemon.c :caption: mydaemon.c
DEFINE_MGROUP( MYDAEMON, "My daemon's memory") DEFINE_MGROUP( MYDAEMON, "My daemon's memory");
DEFINE_MTYPE( MYDAEMON, MYNEIGHBOR, "Neighbor entry") DEFINE_MTYPE( MYDAEMON, MYNEIGHBOR, "Neighbor entry");
DEFINE_MTYPE_STATIC(MYDAEMON, MYNEIGHBORNAME, "Neighbor name") DEFINE_MTYPE_STATIC(MYDAEMON, MYNEIGHBORNAME, "Neighbor name");
struct neigh *neighbor_new(const char *name) struct neigh *neighbor_new(const char *name)
{ {

30
eigrpd/eigrp_memory.c
View file

@ -25,18 +25,18 @@
#include "eigrp_memory.h" #include "eigrp_memory.h"
DEFINE_MGROUP(EIGRPD, "eigrpd") DEFINE_MGROUP(EIGRPD, "eigrpd");
DEFINE_MTYPE(EIGRPD, EIGRP_TOP, "EIGRP structure") DEFINE_MTYPE(EIGRPD, EIGRP_TOP, "EIGRP structure");
DEFINE_MTYPE(EIGRPD, EIGRP_IF, "EIGRP interface") DEFINE_MTYPE(EIGRPD, EIGRP_IF, "EIGRP interface");
DEFINE_MTYPE(EIGRPD, EIGRP_NEIGHBOR, "EIGRP neighbor") DEFINE_MTYPE(EIGRPD, EIGRP_NEIGHBOR, "EIGRP neighbor");
DEFINE_MTYPE(EIGRPD, EIGRP_IF_PARAMS, "EIGRP Interface Parameters") DEFINE_MTYPE(EIGRPD, EIGRP_IF_PARAMS, "EIGRP Interface Parameters");
DEFINE_MTYPE(EIGRPD, EIGRP_IF_INFO, "EIGRP Interface Information") DEFINE_MTYPE(EIGRPD, EIGRP_IF_INFO, "EIGRP Interface Information");
DEFINE_MTYPE(EIGRPD, EIGRP_FIFO, "EIGRP FIFO") DEFINE_MTYPE(EIGRPD, EIGRP_FIFO, "EIGRP FIFO");
DEFINE_MTYPE(EIGRPD, EIGRP_PACKET, "EIGRP Packet") DEFINE_MTYPE(EIGRPD, EIGRP_PACKET, "EIGRP Packet");
DEFINE_MTYPE(EIGRPD, EIGRP_IPV4_INT_TLV, "EIGRP IPv4 TLV") DEFINE_MTYPE(EIGRPD, EIGRP_IPV4_INT_TLV, "EIGRP IPv4 TLV");
DEFINE_MTYPE(EIGRPD, EIGRP_SEQ_TLV, "EIGRP SEQ TLV") DEFINE_MTYPE(EIGRPD, EIGRP_SEQ_TLV, "EIGRP SEQ TLV");
DEFINE_MTYPE(EIGRPD, EIGRP_AUTH_TLV, "EIGRP AUTH TLV") DEFINE_MTYPE(EIGRPD, EIGRP_AUTH_TLV, "EIGRP AUTH TLV");
DEFINE_MTYPE(EIGRPD, EIGRP_AUTH_SHA256_TLV, "EIGRP SHA TLV") DEFINE_MTYPE(EIGRPD, EIGRP_AUTH_SHA256_TLV, "EIGRP SHA TLV");
DEFINE_MTYPE(EIGRPD, EIGRP_PREFIX_DESCRIPTOR, "EIGRP Prefix") DEFINE_MTYPE(EIGRPD, EIGRP_PREFIX_DESCRIPTOR, "EIGRP Prefix");
DEFINE_MTYPE(EIGRPD, EIGRP_ROUTE_DESCRIPTOR, "EIGRP Nexthop Entry") DEFINE_MTYPE(EIGRPD, EIGRP_ROUTE_DESCRIPTOR, "EIGRP Nexthop Entry");
DEFINE_MTYPE(EIGRPD, EIGRP_FSM_MSG, "EIGRP FSM Message") DEFINE_MTYPE(EIGRPD, EIGRP_FSM_MSG, "EIGRP FSM Message");

30
eigrpd/eigrp_memory.h
View file

@ -24,20 +24,20 @@
#include "memory.h" #include "memory.h"
DECLARE_MGROUP(EIGRPD) DECLARE_MGROUP(EIGRPD);
DECLARE_MTYPE(EIGRP_TOP) DECLARE_MTYPE(EIGRP_TOP);
DECLARE_MTYPE(EIGRP_IF) DECLARE_MTYPE(EIGRP_IF);
DECLARE_MTYPE(EIGRP_NEIGHBOR) DECLARE_MTYPE(EIGRP_NEIGHBOR);
DECLARE_MTYPE(EIGRP_IF_PARAMS) DECLARE_MTYPE(EIGRP_IF_PARAMS);
DECLARE_MTYPE(EIGRP_IF_INFO) DECLARE_MTYPE(EIGRP_IF_INFO);
DECLARE_MTYPE(EIGRP_FIFO) DECLARE_MTYPE(EIGRP_FIFO);
DECLARE_MTYPE(EIGRP_PACKET) DECLARE_MTYPE(EIGRP_PACKET);
DECLARE_MTYPE(EIGRP_IPV4_INT_TLV) DECLARE_MTYPE(EIGRP_IPV4_INT_TLV);
DECLARE_MTYPE(EIGRP_SEQ_TLV) DECLARE_MTYPE(EIGRP_SEQ_TLV);
DECLARE_MTYPE(EIGRP_AUTH_TLV) DECLARE_MTYPE(EIGRP_AUTH_TLV);
DECLARE_MTYPE(EIGRP_AUTH_SHA256_TLV) DECLARE_MTYPE(EIGRP_AUTH_SHA256_TLV);
DECLARE_MTYPE(EIGRP_PREFIX_DESCRIPTOR) DECLARE_MTYPE(EIGRP_PREFIX_DESCRIPTOR);
DECLARE_MTYPE(EIGRP_ROUTE_DESCRIPTOR) DECLARE_MTYPE(EIGRP_ROUTE_DESCRIPTOR);
DECLARE_MTYPE(EIGRP_FSM_MSG) DECLARE_MTYPE(EIGRP_FSM_MSG);
#endif /* _FRR_EIGRP_MEMORY_H */ #endif /* _FRR_EIGRP_MEMORY_H */

6
isisd/fabricd.c
View file

@ -33,9 +33,9 @@
#include "isisd/isis_tx_queue.h" #include "isisd/isis_tx_queue.h"
#include "isisd/isis_csm.h" #include "isisd/isis_csm.h"
DEFINE_MTYPE_STATIC(ISISD, FABRICD_STATE, "ISIS OpenFabric") DEFINE_MTYPE_STATIC(ISISD, FABRICD_STATE, "ISIS OpenFabric");
DEFINE_MTYPE_STATIC(ISISD, FABRICD_NEIGHBOR, "ISIS OpenFabric Neighbor Entry") DEFINE_MTYPE_STATIC(ISISD, FABRICD_NEIGHBOR, "ISIS OpenFabric Neighbor Entry");
DEFINE_MTYPE_STATIC(ISISD, FABRICD_FLOODING_INFO, "ISIS OpenFabric Flooding Log") DEFINE_MTYPE_STATIC(ISISD, FABRICD_FLOODING_INFO, "ISIS OpenFabric Flooding Log");
/* Tracks initial synchronization as per section 2.4 /* Tracks initial synchronization as per section 2.4
* *

2
isisd/isis_bfd.c
View file

@ -32,7 +32,7 @@
#include "isisd/isisd.h" #include "isisd/isisd.h"
#include "isisd/fabricd.h" #include "isisd/fabricd.h"
DEFINE_MTYPE_STATIC(ISISD, BFD_SESSION, "ISIS BFD Session") DEFINE_MTYPE_STATIC(ISISD, BFD_SESSION, "ISIS BFD Session");
struct bfd_session { struct bfd_session {
int family; int family;

44
isisd/isis_memory.c
View file

@ -25,25 +25,25 @@
#include "isis_memory.h" #include "isis_memory.h"
DEFINE_MGROUP(ISISD, "isisd") DEFINE_MGROUP(ISISD, "isisd");
DEFINE_MTYPE(ISISD, ISIS, "ISIS") DEFINE_MTYPE(ISISD, ISIS, "ISIS");
DEFINE_MTYPE(ISISD, ISIS_TMP, "ISIS TMP") DEFINE_MTYPE(ISISD, ISIS_TMP, "ISIS TMP");
DEFINE_MTYPE(ISISD, ISIS_CIRCUIT, "ISIS circuit") DEFINE_MTYPE(ISISD, ISIS_CIRCUIT, "ISIS circuit");
DEFINE_MTYPE(ISISD, ISIS_LSP, "ISIS LSP") DEFINE_MTYPE(ISISD, ISIS_LSP, "ISIS LSP");
DEFINE_MTYPE(ISISD, ISIS_ADJACENCY, "ISIS adjacency") DEFINE_MTYPE(ISISD, ISIS_ADJACENCY, "ISIS adjacency");
DEFINE_MTYPE(ISISD, ISIS_ADJACENCY_INFO, "ISIS adjacency info") DEFINE_MTYPE(ISISD, ISIS_ADJACENCY_INFO, "ISIS adjacency info");
DEFINE_MTYPE(ISISD, ISIS_AREA, "ISIS area") DEFINE_MTYPE(ISISD, ISIS_AREA, "ISIS area");
DEFINE_MTYPE(ISISD, ISIS_AREA_ADDR, "ISIS area address") DEFINE_MTYPE(ISISD, ISIS_AREA_ADDR, "ISIS area address");
DEFINE_MTYPE(ISISD, ISIS_DYNHN, "ISIS dyn hostname") DEFINE_MTYPE(ISISD, ISIS_DYNHN, "ISIS dyn hostname");
DEFINE_MTYPE(ISISD, ISIS_SPFTREE, "ISIS SPFtree") DEFINE_MTYPE(ISISD, ISIS_SPFTREE, "ISIS SPFtree");
DEFINE_MTYPE(ISISD, ISIS_VERTEX, "ISIS vertex") DEFINE_MTYPE(ISISD, ISIS_VERTEX, "ISIS vertex");
DEFINE_MTYPE(ISISD, ISIS_ROUTE_INFO, "ISIS route info") DEFINE_MTYPE(ISISD, ISIS_ROUTE_INFO, "ISIS route info");
DEFINE_MTYPE(ISISD, ISIS_NEXTHOP, "ISIS nexthop") DEFINE_MTYPE(ISISD, ISIS_NEXTHOP, "ISIS nexthop");
DEFINE_MTYPE(ISISD, ISIS_NEXTHOP_LABELS, "ISIS nexthop MPLS labels") DEFINE_MTYPE(ISISD, ISIS_NEXTHOP_LABELS, "ISIS nexthop MPLS labels");
DEFINE_MTYPE(ISISD, ISIS_DICT, "ISIS dictionary") DEFINE_MTYPE(ISISD, ISIS_DICT, "ISIS dictionary");
DEFINE_MTYPE(ISISD, ISIS_DICT_NODE, "ISIS dictionary node") DEFINE_MTYPE(ISISD, ISIS_DICT_NODE, "ISIS dictionary node");
DEFINE_MTYPE(ISISD, ISIS_EXT_ROUTE, "ISIS redistributed route") DEFINE_MTYPE(ISISD, ISIS_EXT_ROUTE, "ISIS redistributed route");
DEFINE_MTYPE(ISISD, ISIS_EXT_INFO, "ISIS redistributed route info") DEFINE_MTYPE(ISISD, ISIS_EXT_INFO, "ISIS redistributed route info");
DEFINE_MTYPE(ISISD, ISIS_MPLS_TE, "ISIS MPLS_TE parameters") DEFINE_MTYPE(ISISD, ISIS_MPLS_TE, "ISIS MPLS_TE parameters");
DEFINE_MTYPE(ISISD, ISIS_ACL_NAME, "ISIS access-list name") DEFINE_MTYPE(ISISD, ISIS_ACL_NAME, "ISIS access-list name");
DEFINE_MTYPE(ISISD, ISIS_PLIST_NAME, "ISIS prefix-list name") DEFINE_MTYPE(ISISD, ISIS_PLIST_NAME, "ISIS prefix-list name");

44
isisd/isis_memory.h
View file

@ -24,27 +24,27 @@
#include "memory.h" #include "memory.h"
DECLARE_MGROUP(ISISD) DECLARE_MGROUP(ISISD);
DECLARE_MTYPE(ISIS) DECLARE_MTYPE(ISIS);
DECLARE_MTYPE(ISIS_TMP) DECLARE_MTYPE(ISIS_TMP);
DECLARE_MTYPE(ISIS_CIRCUIT) DECLARE_MTYPE(ISIS_CIRCUIT);
DECLARE_MTYPE(ISIS_LSP) DECLARE_MTYPE(ISIS_LSP);
DECLARE_MTYPE(ISIS_ADJACENCY) DECLARE_MTYPE(ISIS_ADJACENCY);
DECLARE_MTYPE(ISIS_ADJACENCY_INFO) DECLARE_MTYPE(ISIS_ADJACENCY_INFO);
DECLARE_MTYPE(ISIS_AREA) DECLARE_MTYPE(ISIS_AREA);
DECLARE_MTYPE(ISIS_AREA_ADDR) DECLARE_MTYPE(ISIS_AREA_ADDR);
DECLARE_MTYPE(ISIS_DYNHN) DECLARE_MTYPE(ISIS_DYNHN);
DECLARE_MTYPE(ISIS_SPFTREE) DECLARE_MTYPE(ISIS_SPFTREE);
DECLARE_MTYPE(ISIS_VERTEX) DECLARE_MTYPE(ISIS_VERTEX);
DECLARE_MTYPE(ISIS_ROUTE_INFO) DECLARE_MTYPE(ISIS_ROUTE_INFO);
DECLARE_MTYPE(ISIS_NEXTHOP) DECLARE_MTYPE(ISIS_NEXTHOP);
DECLARE_MTYPE(ISIS_NEXTHOP_LABELS) DECLARE_MTYPE(ISIS_NEXTHOP_LABELS);
DECLARE_MTYPE(ISIS_DICT) DECLARE_MTYPE(ISIS_DICT);
DECLARE_MTYPE(ISIS_DICT_NODE) DECLARE_MTYPE(ISIS_DICT_NODE);
DECLARE_MTYPE(ISIS_EXT_ROUTE) DECLARE_MTYPE(ISIS_EXT_ROUTE);
DECLARE_MTYPE(ISIS_EXT_INFO) DECLARE_MTYPE(ISIS_EXT_INFO);
DECLARE_MTYPE(ISIS_MPLS_TE) DECLARE_MTYPE(ISIS_MPLS_TE);
DECLARE_MTYPE(ISIS_ACL_NAME) DECLARE_MTYPE(ISIS_ACL_NAME);
DECLARE_MTYPE(ISIS_PLIST_NAME) DECLARE_MTYPE(ISIS_PLIST_NAME);
#endif /* _QUAGGA_ISIS_MEMORY_H */ #endif /* _QUAGGA_ISIS_MEMORY_H */

6
isisd/isis_mt.c
View file

@ -29,9 +29,9 @@
#include "isisd/isis_mt.h" #include "isisd/isis_mt.h"
#include "isisd/isis_tlvs.h" #include "isisd/isis_tlvs.h"
DEFINE_MTYPE_STATIC(ISISD, MT_AREA_SETTING, "ISIS MT Area Setting") DEFINE_MTYPE_STATIC(ISISD, MT_AREA_SETTING, "ISIS MT Area Setting");
DEFINE_MTYPE_STATIC(ISISD, MT_CIRCUIT_SETTING, "ISIS MT Circuit Setting") DEFINE_MTYPE_STATIC(ISISD, MT_CIRCUIT_SETTING, "ISIS MT Circuit Setting");
DEFINE_MTYPE_STATIC(ISISD, MT_ADJ_INFO, "ISIS MT Adjacency Info") DEFINE_MTYPE_STATIC(ISISD, MT_ADJ_INFO, "ISIS MT Adjacency Info");
bool isis_area_ipv6_dstsrc_enabled(struct isis_area *area) bool isis_area_ipv6_dstsrc_enabled(struct isis_area *area)
{ {

2
isisd/isis_sr.c
View file

@ -49,7 +49,7 @@
#include "isisd/isis_errors.h" #include "isisd/isis_errors.h"
/* Local variables and functions */ /* Local variables and functions */
DEFINE_MTYPE_STATIC(ISISD, ISIS_SR_INFO, "ISIS segment routing information") DEFINE_MTYPE_STATIC(ISISD, ISIS_SR_INFO, "ISIS segment routing information");
static void sr_local_block_delete(struct isis_area *area); static void sr_local_block_delete(struct isis_area *area);
static int sr_local_block_init(struct isis_area *area); static int sr_local_block_init(struct isis_area *area);

6
isisd/isis_tlvs.c
View file

@ -45,9 +45,9 @@
#include "isisd/isis_te.h" #include "isisd/isis_te.h"
#include "isisd/isis_sr.h" #include "isisd/isis_sr.h"
DEFINE_MTYPE_STATIC(ISISD, ISIS_TLV, "ISIS TLVs") DEFINE_MTYPE_STATIC(ISISD, ISIS_TLV, "ISIS TLVs");
DEFINE_MTYPE(ISISD, ISIS_SUBTLV, "ISIS Sub-TLVs") DEFINE_MTYPE(ISISD, ISIS_SUBTLV, "ISIS Sub-TLVs");
DEFINE_MTYPE_STATIC(ISISD, ISIS_MT_ITEM_LIST, "ISIS MT Item Lists") DEFINE_MTYPE_STATIC(ISISD, ISIS_MT_ITEM_LIST, "ISIS MT Item Lists");
typedef int (*unpack_tlv_func)(enum isis_tlv_context context, uint8_t tlv_type, typedef int (*unpack_tlv_func)(enum isis_tlv_context context, uint8_t tlv_type,
uint8_t tlv_len, struct stream *s, uint8_t tlv_len, struct stream *s,

2
isisd/isis_tlvs.h
View file

@ -28,7 +28,7 @@
#include "openbsd-tree.h" #include "openbsd-tree.h"
#include "prefix.h" #include "prefix.h"
DECLARE_MTYPE(ISIS_SUBTLV) DECLARE_MTYPE(ISIS_SUBTLV);
struct lspdb_head; struct lspdb_head;
struct isis_subtlvs; struct isis_subtlvs;

4
isisd/isis_tx_queue.c
View file

@ -32,8 +32,8 @@
#include "isisd/isis_misc.h" #include "isisd/isis_misc.h"
#include "isisd/isis_tx_queue.h" #include "isisd/isis_tx_queue.h"
DEFINE_MTYPE_STATIC(ISISD, TX_QUEUE, "ISIS TX Queue") DEFINE_MTYPE_STATIC(ISISD, TX_QUEUE, "ISIS TX Queue");
DEFINE_MTYPE_STATIC(ISISD, TX_QUEUE_ENTRY, "ISIS TX Queue Entry") DEFINE_MTYPE_STATIC(ISISD, TX_QUEUE_ENTRY, "ISIS TX Queue Entry");
struct isis_tx_queue { struct isis_tx_queue {
struct isis_circuit *circuit; struct isis_circuit *circuit;

2
lib/bfd.c
View file

@ -32,7 +32,7 @@
#include "vty.h" #include "vty.h"
#include "bfd.h" #include "bfd.h"
DEFINE_MTYPE_STATIC(LIB, BFD_INFO, "BFD info") DEFINE_MTYPE_STATIC(LIB, BFD_INFO, "BFD info");
static int bfd_debug = 0; static int bfd_debug = 0;
static struct bfd_gbl bfd_gbl; static struct bfd_gbl bfd_gbl;

4
lib/buffer.c
View file

@ -29,8 +29,8 @@
#include <stddef.h> #include <stddef.h>
DEFINE_MTYPE_STATIC(LIB, BUFFER, "Buffer") DEFINE_MTYPE_STATIC(LIB, BUFFER, "Buffer");
DEFINE_MTYPE_STATIC(LIB, BUFFER_DATA, "Buffer data") DEFINE_MTYPE_STATIC(LIB, BUFFER_DATA, "Buffer data");
/* Buffer master. */ /* Buffer master. */
struct buffer { struct buffer {

4
lib/command.c
View file

@ -51,8 +51,8 @@
#include "frrscript.h" #include "frrscript.h"
DEFINE_MTYPE_STATIC(LIB, HOST, "Host config") DEFINE_MTYPE_STATIC(LIB, HOST, "Host config");
DEFINE_MTYPE(LIB, COMPLETION, "Completion item") DEFINE_MTYPE(LIB, COMPLETION, "Completion item");
#define item(x) \ #define item(x) \
{ \ { \

2
lib/command.h
View file

@ -34,7 +34,7 @@
extern "C" { extern "C" {
#endif #endif
DECLARE_MTYPE(COMPLETION) DECLARE_MTYPE(COMPLETION);
/* /*
* From RFC 1123 (Requirements for Internet Hosts), Section 2.1 on hostnames: * From RFC 1123 (Requirements for Internet Hosts), Section 2.1 on hostnames:

10
lib/command_graph.c
View file

@ -26,11 +26,11 @@
#include "command_graph.h" #include "command_graph.h"
DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command Tokens") DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command Tokens");
DEFINE_MTYPE_STATIC(LIB, CMD_DESC, "Command Token Text") DEFINE_MTYPE_STATIC(LIB, CMD_DESC, "Command Token Text");
DEFINE_MTYPE_STATIC(LIB, CMD_TEXT, "Command Token Help") DEFINE_MTYPE_STATIC(LIB, CMD_TEXT, "Command Token Help");
DEFINE_MTYPE(LIB, CMD_ARG, "Command Argument") DEFINE_MTYPE(LIB, CMD_ARG, "Command Argument");
DEFINE_MTYPE_STATIC(LIB, CMD_VAR, "Command Argument Name") DEFINE_MTYPE_STATIC(LIB, CMD_VAR, "Command Argument Name");
struct cmd_token *cmd_token_new(enum cmd_token_type type, uint8_t attr, struct cmd_token *cmd_token_new(enum cmd_token_type type, uint8_t attr,
const char *text, const char *desc) const char *text, const char *desc)

2
lib/command_graph.h
View file

@ -37,7 +37,7 @@
extern "C" { extern "C" {
#endif #endif
DECLARE_MTYPE(CMD_ARG) DECLARE_MTYPE(CMD_ARG);
struct vty; struct vty;

2
lib/command_match.c
View file

@ -26,7 +26,7 @@
#include "command_match.h" #include "command_match.h"
#include "memory.h" #include "memory.h"
DEFINE_MTYPE_STATIC(LIB, CMD_MATCHSTACK, "Command Match Stack") DEFINE_MTYPE_STATIC(LIB, CMD_MATCHSTACK, "Command Match Stack");
#ifdef TRACE_MATCHER #ifdef TRACE_MATCHER
#define TM 1 #define TM 1

4
lib/command_parse.y
View file

@ -54,7 +54,7 @@
#include "command_graph.h" #include "command_graph.h"
#include "log.h" #include "log.h"
DECLARE_MTYPE(LEX) DECLARE_MTYPE(LEX);
#define YYSTYPE CMD_YYSTYPE #define YYSTYPE CMD_YYSTYPE
#define YYLTYPE CMD_YYLTYPE #define YYLTYPE CMD_YYLTYPE
@ -376,7 +376,7 @@ selector: '[' selector_seq_seq ']' varname_token
#undef scanner #undef scanner
DEFINE_MTYPE(LIB, LEX, "Lexer token (temporary)") DEFINE_MTYPE(LIB, LEX, "Lexer token (temporary)");
void void
cmd_graph_parse (struct graph *graph, const struct cmd_element *cmd) cmd_graph_parse (struct graph *graph, const struct cmd_element *cmd)

3
lib/compiler.h
View file

@ -136,6 +136,9 @@ extern "C" {
#define macro_inline static inline __attribute__((unused)) #define macro_inline static inline __attribute__((unused))
#define macro_pure static inline __attribute__((unused, pure)) #define macro_pure static inline __attribute__((unused, pure))
/* if the macro ends with a function definition */
#define MACRO_REQUIRE_SEMICOLON() \
_Static_assert(1, "please add a semicolon after this macro")
/* variadic macros, use like: /* variadic macros, use like:
* #define V_0() ... * #define V_0() ...

8
lib/distribute.c
View file

@ -27,10 +27,10 @@
#include "distribute.h" #include "distribute.h"
#include "memory.h" #include "memory.h"
DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_CTX, "Distribute ctx") DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_CTX, "Distribute ctx");
DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE, "Distribute list") DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE, "Distribute list");
DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_IFNAME, "Dist-list ifname") DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_IFNAME, "Dist-list ifname");
DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_NAME, "Dist-list name") DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_NAME, "Dist-list name");
static struct list *dist_ctx_list; static struct list *dist_ctx_list;

2
lib/ferr.c
View file

@ -35,7 +35,7 @@
#include "linklist.h" #include "linklist.h"
#include "frr_pthread.h" #include "frr_pthread.h"
DEFINE_MTYPE_STATIC(LIB, ERRINFO, "error information") DEFINE_MTYPE_STATIC(LIB, ERRINFO, "error information");
/* /*
* Thread-specific key for temporary storage of allocated ferr. * Thread-specific key for temporary storage of allocated ferr.

6
lib/filter.c
View file

@ -31,9 +31,9 @@
#include "libfrr.h" #include "libfrr.h"
#include "northbound_cli.h" #include "northbound_cli.h"
DEFINE_MTYPE_STATIC(LIB, ACCESS_LIST, "Access List") DEFINE_MTYPE_STATIC(LIB, ACCESS_LIST, "Access List");
DEFINE_MTYPE_STATIC(LIB, ACCESS_LIST_STR, "Access List Str") DEFINE_MTYPE_STATIC(LIB, ACCESS_LIST_STR, "Access List Str");
DEFINE_MTYPE_STATIC(LIB, ACCESS_FILTER, "Access Filter") DEFINE_MTYPE_STATIC(LIB, ACCESS_FILTER, "Access Filter");
/* Static structure for mac access_list's master. */ /* Static structure for mac access_list's master. */
static struct access_master access_master_mac = { static struct access_master access_master_mac = {

4
lib/frr_pthread.c
View file

@ -30,8 +30,8 @@
#include "zlog.h" #include "zlog.h"
#include "libfrr_trace.h" #include "libfrr_trace.h"
DEFINE_MTYPE_STATIC(LIB, FRR_PTHREAD, "FRR POSIX Thread") DEFINE_MTYPE_STATIC(LIB, FRR_PTHREAD, "FRR POSIX Thread");
DEFINE_MTYPE_STATIC(LIB, PTHREAD_PRIM, "POSIX sync primitives") DEFINE_MTYPE_STATIC(LIB, PTHREAD_PRIM, "POSIX sync primitives");
/* default frr_pthread start/stop routine prototypes */ /* default frr_pthread start/stop routine prototypes */
static void *fpt_run(void *arg); static void *fpt_run(void *arg);

2
lib/frr_zmq.c
View file

@ -26,7 +26,7 @@
#include "log.h" #include "log.h"
#include "lib_errors.h" #include "lib_errors.h"
DEFINE_MTYPE_STATIC(LIB, ZEROMQ_CB, "ZeroMQ callback") DEFINE_MTYPE_STATIC(LIB, ZEROMQ_CB, "ZeroMQ callback");
/* libzmq's context */ /* libzmq's context */
void *frrzmq_context = NULL; void *frrzmq_context = NULL;

4
lib/frrcu.c
View file

@ -54,8 +54,8 @@
#include "seqlock.h" #include "seqlock.h"
#include "atomlist.h" #include "atomlist.h"
DEFINE_MTYPE_STATIC(LIB, RCU_THREAD, "RCU thread") DEFINE_MTYPE_STATIC(LIB, RCU_THREAD, "RCU thread");
DEFINE_MTYPE_STATIC(LIB, RCU_NEXT, "RCU sequence barrier") DEFINE_MTYPE_STATIC(LIB, RCU_NEXT, "RCU sequence barrier");
DECLARE_ATOMLIST(rcu_heads, struct rcu_head, head) DECLARE_ATOMLIST(rcu_heads, struct rcu_head, head)

2
lib/grammar_sandbox.c
View file

@ -34,7 +34,7 @@
#define GRAMMAR_STR "CLI grammar sandbox\n" #define GRAMMAR_STR "CLI grammar sandbox\n"
DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command desc") DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command desc");
/** headers **/ /** headers **/
void grammar_sandbox_init(void); void grammar_sandbox_init(void);

4
lib/graph.c
View file

@ -25,8 +25,8 @@
#include "memory.h" #include "memory.h"
#include "buffer.h" #include "buffer.h"
DEFINE_MTYPE_STATIC(LIB, GRAPH, "Graph") DEFINE_MTYPE_STATIC(LIB, GRAPH, "Graph");
DEFINE_MTYPE_STATIC(LIB, GRAPH_NODE, "Graph Node") DEFINE_MTYPE_STATIC(LIB, GRAPH_NODE, "Graph Node");
struct graph *graph_new(void) struct graph *graph_new(void)
{ {
struct graph *graph = XCALLOC(MTYPE_GRAPH, sizeof(struct graph)); struct graph *graph = XCALLOC(MTYPE_GRAPH, sizeof(struct graph));

6
lib/hash.c
View file

@ -31,9 +31,9 @@
#include "frr_pthread.h" #include "frr_pthread.h"
#include "libfrr_trace.h" #include "libfrr_trace.h"
DEFINE_MTYPE_STATIC(LIB, HASH, "Hash") DEFINE_MTYPE_STATIC(LIB, HASH, "Hash");
DEFINE_MTYPE_STATIC(LIB, HASH_BUCKET, "Hash Bucket") DEFINE_MTYPE_STATIC(LIB, HASH_BUCKET, "Hash Bucket");
DEFINE_MTYPE_STATIC(LIB, HASH_INDEX, "Hash Index") DEFINE_MTYPE_STATIC(LIB, HASH_INDEX, "Hash Index");
static pthread_mutex_t _hashes_mtx = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t _hashes_mtx = PTHREAD_MUTEX_INITIALIZER;
static struct list *_hashes; static struct list *_hashes;

2
lib/hook.c
View file

@ -23,7 +23,7 @@
#include "memory.h" #include "memory.h"
#include "hook.h" #include "hook.h"
DEFINE_MTYPE_STATIC(LIB, HOOK_ENTRY, "Hook entry") DEFINE_MTYPE_STATIC(LIB, HOOK_ENTRY, "Hook entry");
void _hook_register(struct hook *hook, struct hookent *stackent, void *funcptr, void _hook_register(struct hook *hook, struct hookent *stackent, void *funcptr,
void *arg, bool has_arg, struct frrmod_runtime *module, void *arg, bool has_arg, struct frrmod_runtime *module,

13
lib/id_alloc.c
View file

@ -29,13 +29,14 @@
#include <inttypes.h> #include <inttypes.h>
DEFINE_MTYPE_STATIC(LIB, IDALLOC_ALLOCATOR, "ID Number Allocator") DEFINE_MTYPE_STATIC(LIB, IDALLOC_ALLOCATOR, "ID Number Allocator");
DEFINE_MTYPE_STATIC(LIB, IDALLOC_ALLOCATOR_NAME, "ID Number Allocator Name") DEFINE_MTYPE_STATIC(LIB, IDALLOC_ALLOCATOR_NAME, "ID Number Allocator Name");
DEFINE_MTYPE_STATIC(LIB, IDALLOC_DIRECTORY, "ID Number Allocator Directory") DEFINE_MTYPE_STATIC(LIB, IDALLOC_DIRECTORY, "ID Number Allocator Directory");
DEFINE_MTYPE_STATIC(LIB, IDALLOC_SUBDIRECTORY, DEFINE_MTYPE_STATIC(LIB, IDALLOC_SUBDIRECTORY,
"ID Number Allocator Subdirectory") "ID Number Allocator Subdirectory");
DEFINE_MTYPE_STATIC(LIB, IDALLOC_PAGE, "ID Number Allocator Page") DEFINE_MTYPE_STATIC(LIB, IDALLOC_PAGE, "ID Number Allocator Page");
DEFINE_MTYPE_STATIC(LIB, IDALLOC_POOL, "ID Number temporary holding pool entry") DEFINE_MTYPE_STATIC(LIB, IDALLOC_POOL,
"ID Number temporary holding pool entry");
#if UINT_MAX >= UINT32_MAX #if UINT_MAX >= UINT32_MAX
#define FFS32(x) ffs(x) #define FFS32(x) ffs(x)

10
lib/if.c
View file

@ -39,11 +39,11 @@
#include "lib/if_clippy.c" #include "lib/if_clippy.c"
#endif #endif
DEFINE_MTYPE_STATIC(LIB, IF, "Interface") DEFINE_MTYPE_STATIC(LIB, IF, "Interface");
DEFINE_MTYPE_STATIC(LIB, CONNECTED, "Connected") DEFINE_MTYPE_STATIC(LIB, CONNECTED, "Connected");
DEFINE_MTYPE_STATIC(LIB, NBR_CONNECTED, "Neighbor Connected") DEFINE_MTYPE_STATIC(LIB, NBR_CONNECTED, "Neighbor Connected");
DEFINE_MTYPE(LIB, CONNECTED_LABEL, "Connected interface label") DEFINE_MTYPE(LIB, CONNECTED_LABEL, "Connected interface label");
DEFINE_MTYPE_STATIC(LIB, IF_LINK_PARAMS, "Informational Link Parameters") DEFINE_MTYPE_STATIC(LIB, IF_LINK_PARAMS, "Informational Link Parameters");
static struct interface *if_lookup_by_ifindex(ifindex_t ifindex, static struct interface *if_lookup_by_ifindex(ifindex_t ifindex,
vrf_id_t vrf_id); vrf_id_t vrf_id);

2
lib/if.h
View file

@ -31,7 +31,7 @@
extern "C" { extern "C" {
#endif #endif
DECLARE_MTYPE(CONNECTED_LABEL) DECLARE_MTYPE(CONNECTED_LABEL);
/* Interface link-layer type, if known. Derived from: /* Interface link-layer type, if known. Derived from:
* *

9
lib/if_rmap.c
View file

@ -26,10 +26,11 @@
#include "if.h" #include "if.h"
#include "if_rmap.h" #include "if_rmap.h"
DEFINE_MTYPE_STATIC(LIB, IF_RMAP_CTX, "Interface route map container") DEFINE_MTYPE_STATIC(LIB, IF_RMAP_CTX, "Interface route map container");
DEFINE_MTYPE_STATIC(LIB, IF_RMAP_CTX_NAME, "Interface route map container name") DEFINE_MTYPE_STATIC(LIB, IF_RMAP_CTX_NAME,
DEFINE_MTYPE_STATIC(LIB, IF_RMAP, "Interface route map") "Interface route map container name");
DEFINE_MTYPE_STATIC(LIB, IF_RMAP_NAME, "I.f. route map name") DEFINE_MTYPE_STATIC(LIB, IF_RMAP, "Interface route map");
DEFINE_MTYPE_STATIC(LIB, IF_RMAP_NAME, "I.f. route map name");
static struct list *if_rmap_ctx_list; static struct list *if_rmap_ctx_list;

4
lib/keychain.c
View file

@ -25,8 +25,8 @@
#include "linklist.h" #include "linklist.h"
#include "keychain.h" #include "keychain.h"
DEFINE_MTYPE_STATIC(LIB, KEY, "Key") DEFINE_MTYPE_STATIC(LIB, KEY, "Key");
DEFINE_MTYPE_STATIC(LIB, KEYCHAIN, "Key chain") DEFINE_MTYPE_STATIC(LIB, KEYCHAIN, "Key chain");
DEFINE_QOBJ_TYPE(keychain) DEFINE_QOBJ_TYPE(keychain)
DEFINE_QOBJ_TYPE(key) DEFINE_QOBJ_TYPE(key)

2
lib/ldp_sync.c
View file

@ -31,7 +31,7 @@
#include "ldp_sync.h" #include "ldp_sync.h"
/* Library code */ /* Library code */
DEFINE_MTYPE_STATIC(LIB, LDP_SYNC_INFO, "LDP SYNC info") DEFINE_MTYPE_STATIC(LIB, LDP_SYNC_INFO, "LDP SYNC info");
/* /*
* ldp_sync_info_create - Allocate the LDP_SYNC information * ldp_sync_info_create - Allocate the LDP_SYNC information

2
lib/link_state.c
View file

@ -36,7 +36,7 @@
#include "link_state.h" #include "link_state.h"
/* Link State Memory allocation */ /* Link State Memory allocation */
DEFINE_MTYPE_STATIC(LIB, LS_DB, "Link State Database") DEFINE_MTYPE_STATIC(LIB, LS_DB, "Link State Database");
/** /**
* Link State Node management functions * Link State Node management functions

4
lib/linklist.c
View file

@ -25,8 +25,8 @@
#include "memory.h" #include "memory.h"
#include "libfrr_trace.h" #include "libfrr_trace.h"
DEFINE_MTYPE_STATIC(LIB, LINK_LIST, "Link List") DEFINE_MTYPE_STATIC(LIB, LINK_LIST, "Link List");
DEFINE_MTYPE_STATIC(LIB, LINK_NODE, "Link Node") DEFINE_MTYPE_STATIC(LIB, LINK_NODE, "Link Node");
struct list *list_new(void) struct list *list_new(void)
{ {

4
lib/memory.c
View file

@ -34,8 +34,8 @@
static struct memgroup *mg_first = NULL; static struct memgroup *mg_first = NULL;
struct memgroup **mg_insert = &mg_first; struct memgroup **mg_insert = &mg_first;
DEFINE_MGROUP(LIB, "libfrr") DEFINE_MGROUP(LIB, "libfrr");
DEFINE_MTYPE(LIB, TMP, "Temporary memory") DEFINE_MTYPE(LIB, TMP, "Temporary memory");
static inline void mt_count_alloc(struct memtype *mt, size_t size, void *ptr) static inline void mt_count_alloc(struct memtype *mt, size_t size, void *ptr)
{ {

22
lib/memory.h
View file

@ -56,20 +56,20 @@ struct memgroup {
/* macro usage: /* macro usage:
* *
* mydaemon.h * mydaemon.h
* DECLARE_MGROUP(MYDAEMON) * DECLARE_MGROUP(MYDAEMON);
* DECLARE_MTYPE(MYDAEMON_COMMON) * DECLARE_MTYPE(MYDAEMON_COMMON);
* *
* mydaemon.c * mydaemon.c
* DEFINE_MGROUP(MYDAEMON, "my daemon memory") * DEFINE_MGROUP(MYDAEMON, "my daemon memory");
* DEFINE_MTYPE(MYDAEMON, MYDAEMON_COMMON, * DEFINE_MTYPE(MYDAEMON, MYDAEMON_COMMON,
* "this mtype is used in multiple files in mydaemon") * "this mtype is used in multiple files in mydaemon");
* foo = qmalloc(MTYPE_MYDAEMON_COMMON, sizeof(*foo)) * foo = qmalloc(MTYPE_MYDAEMON_COMMON, sizeof(*foo))
* *
* mydaemon_io.c * mydaemon_io.c
* bar = qmalloc(MTYPE_MYDAEMON_COMMON, sizeof(*bar)) * bar = qmalloc(MTYPE_MYDAEMON_COMMON, sizeof(*bar))
* *
* DEFINE_MTYPE_STATIC(MYDAEMON, MYDAEMON_IO, * DEFINE_MTYPE_STATIC(MYDAEMON, MYDAEMON_IO,
* "this mtype is used only in this file") * "this mtype is used only in this file");
* baz = qmalloc(MTYPE_MYDAEMON_IO, sizeof(*baz)) * baz = qmalloc(MTYPE_MYDAEMON_IO, sizeof(*baz))
* *
* Note: Naming conventions (MGROUP_ and MTYPE_ prefixes are enforced * Note: Naming conventions (MGROUP_ and MTYPE_ prefixes are enforced
@ -78,7 +78,7 @@ struct memgroup {
* but MGROUP_* aren't. * but MGROUP_* aren't.
*/ */
#define DECLARE_MGROUP(name) extern struct memgroup _mg_##name; #define DECLARE_MGROUP(name) extern struct memgroup _mg_##name
#define _DEFINE_MGROUP(mname, desc, ...) \ #define _DEFINE_MGROUP(mname, desc, ...) \
struct memgroup _mg_##mname \ struct memgroup _mg_##mname \
__attribute__((section(".data.mgroups"))) = { \ __attribute__((section(".data.mgroups"))) = { \
@ -104,7 +104,7 @@ struct memgroup {
_mg_##mname.next->ref = _mg_##mname.ref; \ _mg_##mname.next->ref = _mg_##mname.ref; \
*_mg_##mname.ref = _mg_##mname.next; \ *_mg_##mname.ref = _mg_##mname.next; \
} \ } \
/* end */ MACRO_REQUIRE_SEMICOLON() /* end */
#define DEFINE_MGROUP(mname, desc) \ #define DEFINE_MGROUP(mname, desc) \
_DEFINE_MGROUP(mname, desc, ) _DEFINE_MGROUP(mname, desc, )
@ -112,7 +112,7 @@ struct memgroup {
_DEFINE_MGROUP(mname, desc, .active_at_exit = true) _DEFINE_MGROUP(mname, desc, .active_at_exit = true)
#define DECLARE_MTYPE(name) \ #define DECLARE_MTYPE(name) \
extern struct memtype MTYPE_##name[1]; \ extern struct memtype MTYPE_##name[1] \
/* end */ /* end */
#define DEFINE_MTYPE_ATTR(group, mname, attr, desc) \ #define DEFINE_MTYPE_ATTR(group, mname, attr, desc) \
@ -140,7 +140,7 @@ struct memgroup {
MTYPE_##mname->next->ref = MTYPE_##mname->ref; \ MTYPE_##mname->next->ref = MTYPE_##mname->ref; \
*MTYPE_##mname->ref = MTYPE_##mname->next; \ *MTYPE_##mname->ref = MTYPE_##mname->next; \
} \ } \
/* end */ MACRO_REQUIRE_SEMICOLON() /* end */
#define DEFINE_MTYPE(group, name, desc) \ #define DEFINE_MTYPE(group, name, desc) \
DEFINE_MTYPE_ATTR(group, name, , desc) \ DEFINE_MTYPE_ATTR(group, name, , desc) \
@ -150,8 +150,8 @@ struct memgroup {
DEFINE_MTYPE_ATTR(group, name, static, desc) \ DEFINE_MTYPE_ATTR(group, name, static, desc) \
/* end */ /* end */
DECLARE_MGROUP(LIB) DECLARE_MGROUP(LIB);
DECLARE_MTYPE(TMP) DECLARE_MTYPE(TMP);
extern void *qmalloc(struct memtype *mt, size_t size) extern void *qmalloc(struct memtype *mt, size_t size)

4
lib/module.c
View file

@ -27,8 +27,8 @@
#include "memory.h" #include "memory.h"
#include "version.h" #include "version.h"
DEFINE_MTYPE_STATIC(LIB, MODULE_LOADNAME, "Module loading name") DEFINE_MTYPE_STATIC(LIB, MODULE_LOADNAME, "Module loading name");
DEFINE_MTYPE_STATIC(LIB, MODULE_LOADARGS, "Module loading arguments") DEFINE_MTYPE_STATIC(LIB, MODULE_LOADARGS, "Module loading arguments");
static struct frrmod_info frrmod_default_info = { static struct frrmod_info frrmod_default_info = {
.name = "libfrr", .name = "libfrr",

4
lib/netns_linux.c
View file

@ -40,8 +40,8 @@
#include "vrf.h" #include "vrf.h"
#include "lib_errors.h" #include "lib_errors.h"
DEFINE_MTYPE_STATIC(LIB, NS, "NetNS Context") DEFINE_MTYPE_STATIC(LIB, NS, "NetNS Context");
DEFINE_MTYPE_STATIC(LIB, NS_NAME, "NetNS Name") DEFINE_MTYPE_STATIC(LIB, NS_NAME, "NetNS Name");
static inline int ns_compare(const struct ns *ns, const struct ns *ns2); static inline int ns_compare(const struct ns *ns, const struct ns *ns2);
static struct ns *ns_lookup_name_internal(const char *name); static struct ns *ns_lookup_name_internal(const char *name);

4
lib/netns_other.c
View file

@ -26,8 +26,8 @@
#include "log.h" #include "log.h"
#include "memory.h" #include "memory.h"
DEFINE_MTYPE_STATIC(LIB, NS, "NetNS Context") DEFINE_MTYPE_STATIC(LIB, NS, "NetNS Context");
DEFINE_MTYPE_STATIC(LIB, NS_NAME, "NetNS Name") DEFINE_MTYPE_STATIC(LIB, NS_NAME, "NetNS Name");
static inline int ns_compare(const struct ns *ns, const struct ns *ns2); static inline int ns_compare(const struct ns *ns, const struct ns *ns2);

4
lib/nexthop.c
View file

@ -34,8 +34,8 @@
#include "vrf.h" #include "vrf.h"
#include "nexthop_group.h" #include "nexthop_group.h"
DEFINE_MTYPE_STATIC(LIB, NEXTHOP, "Nexthop") DEFINE_MTYPE_STATIC(LIB, NEXTHOP, "Nexthop");
DEFINE_MTYPE_STATIC(LIB, NH_LABEL, "Nexthop label") DEFINE_MTYPE_STATIC(LIB, NH_LABEL, "Nexthop label");
static int _nexthop_labels_cmp(const struct nexthop *nh1, static int _nexthop_labels_cmp(const struct nexthop *nh1,
const struct nexthop *nh2) const struct nexthop *nh2)

2
lib/nexthop_group.c
View file

@ -32,7 +32,7 @@
#include "lib/nexthop_group_clippy.c" #include "lib/nexthop_group_clippy.c"
#endif #endif
DEFINE_MTYPE_STATIC(LIB, NEXTHOP_GROUP, "Nexthop Group") DEFINE_MTYPE_STATIC(LIB, NEXTHOP_GROUP, "Nexthop Group");
/* /*
* Internal struct used to hold nhg config strings * Internal struct used to hold nhg config strings

6
lib/northbound.c
View file

@ -32,9 +32,9 @@
#include "northbound_db.h" #include "northbound_db.h"
#include "frrstr.h" #include "frrstr.h"
DEFINE_MTYPE_STATIC(LIB, NB_NODE, "Northbound Node") DEFINE_MTYPE_STATIC(LIB, NB_NODE, "Northbound Node");
DEFINE_MTYPE_STATIC(LIB, NB_CONFIG, "Northbound Configuration") DEFINE_MTYPE_STATIC(LIB, NB_CONFIG, "Northbound Configuration");
DEFINE_MTYPE_STATIC(LIB, NB_CONFIG_ENTRY, "Northbound Configuration Entry") DEFINE_MTYPE_STATIC(LIB, NB_CONFIG_ENTRY, "Northbound Configuration Entry");
/* Running configuration - shouldn't be modified directly. */ /* Running configuration - shouldn't be modified directly. */
struct nb_config *running_config; struct nb_config *running_config;

2
lib/northbound_confd.c
View file

@ -32,7 +32,7 @@
#include <confd_dp.h> #include <confd_dp.h>
#include <confd_maapi.h> #include <confd_maapi.h>
DEFINE_MTYPE_STATIC(LIB, CONFD, "ConfD module") DEFINE_MTYPE_STATIC(LIB, CONFD, "ConfD module");
static struct debug nb_dbg_client_confd = {0, "Northbound client: ConfD"}; static struct debug nb_dbg_client_confd = {0, "Northbound client: ConfD"};

2
lib/northbound_sysrepo.c
View file

@ -32,7 +32,7 @@
#include <sysrepo/values.h> #include <sysrepo/values.h>
#include <sysrepo/xpath.h> #include <sysrepo/xpath.h>
DEFINE_MTYPE_STATIC(LIB, SYSREPO, "Sysrepo module") DEFINE_MTYPE_STATIC(LIB, SYSREPO, "Sysrepo module");
static struct debug nb_dbg_client_sysrepo = {0, "Northbound client: Sysrepo"}; static struct debug nb_dbg_client_sysrepo = {0, "Northbound client: Sysrepo"};

8
lib/plist.c
View file

@ -33,10 +33,10 @@
#include "plist_int.h" #include "plist_int.h"
DEFINE_MTYPE_STATIC(LIB, PREFIX_LIST, "Prefix List") DEFINE_MTYPE_STATIC(LIB, PREFIX_LIST, "Prefix List");
DEFINE_MTYPE_STATIC(LIB, MPREFIX_LIST_STR, "Prefix List Str") DEFINE_MTYPE_STATIC(LIB, MPREFIX_LIST_STR, "Prefix List Str");
DEFINE_MTYPE_STATIC(LIB, PREFIX_LIST_ENTRY, "Prefix List Entry") DEFINE_MTYPE_STATIC(LIB, PREFIX_LIST_ENTRY, "Prefix List Entry");
DEFINE_MTYPE_STATIC(LIB, PREFIX_LIST_TRIE, "Prefix List Trie Table") DEFINE_MTYPE_STATIC(LIB, PREFIX_LIST_TRIE, "Prefix List Trie Table");
/* not currently changeable, code assumes bytes further down */ /* not currently changeable, code assumes bytes further down */
#define PLC_BITS 8 #define PLC_BITS 8

4
lib/prefix.c
View file

@ -32,8 +32,8 @@
#include "printfrr.h" #include "printfrr.h"
#include "vxlan.h" #include "vxlan.h"
DEFINE_MTYPE_STATIC(LIB, PREFIX, "Prefix") DEFINE_MTYPE_STATIC(LIB, PREFIX, "Prefix");
DEFINE_MTYPE_STATIC(LIB, PREFIX_FLOWSPEC, "Prefix Flowspec") DEFINE_MTYPE_STATIC(LIB, PREFIX_FLOWSPEC, "Prefix Flowspec");
/* Maskbit. */ /* Maskbit. */
static const uint8_t maskbit[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0, static const uint8_t maskbit[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0,

2
lib/privs.c
View file

@ -28,7 +28,7 @@
#include "lib_errors.h" #include "lib_errors.h"
#include "lib/queue.h" #include "lib/queue.h"
DEFINE_MTYPE_STATIC(LIB, PRIVS, "Privilege information") DEFINE_MTYPE_STATIC(LIB, PRIVS, "Privilege information");
/* /*
* Different capabilities/privileges apis have different characteristics: some * Different capabilities/privileges apis have different characteristics: some

4
lib/pullwr.c
View file

@ -48,8 +48,8 @@ struct pullwr {
int64_t maxspin; /* PULLWR_MAXSPIN */ int64_t maxspin; /* PULLWR_MAXSPIN */
}; };
DEFINE_MTYPE_STATIC(LIB, PULLWR_HEAD, "pull-driven write controller") DEFINE_MTYPE_STATIC(LIB, PULLWR_HEAD, "pull-driven write controller");
DEFINE_MTYPE_STATIC(LIB, PULLWR_BUF, "pull-driven write buffer") DEFINE_MTYPE_STATIC(LIB, PULLWR_BUF, "pull-driven write buffer");
static int pullwr_run(struct thread *t); static int pullwr_run(struct thread *t);

2
lib/ringbuf.c
View file

@ -22,7 +22,7 @@
#include "ringbuf.h" #include "ringbuf.h"
#include "memory.h" #include "memory.h"
DEFINE_MTYPE_STATIC(LIB, RINGBUFFER, "Ring buffer") DEFINE_MTYPE_STATIC(LIB, RINGBUFFER, "Ring buffer");
struct ringbuf *ringbuf_new(size_t size) struct ringbuf *ringbuf_new(size_t size)
{ {

16
lib/routemap.c
View file

@ -33,14 +33,14 @@
#include "lib_errors.h" #include "lib_errors.h"
#include "table.h" #include "table.h"
DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP, "Route map") DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP, "Route map");
DEFINE_MTYPE(LIB, ROUTE_MAP_NAME, "Route map name") DEFINE_MTYPE(LIB, ROUTE_MAP_NAME, "Route map name");
DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP_INDEX, "Route map index") DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP_INDEX, "Route map index");
DEFINE_MTYPE(LIB, ROUTE_MAP_RULE, "Route map rule") DEFINE_MTYPE(LIB, ROUTE_MAP_RULE, "Route map rule");
DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP_RULE_STR, "Route map rule str") DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP_RULE_STR, "Route map rule str");
DEFINE_MTYPE(LIB, ROUTE_MAP_COMPILED, "Route map compiled") DEFINE_MTYPE(LIB, ROUTE_MAP_COMPILED, "Route map compiled");
DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP_DEP, "Route map dependency") DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP_DEP, "Route map dependency");
DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP_DEP_DATA, "Route map dependency data") DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP_DEP_DATA, "Route map dependency data");
DEFINE_QOBJ_TYPE(route_map_index) DEFINE_QOBJ_TYPE(route_map_index)
DEFINE_QOBJ_TYPE(route_map) DEFINE_QOBJ_TYPE(route_map)

6
lib/routemap.h
View file

@ -32,9 +32,9 @@
extern "C" { extern "C" {
#endif #endif
DECLARE_MTYPE(ROUTE_MAP_NAME) DECLARE_MTYPE(ROUTE_MAP_NAME);
DECLARE_MTYPE(ROUTE_MAP_RULE) DECLARE_MTYPE(ROUTE_MAP_RULE);
DECLARE_MTYPE(ROUTE_MAP_COMPILED) DECLARE_MTYPE(ROUTE_MAP_COMPILED);
/* Route map's type. */ /* Route map's type. */
enum route_map_type { RMAP_PERMIT, RMAP_DENY, RMAP_ANY }; enum route_map_type { RMAP_PERMIT, RMAP_DENY, RMAP_ANY };

4
lib/skiplist.c
View file

@ -63,8 +63,8 @@
#include "lib_errors.h" #include "lib_errors.h"
#include "network.h" #include "network.h"
DEFINE_MTYPE_STATIC(LIB, SKIP_LIST, "Skip List") DEFINE_MTYPE_STATIC(LIB, SKIP_LIST, "Skip List");
DEFINE_MTYPE_STATIC(LIB, SKIP_LIST_NODE, "Skip Node") DEFINE_MTYPE_STATIC(LIB, SKIP_LIST_NODE, "Skip Node");
#define BitsInRandom 31 #define BitsInRandom 31

2
lib/sockunion.c
View file

@ -29,7 +29,7 @@
#include "lib_errors.h" #include "lib_errors.h"
#include "printfrr.h" #include "printfrr.h"
DEFINE_MTYPE_STATIC(LIB, SOCKUNION, "Socket union") DEFINE_MTYPE_STATIC(LIB, SOCKUNION, "Socket union");
const char *inet_sutop(const union sockunion *su, char *str) const char *inet_sutop(const union sockunion *su, char *str)
{ {

4
lib/spf_backoff.c
View file

@ -33,8 +33,8 @@
#include "thread.h" #include "thread.h"
#include "vty.h" #include "vty.h"
DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF, "SPF backoff") DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF, "SPF backoff");
DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF_NAME, "SPF backoff name") DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF_NAME, "SPF backoff name");
static bool debug_spf_backoff = false; static bool debug_spf_backoff = false;
#define backoff_debug(...) \ #define backoff_debug(...) \

2
lib/srcdest_table.c
View file

@ -30,7 +30,7 @@
#include "table.h" #include "table.h"
#include "printfrr.h" #include "printfrr.h"
DEFINE_MTYPE_STATIC(LIB, ROUTE_SRC_NODE, "Route source node") DEFINE_MTYPE_STATIC(LIB, ROUTE_SRC_NODE, "Route source node");
/* ----- functions to manage rnodes _with_ srcdest table ----- */ /* ----- functions to manage rnodes _with_ srcdest table ----- */
struct srcdest_rnode { struct srcdest_rnode {

4
lib/stream.c
View file

@ -31,8 +31,8 @@
#include "frr_pthread.h" #include "frr_pthread.h"
#include "lib_errors.h" #include "lib_errors.h"
DEFINE_MTYPE_STATIC(LIB, STREAM, "Stream") DEFINE_MTYPE_STATIC(LIB, STREAM, "Stream");
DEFINE_MTYPE_STATIC(LIB, STREAM_FIFO, "Stream FIFO") DEFINE_MTYPE_STATIC(LIB, STREAM_FIFO, "Stream FIFO");
/* Tests whether a position is valid */ /* Tests whether a position is valid */
#define GETP_VALID(S, G) ((G) <= (S)->endp) #define GETP_VALID(S, G) ((G) <= (S)->endp)

4
lib/table.c
View file

@ -29,8 +29,8 @@
#include "sockunion.h" #include "sockunion.h"
#include "libfrr_trace.h" #include "libfrr_trace.h"
DEFINE_MTYPE_STATIC(LIB, ROUTE_TABLE, "Route table") DEFINE_MTYPE_STATIC(LIB, ROUTE_TABLE, "Route table");
DEFINE_MTYPE(LIB, ROUTE_NODE, "Route node") DEFINE_MTYPE(LIB, ROUTE_NODE, "Route node");
static void route_table_free(struct route_table *); static void route_table_free(struct route_table *);

2
lib/table.h
View file

@ -31,7 +31,7 @@
extern "C" { extern "C" {
#endif #endif
DECLARE_MTYPE(ROUTE_NODE) DECLARE_MTYPE(ROUTE_NODE);
/* /*
* Forward declarations. * Forward declarations.

2
lib/termtable.c
View file

@ -24,7 +24,7 @@
#include "memory.h" #include "memory.h"
#include "termtable.h" #include "termtable.h"
DEFINE_MTYPE_STATIC(LIB, TTABLE, "ASCII table") DEFINE_MTYPE_STATIC(LIB, TTABLE, "ASCII table");
/* clang-format off */ /* clang-format off */
const struct ttable_style ttable_styles[] = { const struct ttable_style ttable_styles[] = {

8
lib/thread.c
View file

@ -38,10 +38,10 @@
#include "libfrr_trace.h" #include "libfrr_trace.h"
#include "libfrr.h" #include "libfrr.h"
DEFINE_MTYPE_STATIC(LIB, THREAD, "Thread") DEFINE_MTYPE_STATIC(LIB, THREAD, "Thread");
DEFINE_MTYPE_STATIC(LIB, THREAD_MASTER, "Thread master") DEFINE_MTYPE_STATIC(LIB, THREAD_MASTER, "Thread master");
DEFINE_MTYPE_STATIC(LIB, THREAD_POLL, "Thread Poll Info") DEFINE_MTYPE_STATIC(LIB, THREAD_POLL, "Thread Poll Info");
DEFINE_MTYPE_STATIC(LIB, THREAD_STATS, "Thread stats") DEFINE_MTYPE_STATIC(LIB, THREAD_STATS, "Thread stats");
DECLARE_LIST(thread_list, struct thread, threaditem) DECLARE_LIST(thread_list, struct thread, threaditem)

6
lib/typesafe.c
View file

@ -25,9 +25,9 @@
#include "memory.h" #include "memory.h"
#include "network.h" #include "network.h"
DEFINE_MTYPE_STATIC(LIB, TYPEDHASH_BUCKET, "Typed-hash bucket") DEFINE_MTYPE_STATIC(LIB, TYPEDHASH_BUCKET, "Typed-hash bucket");
DEFINE_MTYPE_STATIC(LIB, SKIPLIST_OFLOW, "Skiplist overflow") DEFINE_MTYPE_STATIC(LIB, SKIPLIST_OFLOW, "Skiplist overflow");
DEFINE_MTYPE_STATIC(LIB, HEAP_ARRAY, "Typed-heap array") DEFINE_MTYPE_STATIC(LIB, HEAP_ARRAY, "Typed-heap array");
#if 0 #if 0
static void hash_consistency_check(struct thash_head *head) static void hash_consistency_check(struct thash_head *head)

4
lib/vector.c
View file

@ -23,8 +23,8 @@
#include "vector.h" #include "vector.h"
#include "memory.h" #include "memory.h"
DEFINE_MTYPE_STATIC(LIB, VECTOR, "Vector") DEFINE_MTYPE_STATIC(LIB, VECTOR, "Vector");
DEFINE_MTYPE_STATIC(LIB, VECTOR_INDEX, "Vector index") DEFINE_MTYPE_STATIC(LIB, VECTOR_INDEX, "Vector index");
/* Initialize vector : allocate memory and return vector. */ /* Initialize vector : allocate memory and return vector. */
vector vector_init(unsigned int size) vector vector_init(unsigned int size)

4
lib/vrf.c
View file

@ -42,8 +42,8 @@
/* default VRF name value used when VRF backend is not NETNS */ /* default VRF name value used when VRF backend is not NETNS */
#define VRF_DEFAULT_NAME_INTERNAL "default" #define VRF_DEFAULT_NAME_INTERNAL "default"
DEFINE_MTYPE_STATIC(LIB, VRF, "VRF") DEFINE_MTYPE_STATIC(LIB, VRF, "VRF");
DEFINE_MTYPE_STATIC(LIB, VRF_BITMAP, "VRF bit-map") DEFINE_MTYPE_STATIC(LIB, VRF_BITMAP, "VRF bit-map");
DEFINE_QOBJ_TYPE(vrf) DEFINE_QOBJ_TYPE(vrf)

6
lib/vty.c
View file

@ -56,9 +56,9 @@
#include "lib/vty_clippy.c" #include "lib/vty_clippy.c"
#endif #endif
DEFINE_MTYPE_STATIC(LIB, VTY, "VTY") DEFINE_MTYPE_STATIC(LIB, VTY, "VTY");
DEFINE_MTYPE_STATIC(LIB, VTY_OUT_BUF, "VTY output buffer") DEFINE_MTYPE_STATIC(LIB, VTY_OUT_BUF, "VTY output buffer");
DEFINE_MTYPE_STATIC(LIB, VTY_HIST, "VTY history") DEFINE_MTYPE_STATIC(LIB, VTY_HIST, "VTY history");
/* Vty events */ /* Vty events */
enum event { enum event {

4
lib/wheel.c
View file

@ -24,8 +24,8 @@
#include "wheel.h" #include "wheel.h"
#include "log.h" #include "log.h"
DEFINE_MTYPE_STATIC(LIB, TIMER_WHEEL, "Timer Wheel") DEFINE_MTYPE_STATIC(LIB, TIMER_WHEEL, "Timer Wheel");
DEFINE_MTYPE_STATIC(LIB, TIMER_WHEEL_LIST, "Timer Wheel Slot List") DEFINE_MTYPE_STATIC(LIB, TIMER_WHEEL_LIST, "Timer Wheel Slot List");
static int debug_timer_wheel = 0; static int debug_timer_wheel = 0;

6
lib/workqueue.c
View file

@ -28,9 +28,9 @@
#include "command.h" #include "command.h"
#include "log.h" #include "log.h"
DEFINE_MTYPE(LIB, WORK_QUEUE, "Work queue") DEFINE_MTYPE(LIB, WORK_QUEUE, "Work queue");
DEFINE_MTYPE_STATIC(LIB, WORK_QUEUE_ITEM, "Work queue item") DEFINE_MTYPE_STATIC(LIB, WORK_QUEUE_ITEM, "Work queue item");
DEFINE_MTYPE_STATIC(LIB, WORK_QUEUE_NAME, "Work queue name string") DEFINE_MTYPE_STATIC(LIB, WORK_QUEUE_NAME, "Work queue name string");
/* master list of work_queues */ /* master list of work_queues */
static struct list _work_queues; static struct list _work_queues;

2
lib/workqueue.h
View file

@ -30,7 +30,7 @@
extern "C" { extern "C" {
#endif #endif
DECLARE_MTYPE(WORK_QUEUE) DECLARE_MTYPE(WORK_QUEUE);
/* Hold time for the initial schedule of a queue run, in millisec */ /* Hold time for the initial schedule of a queue run, in millisec */
#define WORK_QUEUE_DEFAULT_HOLD 50 #define WORK_QUEUE_DEFAULT_HOLD 50

4
lib/yang.c
View file

@ -27,8 +27,8 @@
#include <libyang/user_types.h> #include <libyang/user_types.h>
DEFINE_MTYPE_STATIC(LIB, YANG_MODULE, "YANG module") DEFINE_MTYPE_STATIC(LIB, YANG_MODULE, "YANG module");
DEFINE_MTYPE_STATIC(LIB, YANG_DATA, "YANG data structure") DEFINE_MTYPE_STATIC(LIB, YANG_DATA, "YANG data structure");
/* libyang container. */ /* libyang container. */
struct ly_ctx *ly_native_ctx; struct ly_ctx *ly_native_ctx;

6
lib/yang_translator.c
View file

@ -26,9 +26,9 @@
#include "yang_translator.h" #include "yang_translator.h"
#include "frrstr.h" #include "frrstr.h"
DEFINE_MTYPE_STATIC(LIB, YANG_TRANSLATOR, "YANG Translator") DEFINE_MTYPE_STATIC(LIB, YANG_TRANSLATOR, "YANG Translator");
DEFINE_MTYPE_STATIC(LIB, YANG_TRANSLATOR_MODULE, "YANG Translator Module") DEFINE_MTYPE_STATIC(LIB, YANG_TRANSLATOR_MODULE, "YANG Translator Module");
DEFINE_MTYPE_STATIC(LIB, YANG_TRANSLATOR_MAPPING, "YANG Translator Mapping") DEFINE_MTYPE_STATIC(LIB, YANG_TRANSLATOR_MAPPING, "YANG Translator Mapping");
/* Generate the yang_translators tree. */ /* Generate the yang_translators tree. */
static inline int yang_translator_compare(const struct yang_translator *a, static inline int yang_translator_compare(const struct yang_translator *a,

4
lib/zclient.c
View file

@ -42,8 +42,8 @@
#include "srte.h" #include "srte.h"
#include "printfrr.h" #include "printfrr.h"
DEFINE_MTYPE_STATIC(LIB, ZCLIENT, "Zclient") DEFINE_MTYPE_STATIC(LIB, ZCLIENT, "Zclient");
DEFINE_MTYPE_STATIC(LIB, REDIST_INST, "Redistribution instance IDs") DEFINE_MTYPE_STATIC(LIB, REDIST_INST, "Redistribution instance IDs");
/* Zebra client events. */ /* Zebra client events. */
enum event { ZCLIENT_SCHEDULE, ZCLIENT_READ, ZCLIENT_CONNECT }; enum event { ZCLIENT_SCHEDULE, ZCLIENT_READ, ZCLIENT_CONNECT };

4
lib/zlog.c
View file

@ -54,8 +54,8 @@
#include "zlog.h" #include "zlog.h"
#include "libfrr_trace.h" #include "libfrr_trace.h"
DEFINE_MTYPE_STATIC(LIB, LOG_MESSAGE, "log message") DEFINE_MTYPE_STATIC(LIB, LOG_MESSAGE, "log message");
DEFINE_MTYPE_STATIC(LIB, LOG_TLSBUF, "log thread-local buffer") DEFINE_MTYPE_STATIC(LIB, LOG_TLSBUF, "log thread-local buffer");
DEFINE_HOOK(zlog_init, (const char *progname, const char *protoname, DEFINE_HOOK(zlog_init, (const char *progname, const char *protoname,
unsigned short instance, uid_t uid, gid_t gid), unsigned short instance, uid_t uid, gid_t gid),

12
lib/zlog_targets.c
View file

@ -31,13 +31,13 @@
* absolute end. * absolute end.
*/ */
DECLARE_MGROUP(LOG) DECLARE_MGROUP(LOG);
DEFINE_MGROUP_ACTIVEATEXIT(LOG, "logging subsystem") DEFINE_MGROUP_ACTIVEATEXIT(LOG, "logging subsystem");
DEFINE_MTYPE_STATIC(LOG, LOG_FD, "log file target") DEFINE_MTYPE_STATIC(LOG, LOG_FD, "log file target");
DEFINE_MTYPE_STATIC(LOG, LOG_FD_NAME, "log file name") DEFINE_MTYPE_STATIC(LOG, LOG_FD_NAME, "log file name");
DEFINE_MTYPE_STATIC(LOG, LOG_FD_ROTATE, "log file rotate helper") DEFINE_MTYPE_STATIC(LOG, LOG_FD_ROTATE, "log file rotate helper");
DEFINE_MTYPE_STATIC(LOG, LOG_SYSL, "syslog target") DEFINE_MTYPE_STATIC(LOG, LOG_SYSL, "syslog target");
struct zlt_fd { struct zlt_fd {
struct zlog_target zt; struct zlog_target zt;

4
nhrpd/nhrp_cache.c
View file

@ -15,8 +15,8 @@
#include "netlink.h" #include "netlink.h"
DEFINE_MTYPE_STATIC(NHRPD, NHRP_CACHE, "NHRP cache entry") DEFINE_MTYPE_STATIC(NHRPD, NHRP_CACHE, "NHRP cache entry");
DEFINE_MTYPE_STATIC(NHRPD, NHRP_CACHE_CONFIG, "NHRP cache config entry") DEFINE_MTYPE_STATIC(NHRPD, NHRP_CACHE_CONFIG, "NHRP cache config entry");
unsigned long nhrp_cache_counts[NHRP_CACHE_NUM_TYPES]; unsigned long nhrp_cache_counts[NHRP_CACHE_NUM_TYPES];

2
nhrpd/nhrp_interface.c
View file

@ -21,7 +21,7 @@
#include "os.h" #include "os.h"
#include "netlink.h" #include "netlink.h"
DEFINE_MTYPE_STATIC(NHRPD, NHRP_IF, "NHRP interface") DEFINE_MTYPE_STATIC(NHRPD, NHRP_IF, "NHRP interface");
static void nhrp_interface_update_cache_config(struct interface *ifp, static void nhrp_interface_update_cache_config(struct interface *ifp,
bool available, bool available,

2
nhrpd/nhrp_main.c
View file

@ -29,7 +29,7 @@
#include "netlink.h" #include "netlink.h"
#include "nhrp_errors.h" #include "nhrp_errors.h"
DEFINE_MGROUP(NHRPD, "NHRP") DEFINE_MGROUP(NHRPD, "NHRP");
unsigned int debug_flags = 0; unsigned int debug_flags = 0;

4
nhrpd/nhrp_nhs.c
View file

@ -14,8 +14,8 @@
#include "nhrpd.h" #include "nhrpd.h"
#include "nhrp_protocol.h" #include "nhrp_protocol.h"
DEFINE_MTYPE_STATIC(NHRPD, NHRP_NHS, "NHRP next hop server") DEFINE_MTYPE_STATIC(NHRPD, NHRP_NHS, "NHRP next hop server");
DEFINE_MTYPE_STATIC(NHRPD, NHRP_REGISTRATION, "NHRP registration entries") DEFINE_MTYPE_STATIC(NHRPD, NHRP_REGISTRATION, "NHRP registration entries");
static int nhrp_nhs_resolve(struct thread *t); static int nhrp_nhs_resolve(struct thread *t);
static int nhrp_reg_send_req(struct thread *t); static int nhrp_reg_send_req(struct thread *t);

2
nhrpd/nhrp_peer.c
View file

@ -22,7 +22,7 @@
#include "nhrp_protocol.h" #include "nhrp_protocol.h"
#include "os.h" #include "os.h"
DEFINE_MTYPE_STATIC(NHRPD, NHRP_PEER, "NHRP peer entry") DEFINE_MTYPE_STATIC(NHRPD, NHRP_PEER, "NHRP peer entry");
struct ipv6hdr { struct ipv6hdr {
uint8_t priority_version; uint8_t priority_version;

2
nhrpd/nhrp_route.c
View file

@ -18,7 +18,7 @@
#include "log.h" #include "log.h"
#include "zclient.h" #include "zclient.h"
DEFINE_MTYPE_STATIC(NHRPD, NHRP_ROUTE, "NHRP routing entry") DEFINE_MTYPE_STATIC(NHRPD, NHRP_ROUTE, "NHRP routing entry");
static struct zclient *zclient; static struct zclient *zclient;
static struct route_table *zebra_rib[AFI_MAX]; static struct route_table *zebra_rib[AFI_MAX];

Some files were not shown because too many files have changed in this diff Show more