mirror of
https://github.com/openwrt/routing.git
synced 2025-02-24 07:25:03 +00:00
369908cb0a
The alfred server always needs interfaces to operate on. But these interfaces might not exist at the moment when the daemon process is started. This situation stopped the startup process after the init scripts waited for a longer period of polling the system state. But alfred is able to deal with interfaces which disappeared at runtime but existed at startup. To force a similar behavior for the alfred startup, the parameter "--force" or "-f" is used. The extra polling code is therefore no longer needed in the init scripts. Signed-off-by: Sven Eckelmann <sven@narfation.org>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From: Sven Eckelmann <sven@narfation.org>
|
|
Date: Mon, 15 Feb 2021 19:56:22 +0100
|
|
Subject: alfred: Show error message for invalid batadv interface
|
|
|
|
The alfred server process always stopped without any informational message
|
|
when the provided batman-adv was not "none" and was not accessible. This
|
|
made it extremely hard to debug the reason why alfred directly stopped
|
|
after launching it.
|
|
|
|
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
Forwarded: https://patchwork.open-mesh.org/project/b.a.t.m.a.n./patch/20210215200126.140253-1-sven@narfation.org/
|
|
|
|
diff --git a/server.c b/server.c
|
|
index 18109cc76283484a67f54fbc34f88039b9602531..47e9ae28b703da23fb930756d2971161ab332bc1 100644
|
|
--- a/server.c
|
|
+++ b/server.c
|
|
@@ -385,8 +385,11 @@ int alfred_server(struct globals *globals)
|
|
}
|
|
|
|
if (strcmp(globals->mesh_iface, "none") != 0 &&
|
|
- batadv_interface_check(globals->mesh_iface) < 0)
|
|
+ batadv_interface_check(globals->mesh_iface) < 0) {
|
|
+ fprintf(stderr, "Can't start server: batman-adv interface %s not found\n",
|
|
+ globals->mesh_iface);
|
|
return -1;
|
|
+ }
|
|
|
|
num_socks = netsock_open_all(globals);
|
|
if (num_socks <= 0) {
|