chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: move ManagerRunningAs to shared
[elogind.git]
/
src
/
core
/
socket.c
diff --git
a/src/core/socket.c
b/src/core/socket.c
index 8153a8e76206b8093f2f28a66dde398ed780c597..26e7fd24de7c7ebcf0770d0390a8c3221d5b9822 100644
(file)
--- a/
src/core/socket.c
+++ b/
src/core/socket.c
@@
-39,6
+39,7
@@
#include "mkdir.h"
#include "path-util.h"
#include "unit-name.h"
#include "mkdir.h"
#include "path-util.h"
#include "unit-name.h"
+#include "unit-printf.h"
#include "dbus-socket.h"
#include "missing.h"
#include "special.h"
#include "dbus-socket.h"
#include "missing.h"
#include "special.h"
@@
-83,6
+84,7
@@
static void socket_init(Unit *u) {
exec_context_init(&s->exec_context);
s->exec_context.std_output = u->manager->default_std_output;
s->exec_context.std_error = u->manager->default_std_error;
exec_context_init(&s->exec_context);
s->exec_context.std_output = u->manager->default_std_output;
s->exec_context.std_error = u->manager->default_std_error;
+ kill_context_init(&s->kill_context);
s->control_command_id = _SOCKET_EXEC_COMMAND_INVALID;
}
s->control_command_id = _SOCKET_EXEC_COMMAND_INVALID;
}
@@
-223,7
+225,7
@@
static int socket_verify(Socket *s) {
return -EINVAL;
}
return -EINVAL;
}
- if (s->exec_context.pam_name && s->
exec
_context.kill_mode != KILL_CONTROL_GROUP) {
+ if (s->exec_context.pam_name && s->
kill
_context.kill_mode != KILL_CONTROL_GROUP) {
log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", UNIT(s)->id);
return -EINVAL;
}
log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", UNIT(s)->id);
return -EINVAL;
}
@@
-304,7
+306,7
@@
static int socket_add_default_dependencies(Socket *s) {
int r;
assert(s);
int r;
assert(s);
- if (UNIT(s)->manager->running_as ==
MANAGER
_SYSTEM) {
+ if (UNIT(s)->manager->running_as ==
SYSTEMD
_SYSTEM) {
if ((r = unit_add_dependency_by_name(UNIT(s), UNIT_BEFORE, SPECIAL_SOCKETS_TARGET, NULL, true)) < 0)
return r;
if ((r = unit_add_dependency_by_name(UNIT(s), UNIT_BEFORE, SPECIAL_SOCKETS_TARGET, NULL, true)) < 0)
return r;
@@
-373,7
+375,7
@@
static int socket_load(Unit *u) {
if ((r = socket_add_default_dependencies(s)) < 0)
return r;
if ((r = socket_add_default_dependencies(s)) < 0)
return r;
- r = unit_
patch_working_directory(UNIT(s)
, &s->exec_context);
+ r = unit_
exec_context_defaults(u
, &s->exec_context);
if (r < 0)
return r;
}
if (r < 0)
return r;
}
@@
-526,6
+528,7
@@
static void socket_dump(Unit *u, FILE *f, const char *prefix) {
}
exec_context_dump(&s->exec_context, f, prefix);
}
exec_context_dump(&s->exec_context, f, prefix);
+ kill_context_dump(&s->kill_context, f, prefix);
for (c = 0; c < _SOCKET_EXEC_COMMAND_MAX; c++) {
if (!s->exec_command[c])
for (c = 0; c < _SOCKET_EXEC_COMMAND_MAX; c++) {
if (!s->exec_command[c])
@@
-582,7
+585,7
@@
static int instance_from_socket(int fd, unsigned nr, char **instance) {
}
case AF_INET6: {
}
case AF_INET6: {
- static const char ipv4_prefix[] = {
+ static const
unsigned
char ipv4_prefix[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF
};
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF
};
@@
-1226,8
+1229,8
@@
static void socket_enter_signal(Socket *s, SocketState state, SocketResult f) {
if (f != SOCKET_SUCCESS)
s->result = f;
if (f != SOCKET_SUCCESS)
s->result = f;
- if (s->
exec
_context.kill_mode != KILL_NONE) {
- int sig = (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_FINAL_SIGTERM) ? s->
exec
_context.kill_signal : SIGKILL;
+ if (s->
kill
_context.kill_mode != KILL_NONE) {
+ int sig = (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_FINAL_SIGTERM) ? s->
kill
_context.kill_signal : SIGKILL;
if (s->control_pid > 0) {
if (kill_and_sigcont(s->control_pid, sig) < 0 && errno != ESRCH)
if (s->control_pid > 0) {
if (kill_and_sigcont(s->control_pid, sig) < 0 && errno != ESRCH)
@@
-1237,7
+1240,7
@@
static void socket_enter_signal(Socket *s, SocketState state, SocketResult f) {
wait_for_exit = true;
}
wait_for_exit = true;
}
- if (s->
exec
_context.kill_mode == KILL_CONTROL_GROUP) {
+ if (s->
kill
_context.kill_mode == KILL_CONTROL_GROUP) {
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func))) {
r = -ENOMEM;
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func))) {
r = -ENOMEM;
@@
-1848,7
+1851,8
@@
static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
if (w->socket_accept) {
for (;;) {
if (w->socket_accept) {
for (;;) {
- if ((cfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK)) < 0) {
+ cfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK);
+ if (cfd < 0) {
if (errno == EINTR)
continue;
if (errno == EINTR)
continue;
@@
-1882,7
+1886,7
@@
static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
s->control_pid = 0;
s->control_pid = 0;
- if (is_clean_exit(code, status))
+ if (is_clean_exit(code, status
, NULL
))
f = SOCKET_SUCCESS;
else if (code == CLD_EXITED)
f = SOCKET_FAILURE_EXIT_CODE;
f = SOCKET_SUCCESS;
else if (code == CLD_EXITED)
f = SOCKET_FAILURE_EXIT_CODE;
@@
-1983,7
+1987,7
@@
static void socket_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
break;
case SOCKET_STOP_PRE_SIGTERM:
break;
case SOCKET_STOP_PRE_SIGTERM:
- if (s->
exec
_context.send_sigkill) {
+ if (s->
kill
_context.send_sigkill) {
log_warning("%s stopping timed out. Killing.", u->id);
socket_enter_signal(s, SOCKET_STOP_PRE_SIGKILL, SOCKET_FAILURE_TIMEOUT);
} else {
log_warning("%s stopping timed out. Killing.", u->id);
socket_enter_signal(s, SOCKET_STOP_PRE_SIGKILL, SOCKET_FAILURE_TIMEOUT);
} else {
@@
-2003,7
+2007,7
@@
static void socket_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
break;
case SOCKET_FINAL_SIGTERM:
break;
case SOCKET_FINAL_SIGTERM:
- if (s->
exec
_context.send_sigkill) {
+ if (s->
kill
_context.send_sigkill) {
log_warning("%s stopping timed out (2). Killing.", u->id);
socket_enter_signal(s, SOCKET_FINAL_SIGKILL, SOCKET_FAILURE_TIMEOUT);
} else {
log_warning("%s stopping timed out (2). Killing.", u->id);
socket_enter_signal(s, SOCKET_FINAL_SIGKILL, SOCKET_FAILURE_TIMEOUT);
} else {
@@
-2102,7
+2106,7
@@
static void socket_reset_failed(Unit *u) {
s->result = SOCKET_SUCCESS;
}
s->result = SOCKET_SUCCESS;
}
-static int socket_kill(Unit *u, KillWho who,
KillMode mode,
int signo, DBusError *error) {
+static int socket_kill(Unit *u, KillWho who, int signo, DBusError *error) {
Socket *s = SOCKET(u);
int r = 0;
Set *pid_set = NULL;
Socket *s = SOCKET(u);
int r = 0;
Set *pid_set = NULL;
@@
-2124,23
+2128,25
@@
static int socket_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
if (kill(s->control_pid, signo) < 0)
r = -errno;
if (kill(s->control_pid, signo) < 0)
r = -errno;
- if (who == KILL_ALL
&& mode == KILL_CONTROL_GROUP
) {
+ if (who == KILL_ALL) {
int q;
int q;
- if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
+ pid_set = set_new(trivial_hash_func, trivial_compare_func);
+ if (!pid_set)
return -ENOMEM;
/* Exclude the control pid from being killed via the cgroup */
return -ENOMEM;
/* Exclude the control pid from being killed via the cgroup */
- if (s->control_pid > 0)
- if ((q = set_put(pid_set, LONG_TO_PTR(s->control_pid))) < 0) {
+ if (s->control_pid > 0) {
+ q = set_put(pid_set, LONG_TO_PTR(s->control_pid));
+ if (q < 0) {
r = q;
goto finish;
}
r = q;
goto finish;
}
+ }
q = cgroup_bonding_kill_list(UNIT(s)->cgroup_bondings, signo, false, false, pid_set, NULL);
q = cgroup_bonding_kill_list(UNIT(s)->cgroup_bondings, signo, false, false, pid_set, NULL);
- if (q < 0)
- if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)
- r = q;
+ if (q < 0 && q != -EAGAIN && q != -ESRCH && q != -ENOENT)
+ r = q;
}
finish:
}
finish:
@@
-2190,6
+2196,8
@@
DEFINE_STRING_TABLE_LOOKUP(socket_result, SocketResult);
const UnitVTable socket_vtable = {
.object_size = sizeof(Socket),
const UnitVTable socket_vtable = {
.object_size = sizeof(Socket),
+ .exec_context_offset = offsetof(Socket, exec_context),
+
.sections =
"Unit\0"
"Socket\0"
.sections =
"Unit\0"
"Socket\0"