diff options
176 files changed, 859 insertions, 853 deletions
diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c index 85d79bdc3..41391c51a 100644 --- a/babeld/babel_interface.c +++ b/babeld/babel_interface.c @@ -42,7 +42,7 @@ THE SOFTWARE. #include "xroute.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) diff --git a/babeld/babeld.c b/babeld/babeld.c index a907daf6c..72080bd7e 100644 --- a/babeld/babeld.c +++ b/babeld/babeld.c @@ -46,8 +46,8 @@ THE SOFTWARE. #include "babel_zebra.h" #include "babel_errors.h" -DEFINE_MGROUP(BABELD, "babeld") -DEFINE_MTYPE_STATIC(BABELD, BABEL, "Babel Structure") +DEFINE_MGROUP(BABELD, "babeld"); +DEFINE_MTYPE_STATIC(BABELD, BABEL, "Babel Structure"); static int babel_init_routing_process(struct thread *thread); static void babel_get_myid(void); diff --git a/babeld/util.h b/babeld/util.h index 8b1b6fbfc..037ebe366 100644 --- a/babeld/util.h +++ b/babeld/util.h @@ -29,7 +29,7 @@ THE SOFTWARE. #include "log.h" #include "memory.h" -DECLARE_MGROUP(BABELD) +DECLARE_MGROUP(BABELD); #if defined(i386) || defined(__mc68020__) || defined(__x86_64__) #define DO_NTOHS(_d, _s) do{ _d = ntohs(*(const unsigned short*)(_s)); }while(0) diff --git a/bfdd/bfd.c b/bfdd/bfd.c index 3cbb3691e..5c8a68f6c 100644 --- a/bfdd/bfd.c +++ b/bfdd/bfd.c @@ -32,10 +32,10 @@ #include "bfd.h" -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_SESSION_OBSERVER, "Session observer") -DEFINE_MTYPE_STATIC(BFDD, BFDD_VRF, "BFD VRF") +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_SESSION_OBSERVER, "Session observer"); +DEFINE_MTYPE_STATIC(BFDD, BFDD_VRF, "BFD VRF"); /* * Prototypes diff --git a/bfdd/bfd.h b/bfdd/bfd.h index 7c537b40d..b48ae304a 100644 --- a/bfdd/bfd.h +++ b/bfdd/bfd.h @@ -41,9 +41,9 @@ #define BFDD_JSON_CONV_OPTIONS (0) #endif -DECLARE_MGROUP(BFDD) -DECLARE_MTYPE(BFDD_CONTROL) -DECLARE_MTYPE(BFDD_NOTIFICATION) +DECLARE_MGROUP(BFDD); +DECLARE_MTYPE(BFDD_CONTROL); +DECLARE_MTYPE(BFDD_NOTIFICATION); struct bfd_timers { uint32_t desired_min_tx; diff --git a/bfdd/bfdd.c b/bfdd/bfdd.c index 0cac99010..0285e63d6 100644 --- a/bfdd/bfdd.c +++ b/bfdd/bfdd.c @@ -41,9 +41,9 @@ /* * FRR related code. */ -DEFINE_MGROUP(BFDD, "Bidirectional Forwarding Detection Daemon") -DEFINE_MTYPE(BFDD, BFDD_CONTROL, "long-lived control socket memory") -DEFINE_MTYPE(BFDD, BFDD_NOTIFICATION, "short-lived control notification data") +DEFINE_MGROUP(BFDD, "Bidirectional Forwarding Detection Daemon"); +DEFINE_MTYPE(BFDD, BFDD_CONTROL, "long-lived control socket memory"); +DEFINE_MTYPE(BFDD, BFDD_NOTIFICATION, "short-lived control notification data"); /* Master of threads. */ struct thread_master *master; diff --git a/bfdd/config.c b/bfdd/config.c index b71670f01..41baa8c71 100644 --- a/bfdd/config.c +++ b/bfdd/config.c @@ -30,7 +30,7 @@ #include "bfd.h" -DEFINE_MTYPE_STATIC(BFDD, BFDD_LABEL, "long-lived label memory") +DEFINE_MTYPE_STATIC(BFDD, BFDD_LABEL, "long-lived label memory"); /* * Definitions diff --git a/bfdd/dplane.c b/bfdd/dplane.c index 66b79f3b1..20ef06da8 100644 --- a/bfdd/dplane.c +++ b/bfdd/dplane.c @@ -46,7 +46,8 @@ #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. */ #define BFD_DPLANE_CLIENT_BUF_SIZE 8192 diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c index 4102d102e..996b3d038 100644 --- a/bgpd/bgp_bmp.c +++ b/bgpd/bgp_bmp.c @@ -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_put(struct bmp_active *ba); -DEFINE_MGROUP(BMP, "BMP (BGP Monitoring Protocol)") - -DEFINE_MTYPE_STATIC(BMP, BMP_CONN, "BMP connection state") -DEFINE_MTYPE_STATIC(BMP, BMP_TARGETS, "BMP targets") -DEFINE_MTYPE_STATIC(BMP, BMP_TARGETSNAME, "BMP targets name") -DEFINE_MTYPE_STATIC(BMP, BMP_LISTENER, "BMP listener") -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_QUEUE, "BMP update queue item") -DEFINE_MTYPE_STATIC(BMP, BMP, "BMP instance state") -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_OPEN, "BMP stored BGP OPEN message") +DEFINE_MGROUP(BMP, "BMP (BGP Monitoring Protocol)"); + +DEFINE_MTYPE_STATIC(BMP, BMP_CONN, "BMP connection state"); +DEFINE_MTYPE_STATIC(BMP, BMP_TARGETS, "BMP targets"); +DEFINE_MTYPE_STATIC(BMP, BMP_TARGETSNAME, "BMP targets name"); +DEFINE_MTYPE_STATIC(BMP, BMP_LISTENER, "BMP listener"); +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_QUEUE, "BMP update queue item"); +DEFINE_MTYPE_STATIC(BMP, BMP, "BMP instance state"); +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_OPEN, "BMP stored BGP OPEN message"); DEFINE_QOBJ_TYPE(bmp_targets) diff --git a/bgpd/bgp_bmp.h b/bgpd/bgp_bmp.h index 2c3ba570e..262451a78 100644 --- a/bgpd/bgp_bmp.h +++ b/bgpd/bgp_bmp.h @@ -309,6 +309,6 @@ enum { BMP_STATS_FRR_NH_INVALID = 65531, }; -DECLARE_MGROUP(BMP) +DECLARE_MGROUP(BMP); #endif /*_BGP_BMP_H_*/ diff --git a/bgpd/bgp_labelpool.c b/bgpd/bgp_labelpool.c index 001340be3..9a6cc10ae 100644 --- a/bgpd/bgp_labelpool.c +++ b/bgpd/bgp_labelpool.c @@ -50,10 +50,10 @@ static struct labelpool *lp; /* request this many labels at a time from zebra */ #define LP_CHUNK_SIZE 50 -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_CB, "BGP Dynamic Label Assignment") -DEFINE_MTYPE_STATIC(BGPD, BGP_LABEL_CBQ, "BGP Dynamic Label Callback") +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_CB, "BGP Dynamic Label Assignment"); +DEFINE_MTYPE_STATIC(BGPD, BGP_LABEL_CBQ, "BGP Dynamic Label Callback"); struct lp_chunk { uint32_t first; diff --git a/bgpd/bgp_memory.c b/bgpd/bgp_memory.c index 0013eb2df..9a4eb5d3b 100644 --- a/bgpd/bgp_memory.c +++ b/bgpd/bgp_memory.c @@ -28,112 +28,112 @@ /* this file is temporary in nature; definitions should be moved to the * files they're used in */ -DEFINE_MGROUP(BGPD, "bgpd") -DEFINE_MTYPE(BGPD, BGP, "BGP instance") -DEFINE_MTYPE(BGPD, BGP_LISTENER, "BGP listen socket details") -DEFINE_MTYPE(BGPD, BGP_PEER, "BGP peer") -DEFINE_MTYPE(BGPD, BGP_PEER_HOST, "BGP peer hostname") -DEFINE_MTYPE(BGPD, BGP_PEER_IFNAME, "BGP peer ifname") -DEFINE_MTYPE(BGPD, PEER_GROUP, "Peer group") -DEFINE_MTYPE(BGPD, PEER_GROUP_HOST, "BGP Peer group hostname") -DEFINE_MTYPE(BGPD, PEER_DESC, "Peer description") -DEFINE_MTYPE(BGPD, PEER_PASSWORD, "Peer password string") -DEFINE_MTYPE(BGPD, BGP_PEER_AF, "BGP peer af") -DEFINE_MTYPE(BGPD, BGP_UPDGRP, "BGP update group") -DEFINE_MTYPE(BGPD, BGP_UPD_SUBGRP, "BGP update subgroup") -DEFINE_MTYPE(BGPD, BGP_PACKET, "BGP packet") -DEFINE_MTYPE(BGPD, ATTR, "BGP attribute") -DEFINE_MTYPE(BGPD, AS_PATH, "BGP aspath") -DEFINE_MTYPE(BGPD, AS_SEG, "BGP aspath seg") -DEFINE_MTYPE(BGPD, AS_SEG_DATA, "BGP aspath segment data") -DEFINE_MTYPE(BGPD, AS_STR, "BGP aspath str") - -DEFINE_MTYPE(BGPD, BGP_TABLE, "BGP table") -DEFINE_MTYPE(BGPD, BGP_NODE, "BGP node") -DEFINE_MTYPE(BGPD, BGP_ROUTE, "BGP route") -DEFINE_MTYPE(BGPD, BGP_ROUTE_EXTRA, "BGP ancillary route info") -DEFINE_MTYPE(BGPD, BGP_CONN, "BGP connected") -DEFINE_MTYPE(BGPD, BGP_STATIC, "BGP static") -DEFINE_MTYPE(BGPD, BGP_ADVERTISE_ATTR, "BGP adv attr") -DEFINE_MTYPE(BGPD, BGP_ADVERTISE, "BGP adv") -DEFINE_MTYPE(BGPD, BGP_SYNCHRONISE, "BGP synchronise") -DEFINE_MTYPE(BGPD, BGP_ADJ_IN, "BGP adj in") -DEFINE_MTYPE(BGPD, BGP_ADJ_OUT, "BGP adj out") -DEFINE_MTYPE(BGPD, BGP_MPATH_INFO, "BGP multipath info") - -DEFINE_MTYPE(BGPD, AS_LIST, "BGP AS list") -DEFINE_MTYPE(BGPD, AS_FILTER, "BGP AS filter") -DEFINE_MTYPE(BGPD, AS_FILTER_STR, "BGP AS filter str") - -DEFINE_MTYPE(BGPD, COMMUNITY, "community") -DEFINE_MTYPE(BGPD, COMMUNITY_VAL, "community val") -DEFINE_MTYPE(BGPD, COMMUNITY_STR, "community str") - -DEFINE_MTYPE(BGPD, ECOMMUNITY, "extcommunity") -DEFINE_MTYPE(BGPD, ECOMMUNITY_VAL, "extcommunity val") -DEFINE_MTYPE(BGPD, ECOMMUNITY_STR, "extcommunity str") - -DEFINE_MTYPE(BGPD, COMMUNITY_LIST, "community-list") -DEFINE_MTYPE(BGPD, COMMUNITY_LIST_NAME, "community-list name") -DEFINE_MTYPE(BGPD, COMMUNITY_LIST_ENTRY, "community-list entry") -DEFINE_MTYPE(BGPD, COMMUNITY_LIST_CONFIG, "community-list config") -DEFINE_MTYPE(BGPD, COMMUNITY_LIST_HANDLER, "community-list handler") - -DEFINE_MTYPE(BGPD, CLUSTER, "Cluster list") -DEFINE_MTYPE(BGPD, CLUSTER_VAL, "Cluster list val") - -DEFINE_MTYPE(BGPD, BGP_PROCESS_QUEUE, "BGP Process queue") -DEFINE_MTYPE(BGPD, BGP_CLEAR_NODE_QUEUE, "BGP node clear queue") - -DEFINE_MTYPE(BGPD, TRANSIT, "BGP transit attr") -DEFINE_MTYPE(BGPD, TRANSIT_VAL, "BGP transit val") - -DEFINE_MTYPE(BGPD, BGP_DEBUG_FILTER, "BGP debug filter") -DEFINE_MTYPE(BGPD, BGP_DEBUG_STR, "BGP debug filter string") - -DEFINE_MTYPE(BGPD, BGP_DISTANCE, "BGP distance") -DEFINE_MTYPE(BGPD, BGP_NEXTHOP_CACHE, "BGP nexthop") -DEFINE_MTYPE(BGPD, BGP_CONFED_LIST, "BGP confed list") -DEFINE_MTYPE(BGPD, PEER_UPDATE_SOURCE, "BGP peer update interface") -DEFINE_MTYPE(BGPD, PEER_CONF_IF, "BGP peer config interface") -DEFINE_MTYPE(BGPD, BGP_DAMP_INFO, "Dampening info") -DEFINE_MTYPE(BGPD, BGP_DAMP_ARRAY, "BGP Dampening array") -DEFINE_MTYPE(BGPD, BGP_DAMP_REUSELIST, "BGP Dampening reuse list") -DEFINE_MTYPE(BGPD, BGP_REGEXP, "BGP regexp") -DEFINE_MTYPE(BGPD, BGP_AGGREGATE, "BGP aggregate") -DEFINE_MTYPE(BGPD, BGP_ADDR, "BGP own address") -DEFINE_MTYPE(BGPD, TIP_ADDR, "BGP own tunnel-ip address") - -DEFINE_MTYPE(BGPD, BGP_REDIST, "BGP redistribution") -DEFINE_MTYPE(BGPD, BGP_FILTER_NAME, "BGP Filter Information") -DEFINE_MTYPE(BGPD, BGP_DUMP_STR, "BGP Dump String Information") -DEFINE_MTYPE(BGPD, ENCAP_TLV, "ENCAP TLV") - -DEFINE_MTYPE(BGPD, BGP_TEA_OPTIONS, "BGP TEA Options") -DEFINE_MTYPE(BGPD, BGP_TEA_OPTIONS_VALUE, "BGP TEA Options Value") - -DEFINE_MTYPE(BGPD, LCOMMUNITY, "Large Community") -DEFINE_MTYPE(BGPD, LCOMMUNITY_STR, "Large Community display string") -DEFINE_MTYPE(BGPD, LCOMMUNITY_VAL, "Large Community value") - -DEFINE_MTYPE(BGPD, BGP_EVPN, "BGP EVPN 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_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, "BGP EVPN ESI 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_IMPORT_RT, "BGP EVPN 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_FLOWSPEC, "BGP flowspec") -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_COMPILED, "BGP flowspec compiled") -DEFINE_MTYPE(BGPD, BGP_FLOWSPEC_NAME, "BGP flowspec name") -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_VPN, "BGP prefix-sid srv6 vpn service") +DEFINE_MGROUP(BGPD, "bgpd"); +DEFINE_MTYPE(BGPD, BGP, "BGP instance"); +DEFINE_MTYPE(BGPD, BGP_LISTENER, "BGP listen socket details"); +DEFINE_MTYPE(BGPD, BGP_PEER, "BGP peer"); +DEFINE_MTYPE(BGPD, BGP_PEER_HOST, "BGP peer hostname"); +DEFINE_MTYPE(BGPD, BGP_PEER_IFNAME, "BGP peer ifname"); +DEFINE_MTYPE(BGPD, PEER_GROUP, "Peer group"); +DEFINE_MTYPE(BGPD, PEER_GROUP_HOST, "BGP Peer group hostname"); +DEFINE_MTYPE(BGPD, PEER_DESC, "Peer description"); +DEFINE_MTYPE(BGPD, PEER_PASSWORD, "Peer password string"); +DEFINE_MTYPE(BGPD, BGP_PEER_AF, "BGP peer af"); +DEFINE_MTYPE(BGPD, BGP_UPDGRP, "BGP update group"); +DEFINE_MTYPE(BGPD, BGP_UPD_SUBGRP, "BGP update subgroup"); +DEFINE_MTYPE(BGPD, BGP_PACKET, "BGP packet"); +DEFINE_MTYPE(BGPD, ATTR, "BGP attribute"); +DEFINE_MTYPE(BGPD, AS_PATH, "BGP aspath"); +DEFINE_MTYPE(BGPD, AS_SEG, "BGP aspath seg"); +DEFINE_MTYPE(BGPD, AS_SEG_DATA, "BGP aspath segment data"); +DEFINE_MTYPE(BGPD, AS_STR, "BGP aspath str"); + +DEFINE_MTYPE(BGPD, BGP_TABLE, "BGP table"); +DEFINE_MTYPE(BGPD, BGP_NODE, "BGP node"); +DEFINE_MTYPE(BGPD, BGP_ROUTE, "BGP route"); +DEFINE_MTYPE(BGPD, BGP_ROUTE_EXTRA, "BGP ancillary route info"); +DEFINE_MTYPE(BGPD, BGP_CONN, "BGP connected"); +DEFINE_MTYPE(BGPD, BGP_STATIC, "BGP static"); +DEFINE_MTYPE(BGPD, BGP_ADVERTISE_ATTR, "BGP adv attr"); +DEFINE_MTYPE(BGPD, BGP_ADVERTISE, "BGP adv"); +DEFINE_MTYPE(BGPD, BGP_SYNCHRONISE, "BGP synchronise"); +DEFINE_MTYPE(BGPD, BGP_ADJ_IN, "BGP adj in"); +DEFINE_MTYPE(BGPD, BGP_ADJ_OUT, "BGP adj out"); +DEFINE_MTYPE(BGPD, BGP_MPATH_INFO, "BGP multipath info"); + +DEFINE_MTYPE(BGPD, AS_LIST, "BGP AS list"); +DEFINE_MTYPE(BGPD, AS_FILTER, "BGP AS filter"); +DEFINE_MTYPE(BGPD, AS_FILTER_STR, "BGP AS filter str"); + +DEFINE_MTYPE(BGPD, COMMUNITY, "community"); +DEFINE_MTYPE(BGPD, COMMUNITY_VAL, "community val"); +DEFINE_MTYPE(BGPD, COMMUNITY_STR, "community str"); + +DEFINE_MTYPE(BGPD, ECOMMUNITY, "extcommunity"); +DEFINE_MTYPE(BGPD, ECOMMUNITY_VAL, "extcommunity val"); +DEFINE_MTYPE(BGPD, ECOMMUNITY_STR, "extcommunity str"); + +DEFINE_MTYPE(BGPD, COMMUNITY_LIST, "community-list"); +DEFINE_MTYPE(BGPD, COMMUNITY_LIST_NAME, "community-list name"); +DEFINE_MTYPE(BGPD, COMMUNITY_LIST_ENTRY, "community-list entry"); +DEFINE_MTYPE(BGPD, COMMUNITY_LIST_CONFIG, "community-list config"); +DEFINE_MTYPE(BGPD, COMMUNITY_LIST_HANDLER, "community-list handler"); + +DEFINE_MTYPE(BGPD, CLUSTER, "Cluster list"); +DEFINE_MTYPE(BGPD, CLUSTER_VAL, "Cluster list val"); + +DEFINE_MTYPE(BGPD, BGP_PROCESS_QUEUE, "BGP Process queue"); +DEFINE_MTYPE(BGPD, BGP_CLEAR_NODE_QUEUE, "BGP node clear queue"); + +DEFINE_MTYPE(BGPD, TRANSIT, "BGP transit attr"); +DEFINE_MTYPE(BGPD, TRANSIT_VAL, "BGP transit val"); + +DEFINE_MTYPE(BGPD, BGP_DEBUG_FILTER, "BGP debug filter"); +DEFINE_MTYPE(BGPD, BGP_DEBUG_STR, "BGP debug filter string"); + +DEFINE_MTYPE(BGPD, BGP_DISTANCE, "BGP distance"); +DEFINE_MTYPE(BGPD, BGP_NEXTHOP_CACHE, "BGP nexthop"); +DEFINE_MTYPE(BGPD, BGP_CONFED_LIST, "BGP confed list"); +DEFINE_MTYPE(BGPD, PEER_UPDATE_SOURCE, "BGP peer update interface"); +DEFINE_MTYPE(BGPD, PEER_CONF_IF, "BGP peer config interface"); +DEFINE_MTYPE(BGPD, BGP_DAMP_INFO, "Dampening info"); +DEFINE_MTYPE(BGPD, BGP_DAMP_ARRAY, "BGP Dampening array"); +DEFINE_MTYPE(BGPD, BGP_DAMP_REUSELIST, "BGP Dampening reuse list"); +DEFINE_MTYPE(BGPD, BGP_REGEXP, "BGP regexp"); +DEFINE_MTYPE(BGPD, BGP_AGGREGATE, "BGP aggregate"); +DEFINE_MTYPE(BGPD, BGP_ADDR, "BGP own address"); +DEFINE_MTYPE(BGPD, TIP_ADDR, "BGP own tunnel-ip address"); + +DEFINE_MTYPE(BGPD, BGP_REDIST, "BGP redistribution"); +DEFINE_MTYPE(BGPD, BGP_FILTER_NAME, "BGP Filter Information"); +DEFINE_MTYPE(BGPD, BGP_DUMP_STR, "BGP Dump String Information"); +DEFINE_MTYPE(BGPD, ENCAP_TLV, "ENCAP TLV"); + +DEFINE_MTYPE(BGPD, BGP_TEA_OPTIONS, "BGP TEA Options"); +DEFINE_MTYPE(BGPD, BGP_TEA_OPTIONS_VALUE, "BGP TEA Options Value"); + +DEFINE_MTYPE(BGPD, LCOMMUNITY, "Large Community"); +DEFINE_MTYPE(BGPD, LCOMMUNITY_STR, "Large Community display string"); +DEFINE_MTYPE(BGPD, LCOMMUNITY_VAL, "Large Community value"); + +DEFINE_MTYPE(BGPD, BGP_EVPN, "BGP EVPN 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_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, "BGP EVPN ESI 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_IMPORT_RT, "BGP EVPN 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_FLOWSPEC, "BGP flowspec"); +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_COMPILED, "BGP flowspec compiled"); +DEFINE_MTYPE(BGPD, BGP_FLOWSPEC_NAME, "BGP flowspec name"); +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_VPN, "BGP prefix-sid srv6 vpn service"); diff --git a/bgpd/bgp_memory.h b/bgpd/bgp_memory.h index 63998e95a..7b839f1d4 100644 --- a/bgpd/bgp_memory.h +++ b/bgpd/bgp_memory.h @@ -24,115 +24,115 @@ #include "memory.h" -DECLARE_MGROUP(BGPD) -DECLARE_MTYPE(BGP) -DECLARE_MTYPE(BGP_LISTENER) -DECLARE_MTYPE(BGP_PEER) -DECLARE_MTYPE(BGP_PEER_HOST) -DECLARE_MTYPE(BGP_PEER_IFNAME) -DECLARE_MTYPE(PEER_GROUP) -DECLARE_MTYPE(PEER_GROUP_HOST) -DECLARE_MTYPE(PEER_DESC) -DECLARE_MTYPE(PEER_PASSWORD) -DECLARE_MTYPE(BGP_PEER_AF) -DECLARE_MTYPE(BGP_UPDGRP) -DECLARE_MTYPE(BGP_UPD_SUBGRP) -DECLARE_MTYPE(BGP_PACKET) -DECLARE_MTYPE(ATTR) -DECLARE_MTYPE(AS_PATH) -DECLARE_MTYPE(AS_SEG) -DECLARE_MTYPE(AS_SEG_DATA) -DECLARE_MTYPE(AS_STR) - -DECLARE_MTYPE(BGP_TABLE) -DECLARE_MTYPE(BGP_NODE) -DECLARE_MTYPE(BGP_ROUTE) -DECLARE_MTYPE(BGP_ROUTE_EXTRA) -DECLARE_MTYPE(BGP_CONN) -DECLARE_MTYPE(BGP_STATIC) -DECLARE_MTYPE(BGP_ADVERTISE_ATTR) -DECLARE_MTYPE(BGP_ADVERTISE) -DECLARE_MTYPE(BGP_SYNCHRONISE) -DECLARE_MTYPE(BGP_ADJ_IN) -DECLARE_MTYPE(BGP_ADJ_OUT) -DECLARE_MTYPE(BGP_MPATH_INFO) - -DECLARE_MTYPE(AS_LIST) -DECLARE_MTYPE(AS_FILTER) -DECLARE_MTYPE(AS_FILTER_STR) - -DECLARE_MTYPE(COMMUNITY) -DECLARE_MTYPE(COMMUNITY_VAL) -DECLARE_MTYPE(COMMUNITY_STR) - -DECLARE_MTYPE(ECOMMUNITY) -DECLARE_MTYPE(ECOMMUNITY_VAL) -DECLARE_MTYPE(ECOMMUNITY_STR) - -DECLARE_MTYPE(COMMUNITY_LIST) -DECLARE_MTYPE(COMMUNITY_LIST_NAME) -DECLARE_MTYPE(COMMUNITY_LIST_ENTRY) -DECLARE_MTYPE(COMMUNITY_LIST_CONFIG) -DECLARE_MTYPE(COMMUNITY_LIST_HANDLER) - -DECLARE_MTYPE(CLUSTER) -DECLARE_MTYPE(CLUSTER_VAL) - -DECLARE_MTYPE(BGP_PROCESS_QUEUE) -DECLARE_MTYPE(BGP_CLEAR_NODE_QUEUE) - -DECLARE_MTYPE(TRANSIT) -DECLARE_MTYPE(TRANSIT_VAL) - -DECLARE_MTYPE(BGP_DEBUG_FILTER) -DECLARE_MTYPE(BGP_DEBUG_STR) - -DECLARE_MTYPE(BGP_DISTANCE) -DECLARE_MTYPE(BGP_NEXTHOP_CACHE) -DECLARE_MTYPE(BGP_CONFED_LIST) -DECLARE_MTYPE(PEER_UPDATE_SOURCE) -DECLARE_MTYPE(PEER_CONF_IF) -DECLARE_MTYPE(BGP_DAMP_INFO) -DECLARE_MTYPE(BGP_DAMP_ARRAY) -DECLARE_MTYPE(BGP_DAMP_REUSELIST) -DECLARE_MTYPE(BGP_REGEXP) -DECLARE_MTYPE(BGP_AGGREGATE) -DECLARE_MTYPE(BGP_ADDR) -DECLARE_MTYPE(TIP_ADDR) - -DECLARE_MTYPE(BGP_REDIST) -DECLARE_MTYPE(BGP_FILTER_NAME) -DECLARE_MTYPE(BGP_DUMP_STR) -DECLARE_MTYPE(ENCAP_TLV) - -DECLARE_MTYPE(BGP_TEA_OPTIONS) -DECLARE_MTYPE(BGP_TEA_OPTIONS_VALUE) - -DECLARE_MTYPE(LCOMMUNITY) -DECLARE_MTYPE(LCOMMUNITY_STR) -DECLARE_MTYPE(LCOMMUNITY_VAL) - -DECLARE_MTYPE(BGP_EVPN_MH_INFO) -DECLARE_MTYPE(BGP_EVPN_ES) -DECLARE_MTYPE(BGP_EVPN_ES_EVI) -DECLARE_MTYPE(BGP_EVPN_ES_VRF) -DECLARE_MTYPE(BGP_EVPN_ES_VTEP) -DECLARE_MTYPE(BGP_EVPN_PATH_ES_INFO) -DECLARE_MTYPE(BGP_EVPN_ES_EVI_VTEP) - -DECLARE_MTYPE(BGP_EVPN) -DECLARE_MTYPE(BGP_EVPN_IMPORT_RT) -DECLARE_MTYPE(BGP_EVPN_VRF_IMPORT_RT) -DECLARE_MTYPE(BGP_EVPN_MACIP) - -DECLARE_MTYPE(BGP_FLOWSPEC) -DECLARE_MTYPE(BGP_FLOWSPEC_RULE) -DECLARE_MTYPE(BGP_FLOWSPEC_RULE_STR) -DECLARE_MTYPE(BGP_FLOWSPEC_COMPILED) -DECLARE_MTYPE(BGP_FLOWSPEC_NAME) -DECLARE_MTYPE(BGP_FLOWSPEC_INDEX) - -DECLARE_MTYPE(BGP_SRV6_L3VPN) -DECLARE_MTYPE(BGP_SRV6_VPN) +DECLARE_MGROUP(BGPD); +DECLARE_MTYPE(BGP); +DECLARE_MTYPE(BGP_LISTENER); +DECLARE_MTYPE(BGP_PEER); +DECLARE_MTYPE(BGP_PEER_HOST); +DECLARE_MTYPE(BGP_PEER_IFNAME); +DECLARE_MTYPE(PEER_GROUP); +DECLARE_MTYPE(PEER_GROUP_HOST); +DECLARE_MTYPE(PEER_DESC); +DECLARE_MTYPE(PEER_PASSWORD); +DECLARE_MTYPE(BGP_PEER_AF); +DECLARE_MTYPE(BGP_UPDGRP); +DECLARE_MTYPE(BGP_UPD_SUBGRP); +DECLARE_MTYPE(BGP_PACKET); +DECLARE_MTYPE(ATTR); +DECLARE_MTYPE(AS_PATH); +DECLARE_MTYPE(AS_SEG); +DECLARE_MTYPE(AS_SEG_DATA); +DECLARE_MTYPE(AS_STR); + +DECLARE_MTYPE(BGP_TABLE); +DECLARE_MTYPE(BGP_NODE); +DECLARE_MTYPE(BGP_ROUTE); +DECLARE_MTYPE(BGP_ROUTE_EXTRA); +DECLARE_MTYPE(BGP_CONN); +DECLARE_MTYPE(BGP_STATIC); +DECLARE_MTYPE(BGP_ADVERTISE_ATTR); +DECLARE_MTYPE(BGP_ADVERTISE); +DECLARE_MTYPE(BGP_SYNCHRONISE); +DECLARE_MTYPE(BGP_ADJ_IN); +DECLARE_MTYPE(BGP_ADJ_OUT); +DECLARE_MTYPE(BGP_MPATH_INFO); + +DECLARE_MTYPE(AS_LIST); +DECLARE_MTYPE(AS_FILTER); +DECLARE_MTYPE(AS_FILTER_STR); + +DECLARE_MTYPE(COMMUNITY); +DECLARE_MTYPE(COMMUNITY_VAL); +DECLARE_MTYPE(COMMUNITY_STR); + +DECLARE_MTYPE(ECOMMUNITY); +DECLARE_MTYPE(ECOMMUNITY_VAL); +DECLARE_MTYPE(ECOMMUNITY_STR); + +DECLARE_MTYPE(COMMUNITY_LIST); +DECLARE_MTYPE(COMMUNITY_LIST_NAME); +DECLARE_MTYPE(COMMUNITY_LIST_ENTRY); +DECLARE_MTYPE(COMMUNITY_LIST_CONFIG); +DECLARE_MTYPE(COMMUNITY_LIST_HANDLER); + +DECLARE_MTYPE(CLUSTER); +DECLARE_MTYPE(CLUSTER_VAL); + +DECLARE_MTYPE(BGP_PROCESS_QUEUE); +DECLARE_MTYPE(BGP_CLEAR_NODE_QUEUE); + +DECLARE_MTYPE(TRANSIT); +DECLARE_MTYPE(TRANSIT_VAL); + +DECLARE_MTYPE(BGP_DEBUG_FILTER); +DECLARE_MTYPE(BGP_DEBUG_STR); + +DECLARE_MTYPE(BGP_DISTANCE); +DECLARE_MTYPE(BGP_NEXTHOP_CACHE); +DECLARE_MTYPE(BGP_CONFED_LIST); +DECLARE_MTYPE(PEER_UPDATE_SOURCE); +DECLARE_MTYPE(PEER_CONF_IF); +DECLARE_MTYPE(BGP_DAMP_INFO); +DECLARE_MTYPE(BGP_DAMP_ARRAY); +DECLARE_MTYPE(BGP_DAMP_REUSELIST); +DECLARE_MTYPE(BGP_REGEXP); +DECLARE_MTYPE(BGP_AGGREGATE); +DECLARE_MTYPE(BGP_ADDR); +DECLARE_MTYPE(TIP_ADDR); + +DECLARE_MTYPE(BGP_REDIST); +DECLARE_MTYPE(BGP_FILTER_NAME); +DECLARE_MTYPE(BGP_DUMP_STR); +DECLARE_MTYPE(ENCAP_TLV); + +DECLARE_MTYPE(BGP_TEA_OPTIONS); +DECLARE_MTYPE(BGP_TEA_OPTIONS_VALUE); + +DECLARE_MTYPE(LCOMMUNITY); +DECLARE_MTYPE(LCOMMUNITY_STR); +DECLARE_MTYPE(LCOMMUNITY_VAL); + +DECLARE_MTYPE(BGP_EVPN_MH_INFO); +DECLARE_MTYPE(BGP_EVPN_ES); +DECLARE_MTYPE(BGP_EVPN_ES_EVI); +DECLARE_MTYPE(BGP_EVPN_ES_VRF); +DECLARE_MTYPE(BGP_EVPN_ES_VTEP); +DECLARE_MTYPE(BGP_EVPN_PATH_ES_INFO); +DECLARE_MTYPE(BGP_EVPN_ES_EVI_VTEP); + +DECLARE_MTYPE(BGP_EVPN); +DECLARE_MTYPE(BGP_EVPN_IMPORT_RT); +DECLARE_MTYPE(BGP_EVPN_VRF_IMPORT_RT); +DECLARE_MTYPE(BGP_EVPN_MACIP); + +DECLARE_MTYPE(BGP_FLOWSPEC); +DECLARE_MTYPE(BGP_FLOWSPEC_RULE); +DECLARE_MTYPE(BGP_FLOWSPEC_RULE_STR); +DECLARE_MTYPE(BGP_FLOWSPEC_COMPILED); +DECLARE_MTYPE(BGP_FLOWSPEC_NAME); +DECLARE_MTYPE(BGP_FLOWSPEC_INDEX); + +DECLARE_MTYPE(BGP_SRV6_L3VPN); +DECLARE_MTYPE(BGP_SRV6_VPN); #endif /* _QUAGGA_BGP_MEMORY_H */ diff --git a/bgpd/bgp_pbr.c b/bgpd/bgp_pbr.c index 171522f8a..2c6c2c386 100644 --- a/bgpd/bgp_pbr.c +++ b/bgpd/bgp_pbr.c @@ -37,12 +37,12 @@ #include "bgpd/bgp_flowspec_private.h" #include "bgpd/bgp_errors.h" -DEFINE_MTYPE_STATIC(BGPD, PBR_MATCH_ENTRY, "PBR match entry") -DEFINE_MTYPE_STATIC(BGPD, PBR_MATCH, "PBR match") -DEFINE_MTYPE_STATIC(BGPD, PBR_ACTION, "PBR action") -DEFINE_MTYPE_STATIC(BGPD, PBR_RULE, "PBR rule") -DEFINE_MTYPE_STATIC(BGPD, PBR, "BGP PBR Context") -DEFINE_MTYPE_STATIC(BGPD, PBR_VALMASK, "BGP PBR Val Mask Value") +DEFINE_MTYPE_STATIC(BGPD, PBR_MATCH_ENTRY, "PBR match entry"); +DEFINE_MTYPE_STATIC(BGPD, PBR_MATCH, "PBR match"); +DEFINE_MTYPE_STATIC(BGPD, PBR_ACTION, "PBR action"); +DEFINE_MTYPE_STATIC(BGPD, PBR_RULE, "PBR rule"); +DEFINE_MTYPE_STATIC(BGPD, PBR, "BGP PBR Context"); +DEFINE_MTYPE_STATIC(BGPD, PBR_VALMASK, "BGP PBR Val Mask Value"); /* chain strings too long to fit in one line */ #define FSPEC_ACTION_EXCEED_LIMIT "flowspec actions exceeds limit" diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c index 42951efb0..b053ec376 100644 --- a/bgpd/bgp_rpki.c +++ b/bgpd/bgp_rpki.c @@ -60,8 +60,8 @@ #include "bgpd/bgp_rpki_clippy.c" #endif -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, "BGP RPKI Cache server"); +DEFINE_MTYPE_STATIC(BGPD, BGP_RPKI_CACHE_GROUP, "BGP RPKI Cache server group"); #define RPKI_VALID 1 #define RPKI_NOTFOUND 2 diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c index 88c92f795..3ad0b070b 100644 --- a/bgpd/rfapi/bgp_rfapi_cfg.c +++ b/bgpd/rfapi/bgp_rfapi_cfg.c @@ -52,33 +52,33 @@ #undef BGP_VNC_DEBUG_MATCH_GROUP -DEFINE_MGROUP(RFAPI, "rfapi") -DEFINE_MTYPE(RFAPI, RFAPI_CFG, "NVE Configuration") -DEFINE_MTYPE(RFAPI, RFAPI_GROUP_CFG, "NVE 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, "RFAPI Generic") -DEFINE_MTYPE(RFAPI, RFAPI_DESC, "RFAPI Descriptor") -DEFINE_MTYPE(RFAPI, RFAPI_IMPORTTABLE, "RFAPI Import Table") -DEFINE_MTYPE(RFAPI, RFAPI_MONITOR, "RFAPI Monitor VPN") -DEFINE_MTYPE(RFAPI, RFAPI_MONITOR_ENCAP, "RFAPI Monitor Encap") -DEFINE_MTYPE(RFAPI, RFAPI_NEXTHOP, "RFAPI Next Hop") -DEFINE_MTYPE(RFAPI, RFAPI_VN_OPTION, "RFAPI VN Option") -DEFINE_MTYPE(RFAPI, RFAPI_UN_OPTION, "RFAPI UN Option") -DEFINE_MTYPE(RFAPI, RFAPI_WITHDRAW, "RFAPI Withdraw") -DEFINE_MTYPE(RFAPI, RFAPI_RFG_NAME, "RFAPI RFGName") -DEFINE_MTYPE(RFAPI, RFAPI_ADB, "RFAPI Advertisement Data") -DEFINE_MTYPE(RFAPI, RFAPI_ETI, "RFAPI Export Table Info") -DEFINE_MTYPE(RFAPI, RFAPI_NVE_ADDR, "RFAPI NVE Address") -DEFINE_MTYPE(RFAPI, RFAPI_PREFIX_BAG, "RFAPI Prefix Bag") -DEFINE_MTYPE(RFAPI, RFAPI_IT_EXTRA, "RFAPI IT Extra") -DEFINE_MTYPE(RFAPI, RFAPI_INFO, "RFAPI Info") -DEFINE_MTYPE(RFAPI, RFAPI_ADDR, "RFAPI Addr") -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_L2ADDR_OPT, "RFAPI L2 Address Option") -DEFINE_MTYPE(RFAPI, RFAPI_AP, "RFAPI Advertised Prefix") -DEFINE_MTYPE(RFAPI, RFAPI_MONITOR_ETH, "RFAPI Monitor Ethernet") +DEFINE_MGROUP(RFAPI, "rfapi"); +DEFINE_MTYPE(RFAPI, RFAPI_CFG, "NVE Configuration"); +DEFINE_MTYPE(RFAPI, RFAPI_GROUP_CFG, "NVE 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, "RFAPI Generic"); +DEFINE_MTYPE(RFAPI, RFAPI_DESC, "RFAPI Descriptor"); +DEFINE_MTYPE(RFAPI, RFAPI_IMPORTTABLE, "RFAPI Import Table"); +DEFINE_MTYPE(RFAPI, RFAPI_MONITOR, "RFAPI Monitor VPN"); +DEFINE_MTYPE(RFAPI, RFAPI_MONITOR_ENCAP, "RFAPI Monitor Encap"); +DEFINE_MTYPE(RFAPI, RFAPI_NEXTHOP, "RFAPI Next Hop"); +DEFINE_MTYPE(RFAPI, RFAPI_VN_OPTION, "RFAPI VN Option"); +DEFINE_MTYPE(RFAPI, RFAPI_UN_OPTION, "RFAPI UN Option"); +DEFINE_MTYPE(RFAPI, RFAPI_WITHDRAW, "RFAPI Withdraw"); +DEFINE_MTYPE(RFAPI, RFAPI_RFG_NAME, "RFAPI RFGName"); +DEFINE_MTYPE(RFAPI, RFAPI_ADB, "RFAPI Advertisement Data"); +DEFINE_MTYPE(RFAPI, RFAPI_ETI, "RFAPI Export Table Info"); +DEFINE_MTYPE(RFAPI, RFAPI_NVE_ADDR, "RFAPI NVE Address"); +DEFINE_MTYPE(RFAPI, RFAPI_PREFIX_BAG, "RFAPI Prefix Bag"); +DEFINE_MTYPE(RFAPI, RFAPI_IT_EXTRA, "RFAPI IT Extra"); +DEFINE_MTYPE(RFAPI, RFAPI_INFO, "RFAPI Info"); +DEFINE_MTYPE(RFAPI, RFAPI_ADDR, "RFAPI Addr"); +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_L2ADDR_OPT, "RFAPI L2 Address Option"); +DEFINE_MTYPE(RFAPI, RFAPI_AP, "RFAPI Advertised Prefix"); +DEFINE_MTYPE(RFAPI, RFAPI_MONITOR_ETH, "RFAPI Monitor Ethernet"); DEFINE_QOBJ_TYPE(rfapi_nve_group_cfg) DEFINE_QOBJ_TYPE(rfapi_l2_group_cfg) diff --git a/bgpd/rfapi/rfapi_private.h b/bgpd/rfapi/rfapi_private.h index af5636795..e7825e8bf 100644 --- a/bgpd/rfapi/rfapi_private.h +++ b/bgpd/rfapi/rfapi_private.h @@ -367,33 +367,33 @@ extern int rfapi_extract_l2o( */ extern time_t rfapi_time(time_t *t); -DECLARE_MGROUP(RFAPI) -DECLARE_MTYPE(RFAPI_CFG) -DECLARE_MTYPE(RFAPI_GROUP_CFG) -DECLARE_MTYPE(RFAPI_L2_CFG) -DECLARE_MTYPE(RFAPI_RFP_GROUP_CFG) -DECLARE_MTYPE(RFAPI) -DECLARE_MTYPE(RFAPI_DESC) -DECLARE_MTYPE(RFAPI_IMPORTTABLE) -DECLARE_MTYPE(RFAPI_MONITOR) -DECLARE_MTYPE(RFAPI_MONITOR_ENCAP) -DECLARE_MTYPE(RFAPI_NEXTHOP) -DECLARE_MTYPE(RFAPI_VN_OPTION) -DECLARE_MTYPE(RFAPI_UN_OPTION) -DECLARE_MTYPE(RFAPI_WITHDRAW) -DECLARE_MTYPE(RFAPI_RFG_NAME) -DECLARE_MTYPE(RFAPI_ADB) -DECLARE_MTYPE(RFAPI_ETI) -DECLARE_MTYPE(RFAPI_NVE_ADDR) -DECLARE_MTYPE(RFAPI_PREFIX_BAG) -DECLARE_MTYPE(RFAPI_IT_EXTRA) -DECLARE_MTYPE(RFAPI_INFO) -DECLARE_MTYPE(RFAPI_ADDR) -DECLARE_MTYPE(RFAPI_UPDATED_RESPONSE_QUEUE) -DECLARE_MTYPE(RFAPI_RECENT_DELETE) -DECLARE_MTYPE(RFAPI_L2ADDR_OPT) -DECLARE_MTYPE(RFAPI_AP) -DECLARE_MTYPE(RFAPI_MONITOR_ETH) +DECLARE_MGROUP(RFAPI); +DECLARE_MTYPE(RFAPI_CFG); +DECLARE_MTYPE(RFAPI_GROUP_CFG); +DECLARE_MTYPE(RFAPI_L2_CFG); +DECLARE_MTYPE(RFAPI_RFP_GROUP_CFG); +DECLARE_MTYPE(RFAPI); +DECLARE_MTYPE(RFAPI_DESC); +DECLARE_MTYPE(RFAPI_IMPORTTABLE); +DECLARE_MTYPE(RFAPI_MONITOR); +DECLARE_MTYPE(RFAPI_MONITOR_ENCAP); +DECLARE_MTYPE(RFAPI_NEXTHOP); +DECLARE_MTYPE(RFAPI_VN_OPTION); +DECLARE_MTYPE(RFAPI_UN_OPTION); +DECLARE_MTYPE(RFAPI_WITHDRAW); +DECLARE_MTYPE(RFAPI_RFG_NAME); +DECLARE_MTYPE(RFAPI_ADB); +DECLARE_MTYPE(RFAPI_ETI); +DECLARE_MTYPE(RFAPI_NVE_ADDR); +DECLARE_MTYPE(RFAPI_PREFIX_BAG); +DECLARE_MTYPE(RFAPI_IT_EXTRA); +DECLARE_MTYPE(RFAPI_INFO); +DECLARE_MTYPE(RFAPI_ADDR); +DECLARE_MTYPE(RFAPI_UPDATED_RESPONSE_QUEUE); +DECLARE_MTYPE(RFAPI_RECENT_DELETE); +DECLARE_MTYPE(RFAPI_L2ADDR_OPT); +DECLARE_MTYPE(RFAPI_AP); +DECLARE_MTYPE(RFAPI_MONITOR_ETH); /* diff --git a/doc/developer/memtypes.rst b/doc/developer/memtypes.rst index 952b316ea..08dad7fb6 100644 --- a/doc/developer/memtypes.rst +++ b/doc/developer/memtypes.rst @@ -15,15 +15,15 @@ Example: .. code-block:: c :caption: mydaemon.h - DECLARE_MGROUP(MYDAEMON) - DECLARE_MTYPE(MYNEIGHBOR) + DECLARE_MGROUP(MYDAEMON); + DECLARE_MTYPE(MYNEIGHBOR); .. code-block:: c :caption: mydaemon.c - DEFINE_MGROUP( MYDAEMON, "My daemon's memory") - DEFINE_MTYPE( MYDAEMON, MYNEIGHBOR, "Neighbor entry") - DEFINE_MTYPE_STATIC(MYDAEMON, MYNEIGHBORNAME, "Neighbor name") + DEFINE_MGROUP( MYDAEMON, "My daemon's memory"); + DEFINE_MTYPE( MYDAEMON, MYNEIGHBOR, "Neighbor entry"); + DEFINE_MTYPE_STATIC(MYDAEMON, MYNEIGHBORNAME, "Neighbor name"); struct neigh *neighbor_new(const char *name) { diff --git a/eigrpd/eigrp_memory.c b/eigrpd/eigrp_memory.c index 57ca78534..f2cb9a5c9 100644 --- a/eigrpd/eigrp_memory.c +++ b/eigrpd/eigrp_memory.c @@ -25,18 +25,18 @@ #include "eigrp_memory.h" -DEFINE_MGROUP(EIGRPD, "eigrpd") -DEFINE_MTYPE(EIGRPD, EIGRP_TOP, "EIGRP structure") -DEFINE_MTYPE(EIGRPD, EIGRP_IF, "EIGRP interface") -DEFINE_MTYPE(EIGRPD, EIGRP_NEIGHBOR, "EIGRP neighbor") -DEFINE_MTYPE(EIGRPD, EIGRP_IF_PARAMS, "EIGRP Interface Parameters") -DEFINE_MTYPE(EIGRPD, EIGRP_IF_INFO, "EIGRP Interface Information") -DEFINE_MTYPE(EIGRPD, EIGRP_FIFO, "EIGRP FIFO") -DEFINE_MTYPE(EIGRPD, EIGRP_PACKET, "EIGRP Packet") -DEFINE_MTYPE(EIGRPD, EIGRP_IPV4_INT_TLV, "EIGRP IPv4 TLV") -DEFINE_MTYPE(EIGRPD, EIGRP_SEQ_TLV, "EIGRP SEQ TLV") -DEFINE_MTYPE(EIGRPD, EIGRP_AUTH_TLV, "EIGRP AUTH TLV") -DEFINE_MTYPE(EIGRPD, EIGRP_AUTH_SHA256_TLV, "EIGRP SHA TLV") -DEFINE_MTYPE(EIGRPD, EIGRP_PREFIX_DESCRIPTOR, "EIGRP Prefix") -DEFINE_MTYPE(EIGRPD, EIGRP_ROUTE_DESCRIPTOR, "EIGRP Nexthop Entry") -DEFINE_MTYPE(EIGRPD, EIGRP_FSM_MSG, "EIGRP FSM Message") +DEFINE_MGROUP(EIGRPD, "eigrpd"); +DEFINE_MTYPE(EIGRPD, EIGRP_TOP, "EIGRP structure"); +DEFINE_MTYPE(EIGRPD, EIGRP_IF, "EIGRP interface"); +DEFINE_MTYPE(EIGRPD, EIGRP_NEIGHBOR, "EIGRP neighbor"); +DEFINE_MTYPE(EIGRPD, EIGRP_IF_PARAMS, "EIGRP Interface Parameters"); +DEFINE_MTYPE(EIGRPD, EIGRP_IF_INFO, "EIGRP Interface Information"); +DEFINE_MTYPE(EIGRPD, EIGRP_FIFO, "EIGRP FIFO"); +DEFINE_MTYPE(EIGRPD, EIGRP_PACKET, "EIGRP Packet"); +DEFINE_MTYPE(EIGRPD, EIGRP_IPV4_INT_TLV, "EIGRP IPv4 TLV"); +DEFINE_MTYPE(EIGRPD, EIGRP_SEQ_TLV, "EIGRP SEQ TLV"); +DEFINE_MTYPE(EIGRPD, EIGRP_AUTH_TLV, "EIGRP AUTH TLV"); +DEFINE_MTYPE(EIGRPD, EIGRP_AUTH_SHA256_TLV, "EIGRP SHA TLV"); +DEFINE_MTYPE(EIGRPD, EIGRP_PREFIX_DESCRIPTOR, "EIGRP Prefix"); +DEFINE_MTYPE(EIGRPD, EIGRP_ROUTE_DESCRIPTOR, "EIGRP Nexthop Entry"); +DEFINE_MTYPE(EIGRPD, EIGRP_FSM_MSG, "EIGRP FSM Message"); diff --git a/eigrpd/eigrp_memory.h b/eigrpd/eigrp_memory.h index 21ecba2aa..bf1eff875 100644 --- a/eigrpd/eigrp_memory.h +++ b/eigrpd/eigrp_memory.h @@ -24,20 +24,20 @@ #include "memory.h" -DECLARE_MGROUP(EIGRPD) -DECLARE_MTYPE(EIGRP_TOP) -DECLARE_MTYPE(EIGRP_IF) -DECLARE_MTYPE(EIGRP_NEIGHBOR) -DECLARE_MTYPE(EIGRP_IF_PARAMS) -DECLARE_MTYPE(EIGRP_IF_INFO) -DECLARE_MTYPE(EIGRP_FIFO) -DECLARE_MTYPE(EIGRP_PACKET) -DECLARE_MTYPE(EIGRP_IPV4_INT_TLV) -DECLARE_MTYPE(EIGRP_SEQ_TLV) -DECLARE_MTYPE(EIGRP_AUTH_TLV) -DECLARE_MTYPE(EIGRP_AUTH_SHA256_TLV) -DECLARE_MTYPE(EIGRP_PREFIX_DESCRIPTOR) -DECLARE_MTYPE(EIGRP_ROUTE_DESCRIPTOR) -DECLARE_MTYPE(EIGRP_FSM_MSG) +DECLARE_MGROUP(EIGRPD); +DECLARE_MTYPE(EIGRP_TOP); +DECLARE_MTYPE(EIGRP_IF); +DECLARE_MTYPE(EIGRP_NEIGHBOR); +DECLARE_MTYPE(EIGRP_IF_PARAMS); +DECLARE_MTYPE(EIGRP_IF_INFO); +DECLARE_MTYPE(EIGRP_FIFO); +DECLARE_MTYPE(EIGRP_PACKET); +DECLARE_MTYPE(EIGRP_IPV4_INT_TLV); +DECLARE_MTYPE(EIGRP_SEQ_TLV); +DECLARE_MTYPE(EIGRP_AUTH_TLV); +DECLARE_MTYPE(EIGRP_AUTH_SHA256_TLV); +DECLARE_MTYPE(EIGRP_PREFIX_DESCRIPTOR); +DECLARE_MTYPE(EIGRP_ROUTE_DESCRIPTOR); +DECLARE_MTYPE(EIGRP_FSM_MSG); #endif /* _FRR_EIGRP_MEMORY_H */ diff --git a/isisd/fabricd.c b/isisd/fabricd.c index 57e9e91c1..426b96e90 100644 --- a/isisd/fabricd.c +++ b/isisd/fabricd.c @@ -33,9 +33,9 @@ #include "isisd/isis_tx_queue.h" #include "isisd/isis_csm.h" -DEFINE_MTYPE_STATIC(ISISD, FABRICD_STATE, "ISIS OpenFabric") -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_STATE, "ISIS OpenFabric"); +DEFINE_MTYPE_STATIC(ISISD, FABRICD_NEIGHBOR, "ISIS OpenFabric Neighbor Entry"); +DEFINE_MTYPE_STATIC(ISISD, FABRICD_FLOODING_INFO, "ISIS OpenFabric Flooding Log"); /* Tracks initial synchronization as per section 2.4 * diff --git a/isisd/isis_bfd.c b/isisd/isis_bfd.c index 4fac73511..3b51ec04c 100644 --- a/isisd/isis_bfd.c +++ b/isisd/isis_bfd.c @@ -32,7 +32,7 @@ #include "isisd/isisd.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 { int family; diff --git a/isisd/isis_memory.c b/isisd/isis_memory.c index f716e060c..34f6b6089 100644 --- a/isisd/isis_memory.c +++ b/isisd/isis_memory.c @@ -25,25 +25,25 @@ #include "isis_memory.h" -DEFINE_MGROUP(ISISD, "isisd") -DEFINE_MTYPE(ISISD, ISIS, "ISIS") -DEFINE_MTYPE(ISISD, ISIS_TMP, "ISIS TMP") -DEFINE_MTYPE(ISISD, ISIS_CIRCUIT, "ISIS circuit") -DEFINE_MTYPE(ISISD, ISIS_LSP, "ISIS LSP") -DEFINE_MTYPE(ISISD, ISIS_ADJACENCY, "ISIS adjacency") -DEFINE_MTYPE(ISISD, ISIS_ADJACENCY_INFO, "ISIS adjacency info") -DEFINE_MTYPE(ISISD, ISIS_AREA, "ISIS area") -DEFINE_MTYPE(ISISD, ISIS_AREA_ADDR, "ISIS area address") -DEFINE_MTYPE(ISISD, ISIS_DYNHN, "ISIS dyn hostname") -DEFINE_MTYPE(ISISD, ISIS_SPFTREE, "ISIS SPFtree") -DEFINE_MTYPE(ISISD, ISIS_VERTEX, "ISIS vertex") -DEFINE_MTYPE(ISISD, ISIS_ROUTE_INFO, "ISIS route info") -DEFINE_MTYPE(ISISD, ISIS_NEXTHOP, "ISIS nexthop") -DEFINE_MTYPE(ISISD, ISIS_NEXTHOP_LABELS, "ISIS nexthop MPLS labels") -DEFINE_MTYPE(ISISD, ISIS_DICT, "ISIS dictionary") -DEFINE_MTYPE(ISISD, ISIS_DICT_NODE, "ISIS dictionary node") -DEFINE_MTYPE(ISISD, ISIS_EXT_ROUTE, "ISIS redistributed route") -DEFINE_MTYPE(ISISD, ISIS_EXT_INFO, "ISIS redistributed route info") -DEFINE_MTYPE(ISISD, ISIS_MPLS_TE, "ISIS MPLS_TE parameters") -DEFINE_MTYPE(ISISD, ISIS_ACL_NAME, "ISIS access-list name") -DEFINE_MTYPE(ISISD, ISIS_PLIST_NAME, "ISIS prefix-list name") +DEFINE_MGROUP(ISISD, "isisd"); +DEFINE_MTYPE(ISISD, ISIS, "ISIS"); +DEFINE_MTYPE(ISISD, ISIS_TMP, "ISIS TMP"); +DEFINE_MTYPE(ISISD, ISIS_CIRCUIT, "ISIS circuit"); +DEFINE_MTYPE(ISISD, ISIS_LSP, "ISIS LSP"); +DEFINE_MTYPE(ISISD, ISIS_ADJACENCY, "ISIS adjacency"); +DEFINE_MTYPE(ISISD, ISIS_ADJACENCY_INFO, "ISIS adjacency info"); +DEFINE_MTYPE(ISISD, ISIS_AREA, "ISIS area"); +DEFINE_MTYPE(ISISD, ISIS_AREA_ADDR, "ISIS area address"); +DEFINE_MTYPE(ISISD, ISIS_DYNHN, "ISIS dyn hostname"); +DEFINE_MTYPE(ISISD, ISIS_SPFTREE, "ISIS SPFtree"); +DEFINE_MTYPE(ISISD, ISIS_VERTEX, "ISIS vertex"); +DEFINE_MTYPE(ISISD, ISIS_ROUTE_INFO, "ISIS route info"); +DEFINE_MTYPE(ISISD, ISIS_NEXTHOP, "ISIS nexthop"); +DEFINE_MTYPE(ISISD, ISIS_NEXTHOP_LABELS, "ISIS nexthop MPLS labels"); +DEFINE_MTYPE(ISISD, ISIS_DICT, "ISIS dictionary"); +DEFINE_MTYPE(ISISD, ISIS_DICT_NODE, "ISIS dictionary node"); +DEFINE_MTYPE(ISISD, ISIS_EXT_ROUTE, "ISIS redistributed route"); +DEFINE_MTYPE(ISISD, ISIS_EXT_INFO, "ISIS redistributed route info"); +DEFINE_MTYPE(ISISD, ISIS_MPLS_TE, "ISIS MPLS_TE parameters"); +DEFINE_MTYPE(ISISD, ISIS_ACL_NAME, "ISIS access-list name"); +DEFINE_MTYPE(ISISD, ISIS_PLIST_NAME, "ISIS prefix-list name"); diff --git a/isisd/isis_memory.h b/isisd/isis_memory.h index 5bcd2a398..5fd881e42 100644 --- a/isisd/isis_memory.h +++ b/isisd/isis_memory.h @@ -24,27 +24,27 @@ #include "memory.h" -DECLARE_MGROUP(ISISD) -DECLARE_MTYPE(ISIS) -DECLARE_MTYPE(ISIS_TMP) -DECLARE_MTYPE(ISIS_CIRCUIT) -DECLARE_MTYPE(ISIS_LSP) -DECLARE_MTYPE(ISIS_ADJACENCY) -DECLARE_MTYPE(ISIS_ADJACENCY_INFO) -DECLARE_MTYPE(ISIS_AREA) -DECLARE_MTYPE(ISIS_AREA_ADDR) -DECLARE_MTYPE(ISIS_DYNHN) -DECLARE_MTYPE(ISIS_SPFTREE) -DECLARE_MTYPE(ISIS_VERTEX) -DECLARE_MTYPE(ISIS_ROUTE_INFO) -DECLARE_MTYPE(ISIS_NEXTHOP) -DECLARE_MTYPE(ISIS_NEXTHOP_LABELS) -DECLARE_MTYPE(ISIS_DICT) -DECLARE_MTYPE(ISIS_DICT_NODE) -DECLARE_MTYPE(ISIS_EXT_ROUTE) -DECLARE_MTYPE(ISIS_EXT_INFO) -DECLARE_MTYPE(ISIS_MPLS_TE) -DECLARE_MTYPE(ISIS_ACL_NAME) -DECLARE_MTYPE(ISIS_PLIST_NAME) +DECLARE_MGROUP(ISISD); +DECLARE_MTYPE(ISIS); +DECLARE_MTYPE(ISIS_TMP); +DECLARE_MTYPE(ISIS_CIRCUIT); +DECLARE_MTYPE(ISIS_LSP); +DECLARE_MTYPE(ISIS_ADJACENCY); +DECLARE_MTYPE(ISIS_ADJACENCY_INFO); +DECLARE_MTYPE(ISIS_AREA); +DECLARE_MTYPE(ISIS_AREA_ADDR); +DECLARE_MTYPE(ISIS_DYNHN); +DECLARE_MTYPE(ISIS_SPFTREE); +DECLARE_MTYPE(ISIS_VERTEX); +DECLARE_MTYPE(ISIS_ROUTE_INFO); +DECLARE_MTYPE(ISIS_NEXTHOP); +DECLARE_MTYPE(ISIS_NEXTHOP_LABELS); +DECLARE_MTYPE(ISIS_DICT); +DECLARE_MTYPE(ISIS_DICT_NODE); +DECLARE_MTYPE(ISIS_EXT_ROUTE); +DECLARE_MTYPE(ISIS_EXT_INFO); +DECLARE_MTYPE(ISIS_MPLS_TE); +DECLARE_MTYPE(ISIS_ACL_NAME); +DECLARE_MTYPE(ISIS_PLIST_NAME); #endif /* _QUAGGA_ISIS_MEMORY_H */ diff --git a/isisd/isis_mt.c b/isisd/isis_mt.c index 9465c5e75..a6e236c79 100644 --- a/isisd/isis_mt.c +++ b/isisd/isis_mt.c @@ -29,9 +29,9 @@ #include "isisd/isis_mt.h" #include "isisd/isis_tlvs.h" -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_ADJ_INFO, "ISIS MT Adjacency Info") +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_ADJ_INFO, "ISIS MT Adjacency Info"); bool isis_area_ipv6_dstsrc_enabled(struct isis_area *area) { diff --git a/isisd/isis_sr.c b/isisd/isis_sr.c index 21f534641..60ddf8e7e 100644 --- a/isisd/isis_sr.c +++ b/isisd/isis_sr.c @@ -49,7 +49,7 @@ #include "isisd/isis_errors.h" /* 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 int sr_local_block_init(struct isis_area *area); diff --git a/isisd/isis_tlvs.c b/isisd/isis_tlvs.c index a97c19a8b..fa47c2813 100644 --- a/isisd/isis_tlvs.c +++ b/isisd/isis_tlvs.c @@ -45,9 +45,9 @@ #include "isisd/isis_te.h" #include "isisd/isis_sr.h" -DEFINE_MTYPE_STATIC(ISISD, ISIS_TLV, "ISIS 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_TLV, "ISIS TLVs"); +DEFINE_MTYPE(ISISD, ISIS_SUBTLV, "ISIS Sub-TLVs"); +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, uint8_t tlv_len, struct stream *s, diff --git a/isisd/isis_tlvs.h b/isisd/isis_tlvs.h index 037f91f0b..0438d13ae 100644 --- a/isisd/isis_tlvs.h +++ b/isisd/isis_tlvs.h @@ -28,7 +28,7 @@ #include "openbsd-tree.h" #include "prefix.h" -DECLARE_MTYPE(ISIS_SUBTLV) +DECLARE_MTYPE(ISIS_SUBTLV); struct lspdb_head; struct isis_subtlvs; diff --git a/isisd/isis_tx_queue.c b/isisd/isis_tx_queue.c index 5c87e3915..7db76db0d 100644 --- a/isisd/isis_tx_queue.c +++ b/isisd/isis_tx_queue.c @@ -32,8 +32,8 @@ #include "isisd/isis_misc.h" #include "isisd/isis_tx_queue.h" -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, "ISIS TX Queue"); +DEFINE_MTYPE_STATIC(ISISD, TX_QUEUE_ENTRY, "ISIS TX Queue Entry"); struct isis_tx_queue { struct isis_circuit *circuit; @@ -32,7 +32,7 @@ #include "vty.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 struct bfd_gbl bfd_gbl; diff --git a/lib/buffer.c b/lib/buffer.c index 42796faae..7929b3709 100644 --- a/lib/buffer.c +++ b/lib/buffer.c @@ -29,8 +29,8 @@ #include <stddef.h> -DEFINE_MTYPE_STATIC(LIB, BUFFER, "Buffer") -DEFINE_MTYPE_STATIC(LIB, BUFFER_DATA, "Buffer data") +DEFINE_MTYPE_STATIC(LIB, BUFFER, "Buffer"); +DEFINE_MTYPE_STATIC(LIB, BUFFER_DATA, "Buffer data"); /* Buffer master. */ struct buffer { diff --git a/lib/command.c b/lib/command.c index 6a4d504b2..770e2fc5a 100644 --- a/lib/command.c +++ b/lib/command.c @@ -51,8 +51,8 @@ #include "frrscript.h" -DEFINE_MTYPE_STATIC(LIB, HOST, "Host config") -DEFINE_MTYPE(LIB, COMPLETION, "Completion item") +DEFINE_MTYPE_STATIC(LIB, HOST, "Host config"); +DEFINE_MTYPE(LIB, COMPLETION, "Completion item"); #define item(x) \ { \ diff --git a/lib/command.h b/lib/command.h index 71abb20b0..14e51486e 100644 --- a/lib/command.h +++ b/lib/command.h @@ -34,7 +34,7 @@ extern "C" { #endif -DECLARE_MTYPE(COMPLETION) +DECLARE_MTYPE(COMPLETION); /* * From RFC 1123 (Requirements for Internet Hosts), Section 2.1 on hostnames: diff --git a/lib/command_graph.c b/lib/command_graph.c index d30d9ab70..c6c384045 100644 --- a/lib/command_graph.c +++ b/lib/command_graph.c @@ -26,11 +26,11 @@ #include "command_graph.h" -DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command Tokens") -DEFINE_MTYPE_STATIC(LIB, CMD_DESC, "Command Token Text") -DEFINE_MTYPE_STATIC(LIB, CMD_TEXT, "Command Token Help") -DEFINE_MTYPE(LIB, CMD_ARG, "Command Argument") -DEFINE_MTYPE_STATIC(LIB, CMD_VAR, "Command Argument Name") +DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command Tokens"); +DEFINE_MTYPE_STATIC(LIB, CMD_DESC, "Command Token Text"); +DEFINE_MTYPE_STATIC(LIB, CMD_TEXT, "Command Token Help"); +DEFINE_MTYPE(LIB, CMD_ARG, "Command Argument"); +DEFINE_MTYPE_STATIC(LIB, CMD_VAR, "Command Argument Name"); struct cmd_token *cmd_token_new(enum cmd_token_type type, uint8_t attr, const char *text, const char *desc) diff --git a/lib/command_graph.h b/lib/command_graph.h index 86715410c..2754dca67 100644 --- a/lib/command_graph.h +++ b/lib/command_graph.h @@ -37,7 +37,7 @@ extern "C" { #endif -DECLARE_MTYPE(CMD_ARG) +DECLARE_MTYPE(CMD_ARG); struct vty; diff --git a/lib/command_match.c b/lib/command_match.c index 801b05f15..e9e8466ff 100644 --- a/lib/command_match.c +++ b/lib/command_match.c @@ -26,7 +26,7 @@ #include "command_match.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 #define TM 1 diff --git a/lib/command_parse.y b/lib/command_parse.y index 8135d02b4..5ebc19b27 100644 --- a/lib/command_parse.y +++ b/lib/command_parse.y @@ -54,7 +54,7 @@ #include "command_graph.h" #include "log.h" - DECLARE_MTYPE(LEX) + DECLARE_MTYPE(LEX); #define YYSTYPE CMD_YYSTYPE #define YYLTYPE CMD_YYLTYPE @@ -376,7 +376,7 @@ selector: '[' selector_seq_seq ']' varname_token #undef scanner -DEFINE_MTYPE(LIB, LEX, "Lexer token (temporary)") +DEFINE_MTYPE(LIB, LEX, "Lexer token (temporary)"); void cmd_graph_parse (struct graph *graph, const struct cmd_element *cmd) diff --git a/lib/compiler.h b/lib/compiler.h index b5cfbefeb..ab95aa09c 100644 --- a/lib/compiler.h +++ b/lib/compiler.h @@ -136,6 +136,9 @@ extern "C" { #define macro_inline static inline __attribute__((unused)) #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: * #define V_0() ... diff --git a/lib/distribute.c b/lib/distribute.c index 3ea60c877..60bd0a47b 100644 --- a/lib/distribute.c +++ b/lib/distribute.c @@ -27,10 +27,10 @@ #include "distribute.h" #include "memory.h" -DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_CTX, "Distribute ctx") -DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE, "Distribute list") -DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_IFNAME, "Dist-list ifname") -DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_NAME, "Dist-list name") +DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_CTX, "Distribute ctx"); +DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE, "Distribute list"); +DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_IFNAME, "Dist-list ifname"); +DEFINE_MTYPE_STATIC(LIB, DISTRIBUTE_NAME, "Dist-list name"); static struct list *dist_ctx_list; diff --git a/lib/ferr.c b/lib/ferr.c index 691da495c..513ef5ebe 100644 --- a/lib/ferr.c +++ b/lib/ferr.c @@ -35,7 +35,7 @@ #include "linklist.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. diff --git a/lib/filter.c b/lib/filter.c index f5ae9ee2b..83423ba32 100644 --- a/lib/filter.c +++ b/lib/filter.c @@ -31,9 +31,9 @@ #include "libfrr.h" #include "northbound_cli.h" -DEFINE_MTYPE_STATIC(LIB, ACCESS_LIST, "Access List") -DEFINE_MTYPE_STATIC(LIB, ACCESS_LIST_STR, "Access List Str") -DEFINE_MTYPE_STATIC(LIB, ACCESS_FILTER, "Access Filter") +DEFINE_MTYPE_STATIC(LIB, ACCESS_LIST, "Access List"); +DEFINE_MTYPE_STATIC(LIB, ACCESS_LIST_STR, "Access List Str"); +DEFINE_MTYPE_STATIC(LIB, ACCESS_FILTER, "Access Filter"); /* Static structure for mac access_list's master. */ static struct access_master access_master_mac = { diff --git a/lib/frr_pthread.c b/lib/frr_pthread.c index 3f0179fbc..03359f4d1 100644 --- a/lib/frr_pthread.c +++ b/lib/frr_pthread.c @@ -30,8 +30,8 @@ #include "zlog.h" #include "libfrr_trace.h" -DEFINE_MTYPE_STATIC(LIB, FRR_PTHREAD, "FRR POSIX Thread") -DEFINE_MTYPE_STATIC(LIB, PTHREAD_PRIM, "POSIX sync primitives") +DEFINE_MTYPE_STATIC(LIB, FRR_PTHREAD, "FRR POSIX Thread"); +DEFINE_MTYPE_STATIC(LIB, PTHREAD_PRIM, "POSIX sync primitives"); /* default frr_pthread start/stop routine prototypes */ static void *fpt_run(void *arg); diff --git a/lib/frr_zmq.c b/lib/frr_zmq.c index 33adcd7b8..05f0fce5f 100644 --- a/lib/frr_zmq.c +++ b/lib/frr_zmq.c @@ -26,7 +26,7 @@ #include "log.h" #include "lib_errors.h" -DEFINE_MTYPE_STATIC(LIB, ZEROMQ_CB, "ZeroMQ callback") +DEFINE_MTYPE_STATIC(LIB, ZEROMQ_CB, "ZeroMQ callback"); /* libzmq's context */ void *frrzmq_context = NULL; diff --git a/lib/frrcu.c b/lib/frrcu.c index 7e6475b64..c6c19bd56 100644 --- a/lib/frrcu.c +++ b/lib/frrcu.c @@ -54,8 +54,8 @@ #include "seqlock.h" #include "atomlist.h" -DEFINE_MTYPE_STATIC(LIB, RCU_THREAD, "RCU thread") -DEFINE_MTYPE_STATIC(LIB, RCU_NEXT, "RCU sequence barrier") +DEFINE_MTYPE_STATIC(LIB, RCU_THREAD, "RCU thread"); +DEFINE_MTYPE_STATIC(LIB, RCU_NEXT, "RCU sequence barrier"); DECLARE_ATOMLIST(rcu_heads, struct rcu_head, head) diff --git a/lib/grammar_sandbox.c b/lib/grammar_sandbox.c index a40b815ca..209765bd6 100644 --- a/lib/grammar_sandbox.c +++ b/lib/grammar_sandbox.c @@ -34,7 +34,7 @@ #define GRAMMAR_STR "CLI grammar sandbox\n" -DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command desc") +DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command desc"); /** headers **/ void grammar_sandbox_init(void); diff --git a/lib/graph.c b/lib/graph.c index 128e45c57..1cbe1b90f 100644 --- a/lib/graph.c +++ b/lib/graph.c @@ -25,8 +25,8 @@ #include "memory.h" #include "buffer.h" -DEFINE_MTYPE_STATIC(LIB, GRAPH, "Graph") -DEFINE_MTYPE_STATIC(LIB, GRAPH_NODE, "Graph Node") +DEFINE_MTYPE_STATIC(LIB, GRAPH, "Graph"); +DEFINE_MTYPE_STATIC(LIB, GRAPH_NODE, "Graph Node"); struct graph *graph_new(void) { struct graph *graph = XCALLOC(MTYPE_GRAPH, sizeof(struct graph)); diff --git a/lib/hash.c b/lib/hash.c index ec616ee72..e9132f790 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -31,9 +31,9 @@ #include "frr_pthread.h" #include "libfrr_trace.h" -DEFINE_MTYPE_STATIC(LIB, HASH, "Hash") -DEFINE_MTYPE_STATIC(LIB, HASH_BUCKET, "Hash Bucket") -DEFINE_MTYPE_STATIC(LIB, HASH_INDEX, "Hash Index") +DEFINE_MTYPE_STATIC(LIB, HASH, "Hash"); +DEFINE_MTYPE_STATIC(LIB, HASH_BUCKET, "Hash Bucket"); +DEFINE_MTYPE_STATIC(LIB, HASH_INDEX, "Hash Index"); static pthread_mutex_t _hashes_mtx = PTHREAD_MUTEX_INITIALIZER; static struct list *_hashes; diff --git a/lib/hook.c b/lib/hook.c index 5a8ad00d6..895243aad 100644 --- a/lib/hook.c +++ b/lib/hook.c @@ -23,7 +23,7 @@ #include "memory.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 *arg, bool has_arg, struct frrmod_runtime *module, diff --git a/lib/id_alloc.c b/lib/id_alloc.c index 95096fa5f..9179dc429 100644 --- a/lib/id_alloc.c +++ b/lib/id_alloc.c @@ -29,13 +29,14 @@ #include <inttypes.h> -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_DIRECTORY, "ID Number Allocator Directory") +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_DIRECTORY, "ID Number Allocator Directory"); DEFINE_MTYPE_STATIC(LIB, IDALLOC_SUBDIRECTORY, - "ID Number Allocator Subdirectory") -DEFINE_MTYPE_STATIC(LIB, IDALLOC_PAGE, "ID Number Allocator Page") -DEFINE_MTYPE_STATIC(LIB, IDALLOC_POOL, "ID Number temporary holding pool entry") + "ID Number Allocator Subdirectory"); +DEFINE_MTYPE_STATIC(LIB, IDALLOC_PAGE, "ID Number Allocator Page"); +DEFINE_MTYPE_STATIC(LIB, IDALLOC_POOL, + "ID Number temporary holding pool entry"); #if UINT_MAX >= UINT32_MAX #define FFS32(x) ffs(x) @@ -39,11 +39,11 @@ #include "lib/if_clippy.c" #endif -DEFINE_MTYPE_STATIC(LIB, IF, "Interface") -DEFINE_MTYPE_STATIC(LIB, CONNECTED, "Connected") -DEFINE_MTYPE_STATIC(LIB, NBR_CONNECTED, "Neighbor Connected") -DEFINE_MTYPE(LIB, CONNECTED_LABEL, "Connected interface label") -DEFINE_MTYPE_STATIC(LIB, IF_LINK_PARAMS, "Informational Link Parameters") +DEFINE_MTYPE_STATIC(LIB, IF, "Interface"); +DEFINE_MTYPE_STATIC(LIB, CONNECTED, "Connected"); +DEFINE_MTYPE_STATIC(LIB, NBR_CONNECTED, "Neighbor Connected"); +DEFINE_MTYPE(LIB, CONNECTED_LABEL, "Connected interface label"); +DEFINE_MTYPE_STATIC(LIB, IF_LINK_PARAMS, "Informational Link Parameters"); static struct interface *if_lookup_by_ifindex(ifindex_t ifindex, vrf_id_t vrf_id); @@ -31,7 +31,7 @@ extern "C" { #endif -DECLARE_MTYPE(CONNECTED_LABEL) +DECLARE_MTYPE(CONNECTED_LABEL); /* Interface link-layer type, if known. Derived from: * diff --git a/lib/if_rmap.c b/lib/if_rmap.c index 1973d40be..8282e476d 100644 --- a/lib/if_rmap.c +++ b/lib/if_rmap.c @@ -26,10 +26,11 @@ #include "if.h" #include "if_rmap.h" -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, "Interface route map") -DEFINE_MTYPE_STATIC(LIB, IF_RMAP_NAME, "I.f. route map name") +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, "Interface route map"); +DEFINE_MTYPE_STATIC(LIB, IF_RMAP_NAME, "I.f. route map name"); static struct list *if_rmap_ctx_list; diff --git a/lib/keychain.c b/lib/keychain.c index 82fd6a65f..07f65f182 100644 --- a/lib/keychain.c +++ b/lib/keychain.c @@ -25,8 +25,8 @@ #include "linklist.h" #include "keychain.h" -DEFINE_MTYPE_STATIC(LIB, KEY, "Key") -DEFINE_MTYPE_STATIC(LIB, KEYCHAIN, "Key chain") +DEFINE_MTYPE_STATIC(LIB, KEY, "Key"); +DEFINE_MTYPE_STATIC(LIB, KEYCHAIN, "Key chain"); DEFINE_QOBJ_TYPE(keychain) DEFINE_QOBJ_TYPE(key) diff --git a/lib/ldp_sync.c b/lib/ldp_sync.c index c9d7eb37c..8912d1558 100644 --- a/lib/ldp_sync.c +++ b/lib/ldp_sync.c @@ -31,7 +31,7 @@ #include "ldp_sync.h" /* 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 diff --git a/lib/link_state.c b/lib/link_state.c index ecf0d0698..7f0d2a124 100644 --- a/lib/link_state.c +++ b/lib/link_state.c @@ -36,7 +36,7 @@ #include "link_state.h" /* 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 diff --git a/lib/linklist.c b/lib/linklist.c index 43c200223..5de6c8a81 100644 --- a/lib/linklist.c +++ b/lib/linklist.c @@ -25,8 +25,8 @@ #include "memory.h" #include "libfrr_trace.h" -DEFINE_MTYPE_STATIC(LIB, LINK_LIST, "Link List") -DEFINE_MTYPE_STATIC(LIB, LINK_NODE, "Link Node") +DEFINE_MTYPE_STATIC(LIB, LINK_LIST, "Link List"); +DEFINE_MTYPE_STATIC(LIB, LINK_NODE, "Link Node"); struct list *list_new(void) { diff --git a/lib/memory.c b/lib/memory.c index a377d3b94..0dc8e9052 100644 --- a/lib/memory.c +++ b/lib/memory.c @@ -34,8 +34,8 @@ static struct memgroup *mg_first = NULL; struct memgroup **mg_insert = &mg_first; -DEFINE_MGROUP(LIB, "libfrr") -DEFINE_MTYPE(LIB, TMP, "Temporary memory") +DEFINE_MGROUP(LIB, "libfrr"); +DEFINE_MTYPE(LIB, TMP, "Temporary memory"); static inline void mt_count_alloc(struct memtype *mt, size_t size, void *ptr) { diff --git a/lib/memory.h b/lib/memory.h index e9db12fce..c95602f48 100644 --- a/lib/memory.h +++ b/lib/memory.h @@ -56,20 +56,20 @@ struct memgroup { /* macro usage: * * mydaemon.h - * DECLARE_MGROUP(MYDAEMON) - * DECLARE_MTYPE(MYDAEMON_COMMON) + * DECLARE_MGROUP(MYDAEMON); + * DECLARE_MTYPE(MYDAEMON_COMMON); * * mydaemon.c - * DEFINE_MGROUP(MYDAEMON, "my daemon memory") + * DEFINE_MGROUP(MYDAEMON, "my daemon memory"); * 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)) * * mydaemon_io.c * bar = qmalloc(MTYPE_MYDAEMON_COMMON, sizeof(*bar)) * * 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)) * * Note: Naming conventions (MGROUP_ and MTYPE_ prefixes are enforced @@ -78,7 +78,7 @@ struct memgroup { * 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, ...) \ struct memgroup _mg_##mname \ __attribute__((section(".data.mgroups"))) = { \ @@ -104,7 +104,7 @@ struct memgroup { _mg_##mname.next->ref = _mg_##mname.ref; \ *_mg_##mname.ref = _mg_##mname.next; \ } \ - /* end */ + MACRO_REQUIRE_SEMICOLON() /* end */ #define DEFINE_MGROUP(mname, desc) \ _DEFINE_MGROUP(mname, desc, ) @@ -112,7 +112,7 @@ struct memgroup { _DEFINE_MGROUP(mname, desc, .active_at_exit = true) #define DECLARE_MTYPE(name) \ - extern struct memtype MTYPE_##name[1]; \ + extern struct memtype MTYPE_##name[1] \ /* end */ #define DEFINE_MTYPE_ATTR(group, mname, attr, desc) \ @@ -140,7 +140,7 @@ struct memgroup { MTYPE_##mname->next->ref = MTYPE_##mname->ref; \ *MTYPE_##mname->ref = MTYPE_##mname->next; \ } \ - /* end */ + MACRO_REQUIRE_SEMICOLON() /* end */ #define DEFINE_MTYPE(group, name, desc) \ DEFINE_MTYPE_ATTR(group, name, , desc) \ @@ -150,8 +150,8 @@ struct memgroup { DEFINE_MTYPE_ATTR(group, name, static, desc) \ /* end */ -DECLARE_MGROUP(LIB) -DECLARE_MTYPE(TMP) +DECLARE_MGROUP(LIB); +DECLARE_MTYPE(TMP); extern void *qmalloc(struct memtype *mt, size_t size) diff --git a/lib/module.c b/lib/module.c index 3d299a6a2..e103493cf 100644 --- a/lib/module.c +++ b/lib/module.c @@ -27,8 +27,8 @@ #include "memory.h" #include "version.h" -DEFINE_MTYPE_STATIC(LIB, MODULE_LOADNAME, "Module loading name") -DEFINE_MTYPE_STATIC(LIB, MODULE_LOADARGS, "Module loading arguments") +DEFINE_MTYPE_STATIC(LIB, MODULE_LOADNAME, "Module loading name"); +DEFINE_MTYPE_STATIC(LIB, MODULE_LOADARGS, "Module loading arguments"); static struct frrmod_info frrmod_default_info = { .name = "libfrr", diff --git a/lib/netns_linux.c b/lib/netns_linux.c index c68843398..cde842b88 100644 --- a/lib/netns_linux.c +++ b/lib/netns_linux.c @@ -40,8 +40,8 @@ #include "vrf.h" #include "lib_errors.h" -DEFINE_MTYPE_STATIC(LIB, NS, "NetNS Context") -DEFINE_MTYPE_STATIC(LIB, NS_NAME, "NetNS Name") +DEFINE_MTYPE_STATIC(LIB, NS, "NetNS Context"); +DEFINE_MTYPE_STATIC(LIB, NS_NAME, "NetNS Name"); static inline int ns_compare(const struct ns *ns, const struct ns *ns2); static struct ns *ns_lookup_name_internal(const char *name); diff --git a/lib/netns_other.c b/lib/netns_other.c index 3fc4b8df4..b6570d3b9 100644 --- a/lib/netns_other.c +++ b/lib/netns_other.c @@ -26,8 +26,8 @@ #include "log.h" #include "memory.h" -DEFINE_MTYPE_STATIC(LIB, NS, "NetNS Context") -DEFINE_MTYPE_STATIC(LIB, NS_NAME, "NetNS Name") +DEFINE_MTYPE_STATIC(LIB, NS, "NetNS Context"); +DEFINE_MTYPE_STATIC(LIB, NS_NAME, "NetNS Name"); static inline int ns_compare(const struct ns *ns, const struct ns *ns2); diff --git a/lib/nexthop.c b/lib/nexthop.c index dd8c10820..17ef95c68 100644 --- a/lib/nexthop.c +++ b/lib/nexthop.c @@ -34,8 +34,8 @@ #include "vrf.h" #include "nexthop_group.h" -DEFINE_MTYPE_STATIC(LIB, NEXTHOP, "Nexthop") -DEFINE_MTYPE_STATIC(LIB, NH_LABEL, "Nexthop label") +DEFINE_MTYPE_STATIC(LIB, NEXTHOP, "Nexthop"); +DEFINE_MTYPE_STATIC(LIB, NH_LABEL, "Nexthop label"); static int _nexthop_labels_cmp(const struct nexthop *nh1, const struct nexthop *nh2) diff --git a/lib/nexthop_group.c b/lib/nexthop_group.c index dee98ad8d..bf74cb62c 100644 --- a/lib/nexthop_group.c +++ b/lib/nexthop_group.c @@ -32,7 +32,7 @@ #include "lib/nexthop_group_clippy.c" #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 diff --git a/lib/northbound.c b/lib/northbound.c index b6d351828..27ba632c9 100644 --- a/lib/northbound.c +++ b/lib/northbound.c @@ -32,9 +32,9 @@ #include "northbound_db.h" #include "frrstr.h" -DEFINE_MTYPE_STATIC(LIB, NB_NODE, "Northbound Node") -DEFINE_MTYPE_STATIC(LIB, NB_CONFIG, "Northbound Configuration") -DEFINE_MTYPE_STATIC(LIB, NB_CONFIG_ENTRY, "Northbound Configuration Entry") +DEFINE_MTYPE_STATIC(LIB, NB_NODE, "Northbound Node"); +DEFINE_MTYPE_STATIC(LIB, NB_CONFIG, "Northbound Configuration"); +DEFINE_MTYPE_STATIC(LIB, NB_CONFIG_ENTRY, "Northbound Configuration Entry"); /* Running configuration - shouldn't be modified directly. */ struct nb_config *running_config; diff --git a/lib/northbound_confd.c b/lib/northbound_confd.c index 8acba9fd2..f3e701433 100644 --- a/lib/northbound_confd.c +++ b/lib/northbound_confd.c @@ -32,7 +32,7 @@ #include <confd_dp.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"}; diff --git a/lib/northbound_sysrepo.c b/lib/northbound_sysrepo.c index c027f4de7..1c71312ac 100644 --- a/lib/northbound_sysrepo.c +++ b/lib/northbound_sysrepo.c @@ -32,7 +32,7 @@ #include <sysrepo/values.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"}; diff --git a/lib/plist.c b/lib/plist.c index 4588dfe1d..b77c1c11f 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -33,10 +33,10 @@ #include "plist_int.h" -DEFINE_MTYPE_STATIC(LIB, PREFIX_LIST, "Prefix List") -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_TRIE, "Prefix List Trie Table") +DEFINE_MTYPE_STATIC(LIB, PREFIX_LIST, "Prefix List"); +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_TRIE, "Prefix List Trie Table"); /* not currently changeable, code assumes bytes further down */ #define PLC_BITS 8 diff --git a/lib/prefix.c b/lib/prefix.c index 5e5c2d89a..afc4d3d5c 100644 --- a/lib/prefix.c +++ b/lib/prefix.c @@ -32,8 +32,8 @@ #include "printfrr.h" #include "vxlan.h" -DEFINE_MTYPE_STATIC(LIB, PREFIX, "Prefix") -DEFINE_MTYPE_STATIC(LIB, PREFIX_FLOWSPEC, "Prefix Flowspec") +DEFINE_MTYPE_STATIC(LIB, PREFIX, "Prefix"); +DEFINE_MTYPE_STATIC(LIB, PREFIX_FLOWSPEC, "Prefix Flowspec"); /* Maskbit. */ static const uint8_t maskbit[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0, diff --git a/lib/privs.c b/lib/privs.c index 5ca3c0d88..49761af87 100644 --- a/lib/privs.c +++ b/lib/privs.c @@ -28,7 +28,7 @@ #include "lib_errors.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 diff --git a/lib/pullwr.c b/lib/pullwr.c index 0c326f29d..15563d247 100644 --- a/lib/pullwr.c +++ b/lib/pullwr.c @@ -48,8 +48,8 @@ struct pullwr { int64_t maxspin; /* PULLWR_MAXSPIN */ }; -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_HEAD, "pull-driven write controller"); +DEFINE_MTYPE_STATIC(LIB, PULLWR_BUF, "pull-driven write buffer"); static int pullwr_run(struct thread *t); diff --git a/lib/ringbuf.c b/lib/ringbuf.c index 26c4e744b..49221e7cb 100644 --- a/lib/ringbuf.c +++ b/lib/ringbuf.c @@ -22,7 +22,7 @@ #include "ringbuf.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) { diff --git a/lib/routemap.c b/lib/routemap.c index 771408667..05f82e34c 100644 --- a/lib/routemap.c +++ b/lib/routemap.c @@ -33,14 +33,14 @@ #include "lib_errors.h" #include "table.h" -DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP, "Route map") -DEFINE_MTYPE(LIB, ROUTE_MAP_NAME, "Route map name") -DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP_INDEX, "Route map index") -DEFINE_MTYPE(LIB, ROUTE_MAP_RULE, "Route map rule") -DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP_RULE_STR, "Route map rule str") -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_DATA, "Route map dependency data") +DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP, "Route map"); +DEFINE_MTYPE(LIB, ROUTE_MAP_NAME, "Route map name"); +DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP_INDEX, "Route map index"); +DEFINE_MTYPE(LIB, ROUTE_MAP_RULE, "Route map rule"); +DEFINE_MTYPE_STATIC(LIB, ROUTE_MAP_RULE_STR, "Route map rule str"); +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_DATA, "Route map dependency data"); DEFINE_QOBJ_TYPE(route_map_index) DEFINE_QOBJ_TYPE(route_map) diff --git a/lib/routemap.h b/lib/routemap.h index 3e208c8cb..2d5d3a1f9 100644 --- a/lib/routemap.h +++ b/lib/routemap.h @@ -32,9 +32,9 @@ extern "C" { #endif -DECLARE_MTYPE(ROUTE_MAP_NAME) -DECLARE_MTYPE(ROUTE_MAP_RULE) -DECLARE_MTYPE(ROUTE_MAP_COMPILED) +DECLARE_MTYPE(ROUTE_MAP_NAME); +DECLARE_MTYPE(ROUTE_MAP_RULE); +DECLARE_MTYPE(ROUTE_MAP_COMPILED); /* Route map's type. */ enum route_map_type { RMAP_PERMIT, RMAP_DENY, RMAP_ANY }; diff --git a/lib/skiplist.c b/lib/skiplist.c index b79dfa677..fc4285741 100644 --- a/lib/skiplist.c +++ b/lib/skiplist.c @@ -63,8 +63,8 @@ #include "lib_errors.h" #include "network.h" -DEFINE_MTYPE_STATIC(LIB, SKIP_LIST, "Skip List") -DEFINE_MTYPE_STATIC(LIB, SKIP_LIST_NODE, "Skip Node") +DEFINE_MTYPE_STATIC(LIB, SKIP_LIST, "Skip List"); +DEFINE_MTYPE_STATIC(LIB, SKIP_LIST_NODE, "Skip Node"); #define BitsInRandom 31 diff --git a/lib/sockunion.c b/lib/sockunion.c index c701da1e0..d65235b41 100644 --- a/lib/sockunion.c +++ b/lib/sockunion.c @@ -29,7 +29,7 @@ #include "lib_errors.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) { diff --git a/lib/spf_backoff.c b/lib/spf_backoff.c index ac6dd29f0..a273e9346 100644 --- a/lib/spf_backoff.c +++ b/lib/spf_backoff.c @@ -33,8 +33,8 @@ #include "thread.h" #include "vty.h" -DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF, "SPF backoff") -DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF_NAME, "SPF backoff name") +DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF, "SPF backoff"); +DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF_NAME, "SPF backoff name"); static bool debug_spf_backoff = false; #define backoff_debug(...) \ diff --git a/lib/srcdest_table.c b/lib/srcdest_table.c index ef82b7ac0..a11550719 100644 --- a/lib/srcdest_table.c +++ b/lib/srcdest_table.c @@ -30,7 +30,7 @@ #include "table.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 ----- */ struct srcdest_rnode { diff --git a/lib/stream.c b/lib/stream.c index ef73c2fdc..904ee73b1 100644 --- a/lib/stream.c +++ b/lib/stream.c @@ -31,8 +31,8 @@ #include "frr_pthread.h" #include "lib_errors.h" -DEFINE_MTYPE_STATIC(LIB, STREAM, "Stream") -DEFINE_MTYPE_STATIC(LIB, STREAM_FIFO, "Stream FIFO") +DEFINE_MTYPE_STATIC(LIB, STREAM, "Stream"); +DEFINE_MTYPE_STATIC(LIB, STREAM_FIFO, "Stream FIFO"); /* Tests whether a position is valid */ #define GETP_VALID(S, G) ((G) <= (S)->endp) diff --git a/lib/table.c b/lib/table.c index 89e32182b..315381568 100644 --- a/lib/table.c +++ b/lib/table.c @@ -29,8 +29,8 @@ #include "sockunion.h" #include "libfrr_trace.h" -DEFINE_MTYPE_STATIC(LIB, ROUTE_TABLE, "Route table") -DEFINE_MTYPE(LIB, ROUTE_NODE, "Route node") +DEFINE_MTYPE_STATIC(LIB, ROUTE_TABLE, "Route table"); +DEFINE_MTYPE(LIB, ROUTE_NODE, "Route node"); static void route_table_free(struct route_table *); diff --git a/lib/table.h b/lib/table.h index 5d620d332..ba922424f 100644 --- a/lib/table.h +++ b/lib/table.h @@ -31,7 +31,7 @@ extern "C" { #endif -DECLARE_MTYPE(ROUTE_NODE) +DECLARE_MTYPE(ROUTE_NODE); /* * Forward declarations. diff --git a/lib/termtable.c b/lib/termtable.c index b22a1ad38..ddf882285 100644 --- a/lib/termtable.c +++ b/lib/termtable.c @@ -24,7 +24,7 @@ #include "memory.h" #include "termtable.h" -DEFINE_MTYPE_STATIC(LIB, TTABLE, "ASCII table") +DEFINE_MTYPE_STATIC(LIB, TTABLE, "ASCII table"); /* clang-format off */ const struct ttable_style ttable_styles[] = { diff --git a/lib/thread.c b/lib/thread.c index af01c75a4..e5826c5e5 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -38,10 +38,10 @@ #include "libfrr_trace.h" #include "libfrr.h" -DEFINE_MTYPE_STATIC(LIB, THREAD, "Thread") -DEFINE_MTYPE_STATIC(LIB, THREAD_MASTER, "Thread master") -DEFINE_MTYPE_STATIC(LIB, THREAD_POLL, "Thread Poll Info") -DEFINE_MTYPE_STATIC(LIB, THREAD_STATS, "Thread stats") +DEFINE_MTYPE_STATIC(LIB, THREAD, "Thread"); +DEFINE_MTYPE_STATIC(LIB, THREAD_MASTER, "Thread master"); +DEFINE_MTYPE_STATIC(LIB, THREAD_POLL, "Thread Poll Info"); +DEFINE_MTYPE_STATIC(LIB, THREAD_STATS, "Thread stats"); DECLARE_LIST(thread_list, struct thread, threaditem) diff --git a/lib/typesafe.c b/lib/typesafe.c index 69796e2d8..76705fad0 100644 --- a/lib/typesafe.c +++ b/lib/typesafe.c @@ -25,9 +25,9 @@ #include "memory.h" #include "network.h" -DEFINE_MTYPE_STATIC(LIB, TYPEDHASH_BUCKET, "Typed-hash bucket") -DEFINE_MTYPE_STATIC(LIB, SKIPLIST_OFLOW, "Skiplist overflow") -DEFINE_MTYPE_STATIC(LIB, HEAP_ARRAY, "Typed-heap array") +DEFINE_MTYPE_STATIC(LIB, TYPEDHASH_BUCKET, "Typed-hash bucket"); +DEFINE_MTYPE_STATIC(LIB, SKIPLIST_OFLOW, "Skiplist overflow"); +DEFINE_MTYPE_STATIC(LIB, HEAP_ARRAY, "Typed-heap array"); #if 0 static void hash_consistency_check(struct thash_head *head) diff --git a/lib/vector.c b/lib/vector.c index 0631e836f..565c49fd5 100644 --- a/lib/vector.c +++ b/lib/vector.c @@ -23,8 +23,8 @@ #include "vector.h" #include "memory.h" -DEFINE_MTYPE_STATIC(LIB, VECTOR, "Vector") -DEFINE_MTYPE_STATIC(LIB, VECTOR_INDEX, "Vector index") +DEFINE_MTYPE_STATIC(LIB, VECTOR, "Vector"); +DEFINE_MTYPE_STATIC(LIB, VECTOR_INDEX, "Vector index"); /* Initialize vector : allocate memory and return vector. */ vector vector_init(unsigned int size) @@ -42,8 +42,8 @@ /* default VRF name value used when VRF backend is not NETNS */ #define VRF_DEFAULT_NAME_INTERNAL "default" -DEFINE_MTYPE_STATIC(LIB, VRF, "VRF") -DEFINE_MTYPE_STATIC(LIB, VRF_BITMAP, "VRF bit-map") +DEFINE_MTYPE_STATIC(LIB, VRF, "VRF"); +DEFINE_MTYPE_STATIC(LIB, VRF_BITMAP, "VRF bit-map"); DEFINE_QOBJ_TYPE(vrf) @@ -56,9 +56,9 @@ #include "lib/vty_clippy.c" #endif -DEFINE_MTYPE_STATIC(LIB, VTY, "VTY") -DEFINE_MTYPE_STATIC(LIB, VTY_OUT_BUF, "VTY output buffer") -DEFINE_MTYPE_STATIC(LIB, VTY_HIST, "VTY history") +DEFINE_MTYPE_STATIC(LIB, VTY, "VTY"); +DEFINE_MTYPE_STATIC(LIB, VTY_OUT_BUF, "VTY output buffer"); +DEFINE_MTYPE_STATIC(LIB, VTY_HIST, "VTY history"); /* Vty events */ enum event { diff --git a/lib/wheel.c b/lib/wheel.c index 5bdd6292f..1a0469b25 100644 --- a/lib/wheel.c +++ b/lib/wheel.c @@ -24,8 +24,8 @@ #include "wheel.h" #include "log.h" -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, "Timer Wheel"); +DEFINE_MTYPE_STATIC(LIB, TIMER_WHEEL_LIST, "Timer Wheel Slot List"); static int debug_timer_wheel = 0; diff --git a/lib/workqueue.c b/lib/workqueue.c index 8eabdf52e..2a8326c05 100644 --- a/lib/workqueue.c +++ b/lib/workqueue.c @@ -28,9 +28,9 @@ #include "command.h" #include "log.h" -DEFINE_MTYPE(LIB, WORK_QUEUE, "Work queue") -DEFINE_MTYPE_STATIC(LIB, WORK_QUEUE_ITEM, "Work queue item") -DEFINE_MTYPE_STATIC(LIB, WORK_QUEUE_NAME, "Work queue name string") +DEFINE_MTYPE(LIB, WORK_QUEUE, "Work queue"); +DEFINE_MTYPE_STATIC(LIB, WORK_QUEUE_ITEM, "Work queue item"); +DEFINE_MTYPE_STATIC(LIB, WORK_QUEUE_NAME, "Work queue name string"); /* master list of work_queues */ static struct list _work_queues; diff --git a/lib/workqueue.h b/lib/workqueue.h index 7c610f5dd..b076ed0d2 100644 --- a/lib/workqueue.h +++ b/lib/workqueue.h @@ -30,7 +30,7 @@ extern "C" { #endif -DECLARE_MTYPE(WORK_QUEUE) +DECLARE_MTYPE(WORK_QUEUE); /* Hold time for the initial schedule of a queue run, in millisec */ #define WORK_QUEUE_DEFAULT_HOLD 50 diff --git a/lib/yang.c b/lib/yang.c index 383dc9f5e..df3b07fb0 100644 --- a/lib/yang.c +++ b/lib/yang.c @@ -27,8 +27,8 @@ #include <libyang/user_types.h> -DEFINE_MTYPE_STATIC(LIB, YANG_MODULE, "YANG module") -DEFINE_MTYPE_STATIC(LIB, YANG_DATA, "YANG data structure") +DEFINE_MTYPE_STATIC(LIB, YANG_MODULE, "YANG module"); +DEFINE_MTYPE_STATIC(LIB, YANG_DATA, "YANG data structure"); /* libyang container. */ struct ly_ctx *ly_native_ctx; diff --git a/lib/yang_translator.c b/lib/yang_translator.c index 1f64675d6..5b1d96f24 100644 --- a/lib/yang_translator.c +++ b/lib/yang_translator.c @@ -26,9 +26,9 @@ #include "yang_translator.h" #include "frrstr.h" -DEFINE_MTYPE_STATIC(LIB, YANG_TRANSLATOR, "YANG Translator") -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, "YANG Translator"); +DEFINE_MTYPE_STATIC(LIB, YANG_TRANSLATOR_MODULE, "YANG Translator Module"); +DEFINE_MTYPE_STATIC(LIB, YANG_TRANSLATOR_MAPPING, "YANG Translator Mapping"); /* Generate the yang_translators tree. */ static inline int yang_translator_compare(const struct yang_translator *a, diff --git a/lib/zclient.c b/lib/zclient.c index c5e844933..c78937c1e 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -42,8 +42,8 @@ #include "srte.h" #include "printfrr.h" -DEFINE_MTYPE_STATIC(LIB, ZCLIENT, "Zclient") -DEFINE_MTYPE_STATIC(LIB, REDIST_INST, "Redistribution instance IDs") +DEFINE_MTYPE_STATIC(LIB, ZCLIENT, "Zclient"); +DEFINE_MTYPE_STATIC(LIB, REDIST_INST, "Redistribution instance IDs"); /* Zebra client events. */ enum event { ZCLIENT_SCHEDULE, ZCLIENT_READ, ZCLIENT_CONNECT }; diff --git a/lib/zlog.c b/lib/zlog.c index 51509e24f..ca7f8da2e 100644 --- a/lib/zlog.c +++ b/lib/zlog.c @@ -54,8 +54,8 @@ #include "zlog.h" #include "libfrr_trace.h" -DEFINE_MTYPE_STATIC(LIB, LOG_MESSAGE, "log message") -DEFINE_MTYPE_STATIC(LIB, LOG_TLSBUF, "log thread-local buffer") +DEFINE_MTYPE_STATIC(LIB, LOG_MESSAGE, "log message"); +DEFINE_MTYPE_STATIC(LIB, LOG_TLSBUF, "log thread-local buffer"); DEFINE_HOOK(zlog_init, (const char *progname, const char *protoname, unsigned short instance, uid_t uid, gid_t gid), diff --git a/lib/zlog_targets.c b/lib/zlog_targets.c index 8f4c2a46a..f258a8fbb 100644 --- a/lib/zlog_targets.c +++ b/lib/zlog_targets.c @@ -31,13 +31,13 @@ * absolute end. */ -DECLARE_MGROUP(LOG) -DEFINE_MGROUP_ACTIVEATEXIT(LOG, "logging subsystem") +DECLARE_MGROUP(LOG); +DEFINE_MGROUP_ACTIVEATEXIT(LOG, "logging subsystem"); -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_ROTATE, "log file rotate helper") -DEFINE_MTYPE_STATIC(LOG, LOG_SYSL, "syslog 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_ROTATE, "log file rotate helper"); +DEFINE_MTYPE_STATIC(LOG, LOG_SYSL, "syslog target"); struct zlt_fd { struct zlog_target zt; diff --git a/nhrpd/nhrp_cache.c b/nhrpd/nhrp_cache.c index cb298b1a0..4de8e220c 100644 --- a/nhrpd/nhrp_cache.c +++ b/nhrpd/nhrp_cache.c @@ -15,8 +15,8 @@ #include "netlink.h" -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, "NHRP cache entry"); +DEFINE_MTYPE_STATIC(NHRPD, NHRP_CACHE_CONFIG, "NHRP cache config entry"); unsigned long nhrp_cache_counts[NHRP_CACHE_NUM_TYPES]; diff --git a/nhrpd/nhrp_interface.c b/nhrpd/nhrp_interface.c index f86dbe3d2..6e50984d1 100644 --- a/nhrpd/nhrp_interface.c +++ b/nhrpd/nhrp_interface.c @@ -21,7 +21,7 @@ #include "os.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, bool available, diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c index 49a4900bf..4cab58e48 100644 --- a/nhrpd/nhrp_main.c +++ b/nhrpd/nhrp_main.c @@ -29,7 +29,7 @@ #include "netlink.h" #include "nhrp_errors.h" -DEFINE_MGROUP(NHRPD, "NHRP") +DEFINE_MGROUP(NHRPD, "NHRP"); unsigned int debug_flags = 0; diff --git a/nhrpd/nhrp_nhs.c b/nhrpd/nhrp_nhs.c index 9ed03098a..b4c2ffc8e 100644 --- a/nhrpd/nhrp_nhs.c +++ b/nhrpd/nhrp_nhs.c @@ -14,8 +14,8 @@ #include "nhrpd.h" #include "nhrp_protocol.h" -DEFINE_MTYPE_STATIC(NHRPD, NHRP_NHS, "NHRP next hop server") -DEFINE_MTYPE_STATIC(NHRPD, NHRP_REGISTRATION, "NHRP registration entries") +DEFINE_MTYPE_STATIC(NHRPD, NHRP_NHS, "NHRP next hop server"); +DEFINE_MTYPE_STATIC(NHRPD, NHRP_REGISTRATION, "NHRP registration entries"); static int nhrp_nhs_resolve(struct thread *t); static int nhrp_reg_send_req(struct thread *t); diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c index 5e9929ade..60b1b630d 100644 --- a/nhrpd/nhrp_peer.c +++ b/nhrpd/nhrp_peer.c @@ -22,7 +22,7 @@ #include "nhrp_protocol.h" #include "os.h" -DEFINE_MTYPE_STATIC(NHRPD, NHRP_PEER, "NHRP peer entry") +DEFINE_MTYPE_STATIC(NHRPD, NHRP_PEER, "NHRP peer entry"); struct ipv6hdr { uint8_t priority_version; diff --git a/nhrpd/nhrp_route.c b/nhrpd/nhrp_route.c index 737772dbc..7a4c57b5d 100644 --- a/nhrpd/nhrp_route.c +++ b/nhrpd/nhrp_route.c @@ -18,7 +18,7 @@ #include "log.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 route_table *zebra_rib[AFI_MAX]; diff --git a/nhrpd/nhrp_shortcut.c b/nhrpd/nhrp_shortcut.c index ef3be82ca..8ce19cd4a 100644 --- a/nhrpd/nhrp_shortcut.c +++ b/nhrpd/nhrp_shortcut.c @@ -18,7 +18,7 @@ #include "log.h" #include "nhrp_protocol.h" -DEFINE_MTYPE_STATIC(NHRPD, NHRP_SHORTCUT, "NHRP shortcut") +DEFINE_MTYPE_STATIC(NHRPD, NHRP_SHORTCUT, "NHRP shortcut"); static struct route_table *shortcut_rib[AFI_MAX]; diff --git a/nhrpd/nhrp_vc.c b/nhrpd/nhrp_vc.c index d538163e9..b3b657f3f 100644 --- a/nhrpd/nhrp_vc.c +++ b/nhrpd/nhrp_vc.c @@ -17,7 +17,7 @@ #include "nhrpd.h" #include "os.h" -DEFINE_MTYPE_STATIC(NHRPD, NHRP_VC, "NHRP virtual connection") +DEFINE_MTYPE_STATIC(NHRPD, NHRP_VC, "NHRP virtual connection"); struct child_sa { uint32_t id; diff --git a/nhrpd/nhrpd.h b/nhrpd/nhrpd.h index a36d0c445..b8a1ba955 100644 --- a/nhrpd/nhrpd.h +++ b/nhrpd/nhrpd.h @@ -18,7 +18,7 @@ #include "memory.h" #include "resolver.h" -DECLARE_MGROUP(NHRPD) +DECLARE_MGROUP(NHRPD); #define NHRPD_DEFAULT_HOLDTIME 7200 diff --git a/nhrpd/zbuf.c b/nhrpd/zbuf.c index 7f1475cc6..a78d827ea 100644 --- a/nhrpd/zbuf.c +++ b/nhrpd/zbuf.c @@ -21,7 +21,7 @@ #define ERRNO_IO_RETRY(EN) (((EN) == EAGAIN) || ((EN) == EWOULDBLOCK) || ((EN) == EINTR)) -DEFINE_MTYPE_STATIC(NHRPD, ZBUF_DATA, "NHRPD zbuf data") +DEFINE_MTYPE_STATIC(NHRPD, ZBUF_DATA, "NHRPD zbuf data"); struct zbuf *zbuf_alloc(size_t size) { diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c index cf33069c9..9223083ae 100644 --- a/ospf6d/ospf6_area.c +++ b/ospf6d/ospf6_area.c @@ -46,7 +46,7 @@ #include "ospf6d.h" #include "lib/json.h" -DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_PLISTNAME, "Prefix list name") +DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_PLISTNAME, "Prefix list name"); int ospf6_area_cmp(void *va, void *vb) { diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index a5d913874..c05d9cab1 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -45,7 +45,7 @@ #include "ospf6_zebra.h" #include "lib/json.h" -DEFINE_MTYPE_STATIC(OSPF6D, CFG_PLIST_NAME, "configured prefix list names") +DEFINE_MTYPE_STATIC(OSPF6D, CFG_PLIST_NAME, "configured prefix list names"); DEFINE_QOBJ_TYPE(ospf6_interface) DEFINE_HOOK(ospf6_interface_change, (struct ospf6_interface * oi, int state, int old_state), diff --git a/ospf6d/ospf6_memory.c b/ospf6d/ospf6_memory.c index 6585fc158..05bad4936 100644 --- a/ospf6d/ospf6_memory.c +++ b/ospf6d/ospf6_memory.c @@ -25,23 +25,23 @@ #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") +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"); diff --git a/ospf6d/ospf6_memory.h b/ospf6d/ospf6_memory.h index 57f0abd9a..68a0363a1 100644 --- a/ospf6d/ospf6_memory.h +++ b/ospf6d/ospf6_memory.h @@ -24,25 +24,25 @@ #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) +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 */ diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index 9b9453ce2..8d5e0f0a3 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -42,7 +42,7 @@ #include "ospf6_area.h" #include "lib/json.h" -DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_DISTANCE, "OSPF6 distance") +DEFINE_MTYPE_STATIC(OSPF6D, OSPF6_DISTANCE, "OSPF6 distance"); unsigned char conf_debug_ospf6_zebra = 0; diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c index 1b9b66d74..a1d5f632c 100644 --- a/ospfclient/ospf_apiclient.c +++ b/ospfclient/ospf_apiclient.c @@ -60,8 +60,8 @@ XREF_SETUP() -DEFINE_MGROUP(OSPFCLIENT, "libospfapiclient") -DEFINE_MTYPE_STATIC(OSPFCLIENT, OSPF_APICLIENT, "OSPF-API client") +DEFINE_MGROUP(OSPFCLIENT, "libospfapiclient"); +DEFINE_MTYPE_STATIC(OSPFCLIENT, OSPF_APICLIENT, "OSPF-API client"); /* Backlog for listen */ #define BACKLOG 5 diff --git a/ospfd/ospf_memory.c b/ospfd/ospf_memory.c index f4fb68cbd..283844389 100644 --- a/ospfd/ospf_memory.c +++ b/ospfd/ospf_memory.c @@ -25,38 +25,38 @@ #include "ospf_memory.h" -DEFINE_MGROUP(OSPFD, "ospfd") -DEFINE_MTYPE(OSPFD, OSPF_TOP, "OSPF top") -DEFINE_MTYPE(OSPFD, OSPF_AREA, "OSPF area") -DEFINE_MTYPE(OSPFD, OSPF_AREA_RANGE, "OSPF area range") -DEFINE_MTYPE(OSPFD, OSPF_NETWORK, "OSPF network") -DEFINE_MTYPE(OSPFD, OSPF_NEIGHBOR_STATIC, "OSPF static nbr") -DEFINE_MTYPE(OSPFD, OSPF_IF, "OSPF interface") -DEFINE_MTYPE(OSPFD, OSPF_NEIGHBOR, "OSPF neighbor") -DEFINE_MTYPE(OSPFD, OSPF_ROUTE, "OSPF route") -DEFINE_MTYPE(OSPFD, OSPF_TMP, "OSPF tmp mem") -DEFINE_MTYPE(OSPFD, OSPF_LSA, "OSPF LSA") -DEFINE_MTYPE(OSPFD, OSPF_LSA_DATA, "OSPF LSA data") -DEFINE_MTYPE(OSPFD, OSPF_LSDB, "OSPF LSDB") -DEFINE_MTYPE(OSPFD, OSPF_PACKET, "OSPF packet") -DEFINE_MTYPE(OSPFD, OSPF_FIFO, "OSPF FIFO queue") -DEFINE_MTYPE(OSPFD, OSPF_VERTEX, "OSPF vertex") -DEFINE_MTYPE(OSPFD, OSPF_VERTEX_PARENT, "OSPF vertex parent") -DEFINE_MTYPE(OSPFD, OSPF_NEXTHOP, "OSPF nexthop") -DEFINE_MTYPE(OSPFD, OSPF_PATH, "OSPF path") -DEFINE_MTYPE(OSPFD, OSPF_VL_DATA, "OSPF VL data") -DEFINE_MTYPE(OSPFD, OSPF_CRYPT_KEY, "OSPF crypt key") -DEFINE_MTYPE(OSPFD, OSPF_EXTERNAL_INFO, "OSPF ext. info") -DEFINE_MTYPE(OSPFD, OSPF_DISTANCE, "OSPF distance") -DEFINE_MTYPE(OSPFD, OSPF_IF_INFO, "OSPF if info") -DEFINE_MTYPE(OSPFD, OSPF_IF_PARAMS, "OSPF if params") -DEFINE_MTYPE(OSPFD, OSPF_MESSAGE, "OSPF message") -DEFINE_MTYPE(OSPFD, OSPF_MPLS_TE, "OSPF MPLS parameters") -DEFINE_MTYPE(OSPFD, OSPF_ROUTER_INFO, "OSPF Router Info parameters") -DEFINE_MTYPE(OSPFD, OSPF_PCE_PARAMS, "OSPF PCE parameters") -DEFINE_MTYPE(OSPFD, OSPF_EXT_PARAMS, "OSPF Extended parameters") -DEFINE_MTYPE(OSPFD, OSPF_SR_PARAMS, "OSPF Segment Routing parameters") -DEFINE_MTYPE(OSPFD, OSPF_GR_HELPER, "OSPF Graceful Restart Helper") -DEFINE_MTYPE(OSPFD, OSPF_EXTERNAL_RT_AGGR, "OSPF External Route Summarisation") -DEFINE_MTYPE(OSPFD, OSPF_P_SPACE, "OSPF TI-LFA P-Space") -DEFINE_MTYPE(OSPFD, OSPF_Q_SPACE, "OSPF TI-LFA Q-Space") +DEFINE_MGROUP(OSPFD, "ospfd"); +DEFINE_MTYPE(OSPFD, OSPF_TOP, "OSPF top"); +DEFINE_MTYPE(OSPFD, OSPF_AREA, "OSPF area"); +DEFINE_MTYPE(OSPFD, OSPF_AREA_RANGE, "OSPF area range"); +DEFINE_MTYPE(OSPFD, OSPF_NETWORK, "OSPF network"); +DEFINE_MTYPE(OSPFD, OSPF_NEIGHBOR_STATIC, "OSPF static nbr"); +DEFINE_MTYPE(OSPFD, OSPF_IF, "OSPF interface"); +DEFINE_MTYPE(OSPFD, OSPF_NEIGHBOR, "OSPF neighbor"); +DEFINE_MTYPE(OSPFD, OSPF_ROUTE, "OSPF route"); +DEFINE_MTYPE(OSPFD, OSPF_TMP, "OSPF tmp mem"); +DEFINE_MTYPE(OSPFD, OSPF_LSA, "OSPF LSA"); +DEFINE_MTYPE(OSPFD, OSPF_LSA_DATA, "OSPF LSA data"); +DEFINE_MTYPE(OSPFD, OSPF_LSDB, "OSPF LSDB"); +DEFINE_MTYPE(OSPFD, OSPF_PACKET, "OSPF packet"); +DEFINE_MTYPE(OSPFD, OSPF_FIFO, "OSPF FIFO queue"); +DEFINE_MTYPE(OSPFD, OSPF_VERTEX, "OSPF vertex"); +DEFINE_MTYPE(OSPFD, OSPF_VERTEX_PARENT, "OSPF vertex parent"); +DEFINE_MTYPE(OSPFD, OSPF_NEXTHOP, "OSPF nexthop"); +DEFINE_MTYPE(OSPFD, OSPF_PATH, "OSPF path"); +DEFINE_MTYPE(OSPFD, OSPF_VL_DATA, "OSPF VL data"); +DEFINE_MTYPE(OSPFD, OSPF_CRYPT_KEY, "OSPF crypt key"); +DEFINE_MTYPE(OSPFD, OSPF_EXTERNAL_INFO, "OSPF ext. info"); +DEFINE_MTYPE(OSPFD, OSPF_DISTANCE, "OSPF distance"); +DEFINE_MTYPE(OSPFD, OSPF_IF_INFO, "OSPF if info"); +DEFINE_MTYPE(OSPFD, OSPF_IF_PARAMS, "OSPF if params"); +DEFINE_MTYPE(OSPFD, OSPF_MESSAGE, "OSPF message"); +DEFINE_MTYPE(OSPFD, OSPF_MPLS_TE, "OSPF MPLS parameters"); +DEFINE_MTYPE(OSPFD, OSPF_ROUTER_INFO, "OSPF Router Info parameters"); +DEFINE_MTYPE(OSPFD, OSPF_PCE_PARAMS, "OSPF PCE parameters"); +DEFINE_MTYPE(OSPFD, OSPF_EXT_PARAMS, "OSPF Extended parameters"); +DEFINE_MTYPE(OSPFD, OSPF_SR_PARAMS, "OSPF Segment Routing parameters"); +DEFINE_MTYPE(OSPFD, OSPF_GR_HELPER, "OSPF Graceful Restart Helper"); +DEFINE_MTYPE(OSPFD, OSPF_EXTERNAL_RT_AGGR, "OSPF External Route Summarisation"); +DEFINE_MTYPE(OSPFD, OSPF_P_SPACE, "OSPF TI-LFA P-Space"); +DEFINE_MTYPE(OSPFD, OSPF_Q_SPACE, "OSPF TI-LFA Q-Space"); diff --git a/ospfd/ospf_memory.h b/ospfd/ospf_memory.h index 42bc8d7b7..9bd0a844a 100644 --- a/ospfd/ospf_memory.h +++ b/ospfd/ospf_memory.h @@ -24,40 +24,40 @@ #include "memory.h" -DECLARE_MGROUP(OSPFD) -DECLARE_MTYPE(OSPF_TOP) -DECLARE_MTYPE(OSPF_AREA) -DECLARE_MTYPE(OSPF_AREA_RANGE) -DECLARE_MTYPE(OSPF_NETWORK) -DECLARE_MTYPE(OSPF_NEIGHBOR_STATIC) -DECLARE_MTYPE(OSPF_IF) -DECLARE_MTYPE(OSPF_NEIGHBOR) -DECLARE_MTYPE(OSPF_ROUTE) -DECLARE_MTYPE(OSPF_TMP) -DECLARE_MTYPE(OSPF_LSA) -DECLARE_MTYPE(OSPF_LSA_DATA) -DECLARE_MTYPE(OSPF_LSDB) -DECLARE_MTYPE(OSPF_PACKET) -DECLARE_MTYPE(OSPF_FIFO) -DECLARE_MTYPE(OSPF_VERTEX) -DECLARE_MTYPE(OSPF_VERTEX_PARENT) -DECLARE_MTYPE(OSPF_NEXTHOP) -DECLARE_MTYPE(OSPF_PATH) -DECLARE_MTYPE(OSPF_VL_DATA) -DECLARE_MTYPE(OSPF_CRYPT_KEY) -DECLARE_MTYPE(OSPF_EXTERNAL_INFO) -DECLARE_MTYPE(OSPF_DISTANCE) -DECLARE_MTYPE(OSPF_IF_INFO) -DECLARE_MTYPE(OSPF_IF_PARAMS) -DECLARE_MTYPE(OSPF_MESSAGE) -DECLARE_MTYPE(OSPF_MPLS_TE) -DECLARE_MTYPE(OSPF_ROUTER_INFO) -DECLARE_MTYPE(OSPF_PCE_PARAMS) -DECLARE_MTYPE(OSPF_SR_PARAMS) -DECLARE_MTYPE(OSPF_EXT_PARAMS) -DECLARE_MTYPE(OSPF_GR_HELPER) -DECLARE_MTYPE(OSPF_EXTERNAL_RT_AGGR) -DECLARE_MTYPE(OSPF_P_SPACE) -DECLARE_MTYPE(OSPF_Q_SPACE) +DECLARE_MGROUP(OSPFD); +DECLARE_MTYPE(OSPF_TOP); +DECLARE_MTYPE(OSPF_AREA); +DECLARE_MTYPE(OSPF_AREA_RANGE); +DECLARE_MTYPE(OSPF_NETWORK); +DECLARE_MTYPE(OSPF_NEIGHBOR_STATIC); +DECLARE_MTYPE(OSPF_IF); +DECLARE_MTYPE(OSPF_NEIGHBOR); +DECLARE_MTYPE(OSPF_ROUTE); +DECLARE_MTYPE(OSPF_TMP); +DECLARE_MTYPE(OSPF_LSA); +DECLARE_MTYPE(OSPF_LSA_DATA); +DECLARE_MTYPE(OSPF_LSDB); +DECLARE_MTYPE(OSPF_PACKET); +DECLARE_MTYPE(OSPF_FIFO); +DECLARE_MTYPE(OSPF_VERTEX); +DECLARE_MTYPE(OSPF_VERTEX_PARENT); +DECLARE_MTYPE(OSPF_NEXTHOP); +DECLARE_MTYPE(OSPF_PATH); +DECLARE_MTYPE(OSPF_VL_DATA); +DECLARE_MTYPE(OSPF_CRYPT_KEY); +DECLARE_MTYPE(OSPF_EXTERNAL_INFO); +DECLARE_MTYPE(OSPF_DISTANCE); +DECLARE_MTYPE(OSPF_IF_INFO); +DECLARE_MTYPE(OSPF_IF_PARAMS); +DECLARE_MTYPE(OSPF_MESSAGE); +DECLARE_MTYPE(OSPF_MPLS_TE); +DECLARE_MTYPE(OSPF_ROUTER_INFO); +DECLARE_MTYPE(OSPF_PCE_PARAMS); +DECLARE_MTYPE(OSPF_SR_PARAMS); +DECLARE_MTYPE(OSPF_EXT_PARAMS); +DECLARE_MTYPE(OSPF_GR_HELPER); +DECLARE_MTYPE(OSPF_EXTERNAL_RT_AGGR); +DECLARE_MTYPE(OSPF_P_SPACE); +DECLARE_MTYPE(OSPF_Q_SPACE); #endif /* _QUAGGA_OSPF_MEMORY_H */ diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c index 3939b5479..ae9ab48d4 100644 --- a/ospfd/ospf_opaque.c +++ b/ospfd/ospf_opaque.c @@ -56,9 +56,9 @@ #include "ospfd/ospf_ext.h" #include "ospfd/ospf_errors.h" -DEFINE_MTYPE_STATIC(OSPFD, OSPF_OPAQUE_FUNCTAB, "OSPF opaque function table") -DEFINE_MTYPE_STATIC(OSPFD, OPAQUE_INFO_PER_TYPE, "OSPF opaque per-type info") -DEFINE_MTYPE_STATIC(OSPFD, OPAQUE_INFO_PER_ID, "OSPF opaque per-ID info") +DEFINE_MTYPE_STATIC(OSPFD, OSPF_OPAQUE_FUNCTAB, "OSPF opaque function table"); +DEFINE_MTYPE_STATIC(OSPFD, OPAQUE_INFO_PER_TYPE, "OSPF opaque per-type info"); +DEFINE_MTYPE_STATIC(OSPFD, OPAQUE_INFO_PER_ID, "OSPF opaque per-ID info"); /*------------------------------------------------------------------------* * Followings are initialize/terminate functions for Opaque-LSAs handling. diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index a2fbd01ab..56b2f8d66 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -53,9 +53,9 @@ #include "ospfd/ospf_sr.h" #include "ospfd/ospf_ldp_sync.h" -DEFINE_MTYPE_STATIC(OSPFD, OSPF_EXTERNAL, "OSPF External route table") -DEFINE_MTYPE_STATIC(OSPFD, OSPF_REDISTRIBUTE, "OSPF Redistriute") -DEFINE_MTYPE_STATIC(OSPFD, OSPF_DIST_ARGS, "OSPF Distribute arguments") +DEFINE_MTYPE_STATIC(OSPFD, OSPF_EXTERNAL, "OSPF External route table"); +DEFINE_MTYPE_STATIC(OSPFD, OSPF_REDISTRIBUTE, "OSPF Redistriute"); +DEFINE_MTYPE_STATIC(OSPFD, OSPF_DIST_ARGS, "OSPF Distribute arguments"); /* Zebra structure to hold current status. */ diff --git a/pathd/path_cli.c b/pathd/path_cli.c index 8beb42813..a46ec5fac 100644 --- a/pathd/path_cli.c +++ b/pathd/path_cli.c @@ -46,7 +46,7 @@ static int config_write_traffic_eng(struct vty *vty); static int config_write_segment_lists(struct vty *vty); static int config_write_sr_policies(struct vty *vty); -DEFINE_MTYPE_STATIC(PATHD, PATH_CLI, "Client") +DEFINE_MTYPE_STATIC(PATHD, PATH_CLI, "Client"); /* Vty node structures. */ static struct cmd_node segment_routing_node = { diff --git a/pathd/path_memory.c b/pathd/path_memory.c index ad4904a29..7a78c09cf 100644 --- a/pathd/path_memory.c +++ b/pathd/path_memory.c @@ -22,4 +22,4 @@ #include "pathd/path_memory.h" -DEFINE_MGROUP(PATHD, "pathd") +DEFINE_MGROUP(PATHD, "pathd"); diff --git a/pathd/path_memory.h b/pathd/path_memory.h index e2f6787f6..a0896cdad 100644 --- a/pathd/path_memory.h +++ b/pathd/path_memory.h @@ -21,6 +21,6 @@ #include "memory.h" -DECLARE_MGROUP(PATHD) +DECLARE_MGROUP(PATHD); #endif /* _FRR_PATH_MEMORY_H_ */ diff --git a/pathd/path_pcep_memory.c b/pathd/path_pcep_memory.c index 8f608090a..5cb5fb33e 100644 --- a/pathd/path_pcep_memory.c +++ b/pathd/path_pcep_memory.c @@ -22,6 +22,6 @@ #include "pathd/path_pcep_memory.h" -DEFINE_MTYPE(PATHD, PCEP, "PCEP module") -DEFINE_MTYPE(PATHD, PCEPLIB_INFRA, "PCEPlib Infrastructure") -DEFINE_MTYPE(PATHD, PCEPLIB_MESSAGES, "PCEPlib PCEP Messages") +DEFINE_MTYPE(PATHD, PCEP, "PCEP module"); +DEFINE_MTYPE(PATHD, PCEPLIB_INFRA, "PCEPlib Infrastructure"); +DEFINE_MTYPE(PATHD, PCEPLIB_MESSAGES, "PCEPlib PCEP Messages"); diff --git a/pathd/path_pcep_memory.h b/pathd/path_pcep_memory.h index 05c5e2d82..a44d178b2 100644 --- a/pathd/path_pcep_memory.h +++ b/pathd/path_pcep_memory.h @@ -21,8 +21,8 @@ #include "pathd/path_memory.h" -DECLARE_MTYPE(PCEP) -DECLARE_MTYPE(PCEPLIB_INFRA) -DECLARE_MTYPE(PCEPLIB_MESSAGES) +DECLARE_MTYPE(PCEP); +DECLARE_MTYPE(PCEPLIB_INFRA); +DECLARE_MTYPE(PCEPLIB_MESSAGES); #endif /* _FRR_PATH_PCEP_MEMORY_H_ */ diff --git a/pathd/pathd.c b/pathd/pathd.c index e2c7c9572..33e69e42d 100644 --- a/pathd/pathd.c +++ b/pathd/pathd.c @@ -30,9 +30,9 @@ #define HOOK_DELAY 3 -DEFINE_MTYPE_STATIC(PATHD, PATH_SEGMENT_LIST, "Segment List") -DEFINE_MTYPE_STATIC(PATHD, PATH_SR_POLICY, "SR Policy") -DEFINE_MTYPE_STATIC(PATHD, PATH_SR_CANDIDATE, "SR Policy candidate path") +DEFINE_MTYPE_STATIC(PATHD, PATH_SEGMENT_LIST, "Segment List"); +DEFINE_MTYPE_STATIC(PATHD, PATH_SR_POLICY, "SR Policy"); +DEFINE_MTYPE_STATIC(PATHD, PATH_SR_CANDIDATE, "SR Policy candidate path"); DEFINE_HOOK(pathd_candidate_created, (struct srte_candidate * candidate), (candidate)) diff --git a/pbrd/pbr_map.c b/pbrd/pbr_map.c index 5b851988f..c3417a275 100644 --- a/pbrd/pbr_map.c +++ b/pbrd/pbr_map.c @@ -37,9 +37,9 @@ #include "pbr_debug.h" #include "pbr_vrf.h" -DEFINE_MTYPE_STATIC(PBRD, PBR_MAP, "PBR Map") -DEFINE_MTYPE_STATIC(PBRD, PBR_MAP_SEQNO, "PBR Map Sequence") -DEFINE_MTYPE_STATIC(PBRD, PBR_MAP_INTERFACE, "PBR Map Interface") +DEFINE_MTYPE_STATIC(PBRD, PBR_MAP, "PBR Map"); +DEFINE_MTYPE_STATIC(PBRD, PBR_MAP_SEQNO, "PBR Map Sequence"); +DEFINE_MTYPE_STATIC(PBRD, PBR_MAP_INTERFACE, "PBR Map Interface"); static uint32_t pbr_map_sequence_unique; diff --git a/pbrd/pbr_memory.c b/pbrd/pbr_memory.c index febe406ca..5531d4193 100644 --- a/pbrd/pbr_memory.c +++ b/pbrd/pbr_memory.c @@ -24,4 +24,4 @@ #include "pbrd/pbr_memory.h" -DEFINE_MGROUP(PBRD, "pbrd") +DEFINE_MGROUP(PBRD, "pbrd"); diff --git a/pbrd/pbr_memory.h b/pbrd/pbr_memory.h index a87d51909..eb13d5d9d 100644 --- a/pbrd/pbr_memory.h +++ b/pbrd/pbr_memory.h @@ -19,6 +19,6 @@ */ #ifndef __PBR_MEMORY_H__ -DECLARE_MGROUP(PBRD) +DECLARE_MGROUP(PBRD); #endif diff --git a/pbrd/pbr_nht.c b/pbrd/pbr_nht.c index ba9ad97ab..e127999b0 100644 --- a/pbrd/pbr_nht.c +++ b/pbrd/pbr_nht.c @@ -35,7 +35,7 @@ #include "pbrd/pbr_memory.h" #include "pbrd/pbr_debug.h" -DEFINE_MTYPE_STATIC(PBRD, PBR_NHG, "PBR Nexthop Groups") +DEFINE_MTYPE_STATIC(PBRD, PBR_NHG, "PBR Nexthop Groups"); struct hash *pbr_nhg_hash; static struct hash *pbr_nhrc_hash; diff --git a/pbrd/pbr_vrf.c b/pbrd/pbr_vrf.c index 328460740..1b69e23ce 100644 --- a/pbrd/pbr_vrf.c +++ b/pbrd/pbr_vrf.c @@ -28,7 +28,7 @@ #include "pbr_nht.h" #include "pbr_zebra.h" -DEFINE_MTYPE_STATIC(PBRD, PBR_MAP_VRF, "PBR Map VRF") +DEFINE_MTYPE_STATIC(PBRD, PBR_MAP_VRF, "PBR Map VRF"); static struct pbr_vrf *pbr_vrf_alloc(void) { diff --git a/pbrd/pbr_zebra.c b/pbrd/pbr_zebra.c index 467bbc8f7..4b73e13c2 100644 --- a/pbrd/pbr_zebra.c +++ b/pbrd/pbr_zebra.c @@ -41,7 +41,7 @@ #include "pbr_debug.h" #include "pbr_vrf.h" -DEFINE_MTYPE_STATIC(PBRD, PBR_INTERFACE, "PBR Interface") +DEFINE_MTYPE_STATIC(PBRD, PBR_INTERFACE, "PBR Interface"); /* Zebra structure to hold current status. */ struct zclient *zclient; diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c index e873af575..f43a31fde 100644 --- a/pimd/pim_bsm.c +++ b/pimd/pim_bsm.c @@ -42,10 +42,10 @@ static inline void pim_g2rp_timer_restart(struct bsm_rpinfo *bsrp, int hold_time); /* Memory Types */ -DEFINE_MTYPE_STATIC(PIMD, PIM_BSGRP_NODE, "PIM BSR advertised grp info") -DEFINE_MTYPE_STATIC(PIMD, PIM_BSRP_NODE, "PIM BSR advertised RP info") -DEFINE_MTYPE_STATIC(PIMD, PIM_BSM_INFO, "PIM BSM Info") -DEFINE_MTYPE_STATIC(PIMD, PIM_BSM_PKT_VAR_MEM, "PIM BSM Packet") +DEFINE_MTYPE_STATIC(PIMD, PIM_BSGRP_NODE, "PIM BSR advertised grp info"); +DEFINE_MTYPE_STATIC(PIMD, PIM_BSRP_NODE, "PIM BSR advertised RP info"); +DEFINE_MTYPE_STATIC(PIMD, PIM_BSM_INFO, "PIM BSM Info"); +DEFINE_MTYPE_STATIC(PIMD, PIM_BSM_PKT_VAR_MEM, "PIM BSM Packet"); /* All bsm packets forwarded shall be fit within ip mtu less iphdr(max) */ #define MAX_IP_HDR_LEN 24 diff --git a/pimd/pim_memory.c b/pimd/pim_memory.c index 6bc8062c4..1d811d900 100644 --- a/pimd/pim_memory.c +++ b/pimd/pim_memory.c @@ -25,31 +25,31 @@ #include "pim_memory.h" -DEFINE_MGROUP(PIMD, "pimd") -DEFINE_MTYPE(PIMD, PIM_CHANNEL_OIL, "PIM SSM (S,G) channel OIL") -DEFINE_MTYPE(PIMD, PIM_INTERFACE, "PIM interface") -DEFINE_MTYPE(PIMD, PIM_IGMP_JOIN, "PIM interface IGMP static join") -DEFINE_MTYPE(PIMD, PIM_IGMP_SOCKET, "PIM interface IGMP socket") -DEFINE_MTYPE(PIMD, PIM_IGMP_GROUP, "PIM interface IGMP group") -DEFINE_MTYPE(PIMD, PIM_IGMP_GROUP_SOURCE, "PIM interface IGMP source") -DEFINE_MTYPE(PIMD, PIM_NEIGHBOR, "PIM interface neighbor") -DEFINE_MTYPE(PIMD, PIM_IFCHANNEL, "PIM interface (S,G) state") -DEFINE_MTYPE(PIMD, PIM_UPSTREAM, "PIM upstream (S,G) state") -DEFINE_MTYPE(PIMD, PIM_SSMPINGD, "PIM sspimgd socket") -DEFINE_MTYPE(PIMD, PIM_STATIC_ROUTE, "PIM Static Route") -DEFINE_MTYPE(PIMD, PIM_BR, "PIM Bridge Router info") -DEFINE_MTYPE(PIMD, PIM_RP, "PIM RP info") -DEFINE_MTYPE(PIMD, PIM_FILTER_NAME, "PIM RP filter info") -DEFINE_MTYPE(PIMD, PIM_MSDP_PEER, "PIM MSDP peer") -DEFINE_MTYPE(PIMD, PIM_MSDP_MG_NAME, "PIM MSDP mesh-group name") -DEFINE_MTYPE(PIMD, PIM_MSDP_SA, "PIM MSDP source-active cache") -DEFINE_MTYPE(PIMD, PIM_MSDP_MG, "PIM MSDP mesh group") -DEFINE_MTYPE(PIMD, PIM_MSDP_MG_MBR, "PIM MSDP mesh group mbr") -DEFINE_MTYPE(PIMD, PIM_SEC_ADDR, "PIM secondary address") -DEFINE_MTYPE(PIMD, PIM_JP_AGG_GROUP, "PIM JP AGG Group") -DEFINE_MTYPE(PIMD, PIM_JP_AGG_SOURCE, "PIM JP AGG Source") -DEFINE_MTYPE(PIMD, PIM_PIM_INSTANCE, "PIM global state") -DEFINE_MTYPE(PIMD, PIM_NEXTHOP_CACHE, "PIM nexthop cache state") -DEFINE_MTYPE(PIMD, PIM_SSM_INFO, "PIM SSM configuration") -DEFINE_MTYPE(PIMD, PIM_PLIST_NAME, "PIM Prefix List Names") -DEFINE_MTYPE(PIMD, PIM_VXLAN_SG, "PIM VxLAN mroute cache") +DEFINE_MGROUP(PIMD, "pimd"); +DEFINE_MTYPE(PIMD, PIM_CHANNEL_OIL, "PIM SSM (S,G) channel OIL"); +DEFINE_MTYPE(PIMD, PIM_INTERFACE, "PIM interface"); +DEFINE_MTYPE(PIMD, PIM_IGMP_JOIN, "PIM interface IGMP static join"); +DEFINE_MTYPE(PIMD, PIM_IGMP_SOCKET, "PIM interface IGMP socket"); +DEFINE_MTYPE(PIMD, PIM_IGMP_GROUP, "PIM interface IGMP group"); +DEFINE_MTYPE(PIMD, PIM_IGMP_GROUP_SOURCE, "PIM interface IGMP source"); +DEFINE_MTYPE(PIMD, PIM_NEIGHBOR, "PIM interface neighbor"); +DEFINE_MTYPE(PIMD, PIM_IFCHANNEL, "PIM interface (S,G) state"); +DEFINE_MTYPE(PIMD, PIM_UPSTREAM, "PIM upstream (S,G) state"); +DEFINE_MTYPE(PIMD, PIM_SSMPINGD, "PIM sspimgd socket"); +DEFINE_MTYPE(PIMD, PIM_STATIC_ROUTE, "PIM Static Route"); +DEFINE_MTYPE(PIMD, PIM_BR, "PIM Bridge Router info"); +DEFINE_MTYPE(PIMD, PIM_RP, "PIM RP info"); +DEFINE_MTYPE(PIMD, PIM_FILTER_NAME, "PIM RP filter info"); +DEFINE_MTYPE(PIMD, PIM_MSDP_PEER, "PIM MSDP peer"); +DEFINE_MTYPE(PIMD, PIM_MSDP_MG_NAME, "PIM MSDP mesh-group name"); +DEFINE_MTYPE(PIMD, PIM_MSDP_SA, "PIM MSDP source-active cache"); +DEFINE_MTYPE(PIMD, PIM_MSDP_MG, "PIM MSDP mesh group"); +DEFINE_MTYPE(PIMD, PIM_MSDP_MG_MBR, "PIM MSDP mesh group mbr"); +DEFINE_MTYPE(PIMD, PIM_SEC_ADDR, "PIM secondary address"); +DEFINE_MTYPE(PIMD, PIM_JP_AGG_GROUP, "PIM JP AGG Group"); +DEFINE_MTYPE(PIMD, PIM_JP_AGG_SOURCE, "PIM JP AGG Source"); +DEFINE_MTYPE(PIMD, PIM_PIM_INSTANCE, "PIM global state"); +DEFINE_MTYPE(PIMD, PIM_NEXTHOP_CACHE, "PIM nexthop cache state"); +DEFINE_MTYPE(PIMD, PIM_SSM_INFO, "PIM SSM configuration"); +DEFINE_MTYPE(PIMD, PIM_PLIST_NAME, "PIM Prefix List Names"); +DEFINE_MTYPE(PIMD, PIM_VXLAN_SG, "PIM VxLAN mroute cache"); diff --git a/pimd/pim_memory.h b/pimd/pim_memory.h index 6beeb6007..4e5fcde7d 100644 --- a/pimd/pim_memory.h +++ b/pimd/pim_memory.h @@ -24,33 +24,33 @@ #include "memory.h" -DECLARE_MGROUP(PIMD) -DECLARE_MTYPE(PIM_CHANNEL_OIL) -DECLARE_MTYPE(PIM_INTERFACE) -DECLARE_MTYPE(PIM_IGMP_JOIN) -DECLARE_MTYPE(PIM_IGMP_SOCKET) -DECLARE_MTYPE(PIM_IGMP_GROUP) -DECLARE_MTYPE(PIM_IGMP_GROUP_SOURCE) -DECLARE_MTYPE(PIM_NEIGHBOR) -DECLARE_MTYPE(PIM_IFCHANNEL) -DECLARE_MTYPE(PIM_UPSTREAM) -DECLARE_MTYPE(PIM_SSMPINGD) -DECLARE_MTYPE(PIM_STATIC_ROUTE) -DECLARE_MTYPE(PIM_BR) -DECLARE_MTYPE(PIM_RP) -DECLARE_MTYPE(PIM_FILTER_NAME) -DECLARE_MTYPE(PIM_MSDP_PEER) -DECLARE_MTYPE(PIM_MSDP_MG_NAME) -DECLARE_MTYPE(PIM_MSDP_SA) -DECLARE_MTYPE(PIM_MSDP_MG) -DECLARE_MTYPE(PIM_MSDP_MG_MBR) -DECLARE_MTYPE(PIM_SEC_ADDR) -DECLARE_MTYPE(PIM_JP_AGG_GROUP) -DECLARE_MTYPE(PIM_JP_AGG_SOURCE) -DECLARE_MTYPE(PIM_PIM_INSTANCE) -DECLARE_MTYPE(PIM_NEXTHOP_CACHE) -DECLARE_MTYPE(PIM_SSM_INFO) +DECLARE_MGROUP(PIMD); +DECLARE_MTYPE(PIM_CHANNEL_OIL); +DECLARE_MTYPE(PIM_INTERFACE); +DECLARE_MTYPE(PIM_IGMP_JOIN); +DECLARE_MTYPE(PIM_IGMP_SOCKET); +DECLARE_MTYPE(PIM_IGMP_GROUP); +DECLARE_MTYPE(PIM_IGMP_GROUP_SOURCE); +DECLARE_MTYPE(PIM_NEIGHBOR); +DECLARE_MTYPE(PIM_IFCHANNEL); +DECLARE_MTYPE(PIM_UPSTREAM); +DECLARE_MTYPE(PIM_SSMPINGD); +DECLARE_MTYPE(PIM_STATIC_ROUTE); +DECLARE_MTYPE(PIM_BR); +DECLARE_MTYPE(PIM_RP); +DECLARE_MTYPE(PIM_FILTER_NAME); +DECLARE_MTYPE(PIM_MSDP_PEER); +DECLARE_MTYPE(PIM_MSDP_MG_NAME); +DECLARE_MTYPE(PIM_MSDP_SA); +DECLARE_MTYPE(PIM_MSDP_MG); +DECLARE_MTYPE(PIM_MSDP_MG_MBR); +DECLARE_MTYPE(PIM_SEC_ADDR); +DECLARE_MTYPE(PIM_JP_AGG_GROUP); +DECLARE_MTYPE(PIM_JP_AGG_SOURCE); +DECLARE_MTYPE(PIM_PIM_INSTANCE); +DECLARE_MTYPE(PIM_NEXTHOP_CACHE); +DECLARE_MTYPE(PIM_SSM_INFO); DECLARE_MTYPE(PIM_PLIST_NAME); -DECLARE_MTYPE(PIM_VXLAN_SG) +DECLARE_MTYPE(PIM_VXLAN_SG); #endif /* _QUAGGA_PIM_MEMORY_H */ diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c index 89e7e5dc1..c1cdf27bf 100644 --- a/ripd/rip_interface.c +++ b/ripd/rip_interface.c @@ -43,8 +43,8 @@ #include "ripd/rip_debug.h" #include "ripd/rip_interface.h" -DEFINE_MTYPE_STATIC(RIPD, RIP_INTERFACE, "RIP interface") -DEFINE_MTYPE(RIPD, RIP_INTERFACE_STRING, "RIP Interface String") +DEFINE_MTYPE_STATIC(RIPD, RIP_INTERFACE, "RIP interface"); +DEFINE_MTYPE(RIPD, RIP_INTERFACE_STRING, "RIP Interface String"); DEFINE_HOOK(rip_ifaddr_add, (struct connected * ifc), (ifc)) DEFINE_HOOK(rip_ifaddr_del, (struct connected * ifc), (ifc)) diff --git a/ripd/rip_interface.h b/ripd/rip_interface.h index 715daf2e5..fe26a78bd 100644 --- a/ripd/rip_interface.h +++ b/ripd/rip_interface.h @@ -23,7 +23,7 @@ #include "memory.h" #include "zclient.h" -DECLARE_MTYPE(RIP_INTERFACE_STRING) +DECLARE_MTYPE(RIP_INTERFACE_STRING); extern int rip_interface_down(int, struct zclient *, zebra_size_t, vrf_id_t); extern int rip_interface_up(int, struct zclient *, zebra_size_t, vrf_id_t); diff --git a/ripd/rip_offset.c b/ripd/rip_offset.c index 776f121d5..4034fe842 100644 --- a/ripd/rip_offset.c +++ b/ripd/rip_offset.c @@ -29,7 +29,7 @@ #include "ripd/ripd.h" -DEFINE_MTYPE_STATIC(RIPD, RIP_OFFSET_LIST, "RIP offset list") +DEFINE_MTYPE_STATIC(RIPD, RIP_OFFSET_LIST, "RIP offset list"); #define OFFSET_LIST_IN_NAME(O) ((O)->direct[RIP_OFFSET_LIST_IN].alist_name) #define OFFSET_LIST_IN_METRIC(O) ((O)->direct[RIP_OFFSET_LIST_IN].metric) diff --git a/ripd/rip_peer.c b/ripd/rip_peer.c index 23599f087..63493e253 100644 --- a/ripd/rip_peer.c +++ b/ripd/rip_peer.c @@ -29,7 +29,7 @@ #include "ripd/ripd.h" -DEFINE_MTYPE_STATIC(RIPD, RIP_PEER, "RIP peer") +DEFINE_MTYPE_STATIC(RIPD, RIP_PEER, "RIP peer"); static struct rip_peer *rip_peer_new(void) { diff --git a/ripd/ripd.c b/ripd/ripd.c index 4a56efb6f..1c23575bf 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -56,11 +56,11 @@ /* UDP receive buffer size */ #define RIP_UDP_RCV_BUF 41600 -DEFINE_MGROUP(RIPD, "ripd") -DEFINE_MTYPE_STATIC(RIPD, RIP, "RIP structure") -DEFINE_MTYPE_STATIC(RIPD, RIP_VRF_NAME, "RIP VRF name") -DEFINE_MTYPE_STATIC(RIPD, RIP_INFO, "RIP route info") -DEFINE_MTYPE_STATIC(RIPD, RIP_DISTANCE, "RIP distance") +DEFINE_MGROUP(RIPD, "ripd"); +DEFINE_MTYPE_STATIC(RIPD, RIP, "RIP structure"); +DEFINE_MTYPE_STATIC(RIPD, RIP_VRF_NAME, "RIP VRF name"); +DEFINE_MTYPE_STATIC(RIPD, RIP_INFO, "RIP route info"); +DEFINE_MTYPE_STATIC(RIPD, RIP_DISTANCE, "RIP distance"); /* Prototypes. */ static void rip_output_process(struct connected *, struct sockaddr_in *, int, diff --git a/ripd/ripd.h b/ripd/ripd.h index 99718f7b9..97806abc8 100644 --- a/ripd/ripd.h +++ b/ripd/ripd.h @@ -97,7 +97,7 @@ #define RIP_INSTANCE "/frr-ripd:ripd/instance" #define RIP_IFACE "/frr-interface:lib/interface/frr-ripd:rip" -DECLARE_MGROUP(RIPD) +DECLARE_MGROUP(RIPD); /* RIP structure. */ struct rip { diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index 115d7a6b9..11a8fdff8 100644 --- a/ripngd/ripng_interface.c +++ b/ripngd/ripng_interface.c @@ -49,7 +49,7 @@ #define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP #endif -DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_IF, "ripng interface") +DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_IF, "ripng interface"); /* Static utility function. */ static void ripng_enable_apply(struct interface *); diff --git a/ripngd/ripng_nexthop.c b/ripngd/ripng_nexthop.c index ba6e52fdd..3e9fa9093 100644 --- a/ripngd/ripng_nexthop.c +++ b/ripngd/ripng_nexthop.c @@ -39,7 +39,7 @@ #include "ripngd/ripng_debug.h" #include "ripngd/ripng_nexthop.h" -DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_RTE_DATA, "RIPng rte data") +DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_RTE_DATA, "RIPng rte data"); #define DEBUG 1 diff --git a/ripngd/ripng_offset.c b/ripngd/ripng_offset.c index 0094c993a..efce8a092 100644 --- a/ripngd/ripng_offset.c +++ b/ripngd/ripng_offset.c @@ -33,7 +33,7 @@ #include "ripngd/ripngd.h" -DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_OFFSET_LIST, "RIPng offset lst") +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 0ac489c67..479fcaeb5 100644 --- a/ripngd/ripng_peer.c +++ b/ripngd/ripng_peer.c @@ -34,7 +34,7 @@ #include "ripngd/ripngd.h" #include "ripngd/ripng_nexthop.h" -DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_PEER, "RIPng peer") +DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_PEER, "RIPng peer"); static struct ripng_peer *ripng_peer_new(void) { diff --git a/ripngd/ripng_route.c b/ripngd/ripng_route.c index ed9d77a37..1eb1d0f31 100644 --- a/ripngd/ripng_route.c +++ b/ripngd/ripng_route.c @@ -30,7 +30,7 @@ #include "ripngd/ripngd.h" #include "ripngd/ripng_route.h" -DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_AGGREGATE, "RIPng aggregate") +DEFINE_MTYPE_STATIC(RIPNGD, RIPNG_AGGREGATE, "RIPng aggregate"); static struct ripng_aggregate *ripng_aggregate_new(void) { diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index 37e23046e..749feaca6 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -44,10 +44,10 @@ #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") +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 14ac29b3f..12e5a6d4a 100644 --- a/ripngd/ripngd.h +++ b/ripngd/ripngd.h @@ -86,7 +86,7 @@ #define RIPNG_INSTANCE "/frr-ripngd:ripngd/instance" #define RIPNG_IFACE "/frr-interface:lib/interface/frr-ripngd:ripng" -DECLARE_MGROUP(RIPNGD) +DECLARE_MGROUP(RIPNGD); /* RIPng structure. */ struct ripng { diff --git a/sharpd/sharp_globals.h b/sharpd/sharp_globals.h index 52561fd45..ecb7053fd 100644 --- a/sharpd/sharp_globals.h +++ b/sharpd/sharp_globals.h @@ -22,7 +22,7 @@ #ifndef __SHARP_GLOBAL_H__ #define __SHARP_GLOBAL_H__ -DECLARE_MGROUP(SHARPD) +DECLARE_MGROUP(SHARPD); struct sharp_routes { /* The original prefix for route installation */ diff --git a/sharpd/sharp_main.c b/sharpd/sharp_main.c index fe7f9851f..c273d3208 100644 --- a/sharpd/sharp_main.c +++ b/sharpd/sharp_main.c @@ -49,7 +49,7 @@ #include "sharp_globals.h" #include "sharp_nht.h" -DEFINE_MGROUP(SHARPD, "sharpd") +DEFINE_MGROUP(SHARPD, "sharpd"); zebra_capabilities_t _caps_p[] = { }; diff --git a/sharpd/sharp_nht.c b/sharpd/sharp_nht.c index bed0ebfa2..a90387186 100644 --- a/sharpd/sharp_nht.c +++ b/sharpd/sharp_nht.c @@ -32,8 +32,8 @@ #include "sharp_globals.h" #include "sharp_zebra.h" -DEFINE_MTYPE_STATIC(SHARPD, NH_TRACKER, "Nexthop Tracker") -DEFINE_MTYPE_STATIC(SHARPD, NHG, "Nexthop Group") +DEFINE_MTYPE_STATIC(SHARPD, NH_TRACKER, "Nexthop Tracker"); +DEFINE_MTYPE_STATIC(SHARPD, NHG, "Nexthop Group"); struct sharp_nh_tracker *sharp_nh_tracker_get(struct prefix *p) { diff --git a/staticd/static_memory.c b/staticd/static_memory.c index 122cc9fce..9d8d7643e 100644 --- a/staticd/static_memory.c +++ b/staticd/static_memory.c @@ -23,6 +23,6 @@ #include "staticd/static_memory.h" -DEFINE_MGROUP(STATIC, "staticd") +DEFINE_MGROUP(STATIC, "staticd"); DEFINE_MTYPE(STATIC, STATIC_NEXTHOP, "Static Nexthop"); diff --git a/staticd/static_memory.h b/staticd/static_memory.h index 077cd0f32..5348129ab 100644 --- a/staticd/static_memory.h +++ b/staticd/static_memory.h @@ -21,7 +21,7 @@ #include "memory.h" -DECLARE_MGROUP(STATIC) +DECLARE_MGROUP(STATIC); DECLARE_MTYPE(STATIC_ROUTE); DECLARE_MTYPE(STATIC_NEXTHOP); diff --git a/tests/lib/test_heavy_wq.c b/tests/lib/test_heavy_wq.c index cffd52ee0..00aa7b80d 100644 --- a/tests/lib/test_heavy_wq.c +++ b/tests/lib/test_heavy_wq.c @@ -37,9 +37,9 @@ #include "tests.h" -DEFINE_MGROUP(TEST_HEAVYWQ, "heavy-wq test") -DEFINE_MTYPE_STATIC(TEST_HEAVYWQ, WQ_NODE, "heavy_wq_node") -DEFINE_MTYPE_STATIC(TEST_HEAVYWQ, WQ_NODE_STR, "heavy_wq_node->str") +DEFINE_MGROUP(TEST_HEAVYWQ, "heavy-wq test"); +DEFINE_MTYPE_STATIC(TEST_HEAVYWQ, WQ_NODE, "heavy_wq_node"); +DEFINE_MTYPE_STATIC(TEST_HEAVYWQ, WQ_NODE_STR, "heavy_wq_node->str"); extern struct thread_master *master; static struct work_queue *heavy_wq; diff --git a/tests/lib/test_memory.c b/tests/lib/test_memory.c index 84be9cb76..9f04304a2 100644 --- a/tests/lib/test_memory.c +++ b/tests/lib/test_memory.c @@ -19,8 +19,8 @@ #include <zebra.h> #include <memory.h> -DEFINE_MGROUP(TEST_MEMORY, "memory test") -DEFINE_MTYPE_STATIC(TEST_MEMORY, TEST, "generic test mtype") +DEFINE_MGROUP(TEST_MEMORY, "memory test"); +DEFINE_MTYPE_STATIC(TEST_MEMORY, TEST, "generic test mtype"); /* Memory torture tests * diff --git a/tests/lib/test_zmq.c b/tests/lib/test_zmq.c index fe330d98d..65195aa3e 100644 --- a/tests/lib/test_zmq.c +++ b/tests/lib/test_zmq.c @@ -22,8 +22,8 @@ #include "sigevent.h" #include "frr_zmq.h" -DEFINE_MTYPE_STATIC(LIB, TESTBUF, "zmq test buffer") -DEFINE_MTYPE_STATIC(LIB, ZMQMSG, "zmq message") +DEFINE_MTYPE_STATIC(LIB, TESTBUF, "zmq test buffer"); +DEFINE_MTYPE_STATIC(LIB, ZMQMSG, "zmq message"); static struct thread_master *master; diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c index f4f489c3d..775611b3e 100644 --- a/vrrpd/vrrp.c +++ b/vrrpd/vrrp.c @@ -40,8 +40,8 @@ #define VRRP_LOGPFX "[CORE] " -DEFINE_MTYPE_STATIC(VRRPD, VRRP_IP, "VRRP IP address") -DEFINE_MTYPE_STATIC(VRRPD, VRRP_RTR, "VRRP Router") +DEFINE_MTYPE_STATIC(VRRPD, VRRP_IP, "VRRP IP address"); +DEFINE_MTYPE_STATIC(VRRPD, VRRP_RTR, "VRRP Router"); /* statics */ struct hash *vrrp_vrouters_hash; diff --git a/vrrpd/vrrp.h b/vrrpd/vrrp.h index 502d7b82b..c181c2159 100644 --- a/vrrpd/vrrp.h +++ b/vrrpd/vrrp.h @@ -58,7 +58,7 @@ /* User compatibility constant */ #define CS2MS 10 -DECLARE_MGROUP(VRRPD) +DECLARE_MGROUP(VRRPD); /* Northbound */ extern const struct frr_yang_module_info frr_vrrpd_info; diff --git a/vrrpd/vrrp_main.c b/vrrpd/vrrp_main.c index 94f10757a..6d6ca1f63 100644 --- a/vrrpd/vrrp_main.c +++ b/vrrpd/vrrp_main.c @@ -40,7 +40,7 @@ #include "vrrp_vty.h" #include "vrrp_zebra.h" -DEFINE_MGROUP(VRRPD, "vrrpd") +DEFINE_MGROUP(VRRPD, "vrrpd"); char backup_config_file[256]; diff --git a/vrrpd/vrrp_packet.c b/vrrpd/vrrp_packet.c index 3cb13bd71..991c03019 100644 --- a/vrrpd/vrrp_packet.c +++ b/vrrpd/vrrp_packet.c @@ -30,7 +30,7 @@ #include "vrrp_debug.h" #include "vrrp_packet.h" -DEFINE_MTYPE_STATIC(VRRPD, VRRP_PKT, "VRRP packet") +DEFINE_MTYPE_STATIC(VRRPD, VRRP_PKT, "VRRP packet"); /* clang-format off */ static const char *const vrrp_packet_names[16] = { diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 6e809a071..06d224ec2 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -48,7 +48,7 @@ #include "json.h" #include "ferr.h" -DEFINE_MTYPE_STATIC(MVTYSH, VTYSH_CMD, "Vtysh cmd copy") +DEFINE_MTYPE_STATIC(MVTYSH, VTYSH_CMD, "Vtysh cmd copy"); /* Struct VTY. */ struct vty *vty; diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h index 20e1e1b0e..7c8d9315e 100644 --- a/vtysh/vtysh.h +++ b/vtysh/vtysh.h @@ -22,7 +22,7 @@ #define VTYSH_H #include "memory.h" -DECLARE_MGROUP(MVTYSH) +DECLARE_MGROUP(MVTYSH); #define VTYSH_ZEBRA 0x00001 #define VTYSH_RIPD 0x00002 diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c index 47f426b5e..0c98ad533 100644 --- a/vtysh/vtysh_config.c +++ b/vtysh/vtysh_config.c @@ -28,9 +28,9 @@ #include "vtysh/vtysh.h" #include "vtysh/vtysh_user.h" -DEFINE_MGROUP(MVTYSH, "vtysh") -DEFINE_MTYPE_STATIC(MVTYSH, VTYSH_CONFIG, "Vtysh configuration") -DEFINE_MTYPE_STATIC(MVTYSH, VTYSH_CONFIG_LINE, "Vtysh configuration line") +DEFINE_MGROUP(MVTYSH, "vtysh"); +DEFINE_MTYPE_STATIC(MVTYSH, VTYSH_CONFIG, "Vtysh configuration"); +DEFINE_MTYPE_STATIC(MVTYSH, VTYSH_CONFIG_LINE, "Vtysh configuration line"); vector configvec; diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index 5f4d56450..c5ac48556 100644 --- a/watchfrr/watchfrr.c +++ b/watchfrr/watchfrr.c @@ -61,8 +61,8 @@ #define PING_TOKEN "PING" -DEFINE_MGROUP(WATCHFRR, "watchfrr") -DEFINE_MTYPE_STATIC(WATCHFRR, WATCHFRR_DAEMON, "watchfrr daemon entry") +DEFINE_MGROUP(WATCHFRR, "watchfrr"); +DEFINE_MTYPE_STATIC(WATCHFRR, WATCHFRR_DAEMON, "watchfrr daemon entry"); /* Needs to be global, referenced somewhere inside libfrr. */ struct thread_master *master; diff --git a/watchfrr/watchfrr.h b/watchfrr/watchfrr.h index ba6e94960..4df1bf74a 100644 --- a/watchfrr/watchfrr.h +++ b/watchfrr/watchfrr.h @@ -23,7 +23,7 @@ #include "lib/memory.h" -DECLARE_MGROUP(WATCHFRR) +DECLARE_MGROUP(WATCHFRR); extern void watchfrr_vty_init(void); diff --git a/zebra/interface.c b/zebra/interface.c index 6373b4b20..9529f49d9 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -53,7 +53,7 @@ #include "zebra/zebra_errors.h" #include "zebra/zebra_evpn_mh.h" -DEFINE_MTYPE_STATIC(ZEBRA, ZINFO, "Zebra Interface Information") +DEFINE_MTYPE_STATIC(ZEBRA, ZINFO, "Zebra Interface Information"); #define ZEBRA_PTM_SUPPORT diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c index 5352c6214..52f485dd1 100644 --- a/zebra/irdp_interface.c +++ b/zebra/irdp_interface.c @@ -57,7 +57,7 @@ extern int irdp_sock; -DEFINE_MTYPE_STATIC(ZEBRA, IRDP_IF, "IRDP interface data") +DEFINE_MTYPE_STATIC(ZEBRA, IRDP_IF, "IRDP interface data"); #define IRDP_CONFIGED \ do { \ diff --git a/zebra/kernel_netlink.c b/zebra/kernel_netlink.c index aa19b1808..9e655ab26 100644 --- a/zebra/kernel_netlink.c +++ b/zebra/kernel_netlink.c @@ -159,7 +159,7 @@ extern uint32_t nl_rcvbufsize; extern struct zebra_privs_t zserv_privs; -DEFINE_MTYPE_STATIC(ZEBRA, NL_BUF, "Zebra Netlink buffers") +DEFINE_MTYPE_STATIC(ZEBRA, NL_BUF, "Zebra Netlink buffers"); size_t nl_batch_tx_bufsize; char *nl_batch_tx_buf; diff --git a/zebra/rtadv.c b/zebra/rtadv.c index c3add16c5..8a7a15e46 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -54,7 +54,7 @@ extern struct zebra_privs_t zserv_privs; #include "zebra/rtadv_clippy.c" #endif -DEFINE_MTYPE_STATIC(ZEBRA, RTADV_PREFIX, "Router Advertisement Prefix") +DEFINE_MTYPE_STATIC(ZEBRA, RTADV_PREFIX, "Router Advertisement Prefix"); #ifdef OPEN_BSD #include <netinet/icmp6.h> @@ -71,8 +71,8 @@ DEFINE_MTYPE_STATIC(ZEBRA, RTADV_PREFIX, "Router Advertisement Prefix") #define ALLNODE "ff02::1" #define ALLROUTER "ff02::2" -DEFINE_MTYPE_STATIC(ZEBRA, RTADV_RDNSS, "Router Advertisement RDNSS") -DEFINE_MTYPE_STATIC(ZEBRA, RTADV_DNSSL, "Router Advertisement DNSSL") +DEFINE_MTYPE_STATIC(ZEBRA, RTADV_RDNSS, "Router Advertisement RDNSS"); +DEFINE_MTYPE_STATIC(ZEBRA, RTADV_DNSSL, "Router Advertisement DNSSL"); /* Order is intentional. Matches RFC4191. This array is also used for command matching, so only modify with care. */ diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c index 4e63d08ac..6f3e5f042 100644 --- a/zebra/zebra_dplane.c +++ b/zebra/zebra_dplane.c @@ -39,10 +39,10 @@ #include "printfrr.h" /* Memory type for context blocks */ -DEFINE_MTYPE_STATIC(ZEBRA, DP_CTX, "Zebra DPlane Ctx") -DEFINE_MTYPE_STATIC(ZEBRA, DP_INTF, "Zebra DPlane Intf") -DEFINE_MTYPE_STATIC(ZEBRA, DP_PROV, "Zebra DPlane Provider") -DEFINE_MTYPE_STATIC(ZEBRA, DP_NETFILTER, "Zebra Netfilter Internal Object") +DEFINE_MTYPE_STATIC(ZEBRA, DP_CTX, "Zebra DPlane Ctx"); +DEFINE_MTYPE_STATIC(ZEBRA, DP_INTF, "Zebra DPlane Intf"); +DEFINE_MTYPE_STATIC(ZEBRA, DP_PROV, "Zebra DPlane Provider"); +DEFINE_MTYPE_STATIC(ZEBRA, DP_NETFILTER, "Zebra Netfilter Internal Object"); #ifndef AOK # define AOK 0 diff --git a/zebra/zebra_memory.c b/zebra/zebra_memory.c index 17b52a2bc..004da0129 100644 --- a/zebra/zebra_memory.c +++ b/zebra/zebra_memory.c @@ -25,9 +25,9 @@ #include "zebra_memory.h" -DEFINE_MGROUP(ZEBRA, "zebra") -DEFINE_MTYPE(ZEBRA, RE, "Route Entry") -DEFINE_MTYPE(ZEBRA, RIB_DEST, "RIB destination") -DEFINE_MTYPE(ZEBRA, ZVLAN, "VLAN") -DEFINE_MTYPE(ZEBRA, ZVLAN_BITMAP, "VLAN bitmap") -DEFINE_MTYPE(ZEBRA, OPAQUE, "Opaque Data") +DEFINE_MGROUP(ZEBRA, "zebra"); +DEFINE_MTYPE(ZEBRA, RE, "Route Entry"); +DEFINE_MTYPE(ZEBRA, RIB_DEST, "RIB destination"); +DEFINE_MTYPE(ZEBRA, ZVLAN, "VLAN"); +DEFINE_MTYPE(ZEBRA, ZVLAN_BITMAP, "VLAN bitmap"); +DEFINE_MTYPE(ZEBRA, OPAQUE, "Opaque Data"); diff --git a/zebra/zebra_memory.h b/zebra/zebra_memory.h index 71901b765..769a808cb 100644 --- a/zebra/zebra_memory.h +++ b/zebra/zebra_memory.h @@ -28,11 +28,11 @@ extern "C" { #endif -DECLARE_MGROUP(ZEBRA) -DECLARE_MTYPE(ZEBRA_NS) -DECLARE_MTYPE(RE) -DECLARE_MTYPE(RIB_DEST) -DECLARE_MTYPE(OPAQUE) +DECLARE_MGROUP(ZEBRA); +DECLARE_MTYPE(ZEBRA_NS); +DECLARE_MTYPE(RE); +DECLARE_MTYPE(RIB_DEST); +DECLARE_MTYPE(OPAQUE); #ifdef __cplusplus } diff --git a/zebra/zebra_mlag.c b/zebra/zebra_mlag.c index d8ed9b2a3..fdf0d8815 100644 --- a/zebra/zebra_mlag.c +++ b/zebra/zebra_mlag.c @@ -659,7 +659,7 @@ void zebra_mlag_terminate(void) #ifdef HAVE_PROTOBUF_VERSION_3 -DEFINE_MTYPE_STATIC(ZEBRA, MLAG_PBUF, "ZEBRA MLAG PROTOBUF") +DEFINE_MTYPE_STATIC(ZEBRA, MLAG_PBUF, "ZEBRA MLAG PROTOBUF"); int zebra_mlag_protobuf_encode_client_data(struct stream *s, uint32_t *msg_type) { diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c index dc4969501..a87951353 100644 --- a/zebra/zebra_mpls.c +++ b/zebra/zebra_mpls.c @@ -50,9 +50,9 @@ #include "zebra/zebra_srte.h" #include "zebra/zebra_errors.h" -DEFINE_MTYPE_STATIC(ZEBRA, LSP, "MPLS LSP object") -DEFINE_MTYPE_STATIC(ZEBRA, FEC, "MPLS FEC object") -DEFINE_MTYPE_STATIC(ZEBRA, NHLFE, "MPLS nexthop object") +DEFINE_MTYPE_STATIC(ZEBRA, LSP, "MPLS LSP object"); +DEFINE_MTYPE_STATIC(ZEBRA, FEC, "MPLS FEC object"); +DEFINE_MTYPE_STATIC(ZEBRA, NHLFE, "MPLS nexthop object"); int mpls_enabled; diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c index ee2dc7a0e..5f11bbd60 100644 --- a/zebra/zebra_netns_notify.c +++ b/zebra/zebra_netns_notify.c @@ -53,7 +53,7 @@ #define ZEBRA_NS_POLLING_INTERVAL_MSEC 1000 #define ZEBRA_NS_POLLING_MAX_RETRIES 200 -DEFINE_MTYPE_STATIC(ZEBRA, NETNS_MISC, "ZebraNetNSInfo") +DEFINE_MTYPE_STATIC(ZEBRA, NETNS_MISC, "ZebraNetNSInfo"); static struct thread *zebra_netns_notify_current; struct zebra_netns_info { diff --git a/zebra/zebra_ns.c b/zebra/zebra_ns.c index e9ff3fcc0..ae7727ca1 100644 --- a/zebra/zebra_ns.c +++ b/zebra/zebra_ns.c @@ -41,7 +41,7 @@ extern struct zebra_privs_t zserv_privs; -DEFINE_MTYPE(ZEBRA, ZEBRA_NS, "Zebra Name Space") +DEFINE_MTYPE(ZEBRA, ZEBRA_NS, "Zebra Name Space"); static struct zebra_ns *dzns; diff --git a/zebra/zebra_pbr.c b/zebra/zebra_pbr.c index 92a7a0ba3..7ada407cf 100644 --- a/zebra/zebra_pbr.c +++ b/zebra/zebra_pbr.c @@ -35,7 +35,7 @@ #include "zebra/debug.h" /* definitions */ -DEFINE_MTYPE_STATIC(ZEBRA, PBR_IPTABLE_IFNAME, "PBR interface list") +DEFINE_MTYPE_STATIC(ZEBRA, PBR_IPTABLE_IFNAME, "PBR interface list"); /* definitions */ static const struct message ipset_type_msg[] = { diff --git a/zebra/zebra_pw.c b/zebra/zebra_pw.c index ecae021db..c951fcfe7 100644 --- a/zebra/zebra_pw.c +++ b/zebra/zebra_pw.c @@ -35,7 +35,7 @@ #include "zebra/zebra_vrf.h" #include "zebra/zebra_pw.h" -DEFINE_MTYPE_STATIC(LIB, PW, "Pseudowire") +DEFINE_MTYPE_STATIC(LIB, PW, "Pseudowire"); DEFINE_QOBJ_TYPE(zebra_pw) diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c index 48e2bafe4..a6e3f8473 100644 --- a/zebra/zebra_rnh.c +++ b/zebra/zebra_rnh.c @@ -51,7 +51,7 @@ #include "zebra/zebra_memory.h" #include "zebra/zebra_errors.h" -DEFINE_MTYPE_STATIC(ZEBRA, RNH, "Nexthop tracking object") +DEFINE_MTYPE_STATIC(ZEBRA, RNH, "Nexthop tracking object"); static void free_state(vrf_id_t vrf_id, struct route_entry *re, struct route_node *rn); diff --git a/zebra/zebra_router.c b/zebra/zebra_router.c index 249ec38a6..11c1130c4 100644 --- a/zebra/zebra_router.c +++ b/zebra/zebra_router.c @@ -32,7 +32,7 @@ #include "zebra_nhg.h" #include "debug.h" -DEFINE_MTYPE_STATIC(ZEBRA, RIB_TABLE_INFO, "RIB table info") +DEFINE_MTYPE_STATIC(ZEBRA, RIB_TABLE_INFO, "RIB table info"); struct zebra_router zrouter = { .multipath_num = MULTIPATH_NUM, diff --git a/zebra/zebra_srte.c b/zebra/zebra_srte.c index d6043534e..e761cd7d0 100644 --- a/zebra/zebra_srte.c +++ b/zebra/zebra_srte.c @@ -29,7 +29,7 @@ #include "zebra/zebra_rnh.h" #include "zebra/zapi_msg.h" -DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_SR_POLICY, "SR Policy") +DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_SR_POLICY, "SR Policy"); static void zebra_sr_policy_deactivate(struct zebra_sr_policy *policy); diff --git a/zebra/zebra_vrf.c b/zebra/zebra_vrf.c index be4fb29aa..46398f3fb 100644 --- a/zebra/zebra_vrf.c +++ b/zebra/zebra_vrf.c @@ -48,8 +48,8 @@ static void zebra_vrf_table_create(struct zebra_vrf *zvrf, afi_t afi, static void zebra_rnhtable_node_cleanup(struct route_table *table, struct route_node *node); -DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_VRF, "ZEBRA VRF") -DEFINE_MTYPE_STATIC(ZEBRA, OTHER_TABLE, "Other Table") +DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_VRF, "ZEBRA VRF"); +DEFINE_MTYPE_STATIC(ZEBRA, OTHER_TABLE, "Other Table"); /* VRF information update. */ static void zebra_vrf_add_update(struct zebra_vrf *zvrf) |