diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/load-fragment.c | 12 | ||||
| -rw-r--r-- | src/socket.c | 77 | ||||
| -rw-r--r-- | src/socket.h | 1 |
3 files changed, 85 insertions, 5 deletions
diff --git a/src/load-fragment.c b/src/load-fragment.c index c48d764a31..6ec5090197 100644 --- a/src/load-fragment.c +++ b/src/load-fragment.c @@ -220,6 +220,17 @@ static int config_parse_listen( } path_kill_slashes(p->path); + + } else if (streq(lvalue, "ListenSpecial")) { + p->type = SOCKET_SPECIAL; + + if (!(p->path = strdup(rvalue))) { + free(p); + return -ENOMEM; + } + + path_kill_slashes(p->path); + } else if (streq(lvalue, "ListenNetlink")) { p->type = SOCKET_SOCKET; @@ -1908,6 +1919,7 @@ static int load_from_path(Unit *u, const char *path) { { "ListenSequentialPacket", config_parse_listen, 0, &u->socket, "Socket" }, { "ListenFIFO", config_parse_listen, 0, &u->socket, "Socket" }, { "ListenNetlink", config_parse_listen, 0, &u->socket, "Socket" }, + { "ListenSpecial", config_parse_listen, 0, &u->socket, "Socket" }, { "BindIPv6Only", config_parse_socket_bind, 0, &u->socket, "Socket" }, { "Backlog", config_parse_unsigned, 0, &u->socket.backlog, "Socket" }, { "BindToDevice", config_parse_bindtodevice, 0, &u->socket, "Socket" }, diff --git a/src/socket.c b/src/socket.c index 1f03c22a80..ad67215c1f 100644 --- a/src/socket.c +++ b/src/socket.c @@ -249,7 +249,7 @@ static bool socket_needs_mount(Socket *s, const char *prefix) { if (socket_address_needs_mount(&p->address, prefix)) return true; } else { - assert(p->type == SOCKET_FIFO); + assert(p->type == SOCKET_FIFO || p->type == SOCKET_SPECIAL); if (path_startswith(p->path, prefix)) return true; } @@ -482,7 +482,9 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { fprintf(f, "%s%s: %s\n", prefix, listen_lookup(socket_address_family(&p->address), p->address.type), t); free(k); - } else + } else if (p->type == SOCKET_SPECIAL) + fprintf(f, "%sListenSpecial: %s\n", prefix, p->path); + else fprintf(f, "%sListenFIFO: %s\n", prefix, p->path); } @@ -687,7 +689,6 @@ static void socket_apply_fifo_options(Socket *s, int fd) { log_warning("F_SETPIPE_SZ: %m"); } - static int fifo_address_create( const char *path, mode_t directory_mode, @@ -753,6 +754,42 @@ fail: return r; } +static int special_address_create( + const char *path, + int *_fd) { + + int fd = -1, r = 0; + struct stat st; + + assert(path); + assert(_fd); + + if ((fd = open(path, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NONBLOCK|O_NOFOLLOW)) < 0) { + r = -errno; + goto fail; + } + + if (fstat(fd, &st) < 0) { + r = -errno; + goto fail; + } + + /* Check whether this is a /proc, /sys or /dev file or char device */ + if (!S_ISREG(st.st_mode) && !S_ISCHR(st.st_mode)) { + r = -EEXIST; + goto fail; + } + + *_fd = fd; + return 0; + +fail: + if (fd >= 0) + close_nointr_nofail(fd); + + return r; +} + static int socket_open_fds(Socket *s) { SocketPort *p; int r; @@ -796,6 +833,13 @@ static int socket_open_fds(Socket *s) { socket_apply_socket_options(s, p->fd); + } else if (p->type == SOCKET_SPECIAL) { + + if ((r = special_address_create( + p->path, + &p->fd)) < 0) + goto rollback; + } else if (p->type == SOCKET_FIFO) { if ((r = fifo_address_create( @@ -1461,7 +1505,9 @@ static int socket_serialize(Unit *u, FILE *f, FDSet *fds) { else unit_serialize_item_format(u, f, "socket", "%i %i %s", copy, p->address.type, t); free(t); - } else { + } else if (p->type == SOCKET_SPECIAL) + unit_serialize_item_format(u, f, "special", "%i %s", copy, p->path); + else { assert(p->type == SOCKET_FIFO); unit_serialize_item_format(u, f, "fifo", "%i %s", copy, p->path); } @@ -1525,7 +1571,28 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value, else { LIST_FOREACH(port, p, s->ports) - if (streq(p->path, value+skip)) + if (p->type == SOCKET_FIFO && + streq_ptr(p->path, value+skip)) + break; + + if (p) { + if (p->fd >= 0) + close_nointr_nofail(p->fd); + p->fd = fdset_remove(fds, fd); + } + } + + } else if (streq(key, "special")) { + int fd, skip = 0; + SocketPort *p; + + if (sscanf(value, "%i %n", &fd, &skip) < 1 || fd < 0 || !fdset_contains(fds, fd)) + log_debug("Failed to parse special value %s", value); + else { + + LIST_FOREACH(port, p, s->ports) + if (p->type == SOCKET_SPECIAL && + streq_ptr(p->path, value+skip)) break; if (p) { diff --git a/src/socket.h b/src/socket.h index 9dd9f55fde..b83c34cf61 100644 --- a/src/socket.h +++ b/src/socket.h @@ -58,6 +58,7 @@ typedef enum SocketExecCommand { typedef enum SocketType { SOCKET_SOCKET, SOCKET_FIFO, + SOCKET_SPECIAL, _SOCKET_FIFO_MAX, _SOCKET_FIFO_INVALID = -1 } SocketType; |