if ((revents|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) {
log_error("Got invalid event from epoll for stdout stream: %"PRIx32, revents);
- return -EIO;
+ goto terminate;
}
l = read(s->fd, s->buffer+s->length, sizeof(s->buffer)-1-s->length);
return 0;
log_warning("Failed to read from stream: %m");
- goto fail;
+ goto terminate;
}
if (l == 0) {
- r = stdout_stream_scan(s, true);
- if (r < 0)
- goto fail;
-
- return 0;
+ stdout_stream_scan(s, true);
+ goto terminate;
}
s->length += l;
r = stdout_stream_scan(s, false);
if (r < 0)
- goto fail;
+ goto terminate;
return 1;
-fail:
+terminate:
stdout_stream_free(s);
return 0;
}
LIST_REMOVE(stdout_stream, s->server->stdout_streams, s);
}
- if (s->event_source)
+ if (s->event_source) {
+ sd_event_source_set_enabled(s->event_source, SD_EVENT_OFF);
s->event_source = sd_event_source_unref(s->event_source);
+ }
if (s->fd >= 0)
close_nointr_nofail(s->fd);
Server *s = userdata;
StdoutStream *stream;
int fd, r;
- socklen_t len;
assert(s);
stream->fd = fd;
- len = sizeof(stream->ucred);
- if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &stream->ucred, &len) < 0) {
+ r = getpeercred(fd, &stream->ucred);
+ if (r < 0) {
log_error("Failed to determine peer credentials: %m");
- r = -errno;
goto fail;
}
if (shutdown(fd, SHUT_WR) < 0) {
log_error("Failed to shutdown writing side of socket: %m");
- r = -errno;
goto fail;
}
fail:
stdout_stream_free(stream);
- return r;
+ return 0;
}
int server_open_stdout_socket(Server *s) {