-
Notifications
You must be signed in to change notification settings - Fork 377
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Announcement: https://alioth-lists.debian.net/pipermail/babel-users/2023-July/004100.html Babeld removed diversity routing [0], so we need to adjust ubus bindings. Further. we need to add a patch that makes local_kind accessible again: "100-local-make-local_kind-function-accessible.patch" Refresh patches: - 600-add-ubus.patch [0] - jech/babeld@a081608 Signed-off-by: Nick Hainke <vincent@systemli.org>
- Loading branch information
1 parent
26f5f0f
commit 9e13652
Showing
4 changed files
with
46 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
babeld/patches/100-local-make-local_kind-function-accessible.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
From b29cb705c3b717a7d5c61719936464438b9a48f0 Mon Sep 17 00:00:00 2001 | ||
From: Nick Hainke <vincent@systemli.org> | ||
Date: Fri, 15 Jan 2021 15:01:31 +0100 | ||
Subject: [PATCH] local: make local_kind function accessible | ||
|
||
The kind-definitions are contained in the header file: | ||
LOCAL_FLUSH 0 | ||
LOCAL_ADD 1 | ||
LOCAL_CHANGE 2 | ||
|
||
The function (local_kind) that converts them into strings again | ||
is private. New addons (for example openwrt ubus bindings) that make | ||
use of babeld should also use the same function to convert the kind | ||
to string format. This allows to ensure uniformity over all addons. | ||
|
||
Signed-off-by: Nick Hainke <vincent@systemli.org> | ||
--- | ||
local.c | 2 +- | ||
local.h | 1 + | ||
2 files changed, 2 insertions(+), 1 deletion(-) | ||
|
||
--- a/local.c | ||
+++ b/local.c | ||
@@ -80,7 +80,7 @@ write_timeout(int fd, const void *buf, i | ||
} | ||
} | ||
|
||
-static const char * | ||
+const char * | ||
local_kind(int kind) | ||
{ | ||
switch(kind) { | ||
--- a/local.h | ||
+++ b/local.h | ||
@@ -55,3 +55,4 @@ int local_read(struct local_socket *s); | ||
int local_header(struct local_socket *s); | ||
struct local_socket *local_socket_create(int fd); | ||
void local_socket_destroy(int i); | ||
+const char *local_kind(int kind); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters