tcpwrap: execute tcpwrap check in forked client, to avoid blocking name lookups in main systemd process

This commit is contained in:
Lennart Poettering
2010-06-16 16:27:24 +02:00
parent 0213c3f810
commit df1f0afe0c
8 changed files with 28 additions and 26 deletions
-15
View File
@@ -36,7 +36,6 @@
#include "strv.h"
#include "unit-name.h"
#include "dbus-socket.h"
#include "tcpwrap.h"
static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
[SOCKET_DEAD] = UNIT_INACTIVE,
@@ -108,9 +107,6 @@ static void socket_done(Unit *u) {
free(s->bind_to_device);
s->bind_to_device = NULL;
free(s->tcpwrap_name);
s->tcpwrap_name = NULL;
unit_unwatch_timer(u, &s->timer_watch);
}
@@ -309,11 +305,6 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
"%sBindToDevice: %s\n",
prefix, s->bind_to_device);
if (s->tcpwrap_name)
fprintf(f,
"%sTCPWrapName: %s\n",
prefix, s->tcpwrap_name);
if (s->accept)
fprintf(f,
"%sAccepted: %u\n",
@@ -1221,12 +1212,6 @@ static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
break;
}
if (s->tcpwrap_name)
if (!socket_tcpwrap(cfd, s->tcpwrap_name)) {
close_nointr_nofail(cfd);
return;
}
}
socket_enter_running(s, cfd);