diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-06-05 02:29:45 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-06-05 02:43:24 +0200 |
| commit | 2c32259d535646014dbffb7245a4340f557f6293 (patch) | |
| tree | a7a951afe760905531c2cc757cdc495db3ade0fb /src | |
| parent | 4518f1d2c7bef45148fae8761400f4951d4c0842 (diff) | |
| download | fastd-2c32259d535646014dbffb7245a4340f557f6293.tar fastd-2c32259d535646014dbffb7245a4340f557f6293.zip | |
Simplify systemd notify socket handling
Diffstat (limited to 'src')
| -rw-r--r-- | src/fastd.c | 29 | ||||
| -rw-r--r-- | src/shell.c | 2 |
2 files changed, 10 insertions, 21 deletions
diff --git a/src/fastd.c b/src/fastd.c index b5cc758..6512bf7 100644 --- a/src/fastd.c +++ b/src/fastd.c @@ -420,11 +420,15 @@ static int daemonize(void) { } } -#ifdef ENABLE_SYSTEMD /** Sends a readiness notification on a notify socket */ -static void notify_systemd(const char *notify_socket) { +static inline void notify_systemd(void) { +#ifdef ENABLE_SYSTEMD int fd; struct sockaddr_un sa = {}; + const char *notify_socket = getenv("NOTIFY_SOCKET"); + + if (!notify_socket) + return; if ((notify_socket[0] != '@' && notify_socket[0] != '/') || notify_socket[1] == 0) return; @@ -449,9 +453,8 @@ static void notify_systemd(const char *notify_socket) { pr_debug("sent startup notification to systemd"); close(fd); -} #endif - +} /** Early initialization before reading the config */ static inline void init_early(void) { @@ -519,17 +522,6 @@ static inline void init_config(int *status_fd) { static inline void init(int argc, char *argv[]) { int status_fd = -1; -#ifdef ENABLE_SYSTEMD - char *notify_socket = getenv("NOTIFY_SOCKET"); - - if (notify_socket) { - notify_socket = strdup(notify_socket); - - /* unset the socket to allow calling on_pre_up safely */ - unsetenv("NOTIFY_SOCKET"); - } -#endif - init_early(); fastd_configure(argc, argv); init_config(&status_fd); @@ -568,12 +560,7 @@ static inline void init(int argc, char *argv[]) { fastd_peer_hashtable_init(); -#ifdef ENABLE_SYSTEMD - if (notify_socket) { - notify_systemd(notify_socket); - free(notify_socket); - } -#endif + notify_systemd(); if (status_fd >= 0) { static const uint8_t STATUS = 0; diff --git a/src/shell.c b/src/shell.c index 076c4c8..a90d58b 100644 --- a/src/shell.c +++ b/src/shell.c @@ -81,6 +81,8 @@ void fastd_shell_env_free(fastd_shell_env_t *env) { static void shell_command_setenv(pid_t pid, const fastd_shell_env_t *env) { char buf[20]; + unsetenv("NOTIFY_SOCKET"); + snprintf(buf, sizeof(buf), "%u", (unsigned)pid); setenv("FASTD_PID", buf, 1); |