From: Willy Tarreau <w@1wt.eu>
Date: Wed, 21 Dec 2016 17:55:02 +0000 (+0100)
Subject: CLEANUP: tcp: use the build options list to report transparent modes
X-Git-Tag: v1.8-dev1~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba9629160054cc67a3044fc5e35be61c058430cb;p=thirdparty%2Fhaproxy.git

CLEANUP: tcp: use the build options list to report transparent modes

This removes 6 #ifdef from haproxy.c.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 22b6ffaee9..e9dca47334 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -431,29 +431,6 @@ static void display_build_opts()
 	printf("Built without Lua support\n");
 #endif
 
-#if defined(CONFIG_HAP_TRANSPARENT)
-	printf("Built with transparent proxy support using:"
-#if defined(IP_TRANSPARENT)
-	       " IP_TRANSPARENT"
-#endif
-#if defined(IPV6_TRANSPARENT)
-	       " IPV6_TRANSPARENT"
-#endif
-#if defined(IP_FREEBIND)
-	       " IP_FREEBIND"
-#endif
-#if defined(IP_BINDANY)
-	       " IP_BINDANY"
-#endif
-#if defined(IPV6_BINDANY)
-	       " IPV6_BINDANY"
-#endif
-#if defined(SO_BINDANY)
-	       " SO_BINDANY"
-#endif
-	       "\n");
-#endif
-
 	list_for_each_entry(item, &build_opts_list, list) {
 		puts(item->str);
 	}
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index f6d8ca13c7..d7650325df 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -1875,6 +1875,28 @@ static void __tcp_protocol_init(void)
 	tcp_res_cont_keywords_register(&tcp_res_cont_actions);
 	http_req_keywords_register(&http_req_actions);
 	http_res_keywords_register(&http_res_actions);
+
+
+	hap_register_build_opts("Built with transparent proxy support using:"
+#if defined(IP_TRANSPARENT)
+	       " IP_TRANSPARENT"
+#endif
+#if defined(IPV6_TRANSPARENT)
+	       " IPV6_TRANSPARENT"
+#endif
+#if defined(IP_FREEBIND)
+	       " IP_FREEBIND"
+#endif
+#if defined(IP_BINDANY)
+	       " IP_BINDANY"
+#endif
+#if defined(IPV6_BINDANY)
+	       " IPV6_BINDANY"
+#endif
+#if defined(SO_BINDANY)
+	       " SO_BINDANY"
+#endif
+		"", 0);
 }