dc22d38f91
25 April 2021: babeld-1.10
* Removed the disambiguation code: source-specific routing is no longer
supported for IPv4, and for IPv6 only on Linux 3.11 or later.
* Fixed an issue handling of retractions with no next hop, which caused
interoperability problems with BIRD. Thanks to Fabian Bläse.
* If skip-kernel-setup is set, we no longer disable the rp_filter, which
makes babeld work in containers. Thanks to Martin Weinelt.
Remove upstreamed part of ubus patch:
- local: make local_kind function accessible
Signed-off-by: Nick Hainke <vincent@systemli.org>
131 lines
3.9 KiB
Diff
131 lines
3.9 KiB
Diff
--- a/babeld.c
|
|
+++ b/babeld.c
|
|
@@ -54,6 +54,8 @@ THE SOFTWARE.
|
|
#include "local.h"
|
|
#include "version.h"
|
|
|
|
+#include "ubus.h"
|
|
+
|
|
struct timeval now;
|
|
|
|
unsigned char myid[8];
|
|
@@ -518,6 +520,9 @@ main(int argc, char **argv)
|
|
}
|
|
}
|
|
|
|
+ if(ubus_bindings)
|
|
+ babeld_add_ubus();
|
|
+
|
|
init_signals();
|
|
rc = resize_receive_buffer(1500);
|
|
if(rc < 0)
|
|
@@ -613,6 +618,8 @@ main(int argc, char **argv)
|
|
FD_SET(local_sockets[i].fd, &readfds);
|
|
maxfd = MAX(maxfd, local_sockets[i].fd);
|
|
}
|
|
+ if(ubus_bindings)
|
|
+ maxfd = babeld_ubus_add_read_sock(&readfds, maxfd);
|
|
rc = select(maxfd + 1, &readfds, NULL, NULL, &tv);
|
|
if(rc < 0) {
|
|
if(errno != EINTR) {
|
|
@@ -680,6 +687,9 @@ main(int argc, char **argv)
|
|
i++;
|
|
}
|
|
|
|
+ if(ubus_bindings)
|
|
+ babeld_ubus_receive(&readfds);
|
|
+
|
|
if(reopening) {
|
|
kernel_dump_time = now.tv_sec;
|
|
check_neighbours_timeout = now;
|
|
--- a/generate-version.sh
|
|
+++ b/generate-version.sh
|
|
@@ -10,4 +10,4 @@ else
|
|
version="unknown"
|
|
fi
|
|
|
|
-echo "#define BABELD_VERSION \"$version\""
|
|
+echo "#define BABELD_VERSION \"$version-ubus-mod\""
|
|
--- a/configuration.c
|
|
+++ b/configuration.c
|
|
@@ -41,6 +41,8 @@ THE SOFTWARE.
|
|
#include "kernel.h"
|
|
#include "configuration.h"
|
|
|
|
+#include "ubus.h"
|
|
+
|
|
static struct filter *input_filters = NULL;
|
|
static struct filter *output_filters = NULL;
|
|
static struct filter *redistribute_filters = NULL;
|
|
@@ -849,7 +851,8 @@ parse_option(int c, gnc_t gnc, void *clo
|
|
strcmp(token, "daemonise") == 0 ||
|
|
strcmp(token, "skip-kernel-setup") == 0 ||
|
|
strcmp(token, "ipv6-subtrees") == 0 ||
|
|
- strcmp(token, "reflect-kernel-metric") == 0) {
|
|
+ strcmp(token, "reflect-kernel-metric") == 0 ||
|
|
+ strcmp(token, "ubus-bindings") == 0) {
|
|
int b;
|
|
c = getbool(c, &b, gnc, closure);
|
|
if(c < -1)
|
|
@@ -867,6 +870,8 @@ parse_option(int c, gnc_t gnc, void *clo
|
|
has_ipv6_subtrees = b;
|
|
else if(strcmp(token, "reflect-kernel-metric") == 0)
|
|
reflect_kernel_metric = b;
|
|
+ else if(strcmp(token, "ubus-bindings") == 0)
|
|
+ ubus_bindings = b;
|
|
else
|
|
abort();
|
|
} else if(strcmp(token, "protocol-group") == 0) {
|
|
--- a/local.c
|
|
+++ b/local.c
|
|
@@ -42,6 +42,8 @@ THE SOFTWARE.
|
|
#include "local.h"
|
|
#include "version.h"
|
|
|
|
+#include "ubus.h"
|
|
+
|
|
int local_server_socket = -1;
|
|
struct local_socket local_sockets[MAX_LOCAL_SOCKETS];
|
|
int num_local_sockets = 0;
|
|
@@ -191,6 +193,8 @@ local_notify_neighbour(struct neighbour
|
|
if(local_sockets[i].monitor)
|
|
local_notify_neighbour_1(&local_sockets[i], neigh, kind);
|
|
}
|
|
+ if(ubus_bindings)
|
|
+ ubus_notify_neighbour(neigh, kind);
|
|
}
|
|
|
|
static void
|
|
@@ -228,6 +232,8 @@ local_notify_xroute(struct xroute *xrout
|
|
if(local_sockets[i].monitor)
|
|
local_notify_xroute_1(&local_sockets[i], xroute, kind);
|
|
}
|
|
+ if(ubus_bindings)
|
|
+ ubus_notify_xroute(xroute, kind);
|
|
}
|
|
|
|
static void
|
|
@@ -273,6 +279,8 @@ local_notify_route(struct babel_route *r
|
|
if(local_sockets[i].monitor)
|
|
local_notify_route_1(&local_sockets[i], route, kind);
|
|
}
|
|
+ if(ubus_bindings)
|
|
+ ubus_notify_route(route, kind);
|
|
}
|
|
|
|
static void
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -10,10 +10,10 @@ CFLAGS = $(CDEBUGFLAGS) $(DEFINES) $(EXT
|
|
LDLIBS = -lrt
|
|
|
|
SRCS = babeld.c net.c kernel.c util.c interface.c source.c neighbour.c \
|
|
- route.c xroute.c message.c resend.c configuration.c local.c
|
|
+ route.c xroute.c message.c resend.c configuration.c local.c ubus.c
|
|
|
|
OBJS = babeld.o net.o kernel.o util.o interface.o source.o neighbour.o \
|
|
- route.o xroute.o message.o resend.o configuration.o local.o
|
|
+ route.o xroute.o message.o resend.o configuration.o local.o ubus.o
|
|
|
|
babeld: $(OBJS)
|
|
$(CC) $(CFLAGS) $(LDFLAGS) -o babeld $(OBJS) $(LDLIBS)
|