MAJOR: tproxy: remove support for cttproxy
This was the first transparent proxy technology supported by haproxy
circa 2005 but it was obsoleted in 2007 by Tproxy 4.0 which removed a
lot of the earlier versions' shortcomings and was finally merged into
the kernel. Since nobody has been using cttproxy for many years now
and nobody has even just tried to compile the files, it's time to
remove it. The doc was updated as well.
diff --git a/src/haproxy.c b/src/haproxy.c
index 4ff05ab..ae790c4 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -102,10 +102,6 @@
#include <proto/task.h>
#include <proto/dns.h>
-#ifdef CONFIG_HAP_CTTPROXY
-#include <proto/cttproxy.h>
-#endif
-
#ifdef USE_OPENSSL
#include <proto/ssl_sock.h>
#endif
@@ -368,11 +364,8 @@
printf("Built without Lua support\n");
#endif
-#if defined(CONFIG_HAP_TRANSPARENT) || defined(CONFIG_HAP_CTTPROXY)
+#if defined(CONFIG_HAP_TRANSPARENT)
printf("Built with transparent proxy support using:"
-#if defined(CONFIG_HAP_CTTPROXY)
- " CTTPROXY"
-#endif
#if defined(IP_TRANSPARENT)
" IP_TRANSPARENT"
#endif
@@ -1697,22 +1690,6 @@
}
}
-#ifdef CONFIG_HAP_CTTPROXY
- if (global.last_checks & LSTCHK_CTTPROXY) {
- int ret;
-
- ret = check_cttproxy_version();
- if (ret < 0) {
- Alert("[%s.main()] Cannot enable cttproxy.\n%s",
- argv[0],
- (ret == -1) ? " Incorrect module version.\n"
- : " Make sure you have enough permissions and that the module is loaded.\n");
- protocol_unbind_all();
- exit(1);
- }
- }
-#endif
-
if ((global.last_checks & LSTCHK_NETADM) && global.uid) {
Alert("[%s.main()] Some configuration options require full privileges, so global.uid cannot be changed.\n"
"", argv[0]);