diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-12-24 21:18:21 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-12-25 01:29:55 +0100 |
| commit | 79a98c609da042c60260e8e0236464014d480dcb (patch) | |
| tree | 41b2a3453324695917a55294743273711e51b80a | |
| parent | db69869f264af2d1afcdd3e573e0e9fdd5bef065 (diff) | |
unit: include peer identity in description of per-connection socket-activated services
| -rw-r--r-- | src/core/service.c | 19 | ||||
| -rw-r--r-- | src/shared/socket-util.c | 8 |
2 files changed, 21 insertions, 6 deletions
diff --git a/src/core/service.c b/src/core/service.c index 4eb3d9e66..8097e26b0 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -3656,6 +3656,8 @@ static void service_bus_name_owner_change( } int service_set_socket_fd(Service *s, int fd, Socket *sock) { + _cleanup_free_ char *peer = NULL; + int r; assert(s); assert(fd >= 0); @@ -3673,6 +3675,23 @@ int service_set_socket_fd(Service *s, int fd, Socket *sock) { if (s->state != SERVICE_DEAD) return -EAGAIN; + if (getpeername_pretty(fd, &peer) >= 0) { + + if (UNIT(s)->description) { + _cleanup_free_ char *a; + + a = strjoin(UNIT(s)->description, " (", peer, ")", NULL); + if (!a) + return -ENOMEM; + + r = unit_set_description(UNIT(s), a); + } else + r = unit_set_description(UNIT(s), peer); + + if (r < 0) + return r; + } + s->socket_fd = fd; unit_ref_set(&s->accept_socket, UNIT(sock)); diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c index 45ada7eb3..4700b3bc9 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -422,8 +422,7 @@ const char* socket_address_get_path(const SocketAddress *a) { } bool socket_ipv6_is_supported(void) { - char *l = 0; - bool enabled; + _cleanup_free_ char *l = NULL; if (access("/sys/module/ipv6", F_OK) != 0) return 0; @@ -433,10 +432,7 @@ bool socket_ipv6_is_supported(void) { return 1; /* If module was loaded with disable=1 no IPv6 available */ - enabled = l[0] == '0'; - free(l); - - return enabled; + return l[0] == '0'; } bool socket_address_matches_fd(const SocketAddress *a, int fd) { |