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 ad428ee4235c7c2d85f9fce2f3aab3338803dbaa..426fa2e7959af332a1f795c50bc90a86a2313ce8 100644 (file)
--- 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 02f8e86711a73e437fa97d6aa5d5075730949bbb..4a1b050a11c8f75d85a48a58fb4c5ee262b44a13 100644 (file)
--- 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 39399db3136b64f5667532b706322b3274195d87..0cb718b988512900ac773721ffc31cdbea46231f 100644 (file)
--- 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 5652a25883a21e277380d309a897407abedf1198..133a6d65e52c3ce822872cc3e4af7e38efa0b20c 100644 (file)
--- 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 4066fe9b59d335fd39d62a94e0367678068e7cd3..050a08fb8411f322b7dca047d1bf72e3088ff5ac 100644 (file)
--- 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 3f734a681c27cacb29ebd68907bb4632aba79d47..2568d101482f6a6d6df59de5b45a6fef3e2e8c78 100644 (file)
--- 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 71ad054dce9fa17f896754752048b0fd53c6a937..90fddd8be527d99594729756e0d8aafb666043ef 100644 (file)
--- 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 0d6267a8fc7db13a4948be5865ac2c43d61d2986..b83ef5c6113a42a64962e6b4ede9b711cc049329 100644 (file)
--- 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 9020b372ad8c77c9cda35f2e7c219ea57a25a56b..c57269b7465bab815348ed2f230637b109687b03 100644 (file)
--- 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>