chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: shut down sysinit service on shutdown
[elogind.git]
/
src
/
socket.c
diff --git
a/src/socket.c
b/src/socket.c
index f9da353c1280a720b1f5c7f0b52db0a6b5c25339..19f1d2209736a6afe878d6ac44ae2cb73488008a 100644
(file)
--- a/
src/socket.c
+++ b/
src/socket.c
@@
-58,7
+58,6
@@
static void socket_init(Unit *u) {
assert(u);
assert(u->meta.load_state == UNIT_STUB);
assert(u);
assert(u->meta.load_state == UNIT_STUB);
- s->timer_watch.type = WATCH_INVALID;
s->backlog = SOMAXCONN;
s->timeout_usec = DEFAULT_TIMEOUT_USEC;
s->directory_mode = 0755;
s->backlog = SOMAXCONN;
s->timeout_usec = DEFAULT_TIMEOUT_USEC;
s->directory_mode = 0755;
@@
-290,7
+289,7
@@
static void socket_dump(Unit *u, FILE *f, const char *prefix) {
"%sSocketMode: %04o\n"
"%sDirectoryMode: %04o\n",
prefix, socket_state_to_string(s->state),
"%sSocketMode: %04o\n"
"%sDirectoryMode: %04o\n",
prefix, socket_state_to_string(s->state),
- prefix,
yes_no
(s->bind_ipv6_only),
+ prefix,
socket_address_bind_ipv6_only_to_string
(s->bind_ipv6_only),
prefix, s->backlog,
prefix, kill_mode_to_string(s->kill_mode),
prefix, s->socket_mode,
prefix, s->backlog,
prefix, kill_mode_to_string(s->kill_mode),
prefix, s->socket_mode,
@@
-1068,7
+1067,7
@@
static int socket_serialize(Unit *u, FILE *f, FDSet *fds) {
if ((r = socket_address_print(&p->address, &t)) < 0)
return r;
if ((r = socket_address_print(&p->address, &t)) < 0)
return r;
- unit_serialize_item_format(u, f, "socket", "%i %
s", copy
, t);
+ unit_serialize_item_format(u, f, "socket", "%i %
i %s", copy, p->address.type
, t);
free(t);
} else {
assert(p->type == SOCKET_FIFO);
free(t);
} else {
assert(p->type == SOCKET_FIFO);
@@
-1146,15
+1145,15
@@
static int socket_deserialize_item(Unit *u, const char *key, const char *value,
}
} else if (streq(key, "socket")) {
}
} else if (streq(key, "socket")) {
- int fd, skip = 0;
+ int fd,
type,
skip = 0;
SocketPort *p;
SocketPort *p;
- if (sscanf(value, "%i %
n", &fd, &skip) < 1 || fd
< 0 || !fdset_contains(fds, fd))
+ if (sscanf(value, "%i %
i %n", &fd, &type, &skip) < 2 || fd < 0 || type
< 0 || !fdset_contains(fds, fd))
log_debug("Failed to parse socket value %s", value);
else {
LIST_FOREACH(port, p, s->ports)
log_debug("Failed to parse socket value %s", value);
else {
LIST_FOREACH(port, p, s->ports)
- if (socket_address_is(&p->address, value+skip))
+ if (socket_address_is(&p->address, value+skip
, type
))
break;
if (p) {
break;
if (p) {
@@
-1189,6
+1188,9
@@
static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
assert(s);
assert(fd >= 0);
assert(s);
assert(fd >= 0);
+ if (s->state != SOCKET_LISTENING)
+ return;
+
log_debug("Incoming traffic on %s", u->meta.id);
if (events != EPOLLIN) {
log_debug("Incoming traffic on %s", u->meta.id);
if (events != EPOLLIN) {