chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
conf-parser: warn when we open configuration files with weird access bits
[elogind.git]
/
src
/
core
/
socket.c
diff --git
a/src/core/socket.c
b/src/core/socket.c
index 31fc2a25269a659125ee42f284792e8040943af8..5f16493bc224d167437ea439a725ee29bbdc60cf 100644
(file)
--- a/
src/core/socket.c
+++ b/
src/core/socket.c
@@
-179,7
+179,8
@@
static int socket_arm_timer(Socket *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;
@@
-199,13
+200,11
@@
static int socket_instantiate_service(Socket *s) {
return -ENOMEM;
r = asprintf(&name, "%s@%u.service", prefix, s->n_accepted);
return -ENOMEM;
r = asprintf(&name, "%s@%u.service", prefix, s->n_accepted);
- free(prefix);
if (r < 0)
return -ENOMEM;
r = manager_load_unit(UNIT(s)->manager, name, NULL, NULL, &u);
if (r < 0)
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;
@@
-671,10
+670,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",
@@
-1344,8
+1344,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);
@@
-2344,6
+2348,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",
@@
-2408,6
+2426,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,