diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2022-02-01 12:19:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-01 12:19:11 +0300 |
| commit | 461a8d7aba640de1a93ca0d583e08db41ad0d70d (patch) | |
| tree | 8bde1a140913f768c4282e107991fdc1474482f8 /zebra/zapi_msg.c | |
| parent | eaedb8892df335c67bdd6f9752465258b971c6d5 (diff) | |
| parent | b86c1f4fccb6bbc760e1eb276b41dd6a7f86f632 (diff) | |
Merge pull request #10443 from mjstapp/zebra_re_opaque
zebra: name the route_entry opaque struct more specifically
Diffstat (limited to 'zebra/zapi_msg.c')
| -rw-r--r-- | zebra/zapi_msg.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index 5cf7d815d8..b69200d96c 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -62,7 +62,7 @@ #include "zebra/zebra_srte.h" #include "zebra/zebra_srv6.h" -DEFINE_MTYPE_STATIC(ZEBRA, OPAQUE, "Opaque Data"); +DEFINE_MTYPE_STATIC(ZEBRA, RE_OPAQUE, "Route Opaque Data"); static int zapi_nhg_decode(struct stream *s, int cmd, struct zapi_nhg *api_nhg); @@ -2079,8 +2079,9 @@ static void zread_route_add(ZAPI_HANDLER_ARGS) re->mtu = api.mtu; if (CHECK_FLAG(api.message, ZAPI_MESSAGE_OPAQUE)) { - re->opaque = XMALLOC(MTYPE_OPAQUE, - sizeof(struct opaque) + api.opaque.length); + re->opaque = + XMALLOC(MTYPE_RE_OPAQUE, + sizeof(struct re_opaque) + api.opaque.length); re->opaque->length = api.opaque.length; memcpy(re->opaque->data, api.opaque.data, re->opaque->length); } @@ -2092,7 +2093,7 @@ static void zread_route_add(ZAPI_HANDLER_ARGS) __func__); nexthop_group_delete(&ng); zebra_nhg_backup_free(&bnhg); - XFREE(MTYPE_OPAQUE, re->opaque); + XFREE(MTYPE_RE_OPAQUE, re->opaque); XFREE(MTYPE_RE, re); return; } @@ -2105,7 +2106,7 @@ static void zread_route_add(ZAPI_HANDLER_ARGS) __func__, api.safi); nexthop_group_delete(&ng); zebra_nhg_backup_free(&bnhg); - XFREE(MTYPE_OPAQUE, re->opaque); + XFREE(MTYPE_RE_OPAQUE, re->opaque); XFREE(MTYPE_RE, re); return; } @@ -2134,7 +2135,7 @@ static void zread_route_add(ZAPI_HANDLER_ARGS) */ if (ret == -1) { client->error_cnt++; - XFREE(MTYPE_OPAQUE, re->opaque); + XFREE(MTYPE_RE_OPAQUE, re->opaque); XFREE(MTYPE_RE, re); } @@ -2163,9 +2164,9 @@ static void zread_route_add(ZAPI_HANDLER_ARGS) } } -void zapi_opaque_free(struct opaque *opaque) +void zapi_re_opaque_free(struct re_opaque *opaque) { - XFREE(MTYPE_OPAQUE, opaque); + XFREE(MTYPE_RE_OPAQUE, opaque); } static void zread_route_del(ZAPI_HANDLER_ARGS) |