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

babeld: fix compiler warnings

Browse source 
Fixes:
- "route_list_entry" points to "struct babel_route"
- "format_thousands" returns a string pointer
- "UBUS_METHOD_NOARG" wants a function returning an integer

Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Nick Hainke 2021-01-31 20:36:07 +01:00
parent 519c1ff731
commit fa39ea3199
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
babeld/src/ubus.c
View file

@ -45,7 +45,7 @@ struct xroute_list_entry {
// List of received routes (to be used with ubox's list helpers). // List of received routes (to be used with ubox's list helpers).
struct route_list_entry { struct route_list_entry {
struct list_head list; struct list_head list;
struct route_stream *route; struct babel_route *route;
}; };
// List of neighbours (to be used with ubox's list helpers). // List of neighbours (to be used with ubox's list helpers).
@ -55,7 +55,7 @@ struct neighbour_list_entry {
}; };
// Sends a babel info message on ubus socket. // Sends a babel info message on ubus socket.
static void babeld_ubus_babeld_info(struct ubus_context *ctx_local, static int babeld_ubus_babeld_info(struct ubus_context *ctx_local,
struct ubus_object *obj, struct ubus_object *obj,
struct ubus_request_data *req, struct ubus_request_data *req,
const char *method, struct blob_attr *msg) { const char *method, struct blob_attr *msg) {
@ -73,6 +73,8 @@ static void babeld_ubus_babeld_info(struct ubus_context *ctx_local,
ret = ubus_send_reply(ctx_local, req, b.head); ret = ubus_send_reply(ctx_local, req, b.head);
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));
return ret;
} }
// Appends an exported route message entry to the buffer. // Appends an exported route message entry to the buffer.
@ -87,9 +89,8 @@ static void babeld_add_xroute_buf(struct xroute *xroute, struct blob_buf *b) {
blobmsg_close_table(b, prefix); blobmsg_close_table(b, prefix);
} }
// Sends an exported routes message on ubus socket, splitting apart IPv4 and // Sends an exported routes message on ubus socket, splitting apart IPv4 and IPv6 routes.
// IPv6 routes. static int babeld_ubus_get_xroutes(struct ubus_context *ctx_local,
static void babeld_ubus_get_xroutes(struct ubus_context *ctx_local,
struct ubus_object *obj, struct ubus_object *obj,
struct ubus_request_data *req, struct ubus_request_data *req,
const char *method, struct blob_attr *msg) { const char *method, struct blob_attr *msg) {
@ -141,6 +142,8 @@ static void babeld_ubus_get_xroutes(struct ubus_context *ctx_local,
ret = ubus_send_reply(ctx_local, req, b.head); ret = ubus_send_reply(ctx_local, req, b.head);
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));
return ret;
} }
// Appends an route message entry to the buffer. // Appends an route message entry to the buffer.
@ -188,9 +191,8 @@ static void babeld_add_route_buf(struct babel_route *route,
blobmsg_close_table(b, prefix); blobmsg_close_table(b, prefix);
} }
// Sends received routes message on ubus socket, splitting apart IPv4 and IPv6 // Sends received routes message on ubus socket, splitting apart IPv4 and IPv6 routes.
// routes. static int babeld_ubus_get_routes(struct ubus_context *ctx_local,
static void babeld_ubus_get_routes(struct ubus_context *ctx_local,
struct ubus_object *obj, struct ubus_object *obj,
struct ubus_request_data *req, struct ubus_request_data *req,
const char *method, struct blob_attr *msg) { const char *method, struct blob_attr *msg) {
@ -242,6 +244,8 @@ static void babeld_ubus_get_routes(struct ubus_context *ctx_local,
ret = ubus_send_reply(ctx_local, req, b.head); ret = ubus_send_reply(ctx_local, req, b.head);
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));
return ret;
} }
// Appends an neighbour entry to the buffer. // Appends an neighbour entry to the buffer.
@ -255,15 +259,14 @@ static void babeld_add_neighbour_buf(struct neighbour *neigh,
blobmsg_add_u32(b, "uhello-reach", neigh->uhello.reach); blobmsg_add_u32(b, "uhello-reach", neigh->uhello.reach);
blobmsg_add_u32(b, "rxcost", neighbour_rxcost(neigh)); blobmsg_add_u32(b, "rxcost", neighbour_rxcost(neigh));
blobmsg_add_u32(b, "txcost", neigh->txcost); blobmsg_add_u32(b, "txcost", neigh->txcost);
blobmsg_add_u32(b, "rtt", format_thousands(neigh->rtt)); blobmsg_add_string(b, "rtt", format_thousands(neigh->rtt));
blobmsg_add_u32(b, "channel", neigh->ifp->channel); blobmsg_add_u32(b, "channel", neigh->ifp->channel);
blobmsg_add_u8(b, "if_up", if_up(neigh->ifp)); blobmsg_add_u8(b, "if_up", if_up(neigh->ifp));
blobmsg_close_table(b, neighbour); blobmsg_close_table(b, neighbour);
} }
// Sends neighbours message on ubus socket, splitting apart IPv4 and IPv6 // Sends neighbours message on ubus socket, splitting apart IPv4 and IPv6 neighbours.
// neighbours. static int babeld_ubus_get_neighbours(struct ubus_context *ctx_local,
static void babeld_ubus_get_neighbours(struct ubus_context *ctx_local,
struct ubus_object *obj, struct ubus_object *obj,
struct ubus_request_data *req, struct ubus_request_data *req,
const char *method, const char *method,
@ -310,6 +313,8 @@ static void babeld_ubus_get_neighbours(struct ubus_context *ctx_local,
ret = ubus_send_reply(ctx_local, req, b.head); ret = ubus_send_reply(ctx_local, req, b.head);
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));
return ret;
} }
// List of functions we expose via the ubus bus. // List of functions we expose via the ubus bus.