Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

babeld: free blob-buffers that are on stack

Browse source 
As Felix mentioned:
If a buffer was already allocated, blob_buf_init reuses it. You can
keep reusing it as many times as you want. You only need to call
blob_buf_free if you explicitly want to free the buffer memory
(e.g. on exit, or if the blob_buf is on stack).

http://lists.openwrt.org/pipermail/openwrt-devel/2021-October/036722.html

This PR frees the blob-buffers that are on the stack.

Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Nick Hainke 2021-10-13 07:57:09 +02:00
parent 0bb6aa04f6
commit 6d463ca97c
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
babeld/src/ubus.c
View file

@ -74,6 +74,8 @@ static int babeld_ubus_babeld_info(struct ubus_context *ctx_local,
if (ret) if (ret)
fprintf(stderr, "Failed to send reply: %s\n", ubus_strerror(ret)); fprintf(stderr, "Failed to send reply: %s\n", ubus_strerror(ret));
blob_buf_free(&b);
return ret; return ret;
} }
@ -144,6 +146,8 @@ static int babeld_ubus_get_xroutes(struct ubus_context *ctx_local,
if (ret) if (ret)
fprintf(stderr, "Failed to send reply: %s\n", ubus_strerror(ret)); fprintf(stderr, "Failed to send reply: %s\n", ubus_strerror(ret));
blob_buf_free(&b);
return ret; return ret;
} }
@ -247,6 +251,8 @@ static int babeld_ubus_get_routes(struct ubus_context *ctx_local,
if (ret) if (ret)
fprintf(stderr, "Failed to send reply: %s\n", ubus_strerror(ret)); fprintf(stderr, "Failed to send reply: %s\n", ubus_strerror(ret));
blob_buf_free(&b);
return ret; return ret;
} }
@ -317,6 +323,8 @@ static int babeld_ubus_get_neighbours(struct ubus_context *ctx_local,
if (ret) if (ret)
fprintf(stderr, "Failed to send reply: %s\n", ubus_strerror(ret)); fprintf(stderr, "Failed to send reply: %s\n", ubus_strerror(ret));
blob_buf_free(&b);
return ret; return ret;
} }
@ -383,6 +391,7 @@ void ubus_notify_route(struct babel_route *route, int kind) {
babeld_add_route_buf(route, &b); babeld_add_route_buf(route, &b);
snprintf(method, sizeof(method), "route.%s", local_kind(kind)); snprintf(method, sizeof(method), "route.%s", local_kind(kind));
ubus_notify(shared_ctx, &babeld_object, method, b.head, -1); ubus_notify(shared_ctx, &babeld_object, method, b.head, -1);
blob_buf_free(&b);
} }
void ubus_notify_xroute(struct xroute *xroute, int kind) { void ubus_notify_xroute(struct xroute *xroute, int kind) {
@ -403,6 +412,7 @@ void ubus_notify_xroute(struct xroute *xroute, int kind) {
babeld_add_xroute_buf(xroute, &b); babeld_add_xroute_buf(xroute, &b);
snprintf(method, sizeof(method), "xroute.%s", local_kind(kind)); snprintf(method, sizeof(method), "xroute.%s", local_kind(kind));
ubus_notify(shared_ctx, &babeld_object, method, b.head, -1); ubus_notify(shared_ctx, &babeld_object, method, b.head, -1);
blob_buf_free(&b);
} }
void ubus_notify_neighbour(struct neighbour *neigh, int kind) { void ubus_notify_neighbour(struct neighbour *neigh, int kind) {
@ -422,6 +432,7 @@ void ubus_notify_neighbour(struct neighbour *neigh, int kind) {
babeld_add_neighbour_buf(neigh, &b); babeld_add_neighbour_buf(neigh, &b);
snprintf(method, sizeof(method), "neigh.%s", local_kind(kind)); snprintf(method, sizeof(method), "neigh.%s", local_kind(kind));
ubus_notify(shared_ctx, &babeld_object, method, b.head, -1); ubus_notify(shared_ctx, &babeld_object, method, b.head, -1);
blob_buf_free(&b);
} }
void babeld_ubus_receive(fd_set *readfds) { void babeld_ubus_receive(fd_set *readfds) {