[MEDIUM] remove old experimental tcpsplice option
This Linux-specific option was never really used in production and
has since been superseded by new splicing options brought by recent
Linux kernels.
It caused several particular cases in the code because the kernel
would take care of the session without haproxy being able to do
anything on it, which became hard to handle in the new architecture.
Let's simply get rid of it now that there is a replacement available.
diff --git a/src/haproxy.c b/src/haproxy.c
index 607ff15..a592d46 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -93,10 +93,6 @@
#include <proto/stream_sock.h>
#include <proto/task.h>
-#ifdef CONFIG_HAP_TCPSPLICE
-#include <libtcpsplice.h>
-#endif
-
#ifdef CONFIG_HAP_CTTPROXY
#include <proto/cttproxy.h>
#endif
@@ -218,7 +214,7 @@
#if defined(ENABLE_POLL)
" -dp disables poll() usage even when available\n"
#endif
-#if defined(CONFIG_HAP_LINUX_SPLICE) || defined(CONFIG_HAP_TCPSPLICE)
+#if defined(CONFIG_HAP_LINUX_SPLICE)
" -dS disables splice usage (broken on old kernels)\n"
#endif
" -sf/-st [pid ]* finishes/terminates old pids. Must be last arguments.\n"
@@ -420,7 +416,7 @@
#if defined(ENABLE_KQUEUE)
global.tune.options |= GTUNE_USE_KQUEUE;
#endif
-#if defined(CONFIG_HAP_LINUX_SPLICE) || defined(CONFIG_HAP_TCPSPLICE)
+#if defined(CONFIG_HAP_LINUX_SPLICE)
global.tune.options |= GTUNE_USE_SPLICE;
#endif
@@ -459,7 +455,7 @@
else if (*flag == 'd' && flag[1] == 'k')
global.tune.options &= ~GTUNE_USE_KQUEUE;
#endif
-#if defined(CONFIG_HAP_LINUX_SPLICE) || defined(CONFIG_HAP_TCPSPLICE)
+#if defined(CONFIG_HAP_LINUX_SPLICE)
else if (*flag == 'd' && flag[1] == 'S')
global.tune.options &= ~GTUNE_USE_SPLICE;
#endif
@@ -1041,20 +1037,6 @@
}
#endif
}
-
-#ifdef CONFIG_HAP_TCPSPLICE
- if ((global.tune.options & GTUNE_USE_SPLICE) && (global.last_checks & LSTCHK_TCPSPLICE)) {
- if (tcp_splice_start() < 0) {
- Alert("[%s.main()] Cannot enable tcp_splice.\n"
- " Make sure you have enough permissions and that the module is loadable.\n"
- " Alternatively, you may disable the 'tcpsplice' options in the configuration\n"
- " or add 'nosplice' in the global section, or start with '-dS'.\n"
- "", argv[0]);
- protocol_unbind_all();
- exit(1);
- }
- }
-#endif
#ifdef CONFIG_HAP_CTTPROXY
if (global.last_checks & LSTCHK_CTTPROXY) {