chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.freedesktop.org/git/systemd
[elogind.git]
/
src
/
socket.c
diff --git
a/src/socket.c
b/src/socket.c
index f9da353c1280a720b1f5c7f0b52db0a6b5c25339..909151752c7d3c9a035f1090e0b64e0d1b9c1eb9 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,
@@
-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) {