system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-16 06:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "socket: add support for TCP fast Open"

Browse source 
This reverts commit 9528592ff8.

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.
This commit is contained in:
Lennart Poettering 2014-08-14 16:34:47 +02:00
parent 9fdaa9925e
commit 4d8ddba9d7
5 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
man/systemd.socket.xml
View file

@ -498,21 +498,6 @@
<option>false</option>.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>FastOpen=</varname></term>
<listitem><para>Takes a boolean
argument. It works by using a TFO cookie (a TCP option) in the initial
SYN packet to authenticate a previously connected client. If successful,
it may start sending data to the client before the receipt of the final
ACK packet of the three way handshake is received, skipping a round trip
and lowering the latency in the start of transmission of data.
This controls the TCP_FASTOPEN socket option (see
the <ulink url="http://lwn.net/Articles/508865/">TCP
Fast Open: expediting web services</ulink> for details.)
Defaults to
<option>false</option>.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>Priority=</varname></term>
<listitem><para>Takes an integer

1
src/core/dbus-socket.c
View file

@ -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),

1
src/core/load-fragment-gperf.gperf.m4
View file

@ -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)

8
src/core/socket.c
View file

@ -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)

1
src/core/socket.h
View file

@ -135,7 +135,6 @@ struct Socket {
/* Socket options */
bool keep_alive;
bool no_delay;
bool fast_open;
bool free_bind;
bool transparent;
bool broadcast;