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>
68 lines
2.2 KiB
Diff
68 lines
2.2 KiB
Diff
From: Sven Eckelmann <sven@narfation.org>
|
|
Date: Mon, 15 Feb 2021 20:34:54 +0100
|
|
Subject: alfred: Save global mode flags in bitfield
|
|
|
|
The verbose and ipv4mode entries in the globals structure is only used to
|
|
save a boolean information. So just use a bit in a bitfield to store this
|
|
information instead of a full int.
|
|
|
|
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
Forwarded: https://patchwork.open-mesh.org/project/b.a.t.m.a.n./patch/20210215200126.140253-3-sven@narfation.org/
|
|
|
|
diff --git a/alfred.h b/alfred.h
|
|
index 24f48fde3fdac1a8a80fae3b4f93dc2e16ddec0f..f09eb497a6efe62d38891dcac2149a6473f9215a 100644
|
|
--- a/alfred.h
|
|
+++ b/alfred.h
|
|
@@ -115,8 +115,8 @@ struct globals {
|
|
enum clientmode clientmode;
|
|
int clientmode_arg;
|
|
int clientmode_version;
|
|
- int verbose;
|
|
- int ipv4mode;
|
|
+ uint8_t verbose:1;
|
|
+ uint8_t ipv4mode:1;
|
|
|
|
int unix_sock;
|
|
const char *unix_path;
|
|
diff --git a/main.c b/main.c
|
|
index f633462bcc55b1ae3369c42ccf8f030e671ab268..c7588505fb0a277de3a0c0ac08bb4365b9a9a2a1 100644
|
|
--- a/main.c
|
|
+++ b/main.c
|
|
@@ -9,6 +9,7 @@
|
|
#include <arpa/inet.h>
|
|
#include <getopt.h>
|
|
#include <signal.h>
|
|
+#include <stdbool.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
@@ -184,8 +185,8 @@ static struct globals *alfred_init(int argc, char *argv[])
|
|
globals->clientmode_version = 0;
|
|
globals->mesh_iface = "bat0";
|
|
globals->unix_path = ALFRED_SOCK_PATH_DEFAULT;
|
|
- globals->verbose = 0;
|
|
- globals->ipv4mode = 0;
|
|
+ globals->verbose = false;
|
|
+ globals->ipv4mode = false;
|
|
globals->update_command = NULL;
|
|
globals->sync_period.tv_sec = ALFRED_INTERVAL;
|
|
globals->sync_period.tv_nsec = 0;
|
|
@@ -253,7 +254,7 @@ static struct globals *alfred_init(int argc, char *argv[])
|
|
globals->unix_path = optarg;
|
|
break;
|
|
case 'd':
|
|
- globals->verbose++;
|
|
+ globals->verbose = true;
|
|
break;
|
|
case 'c':
|
|
globals->update_command = optarg;
|
|
@@ -269,7 +270,7 @@ static struct globals *alfred_init(int argc, char *argv[])
|
|
printf(" ** Setting sync interval to: %.9f seconds (%ld.%09ld)\n", sync_period, globals->sync_period.tv_sec, globals->sync_period.tv_nsec);
|
|
break;
|
|
case '4':
|
|
- globals->ipv4mode = 1;
|
|
+ globals->ipv4mode = true;
|
|
inet_pton(AF_INET, optarg, &alfred_mcast.ipv4);
|
|
printf(" ** IPv4 Multicast Mode: %x\n", alfred_mcast.ipv4.s_addr);
|
|
break;
|