X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=socket.c;h=68a4d812d6f6956b989a762ca36c9b17071084b5;hp=1b23483881549caa3de4ce14882a8360e5e1bdfb;hb=fa06836725dd6ec9f8f1c4b76608f7147008ecd9;hpb=c43d20a0af915a2641e9645ba7f47f576f9075e3 diff --git a/socket.c b/socket.c index 1b2348388..68a4d812d 100644 --- a/socket.c +++ b/socket.c @@ -12,7 +12,7 @@ #include "socket.h" #include "log.h" -static const UnitActiveState state_table[_SOCKET_STATE_MAX] = { +static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = { [SOCKET_DEAD] = UNIT_INACTIVE, [SOCKET_START_PRE] = UNIT_ACTIVATING, [SOCKET_START_POST] = UNIT_ACTIVATING, @@ -27,6 +27,21 @@ static const UnitActiveState state_table[_SOCKET_STATE_MAX] = { [SOCKET_MAINTAINANCE] = UNIT_INACTIVE, }; +static const char* const state_string_table[_SOCKET_STATE_MAX] = { + [SOCKET_DEAD] = "dead", + [SOCKET_START_PRE] = "start-pre", + [SOCKET_START_POST] = "start-post", + [SOCKET_LISTENING] = "listening", + [SOCKET_RUNNING] = "running", + [SOCKET_STOP_PRE] = "stop-pre", + [SOCKET_STOP_PRE_SIGTERM] = "stop-pre-sigterm", + [SOCKET_STOP_PRE_SIGKILL] = "stop-pre-sigkill", + [SOCKET_STOP_POST] = "stop-post", + [SOCKET_STOP_POST_SIGTERM] = "stop-post-sigterm", + [SOCKET_STOP_POST_SIGKILL] = "stop-post-sigkill", + [SOCKET_MAINTAINANCE] = "maintainance" +}; + static void socket_done(Unit *u) { Socket *s = SOCKET(u); SocketPort *p; @@ -53,7 +68,9 @@ static void socket_done(Unit *u) { s->service = NULL; - unit_unwatch_timer(u, &s->timer_id); + free(s->bind_to_device); + + unit_unwatch_timer(u, &s->timer_watch); } static int socket_init(Unit *u) { @@ -65,7 +82,7 @@ static int socket_init(Unit *u) { * reload */ s->state = 0; - s->timer_id = -1; + s->timer_watch.type = WATCH_INVALID; s->bind_ipv6_only = false; s->backlog = SOMAXCONN; s->timeout_usec = DEFAULT_TIMEOUT_USEC; @@ -110,21 +127,6 @@ static const char* listen_lookup(int type) { static void socket_dump(Unit *u, FILE *f, const char *prefix) { - static const char* const state_table[_SOCKET_STATE_MAX] = { - [SOCKET_DEAD] = "dead", - [SOCKET_START_PRE] = "start-pre", - [SOCKET_START_POST] = "start-post", - [SOCKET_LISTENING] = "listening", - [SOCKET_RUNNING] = "running", - [SOCKET_STOP_PRE] = "stop-pre", - [SOCKET_STOP_PRE_SIGTERM] = "stop-pre-sigterm", - [SOCKET_STOP_PRE_SIGKILL] = "stop-pre-sigkill", - [SOCKET_STOP_POST] = "stop-post", - [SOCKET_STOP_POST_SIGTERM] = "stop-post-sigterm", - [SOCKET_STOP_POST_SIGKILL] = "stop-post-sigkill", - [SOCKET_MAINTAINANCE] = "maintainance" - }; - static const char* const command_table[_SOCKET_EXEC_MAX] = { [SOCKET_EXEC_START_PRE] = "StartPre", [SOCKET_EXEC_START_POST] = "StartPost", @@ -138,6 +140,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { char *prefix2; assert(s); + assert(f); prefix2 = strappend(prefix, "\t"); if (!prefix2) @@ -147,10 +150,15 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { "%sSocket State: %s\n" "%sBindIPv6Only: %s\n" "%sBacklog: %u\n", - prefix, state_table[s->state], + prefix, state_string_table[s->state], prefix, yes_no(s->bind_ipv6_only), prefix, s->backlog); + if (s->bind_to_device) + fprintf(f, + "%sBindToDevice: %s\n", + prefix, s->bind_to_device); + LIST_FOREACH(port, p, s->ports) { if (p->type == SOCKET_SOCKET) { @@ -193,7 +201,7 @@ static void socket_close_fds(Socket *s) { if (p->fd < 0) continue; - unit_unwatch_fd(UNIT(s), p->fd); + unit_unwatch_fd(UNIT(s), &p->fd_watch); assert_se(close_nointr(p->fd) >= 0); p->fd = -1; @@ -213,7 +221,7 @@ static int socket_open_fds(Socket *s) { if (p->type == SOCKET_SOCKET) { - if ((r = socket_address_listen(&p->address, s->backlog, s->bind_ipv6_only, &p->fd)) < 0) + if ((r = socket_address_listen(&p->address, s->backlog, s->bind_ipv6_only, s->bind_to_device, &p->fd)) < 0) goto rollback; } else { @@ -260,7 +268,7 @@ static void socket_unwatch_fds(Socket *s) { if (p->fd < 0) continue; - unit_unwatch_fd(UNIT(s), p->fd); + unit_unwatch_fd(UNIT(s), &p->fd_watch); } } @@ -274,7 +282,7 @@ static int socket_watch_fds(Socket *s) { if (p->fd < 0) continue; - if ((r = unit_watch_fd(UNIT(s), p->fd, POLLIN)) < 0) + if ((r = unit_watch_fd(UNIT(s), p->fd, POLLIN, &p->fd_watch)) < 0) goto fail; } @@ -300,7 +308,7 @@ static void socket_set_state(Socket *s, SocketState state) { state != SOCKET_STOP_POST && state != SOCKET_STOP_POST_SIGTERM && state != SOCKET_STOP_POST_SIGKILL) - unit_unwatch_timer(UNIT(s), &s->timer_id); + unit_unwatch_timer(UNIT(s), &s->timer_watch); if (state != SOCKET_START_PRE && state != SOCKET_START_POST && @@ -310,7 +318,7 @@ static void socket_set_state(Socket *s, SocketState state) { state != SOCKET_STOP_POST && state != SOCKET_STOP_POST_SIGTERM && state != SOCKET_STOP_POST_SIGKILL) - if (s->control_pid >= 0) { + if (s->control_pid > 0) { unit_unwatch_pid(UNIT(s), s->control_pid); s->control_pid = 0; } @@ -332,7 +340,9 @@ static void socket_set_state(Socket *s, SocketState state) { if (state != SOCKET_LISTENING) socket_unwatch_fds(s); - unit_notify(UNIT(s), state_table[old_state], state_table[s->state]); + log_debug("%s changing %s → %s", unit_id(UNIT(s)), state_string_table[old_state], state_string_table[state]); + + unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state]); } static int socket_spawn(Socket *s, ExecCommand *c, bool timeout, pid_t *_pid) { @@ -344,10 +354,10 @@ static int socket_spawn(Socket *s, ExecCommand *c, bool timeout, pid_t *_pid) { assert(_pid); if (timeout) { - if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_id)) < 0) + if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0) goto fail; } else - unit_unwatch_timer(UNIT(s), &s->timer_id); + unit_unwatch_timer(UNIT(s), &s->timer_watch); if ((r = exec_spawn(c, &s->exec_context, NULL, 0, &pid)) < 0) goto fail; @@ -362,7 +372,7 @@ static int socket_spawn(Socket *s, ExecCommand *c, bool timeout, pid_t *_pid) { fail: if (timeout) - unit_unwatch_timer(UNIT(s), &s->timer_id); + unit_unwatch_timer(UNIT(s), &s->timer_watch); return r; } @@ -455,12 +465,27 @@ fail: socket_enter_stop_post(s, false); } +static void socket_enter_listening(Socket *s) { + int r; + assert(s); + + if ((r = socket_watch_fds(s)) < 0) { + log_warning("%s failed to watch sockets: %s", unit_id(UNIT(s)), strerror(-r)); + goto fail; + } + + socket_set_state(s, SOCKET_LISTENING); + return; + +fail: + socket_enter_stop_pre(s, false); +} + static void socket_enter_start_post(Socket *s) { int r; assert(s); - if ((r = socket_open_fds(s)) < 0 || - (r = socket_watch_fds(s)) < 0) { + if ((r = socket_open_fds(s)) < 0) { log_warning("%s failed to listen on sockets: %s", unit_id(UNIT(s)), strerror(-r)); goto fail; } @@ -474,7 +499,7 @@ static void socket_enter_start_post(Socket *s) { socket_set_state(s, SOCKET_START_POST); } else - socket_set_state(s, SOCKET_LISTENING); + socket_enter_listening(s); return; @@ -594,15 +619,15 @@ static int socket_stop(Unit *u) { static UnitActiveState socket_active_state(Unit *u) { assert(u); - return state_table[SOCKET(u)->state]; + return state_translation_table[SOCKET(u)->state]; } -static void socket_fd_event(Unit *u, int fd, uint32_t events) { +static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) { Socket *s = SOCKET(u); assert(s); - log_info("Incoming traffic on %s", unit_id(u)); + log_debug("Incoming traffic on %s", unit_id(u)); if (events != POLLIN) socket_enter_stop_pre(s, false); @@ -617,7 +642,7 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) { assert(s); assert(pid >= 0); - success = code == CLD_EXITED || status == 0; + success = code == CLD_EXITED && status == 0; s->failure = s->failure || !success; assert(s->control_pid == pid); @@ -626,27 +651,30 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) { exec_status_fill(&s->control_command->exec_status, pid, code, status); s->control_pid = 0; - log_debug("%s: control process exited, code=%s status=%i", unit_id(u), sigchld_code(code), status); + log_debug("%s control process exited, code=%s status=%i", unit_id(u), sigchld_code(code), status); if (s->control_command->command_next && - (success || (s->state == SOCKET_EXEC_STOP_PRE || s->state == SOCKET_EXEC_STOP_POST))) + (success || (s->state == SOCKET_EXEC_STOP_PRE || s->state == SOCKET_EXEC_STOP_POST))) { + log_debug("%s running next command for the state %s", unit_id(u), state_string_table[s->state]); socket_run_next(s, success); - else { + } else { /* No further commands for this step, so let's figure * out what to do next */ + log_debug("%s got final SIGCHLD for state %s", unit_id(u), state_string_table[s->state]); + switch (s->state) { case SOCKET_START_PRE: if (success) - socket_enter_start_pre(s); + socket_enter_start_post(s); else socket_enter_stop_pre(s, false); break; case SOCKET_START_POST: if (success) - socket_set_state(s, SOCKET_LISTENING); + socket_enter_listening(s); else socket_enter_stop_pre(s, false); break; @@ -669,13 +697,13 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) { } } -static void socket_timer_event(Unit *u, int id, uint64_t elapsed) { +static void socket_timer_event(Unit *u, uint64_t elapsed, Watch *w) { Socket *s = SOCKET(u); assert(s); assert(elapsed == 1); - assert(s->timer_id == id); + assert(w == &s->timer_watch); switch (s->state) { @@ -752,6 +780,17 @@ int socket_collect_fds(Socket *s, int **fds, unsigned *n_fds) { return 0; } +void socket_notify_service_dead(Socket *s) { + assert(s); + + /* The service is dead. Dang. */ + + if (s->state == SOCKET_RUNNING) { + log_debug("%s got notified about service death.", unit_id(UNIT(s))); + socket_enter_listening(s); + } +} + const UnitVTable socket_vtable = { .suffix = ".socket",