From 4d8ddba9d71e51356cc9488f906b8fef89c60c23 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 14 Aug 2014 16:34:47 +0200 Subject: 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. --- src/core/socket.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/core/socket.c') 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) -- cgit v1.2.3-54-g00ecf