REORG: include: move ssl_sock.h to haproxy/ssl_sock{,-t}.h
Almost nothing changed, just moved a static inline at the end and moved
an export from the types to the main file.
diff --git a/src/backend.c b/src/backend.c
index 8387694..b730df7 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -35,6 +35,7 @@
#include <haproxy/obj_type.h>
#include <haproxy/payload.h>
#include <haproxy/session.h>
+#include <haproxy/ssl_sock.h>
#include <haproxy/task.h>
#include <haproxy/ticks.h>
#include <haproxy/time.h>
@@ -55,7 +56,6 @@
#include <proto/server.h>
#include <proto/stream.h>
#include <proto/stream_interface.h>
-#include <proto/ssl_sock.h>
#define TRACE_SOURCE &trace_strm
diff --git a/src/cfgparse-ssl.c b/src/cfgparse-ssl.c
index aeb6f84..831bdb4 100644
--- a/src/cfgparse-ssl.c
+++ b/src/cfgparse-ssl.c
@@ -36,10 +36,7 @@
#include <common/cfgparse.h>
#include <haproxy/listener.h>
#include <haproxy/openssl-compat.h>
-
-#include <types/ssl_sock.h>
-
-#include <proto/ssl_sock.h>
+#include <haproxy/ssl_sock.h>
/****************** Global Section Parsing ********************************************/
diff --git a/src/check.c b/src/check.c
index 6e8e238..edb4fea 100644
--- a/src/check.c
+++ b/src/check.c
@@ -47,6 +47,7 @@
#include <haproxy/h1.h>
#include <haproxy/htx.h>
#include <haproxy/signal.h>
+#include <haproxy/ssl_sock.h>
#include <haproxy/stats-t.h>
#include <haproxy/task.h>
#include <haproxy/vars.h>
@@ -66,7 +67,6 @@
#include <proto/stream_interface.h>
#include <proto/log.h>
#include <haproxy/proto_udp.h>
-#include <proto/ssl_sock.h>
#include <haproxy/sample.h>
static int tcpcheck_get_step_id(struct check *, struct tcpcheck_rule *);
diff --git a/src/connection.c b/src/connection.c
index a777b9f..6575230 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -24,7 +24,7 @@
#include <haproxy/proto_tcp.h>
#include <proto/stream_interface.h>
#include <haproxy/sample.h>
-#include <proto/ssl_sock.h>
+#include <haproxy/ssl_sock.h>
DECLARE_POOL(pool_head_connection, "connection", sizeof(struct connection));
diff --git a/src/haproxy.c b/src/haproxy.c
index c717577..e3b140b 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -106,6 +106,7 @@
#include <haproxy/regex.h>
#include <haproxy/session.h>
#include <haproxy/signal.h>
+#include <haproxy/ssl_sock.h>
#include <haproxy/tools.h>
#include <haproxy/time.h>
#include <haproxy/uri_auth-t.h>
@@ -131,7 +132,6 @@
#include <proto/queue.h>
#include <proto/server.h>
#include <proto/stream.h>
-#include <proto/ssl_sock.h>
/* array of init calls for older platforms */
DECLARE_INIT_STAGES;
diff --git a/src/log.c b/src/log.c
index fcf61b1..bafd878 100644
--- a/src/log.c
+++ b/src/log.c
@@ -29,6 +29,7 @@
#include <haproxy/cli.h>
#include <haproxy/frontend.h>
#include <haproxy/http.h>
+#include <haproxy/ssl_sock.h>
#include <haproxy/tools.h>
#include <haproxy/time.h>
#include <haproxy/version.h>
@@ -41,7 +42,6 @@
#include <haproxy/ring.h>
#include <haproxy/sample.h>
#include <haproxy/sink.h>
-#include <proto/ssl_sock.h>
#include <proto/stream.h>
#include <proto/stream_interface.h>
diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 6346c8e..201de59 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -23,12 +23,12 @@
#include <haproxy/net_helper.h>
#include <haproxy/regex.h>
#include <haproxy/session-t.h>
+#include <haproxy/ssl_sock.h>
#include <types/proxy.h>
#include <proto/fcgi-app.h>
#include <proto/log.h>
-#include <proto/ssl_sock.h>
#include <proto/stream.h>
#include <proto/stream_interface.h>
#include <haproxy/trace.h>
diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index 1125961..d0699ef 100644
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -25,15 +25,13 @@
#include <haproxy/cli.h>
#include <haproxy/errors.h>
#include <haproxy/ssl_ckch.h>
+#include <haproxy/ssl_sock.h>
#include <haproxy/ssl_utils.h>
#include <haproxy/tools.h>
#include <import/ebsttree.h>
-#include <types/ssl_sock.h>
-
#include <proto/channel.h>
-#include <proto/ssl_sock.h>
#include <proto/stream_interface.h>
/* Uncommitted CKCH transaction */
diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index ab88dcb..7036fdc 100644
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -19,17 +19,15 @@
#include <haproxy/errors.h>
#include <haproxy/ssl_ckch.h>
#include <haproxy/ssl_crtlist.h>
+#include <haproxy/ssl_sock.h>
#include <haproxy/tools.h>
#include <dirent.h>
#include <import/ebpttree.h>
#include <import/ebsttree.h>
-#include <types/ssl_sock.h>
-
#include <proto/channel.h>
#include <proto/stream_interface.h>
-#include <proto/ssl_sock.h>
/* release ssl bind conf */
void ssl_sock_free_ssl_conf(struct ssl_bind_conf *conf)
diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index 8314f3d..70b35b2 100644
--- a/src/ssl_sample.c
+++ b/src/ssl_sample.c
@@ -26,13 +26,11 @@
#include <haproxy/obj_type.h>
#include <haproxy/openssl-compat.h>
#include <haproxy/sample.h>
+#include <haproxy/ssl_sock.h>
#include <haproxy/ssl_utils.h>
#include <haproxy/tools.h>
-#include <types/ssl_sock.h>
-
#include <haproxy/arg.h>
-#include <proto/ssl_sock.h>
/***** Below are some sample fetching functions for ACL/patterns *****/
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 35c03a8..914c22f 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -57,6 +57,7 @@
#include <haproxy/shctx.h>
#include <haproxy/ssl_ckch.h>
#include <haproxy/ssl_crtlist.h>
+#include <haproxy/ssl_sock.h>
#include <haproxy/ssl_utils.h>
#include <haproxy/stats-t.h>
#include <haproxy/task.h>
@@ -69,8 +70,6 @@
#include <import/ebpttree.h>
#include <import/ebsttree.h>
-#include <types/ssl_sock.h>
-
#include <haproxy/arg.h>
#include <proto/channel.h>
#include <haproxy/fd.h>
@@ -81,7 +80,6 @@
#include <proto/stream_interface.h>
#include <proto/log.h>
#include <proto/proxy.h>
-#include <proto/ssl_sock.h>
#include <proto/stream.h>
/* ***** READ THIS before adding code here! *****
diff --git a/src/ssl_utils.c b/src/ssl_utils.c
index 38efe7e..510b5da 100644
--- a/src/ssl_utils.c
+++ b/src/ssl_utils.c
@@ -15,10 +15,7 @@
#include <haproxy/api.h>
#include <haproxy/buf-t.h>
#include <haproxy/openssl-compat.h>
-
-#include <proto/ssl_sock.h>
-
-#include <types/ssl_sock.h>
+#include <haproxy/ssl_sock.h>
/* fill a buffer with the algorithm and size of a public key */
int cert_get_pkey_algo(X509 *crt, struct buffer *out)
diff --git a/src/stats.c b/src/stats.c
index e62f0e4..17d4dda 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -43,6 +43,7 @@
#include <haproxy/map-t.h>
#include <haproxy/pattern-t.h>
#include <haproxy/session.h>
+#include <haproxy/ssl_sock.h>
#include <haproxy/stats.h>
#include <haproxy/task.h>
#include <haproxy/tools.h>
@@ -59,7 +60,6 @@
#include <proto/log.h>
#include <haproxy/pipe.h>
#include <proto/proxy.h>
-#include <proto/ssl_sock.h>
#include <proto/stream.h>
#include <proto/server.h>
#include <proto/stream_interface.h>
diff --git a/src/tools.c b/src/tools.c
index a9ad82b..59903b1 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -46,10 +46,10 @@
#include <haproxy/hlua.h>
#include <haproxy/listener.h>
#include <haproxy/namespace.h>
+#include <haproxy/ssl_sock.h>
#include <haproxy/task.h>
#include <haproxy/tools.h>
#include <haproxy/proto_udp.h>
-#include <proto/ssl_sock.h>
#include <proto/stream_interface.h>
/* This macro returns false if the test __x is false. Many