chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not return -1 (EINVAL) on allocation error
[elogind.git]
/
src
/
core
/
socket.c
diff --git
a/src/core/socket.c
b/src/core/socket.c
index 2442221355356a1e4f485d4485dcf93b0a25cb3f..b39bec2f261f9fafb2336f52181c44135e906d4a 100644
(file)
--- a/
src/core/socket.c
+++ b/
src/core/socket.c
@@
-96,6
+96,8
@@
static void socket_init(Unit *u) {
kill_context_init(&s->kill_context);
cgroup_context_init(&s->cgroup_context);
kill_context_init(&s->kill_context);
cgroup_context_init(&s->cgroup_context);
+ unit_cgroup_context_init_defaults(u, &s->cgroup_context);
+
s->control_command_id = _SOCKET_EXEC_COMMAND_INVALID;
}
s->control_command_id = _SOCKET_EXEC_COMMAND_INVALID;
}
@@
-175,11
+177,12
@@
static int socket_arm_timer(Socket *s) {
return sd_event_source_set_enabled(s->timer_event_source, SD_EVENT_ONESHOT);
}
return sd_event_source_set_enabled(s->timer_event_source, SD_EVENT_ONESHOT);
}
- return sd_event_add_monotonic(UNIT(s)->manager->event,
now(CLOCK_MONOTONIC) + s->timeout_usec, 0, socket_dispatch_timer, s, &s->timer_event_source
);
+ return sd_event_add_monotonic(UNIT(s)->manager->event,
&s->timer_event_source, now(CLOCK_MONOTONIC) + s->timeout_usec, 0, socket_dispatch_timer, s
);
}
static int socket_instantiate_service(Socket *s) {
}
static int socket_instantiate_service(Socket *s) {
- char *prefix, *name;
+ _cleanup_free_ char *prefix = NULL;
+ _cleanup_free_ char *name = NULL;
int r;
Unit *u;
int r;
Unit *u;
@@
-195,18
+198,14
@@
static int socket_instantiate_service(Socket *s) {
assert(s->accept);
assert(s->accept);
- if (!(prefix = unit_name_to_prefix(UNIT(s)->id)))
+ prefix = unit_name_to_prefix(UNIT(s)->id);
+ if (!prefix)
return -ENOMEM;
return -ENOMEM;
- r = asprintf(&name, "%s@%u.service", prefix, s->n_accepted);
- free(prefix);
-
- if (r < 0)
+ if (asprintf(&name, "%s@%u.service", prefix, s->n_accepted) < 0)
return -ENOMEM;
r = manager_load_unit(UNIT(s)->manager, name, NULL, NULL, &u);
return -ENOMEM;
r = manager_load_unit(UNIT(s)->manager, name, NULL, NULL, &u);
- free(name);
-
if (r < 0)
return r;
if (r < 0)
return r;
@@
-339,7
+338,7
@@
static int socket_add_extras(Socket *s) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = unit_exec_context_defaults(u, &s->exec_context);
+ r = unit_exec_context_
patch_
defaults(u, &s->exec_context);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-596,13
+595,7
@@
static void socket_dump(Unit *u, FILE *f, const char *prefix) {
static int instance_from_socket(int fd, unsigned nr, char **instance) {
socklen_t l;
char *r;
static int instance_from_socket(int fd, unsigned nr, char **instance) {
socklen_t l;
char *r;
- union {
- struct sockaddr sa;
- struct sockaddr_un un;
- struct sockaddr_in in;
- struct sockaddr_in6 in6;
- struct sockaddr_storage storage;
- } local, remote;
+ union sockaddr_union local, remote;
assert(fd >= 0);
assert(instance);
assert(fd >= 0);
assert(instance);
@@
-671,10
+664,11
@@
static int instance_from_socket(int fd, unsigned nr, char **instance) {
case AF_UNIX: {
struct ucred ucred;
case AF_UNIX: {
struct ucred ucred;
+ int k;
-
l = sizeof(
ucred);
- if (
getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &ucred, &l)
< 0)
- return
-errno
;
+
k = getpeercred(fd, &
ucred);
+ if (
k
< 0)
+ return
k
;
if (asprintf(&r,
"%u-%lu-%lu",
if (asprintf(&r,
"%u-%lu-%lu",
@@
-1112,7
+1106,7
@@
static int socket_watch_fds(Socket *s) {
if (p->event_source)
r = sd_event_source_set_enabled(p->event_source, SD_EVENT_ON);
else
if (p->event_source)
r = sd_event_source_set_enabled(p->event_source, SD_EVENT_ON);
else
- r = sd_event_add_io(UNIT(s)->manager->event,
p->fd, EPOLLIN, socket_dispatch_io, p, &p->event_source
);
+ r = sd_event_add_io(UNIT(s)->manager->event,
&p->event_source, p->fd, EPOLLIN, socket_dispatch_io, p
);
if (r < 0) {
log_warning_unit(UNIT(s)->id, "Failed to watch listening fds: %s", strerror(-r));
if (r < 0) {
log_warning_unit(UNIT(s)->id, "Failed to watch listening fds: %s", strerror(-r));
@@
-1253,7
+1247,9
@@
static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
UNIT(s)->manager->confirm_spawn,
UNIT(s)->manager->cgroup_supported,
UNIT(s)->cgroup_path,
UNIT(s)->manager->confirm_spawn,
UNIT(s)->manager->cgroup_supported,
UNIT(s)->cgroup_path,
+ manager_get_runtime_prefix(UNIT(s)->manager),
UNIT(s)->id,
UNIT(s)->id,
+ 0,
NULL,
s->exec_runtime,
&pid);
NULL,
s->exec_runtime,
&pid);
@@
-1286,6
+1282,8
@@
static void socket_enter_dead(Socket *s, SocketResult f) {
exec_runtime_destroy(s->exec_runtime);
s->exec_runtime = exec_runtime_unref(s->exec_runtime);
exec_runtime_destroy(s->exec_runtime);
s->exec_runtime = exec_runtime_unref(s->exec_runtime);
+ exec_context_destroy_runtime_directory(&s->exec_context, manager_get_runtime_prefix(UNIT(s)->manager));
+
socket_set_state(s, s->result != SOCKET_SUCCESS ? SOCKET_FAILED : SOCKET_DEAD);
}
socket_set_state(s, s->result != SOCKET_SUCCESS ? SOCKET_FAILED : SOCKET_DEAD);
}
@@
-1343,8
+1341,12
@@
static void socket_enter_signal(Socket *s, SocketState state, SocketResult f) {
goto fail;
socket_set_state(s, state);
goto fail;
socket_set_state(s, state);
- } else if (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_STOP_PRE_SIGKILL)
+ } else if (state == SOCKET_STOP_PRE_SIGTERM)
+ socket_enter_signal(s, SOCKET_STOP_PRE_SIGKILL, SOCKET_SUCCESS);
+ else if (state == SOCKET_STOP_PRE_SIGKILL)
socket_enter_stop_post(s, SOCKET_SUCCESS);
socket_enter_stop_post(s, SOCKET_SUCCESS);
+ else if (state == SOCKET_FINAL_SIGTERM)
+ socket_enter_signal(s, SOCKET_FINAL_SIGKILL, SOCKET_SUCCESS);
else
socket_enter_dead(s, SOCKET_SUCCESS);
else
socket_enter_dead(s, SOCKET_SUCCESS);
@@
-2343,6
+2345,20
@@
static int socket_kill(Unit *u, KillWho who, int signo, sd_bus_error *error) {
return unit_kill_common(u, who, signo, -1, SOCKET(u)->control_pid, error);
}
return unit_kill_common(u, who, signo, -1, SOCKET(u)->control_pid, error);
}
+static int socket_get_timeout(Unit *u, uint64_t *timeout) {
+ Socket *s = SOCKET(u);
+ int r;
+
+ if (!s->timer_event_source)
+ return 0;
+
+ r = sd_event_source_get_time(s->timer_event_source, timeout);
+ if (r < 0)
+ return r;
+
+ return 1;
+}
+
static const char* const socket_state_table[_SOCKET_STATE_MAX] = {
[SOCKET_DEAD] = "dead",
[SOCKET_START_PRE] = "start-pre",
static const char* const socket_state_table[_SOCKET_STATE_MAX] = {
[SOCKET_DEAD] = "dead",
[SOCKET_START_PRE] = "start-pre",
@@
-2407,6
+2423,8
@@
const UnitVTable socket_vtable = {
.kill = socket_kill,
.kill = socket_kill,
+ .get_timeout = socket_get_timeout,
+
.serialize = socket_serialize,
.deserialize_item = socket_deserialize_item,
.distribute_fds = socket_distribute_fds,
.serialize = socket_serialize,
.deserialize_item = socket_deserialize_item,
.distribute_fds = socket_distribute_fds,