Add support for systemd style socket activation.

If the LISTEN_FDS environment variable is set and tinc is run in the
foreground, tinc will use filedescriptors 3 to 3 + LISTEN_FDS for its listening
TCP sockets. For now, tinc will create matching listening UDP sockets itself.

There is no dependency on systemd or on libsystemd-daemon.
This commit is contained in:
Guus Sliepen 2012-03-26 14:46:09 +01:00
parent cc6aee7846
commit 89f4574e0b
2 changed files with 94 additions and 47 deletions

View file

@ -581,6 +581,46 @@ static bool setup_myself(void) {
/* Open sockets */ /* Open sockets */
if(!do_detach && getenv("LISTEN_FDS")) {
sockaddr_t sa;
socklen_t salen;
listen_sockets = atoi(getenv("LISTEN_FDS"));
#ifdef HAVE_UNSETENV
unsetenv("LISTEN_FDS");
#endif
if(listen_sockets > MAXSOCKETS) {
logger(LOG_ERR, "Too many listening sockets");
return false;
}
for(i = 0; i < listen_sockets; i++) {
salen = sizeof sa;
if(getsockname(i + 3, &sa.sa, &salen) < 0) {
logger(LOG_ERR, "Could not get address of listen fd %d: %s", i + 3, sockstrerror(errno));
return false;
}
listen_socket[i].tcp = i + 3;
#ifdef FD_CLOEXEC
fcntl(i + 3, F_SETFD, FD_CLOEXEC);
#endif
listen_socket[i].udp = setup_vpn_in_socket(&sa);
if(listen_socket[i].udp < 0)
return false;
ifdebug(CONNECTIONS) {
hostname = sockaddr2hostname(&sa);
logger(LOG_NOTICE, "Listening on %s", hostname);
free(hostname);
}
memcpy(&listen_socket[i].sa, &sa, salen);
}
} else {
listen_sockets = 0; listen_sockets = 0;
cfg = lookup_config(config_tree, "BindToAddress"); cfg = lookup_config(config_tree, "BindToAddress");
@ -646,6 +686,7 @@ static bool setup_myself(void) {
freeaddrinfo(ai); freeaddrinfo(ai);
} while(cfg); } while(cfg);
}
if(listen_sockets) if(listen_sockets)
logger(LOG_NOTICE, "Ready"); logger(LOG_NOTICE, "Ready");

View file

@ -539,6 +539,12 @@ int main(int argc, char **argv) {
g_argv = argv; g_argv = argv;
if(getenv("LISTEN_PID") && atoi(getenv("LISTEN_PID")) == getpid())
do_detach = false;
#ifdef HAVE_UNSETENV
unsetenv("LISTEN_PID");
#endif
init_configuration(&config_tree); init_configuration(&config_tree);
/* Slllluuuuuuurrrrp! */ /* Slllluuuuuuurrrrp! */