From: Willy Tarreau <w@1wt.eu>
Date: Thu, 4 Jun 2020 15:31:04 +0000 (+0200)
Subject: REORG: include: move proto_tcp.h to haproxy/proto_tcp.h
X-Git-Tag: v2.2-dev9~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc77454aff431d618b20b473157c805bb6a11ab3;p=thirdparty%2Fhaproxy.git

REORG: include: move proto_tcp.h to haproxy/proto_tcp.h

There was no type file. This one really is trivial. A few missing
includes were added to satisfy the exported functions prototypes.
---

diff --git a/include/proto/proto_tcp.h b/include/haproxy/proto_tcp.h
similarity index 85%
rename from include/proto/proto_tcp.h
rename to include/haproxy/proto_tcp.h
index ad428ee423..426fa2e795 100644
--- a/include/proto/proto_tcp.h
+++ b/include/haproxy/proto_tcp.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/proto_tcp.h
+ * include/haproxy/proto_tcp.h
  * This file contains TCP socket protocol definitions.
  *
  * Copyright (C) 2000-2013 Willy Tarreau - w@1wt.eu
@@ -19,11 +19,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_PROTO_TCP_H
-#define _PROTO_PROTO_TCP_H
+#ifndef _HAPROXY_PROTO_TCP_H
+#define _HAPROXY_PROTO_TCP_H
 
+#include <haproxy/arg-t.h>
 #include <haproxy/api.h>
-#include <proto/stick_table.h>
+#include <haproxy/listener-t.h>
+#include <haproxy/sample-t.h>
+#include <types/connection.h>
 
 int tcp_bind_socket(int fd, int flags, struct sockaddr_storage *local, struct sockaddr_storage *remote);
 int tcp_pause_listener(struct listener *l);
@@ -34,7 +37,7 @@ int tcp_get_dst(int fd, struct sockaddr *sa, socklen_t salen, int dir);
 /* Export some samples. */
 int smp_fetch_src(const struct arg *args, struct sample *smp, const char *kw, void *private);
 
-#endif /* _PROTO_PROTO_TCP_H */
+#endif /* _HAPROXY_PROTO_TCP_H */
 
 /*
  * Local variables:
diff --git a/src/backend.c b/src/backend.c
index 02f8e86711..4a1b050a11 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -47,7 +47,7 @@
 #include <proto/log.h>
 #include <haproxy/protocol.h>
 #include <proto/http_ana.h>
-#include <proto/proto_tcp.h>
+#include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
 #include <proto/queue.h>
 #include <haproxy/sample.h>
diff --git a/src/checks.c b/src/checks.c
index 39399db313..0cb718b988 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -59,7 +59,7 @@
 #include <proto/log.h>
 #include <proto/queue.h>
 #include <haproxy/port_range.h>
-#include <proto/proto_tcp.h>
+#include <haproxy/proto_tcp.h>
 #include <haproxy/protocol.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
diff --git a/src/connection.c b/src/connection.c
index 5652a25883..133a6d65e5 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -21,7 +21,7 @@
 
 #include <proto/connection.h>
 #include <haproxy/fd.h>
-#include <proto/proto_tcp.h>
+#include <haproxy/proto_tcp.h>
 #include <proto/stream_interface.h>
 #include <haproxy/sample.h>
 #include <proto/ssl_sock.h>
diff --git a/src/frontend.c b/src/frontend.c
index 4066fe9b59..050a08fb84 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -37,7 +37,7 @@
 #include <proto/channel.h>
 #include <haproxy/fd.h>
 #include <proto/log.h>
-#include <proto/proto_tcp.h>
+#include <haproxy/proto_tcp.h>
 #include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/stream.h>
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 3f734a681c..2568d10148 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -52,7 +52,7 @@
 #include <haproxy/port_range.h>
 #include <haproxy/protocol.h>
 #include <proto/http_ana.h>
-#include <proto/proto_tcp.h>
+#include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
 #include <proto/tcp_rules.h>
diff --git a/src/proxy.c b/src/proxy.c
index 71ad054dce..90fddd8be5 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -41,7 +41,7 @@
 #include <haproxy/fd.h>
 #include <proto/filters.h>
 #include <proto/log.h>
-#include <proto/proto_tcp.h>
+#include <haproxy/proto_tcp.h>
 #include <proto/http_ana.h>
 #include <proto/proxy.h>
 #include <proto/server.h>
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 0d6267a8fc..b83ef5c611 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -78,7 +78,7 @@
 #include <proto/cli.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
-#include <proto/proto_tcp.h>
+#include <haproxy/proto_tcp.h>
 #include <proto/http_ana.h>
 #include <proto/server.h>
 #include <proto/stream_interface.h>
diff --git a/src/stick_table.c b/src/stick_table.c
index 9020b372ad..c57269b746 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -35,7 +35,7 @@
 #include <proto/cli.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
-#include <proto/proto_tcp.h>
+#include <haproxy/proto_tcp.h>
 #include <proto/proxy.h>
 #include <haproxy/sample.h>
 #include <proto/stream.h>