diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-08-14 16:34:47 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-08-14 16:36:32 +0200 |
| commit | 4d8ddba9d71e51356cc9488f906b8fef89c60c23 (patch) | |
| tree | 99690b388a9de41159dc8e19133b15930f254986 /src | |
| parent | 9fdaa9925e1919b766fe1e095228fe663c583923 (diff) | |
Revert "socket: add support for TCP fast Open"
This reverts commit 9528592ff8d7ff361da430285deba8196e8984d5.
Apparently TFO is actually the default at least for the server side now.
Also the setsockopt doesn't actually take a bool, but a qlen integer.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/dbus-socket.c | 1 | ||||
| -rw-r--r-- | src/core/load-fragment-gperf.gperf.m4 | 1 | ||||
| -rw-r--r-- | src/core/socket.c | 8 | ||||
| -rw-r--r-- | src/core/socket.h | 1 |
4 files changed, 0 insertions, 11 deletions
diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c index 71c0115ab4..ad135a1ac2 100644 --- a/src/core/dbus-socket.c +++ b/src/core/dbus-socket.c @@ -97,7 +97,6 @@ const sd_bus_vtable bus_socket_vtable[] = { SD_BUS_PROPERTY("DirectoryMode", "u", bus_property_get_mode, offsetof(Socket, directory_mode), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("Accept", "b", bus_property_get_bool, offsetof(Socket, accept), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("KeepAlive", "b", bus_property_get_bool, offsetof(Socket, keep_alive), SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_PROPERTY("FastOpen" , "b", bus_property_get_bool, offsetof(Socket, fast_open), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("Priority", "i", bus_property_get_int, offsetof(Socket, priority), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("ReceiveBuffer", "t", bus_property_get_size, offsetof(Socket, receive_buffer), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("SendBuffer", "t", bus_property_get_size, offsetof(Socket, send_buffer), SD_BUS_VTABLE_PROPERTY_CONST), diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 index 08d05937f5..f4acdda22a 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -232,7 +232,6 @@ Socket.Accept, config_parse_bool, 0, Socket.MaxConnections, config_parse_unsigned, 0, offsetof(Socket, max_connections) Socket.KeepAlive, config_parse_bool, 0, offsetof(Socket, keep_alive) Socket.NoDelay, config_parse_bool, 0, offsetof(Socket, no_delay) -Socket.FastOpen, config_parse_bool, 0, offsetof(Socket, fast_open) Socket.Priority, config_parse_int, 0, offsetof(Socket, priority) Socket.ReceiveBuffer, config_parse_iec_size, 0, offsetof(Socket, receive_buffer) Socket.SendBuffer, config_parse_iec_size, 0, offsetof(Socket, send_buffer) diff --git a/src/core/socket.c b/src/core/socket.c index 44827ad346..5af15964ff 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -481,7 +481,6 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { "%sDirectoryMode: %04o\n" "%sKeepAlive: %s\n" "%sNoDelay: %s\n" - "%sFastOpen: %s\n" "%sFreeBind: %s\n" "%sTransparent: %s\n" "%sBroadcast: %s\n" @@ -497,7 +496,6 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { prefix, s->directory_mode, prefix, yes_no(s->keep_alive), prefix, yes_no(s->no_delay), - prefix, yes_no(s->fast_open), prefix, yes_no(s->free_bind), prefix, yes_no(s->transparent), prefix, yes_no(s->broadcast), @@ -800,12 +798,6 @@ static void socket_apply_socket_options(Socket *s, int fd) { log_warning_unit(UNIT(s)->id, "TCP_NODELAY failed: %m"); } - if (s->fast_open) { - int b = s->fast_open; - if (setsockopt(fd, SOL_TCP, TCP_FASTOPEN, &b, sizeof(b)) < 0) - log_warning_unit(UNIT(s)->id, "TCP_FASTOPEN failed: %m"); - } - if (s->broadcast) { int one = 1; if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &one, sizeof(one)) < 0) diff --git a/src/core/socket.h b/src/core/socket.h index 6c0084c477..98396e7320 100644 --- a/src/core/socket.h +++ b/src/core/socket.h @@ -135,7 +135,6 @@ struct Socket { /* Socket options */ bool keep_alive; bool no_delay; - bool fast_open; bool free_bind; bool transparent; bool broadcast; |