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

Merge pull request #12432 from mjstapp/use_real_mtypes

Browse Source 
lib, zebra: Use real mtypes instead of MTYPE_TMP
This commit is contained in:
Donald Sharp 2022-12-06 08:34:36 -05:00 committed by GitHub
commit f13611d2f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 63 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/if.c
View File

@ -38,6 +38,7 @@
#include "lib/if_clippy.c" #include "lib/if_clippy.c"
DEFINE_MTYPE_STATIC(LIB, IF, "Interface"); DEFINE_MTYPE_STATIC(LIB, IF, "Interface");
DEFINE_MTYPE_STATIC(LIB, IFDESC, "Intf Desc");
DEFINE_MTYPE_STATIC(LIB, CONNECTED, "Connected"); DEFINE_MTYPE_STATIC(LIB, CONNECTED, "Connected");
DEFINE_MTYPE_STATIC(LIB, NBR_CONNECTED, "Neighbor Connected"); DEFINE_MTYPE_STATIC(LIB, NBR_CONNECTED, "Neighbor Connected");
DEFINE_MTYPE(LIB, CONNECTED_LABEL, "Connected interface label"); DEFINE_MTYPE(LIB, CONNECTED_LABEL, "Connected interface label");
@ -288,7 +289,7 @@ void if_delete(struct interface **ifp)
if_link_params_free(ptr); if_link_params_free(ptr);
XFREE(MTYPE_TMP, ptr->desc); XFREE(MTYPE_IFDESC, ptr->desc);
XFREE(MTYPE_IF, ptr); XFREE(MTYPE_IF, ptr);
*ifp = NULL; *ifp = NULL;
@ -1612,9 +1613,9 @@ static int lib_interface_description_modify(struct nb_cb_modify_args *args)
return NB_OK; return NB_OK;
ifp = nb_running_get_entry(args->dnode, NULL, true); ifp = nb_running_get_entry(args->dnode, NULL, true);
XFREE(MTYPE_TMP, ifp->desc); XFREE(MTYPE_IFDESC, ifp->desc);
description = yang_dnode_get_string(args->dnode, NULL); description = yang_dnode_get_string(args->dnode, NULL);
ifp->desc = XSTRDUP(MTYPE_TMP, description); ifp->desc = XSTRDUP(MTYPE_IFDESC, description);
return NB_OK; return NB_OK;
} }
@ -1627,7 +1628,7 @@ static int lib_interface_description_destroy(struct nb_cb_destroy_args *args)
return NB_OK; return NB_OK;
ifp = nb_running_get_entry(args->dnode, NULL, true); ifp = nb_running_get_entry(args->dnode, NULL, true);
XFREE(MTYPE_TMP, ifp->desc); XFREE(MTYPE_IFDESC, ifp->desc);
return NB_OK; return NB_OK;
} }

8
zebra/if_netlink.c
View File

@ -1081,8 +1081,8 @@ static int netlink_interface(struct nlmsghdr *h, ns_id_t ns_id, int startup)
zif->link_ifindex = link_ifindex; zif->link_ifindex = link_ifindex;
if (desc) { if (desc) {
XFREE(MTYPE_TMP, zif->desc); XFREE(MTYPE_ZIF_DESC, zif->desc);
zif->desc = XSTRDUP(MTYPE_TMP, desc); zif->desc = XSTRDUP(MTYPE_ZIF_DESC, desc);
} }
/* Hardware type and address. */ /* Hardware type and address. */
@ -2136,9 +2136,9 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
zif = ifp->info; zif = ifp->info;
if (zif) { if (zif) {
XFREE(MTYPE_TMP, zif->desc); XFREE(MTYPE_ZIF_DESC, zif->desc);
if (desc) if (desc)
zif->desc = XSTRDUP(MTYPE_TMP, desc); zif->desc = XSTRDUP(MTYPE_ZIF_DESC, desc);
} }
} else { } else {
/* Delete interface notification from kernel */ /* Delete interface notification from kernel */

3
zebra/interface.c
View File

@ -61,6 +61,7 @@ DEFINE_HOOK(zebra_if_extra_info, (struct vty * vty, struct interface *ifp),
DEFINE_HOOK(zebra_if_config_wr, (struct vty * vty, struct interface *ifp), DEFINE_HOOK(zebra_if_config_wr, (struct vty * vty, struct interface *ifp),
(vty, ifp)); (vty, ifp));
DEFINE_MTYPE(ZEBRA, ZIF_DESC, "Intf desc");
static void if_down_del_nbr_connected(struct interface *ifp); static void if_down_del_nbr_connected(struct interface *ifp);
@ -233,7 +234,7 @@ static int if_zebra_delete_hook(struct interface *ifp)
if_nhg_dependents_release(ifp); if_nhg_dependents_release(ifp);
zebra_if_nhg_dependents_free(zebra_if); zebra_if_nhg_dependents_free(zebra_if);
XFREE(MTYPE_TMP, zebra_if->desc); XFREE(MTYPE_ZIF_DESC, zebra_if->desc);
THREAD_OFF(zebra_if->speed_update); THREAD_OFF(zebra_if->speed_update);

3
zebra/interface.h
View File

@ -109,6 +109,9 @@ enum zebra_if_flags {
#define ZEBRA_IF_IS_PROTODOWN_ONLY_EXTERNAL(zif) \ #define ZEBRA_IF_IS_PROTODOWN_ONLY_EXTERNAL(zif) \
((zif)->protodown_rc == ZEBRA_PROTODOWN_EXTERNAL) ((zif)->protodown_rc == ZEBRA_PROTODOWN_EXTERNAL)
/* Mem type for zif desc */
DECLARE_MTYPE(ZIF_DESC);
/* `zebra' daemon local interface structure. */ /* `zebra' daemon local interface structure. */
struct zebra_if { struct zebra_if {
/* back pointer to the interface */ /* back pointer to the interface */

4
zebra/irdp_interface.c
View File

@ -200,12 +200,12 @@ static void if_set_defaults(struct irdp_interface *irdp)
static struct Adv *Adv_new(void) static struct Adv *Adv_new(void)
{ {
return XCALLOC(MTYPE_TMP, sizeof(struct Adv)); return XCALLOC(MTYPE_IRDP_IF, sizeof(struct Adv));
} }
static void Adv_free(struct Adv *adv) static void Adv_free(struct Adv *adv)
{ {
XFREE(MTYPE_TMP, adv); XFREE(MTYPE_IRDP_IF, adv);
} }
static void irdp_if_start(struct interface *ifp, int multicast, static void irdp_if_start(struct interface *ifp, int multicast,

2
zebra/zapi_msg.c
View File

@ -3698,7 +3698,7 @@ static inline void zebra_neigh_ip_del(ZAPI_HANDLER_ARGS)
static inline void zread_iptable(ZAPI_HANDLER_ARGS) static inline void zread_iptable(ZAPI_HANDLER_ARGS)
{ {
struct zebra_pbr_iptable *zpi = struct zebra_pbr_iptable *zpi =
XCALLOC(MTYPE_TMP, sizeof(struct zebra_pbr_iptable)); XCALLOC(MTYPE_PBR_OBJ, sizeof(struct zebra_pbr_iptable));
struct stream *s; struct stream *s;
s = msg; s = msg;

19
zebra/zebra_gr.c
View File

@ -46,6 +46,7 @@
#include "zebra/debug.h" #include "zebra/debug.h"
#include "zebra/zapi_msg.h" #include "zebra/zapi_msg.h"
DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_GR, "GR");
/* /*
* Forward declaration. * Forward declaration.
@ -111,7 +112,7 @@ static struct client_gr_info *zebra_gr_client_info_create(struct zserv *client)
{ {
struct client_gr_info *info; struct client_gr_info *info;
info = XCALLOC(MTYPE_TMP, sizeof(struct client_gr_info)); info = XCALLOC(MTYPE_ZEBRA_GR, sizeof(struct client_gr_info));
TAILQ_INSERT_TAIL(&(client->gr_info_queue), info, gr_info); TAILQ_INSERT_TAIL(&(client->gr_info_queue), info, gr_info);
return info; return info;
@ -127,7 +128,7 @@ static void zebra_gr_client_info_delte(struct zserv *client,
THREAD_OFF(info->t_stale_removal); THREAD_OFF(info->t_stale_removal);
XFREE(MTYPE_TMP, info->current_prefix); XFREE(MTYPE_ZEBRA_GR, info->current_prefix);
LOG_GR("%s: Instance info is being deleted for client %s", __func__, LOG_GR("%s: Instance info is being deleted for client %s", __func__,
zebra_route_string(client->proto)); zebra_route_string(client->proto));
@ -136,7 +137,7 @@ static void zebra_gr_client_info_delte(struct zserv *client,
info->do_delete = true; info->do_delete = true;
zebra_gr_delete_stale_routes(info); zebra_gr_delete_stale_routes(info);
XFREE(MTYPE_TMP, info); XFREE(MTYPE_ZEBRA_GR, info);
} }
/* /*
@ -222,8 +223,8 @@ static void zebra_gr_delete_stale_client(struct client_gr_info *info)
TAILQ_INIT(&(s_client->gr_info_queue)); TAILQ_INIT(&(s_client->gr_info_queue));
listnode_delete(zrouter.stale_client_list, s_client); listnode_delete(zrouter.stale_client_list, s_client);
if (info->stale_client) if (info->stale_client)
XFREE(MTYPE_TMP, s_client); zserv_client_delete(s_client);
XFREE(MTYPE_TMP, info); XFREE(MTYPE_ZEBRA_GR, info);
} }
/* /*
@ -288,7 +289,7 @@ void zebra_gr_client_reconnect(struct zserv *client)
/* Delete the stale client */ /* Delete the stale client */
listnode_delete(zrouter.stale_client_list, old_client); listnode_delete(zrouter.stale_client_list, old_client);
/* Delete old client */ /* Delete old client */
XFREE(MTYPE_TMP, old_client); zserv_client_delete(old_client);
} }
/* /*
@ -474,7 +475,7 @@ static void zebra_gr_route_stale_delete_timer_expiry(struct thread *thread)
LOG_GR("%s: Client %s all stale routes processed", __func__, LOG_GR("%s: Client %s all stale routes processed", __func__,
zebra_route_string(client->proto)); zebra_route_string(client->proto));
XFREE(MTYPE_TMP, info->current_prefix); XFREE(MTYPE_ZEBRA_GR, info->current_prefix);
info->current_afi = 0; info->current_afi = 0;
zebra_gr_delete_stale_client(info); zebra_gr_delete_stale_client(info);
} }
@ -579,7 +580,7 @@ static int32_t zebra_gr_delete_stale_route(struct client_gr_info *info,
&& (info->do_delete == false)) { && (info->do_delete == false)) {
info->current_afi = afi; info->current_afi = afi;
info->current_prefix = XCALLOC( info->current_prefix = XCALLOC(
MTYPE_TMP, MTYPE_ZEBRA_GR,
sizeof(struct prefix)); sizeof(struct prefix));
prefix_copy( prefix_copy(
info->current_prefix, info->current_prefix,
@ -593,7 +594,7 @@ static int32_t zebra_gr_delete_stale_route(struct client_gr_info *info,
* Reset the current prefix to indicate processing completion * Reset the current prefix to indicate processing completion
* of the current AFI * of the current AFI
*/ */
XFREE(MTYPE_TMP, info->current_prefix); XFREE(MTYPE_ZEBRA_GR, info->current_prefix);
} }
return 0; return 0;
} }

27
zebra/zebra_pbr.c
View File

@ -36,6 +36,7 @@
/* definitions */ /* definitions */
DEFINE_MTYPE_STATIC(ZEBRA, PBR_IPTABLE_IFNAME, "PBR interface list"); DEFINE_MTYPE_STATIC(ZEBRA, PBR_IPTABLE_IFNAME, "PBR interface list");
DEFINE_MTYPE(ZEBRA, PBR_OBJ, "PBR");
/* definitions */ /* definitions */
static const struct message ipset_type_msg[] = { static const struct message ipset_type_msg[] = {
@ -163,7 +164,7 @@ void zebra_pbr_rules_free(void *arg)
rule = (struct zebra_pbr_rule *)arg; rule = (struct zebra_pbr_rule *)arg;
(void)dplane_pbr_rule_delete(rule); (void)dplane_pbr_rule_delete(rule);
XFREE(MTYPE_TMP, rule); XFREE(MTYPE_PBR_OBJ, rule);
} }
uint32_t zebra_pbr_rules_hash_key(const void *arg) uint32_t zebra_pbr_rules_hash_key(const void *arg)
@ -275,7 +276,7 @@ void zebra_pbr_ipset_free(void *arg)
ipset = (struct zebra_pbr_ipset *)arg; ipset = (struct zebra_pbr_ipset *)arg;
hook_call(zebra_pbr_ipset_update, 0, ipset); hook_call(zebra_pbr_ipset_update, 0, ipset);
XFREE(MTYPE_TMP, ipset); XFREE(MTYPE_PBR_OBJ, ipset);
} }
uint32_t zebra_pbr_ipset_hash_key(const void *arg) uint32_t zebra_pbr_ipset_hash_key(const void *arg)
@ -319,7 +320,7 @@ void zebra_pbr_ipset_entry_free(void *arg)
hook_call(zebra_pbr_ipset_entry_update, 0, ipset); hook_call(zebra_pbr_ipset_entry_update, 0, ipset);
XFREE(MTYPE_TMP, ipset); XFREE(MTYPE_PBR_OBJ, ipset);
} }
uint32_t zebra_pbr_ipset_entry_hash_key(const void *arg) uint32_t zebra_pbr_ipset_entry_hash_key(const void *arg)
@ -396,7 +397,7 @@ static void _zebra_pbr_iptable_free_all(void *arg, bool all)
} }
list_delete(&iptable->interface_name_list); list_delete(&iptable->interface_name_list);
} }
XFREE(MTYPE_TMP, iptable); XFREE(MTYPE_PBR_OBJ, iptable);
} }
void zebra_pbr_iptable_free(void *arg) void zebra_pbr_iptable_free(void *arg)
@ -478,7 +479,7 @@ static void *pbr_rule_alloc_intern(void *arg)
zpr = (struct zebra_pbr_rule *)arg; zpr = (struct zebra_pbr_rule *)arg;
new = XCALLOC(MTYPE_TMP, sizeof(*new)); new = XCALLOC(MTYPE_PBR_OBJ, sizeof(*new));
memcpy(new, zpr, sizeof(*zpr)); memcpy(new, zpr, sizeof(*zpr));
@ -492,7 +493,7 @@ static struct zebra_pbr_rule *pbr_rule_free(struct zebra_pbr_rule *hash_data,
zebra_neigh_deref(hash_data); zebra_neigh_deref(hash_data);
hash_release(zrouter.rules_hash, hash_data); hash_release(zrouter.rules_hash, hash_data);
if (free_data) { if (free_data) {
XFREE(MTYPE_TMP, hash_data); XFREE(MTYPE_PBR_OBJ, hash_data);
return NULL; return NULL;
} }
@ -688,7 +689,7 @@ void zebra_pbr_add_rule(struct zebra_pbr_rule *rule)
(void)dplane_pbr_rule_update(found, new); (void)dplane_pbr_rule_update(found, new);
/* release the old hash data */ /* release the old hash data */
if (old) if (old)
XFREE(MTYPE_TMP, old); XFREE(MTYPE_PBR_OBJ, old);
} else { } else {
if (IS_ZEBRA_DEBUG_PBR) if (IS_ZEBRA_DEBUG_PBR)
zlog_debug( zlog_debug(
@ -856,7 +857,7 @@ static void *pbr_ipset_alloc_intern(void *arg)
zpi = (struct zebra_pbr_ipset *)arg; zpi = (struct zebra_pbr_ipset *)arg;
new = XCALLOC(MTYPE_TMP, sizeof(struct zebra_pbr_ipset)); new = XCALLOC(MTYPE_PBR_OBJ, sizeof(struct zebra_pbr_ipset));
memcpy(new, zpi, sizeof(*zpi)); memcpy(new, zpi, sizeof(*zpi));
@ -877,7 +878,7 @@ void zebra_pbr_destroy_ipset(struct zebra_pbr_ipset *ipset)
(void)dplane_pbr_ipset_delete(ipset); (void)dplane_pbr_ipset_delete(ipset);
if (lookup) { if (lookup) {
hash_release(zrouter.ipset_hash, lookup); hash_release(zrouter.ipset_hash, lookup);
XFREE(MTYPE_TMP, lookup); XFREE(MTYPE_PBR_OBJ, lookup);
} else } else
zlog_debug( zlog_debug(
"%s: IPSet Entry being deleted we know nothing about", "%s: IPSet Entry being deleted we know nothing about",
@ -930,7 +931,7 @@ static void *pbr_ipset_entry_alloc_intern(void *arg)
zpi = (struct zebra_pbr_ipset_entry *)arg; zpi = (struct zebra_pbr_ipset_entry *)arg;
new = XCALLOC(MTYPE_TMP, sizeof(struct zebra_pbr_ipset_entry)); new = XCALLOC(MTYPE_PBR_OBJ, sizeof(struct zebra_pbr_ipset_entry));
memcpy(new, zpi, sizeof(*zpi)); memcpy(new, zpi, sizeof(*zpi));
@ -952,7 +953,7 @@ void zebra_pbr_del_ipset_entry(struct zebra_pbr_ipset_entry *ipset)
(void)dplane_pbr_ipset_entry_delete(ipset); (void)dplane_pbr_ipset_entry_delete(ipset);
if (lookup) { if (lookup) {
hash_release(zrouter.ipset_entry_hash, lookup); hash_release(zrouter.ipset_entry_hash, lookup);
XFREE(MTYPE_TMP, lookup); XFREE(MTYPE_PBR_OBJ, lookup);
} else } else
zlog_debug("%s: IPSet being deleted we know nothing about", zlog_debug("%s: IPSet being deleted we know nothing about",
__func__); __func__);
@ -967,7 +968,7 @@ static void *pbr_iptable_alloc_intern(void *arg)
zpi = (struct zebra_pbr_iptable *)arg; zpi = (struct zebra_pbr_iptable *)arg;
new = XCALLOC(MTYPE_TMP, sizeof(struct zebra_pbr_iptable)); new = XCALLOC(MTYPE_PBR_OBJ, sizeof(struct zebra_pbr_iptable));
/* Deep structure copy */ /* Deep structure copy */
memcpy(new, zpi, sizeof(*zpi)); memcpy(new, zpi, sizeof(*zpi));
@ -1009,7 +1010,7 @@ void zebra_pbr_del_iptable(struct zebra_pbr_iptable *iptable)
node); node);
} }
list_delete(&iptable->interface_name_list); list_delete(&iptable->interface_name_list);
XFREE(MTYPE_TMP, lookup); XFREE(MTYPE_PBR_OBJ, lookup);
} else } else
zlog_debug("%s: IPTable being deleted we know nothing about", zlog_debug("%s: IPTable being deleted we know nothing about",
__func__); __func__);

3
zebra/zebra_pbr.h
View File

@ -36,6 +36,9 @@
extern "C" { extern "C" {
#endif #endif
/* Memory type for PBR objects. */
DECLARE_MTYPE(PBR_OBJ);
struct zebra_pbr_action { struct zebra_pbr_action {
afi_t afi; afi_t afi;

14
zebra/zserv.c
View File

@ -78,6 +78,8 @@ static struct zserv *find_client_internal(uint8_t proto,
unsigned short instance, unsigned short instance,
uint32_t session_id); uint32_t session_id);
/* Mem type for zclients. */
DEFINE_MTYPE_STATIC(ZEBRA, ZSERV_CLIENT, "ZClients");
/* /*
* Client thread events. * Client thread events.
@ -145,6 +147,14 @@ static void zserv_event(struct zserv *client, enum zserv_event event);
/* Client thread lifecycle -------------------------------------------------- */ /* Client thread lifecycle -------------------------------------------------- */
/*
* Free a zserv client object.
*/
void zserv_client_delete(struct zserv *client)
{
XFREE(MTYPE_ZSERV_CLIENT, client);
}
/* /*
* Log zapi message to zlog. * Log zapi message to zlog.
* *
@ -644,7 +654,7 @@ static void zserv_client_free(struct zserv *client)
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT)
zlog_debug("%s: Deleting client %s", __func__, zlog_debug("%s: Deleting client %s", __func__,
zebra_route_string(client->proto)); zebra_route_string(client->proto));
XFREE(MTYPE_TMP, client); zserv_client_delete(client);
} else { } else {
/* Handle cases where client has GR instance. */ /* Handle cases where client has GR instance. */
if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT)
@ -733,7 +743,7 @@ static struct zserv *zserv_client_create(int sock)
int i; int i;
afi_t afi; afi_t afi;
client = XCALLOC(MTYPE_TMP, sizeof(struct zserv)); client = XCALLOC(MTYPE_ZSERV_CLIENT, sizeof(struct zserv));
/* Make client input/output buffer. */ /* Make client input/output buffer. */
client->sock = sock; client->sock = sock;

7
zebra/zserv.h
View File

@ -363,6 +363,13 @@ extern void zserv_release_client(struct zserv *client);
*/ */
extern void zserv_close_client(struct zserv *client); extern void zserv_close_client(struct zserv *client);
/*
* Free memory for a zserv client object - note that this does not
* clean up the internal allocations associated with the zserv client,
* this just free the struct's memory.
*/
void zserv_client_delete(struct zserv *client);
/* /*
* Log a ZAPI message hexdump. * Log a ZAPI message hexdump.
* *