openwrt-mirror/routing
1
0
Fork 0
mirror of https://github.com/openwrt/routing.git synced 2025-12-21 21:24:32 +04:00
Code Issues Packages Projects Releases Wiki Activity

babeld: fix compiler warnings (#639)

Browse Source 
babeld: fix compiler warnings

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:
Polynomdivision
2021-02-01 20:40:17 +01:00
committed by GitHub
parent 519c1ff731
commit 72408a9cf8
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
babeld/Makefile
View File

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=babeld PKG_NAME:=babeld
PKG_VERSION:=1.9.2 PKG_VERSION:=1.9.2
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/ PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/

23
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.
@@ -89,7 +91,7 @@ static void babeld_add_xroute_buf(struct xroute *xroute, struct blob_buf *b) {
// 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 void babeld_ubus_get_xroutes(struct ubus_context *ctx_local, static int 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 +143,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.
@@ -190,7 +194,7 @@ static void babeld_add_route_buf(struct babel_route *route,
// 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 void babeld_ubus_get_routes(struct ubus_context *ctx_local, static int 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 +246,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,7 +261,7 @@ 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);
@@ -263,7 +269,7 @@ static void babeld_add_neighbour_buf(struct neighbour *neigh,
// 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 void babeld_ubus_get_neighbours(struct ubus_context *ctx_local, static int 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 +316,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.
@@ -379,7 +387,8 @@ void ubus_notify_route(struct babel_route *route, int kind) {
void ubus_notify_xroute(struct xroute *xroute, int kind) { void ubus_notify_xroute(struct xroute *xroute, int kind) {
struct blob_buf b = {0}; struct blob_buf b = {0};
char method[50]; // possible methods are xroute.change, xroute.add, xroute.flush char method[50]; // possible methods are xroute.change, xroute.add,
// xroute.flush
if (!babeld_object.has_subscribers) if (!babeld_object.has_subscribers)
return; return;