REORG: include: move server.h to haproxy/server{,-t}.h
extern struct dict server_name_dict was moved from the type file to the
main file. A handful of inlined functions were moved at the bottom of
the file. Call places were updated to use server-t.h when relevant, or
to simply drop the entry when not needed.
diff --git a/src/backend.c b/src/backend.c
index 26e36ae..e4b677a 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -40,6 +40,7 @@
#include <haproxy/payload.h>
#include <haproxy/proxy.h>
#include <haproxy/queue.h>
+#include <haproxy/server.h>
#include <haproxy/session.h>
#include <haproxy/ssl_sock.h>
#include <haproxy/stream_interface.h>
@@ -54,7 +55,6 @@
#include <haproxy/protocol.h>
#include <haproxy/proto_tcp.h>
#include <haproxy/sample.h>
-#include <proto/server.h>
#include <proto/stream.h>
#define TRACE_SOURCE &trace_strm
diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index 425b57c..cdb6840 100644
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -25,10 +25,10 @@
#include <haproxy/peers.h>
#include <haproxy/proxy.h>
#include <haproxy/sample.h>
+#include <haproxy/server.h>
#include <haproxy/stats-t.h>
#include <haproxy/protocol.h>
-#include <proto/server.h>
#include <haproxy/stick_table.h>
/* Report a warning if a rule is placed after a 'tcp-request session' rule.
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 631f100..49ef69d 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -68,6 +68,7 @@
#include <haproxy/time.h>
#include <haproxy/uri_auth-t.h>
#include <haproxy/namespace.h>
+#include <haproxy/server.h>
#include <haproxy/task.h>
#include <haproxy/thread.h>
@@ -76,7 +77,6 @@
#include <haproxy/protocol.h>
#include <haproxy/peers.h>
#include <haproxy/sample.h>
-#include <proto/server.h>
#include <proto/stream.h>
#include <haproxy/stick_table.h>
#include <haproxy/tcp_rules.h>
diff --git a/src/check.c b/src/check.c
index 1adbf56..308a86e 100644
--- a/src/check.c
+++ b/src/check.c
@@ -49,6 +49,7 @@
#include <haproxy/htx.h>
#include <haproxy/log.h>
#include <haproxy/proxy.h>
+#include <haproxy/server.h>
#include <haproxy/signal.h>
#include <haproxy/ssl_sock.h>
#include <haproxy/stats-t.h>
@@ -63,7 +64,6 @@
#include <haproxy/port_range.h>
#include <haproxy/proto_tcp.h>
#include <haproxy/protocol.h>
-#include <proto/server.h>
#include <haproxy/proto_udp.h>
#include <haproxy/sample.h>
diff --git a/src/cli.c b/src/cli.c
index 321a974..07d3631 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -42,6 +42,7 @@
#include <haproxy/peers.h>
#include <haproxy/proxy.h>
#include <haproxy/sample-t.h>
+#include <haproxy/server.h>
#include <haproxy/session.h>
#include <haproxy/stats-t.h>
#include <haproxy/stream_interface.h>
@@ -61,7 +62,6 @@
#include <haproxy/pipe.h>
#include <haproxy/protocol.h>
#include <proto/stream.h>
-#include <proto/server.h>
#define PAYLOAD_PATTERN "<<"
diff --git a/src/dns.c b/src/dns.c
index dd29d27..8eddde9 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -31,6 +31,7 @@
#include <haproxy/log.h>
#include <haproxy/proxy.h>
#include <haproxy/sample.h>
+#include <haproxy/server.h>
#include <haproxy/stats-t.h>
#include <haproxy/stream_interface.h>
#include <haproxy/task.h>
@@ -43,7 +44,6 @@
#include <haproxy/global.h>
#include <haproxy/fd.h>
-#include <proto/server.h>
#include <haproxy/proto_udp.h>
struct list dns_resolvers = LIST_HEAD_INIT(dns_resolvers);
diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index 5d7aeff..434fc02 100644
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -23,13 +23,12 @@
#include <haproxy/proxy-t.h>
#include <haproxy/regex.h>
#include <haproxy/sample.h>
+#include <haproxy/server-t.h>
#include <haproxy/session.h>
#include <haproxy/tools.h>
#include <haproxy/global.h>
-#include <proto/server.h>
-
/* Global list of all FCGI applications */
static struct fcgi_app *fcgi_apps = NULL;
diff --git a/src/haproxy.c b/src/haproxy.c
index a9e264f..f1478b2 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -107,6 +107,7 @@
#include <haproxy/proxy.h>
#include <haproxy/sample.h>
#include <haproxy/regex.h>
+#include <haproxy/server.h>
#include <haproxy/session.h>
#include <haproxy/signal.h>
#include <haproxy/ssl_sock.h>
@@ -125,7 +126,6 @@
#include <haproxy/arg.h>
#include <haproxy/fd.h>
#include <haproxy/protocol.h>
-#include <proto/server.h>
#include <proto/stream.h>
/* array of init calls for older platforms */
diff --git a/src/hlua.c b/src/hlua.c
index 1ab6f5a..57e015c 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -45,6 +45,7 @@
#include <haproxy/payload.h>
#include <haproxy/proxy-t.h>
#include <haproxy/sample.h>
+#include <haproxy/server-t.h>
#include <haproxy/session.h>
#include <haproxy/stats-t.h>
#include <haproxy/stream_interface.h>
@@ -54,7 +55,6 @@
#include <haproxy/vars.h>
#include <haproxy/arg.h>
-#include <proto/server.h>
#include <proto/stream.h>
/* Lua uses longjmp to perform yield or throwing errors. This
diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c
index 34577b5..cfcbcea 100644
--- a/src/hlua_fcn.c
+++ b/src/hlua_fcn.c
@@ -26,10 +26,10 @@
#include <haproxy/pattern-t.h>
#include <haproxy/proxy.h>
#include <haproxy/regex.h>
+#include <haproxy/server.h>
#include <haproxy/stats.h>
#include <haproxy/time.h>
-#include <proto/server.h>
#include <haproxy/stick_table.h>
/* Contains the class reference of the concat object. */
diff --git a/src/http_ana.c b/src/http_ana.c
index c6b292e..c0b3dd4 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -27,6 +27,7 @@
#include <haproxy/net_helper.h>
#include <haproxy/proxy.h>
#include <haproxy/regex.h>
+#include <haproxy/server-t.h>
#include <haproxy/stats.h>
#include <haproxy/stream_interface.h>
#include <haproxy/uri_auth-t.h>
@@ -34,7 +35,6 @@
#include <haproxy/capture-t.h>
-#include <proto/server.h>
#include <proto/stream.h>
#define TRACE_SOURCE &trace_strm
diff --git a/src/lb_chash.c b/src/lb_chash.c
index aaaef89..1fb44f4 100644
--- a/src/lb_chash.c
+++ b/src/lb_chash.c
@@ -16,13 +16,12 @@
*
*/
+#include <import/eb32tree.h>
#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <haproxy/queue.h>
+#include <haproxy/server-t.h>
#include <haproxy/tools.h>
-#include <import/eb32tree.h>
-
-#include <types/server.h>
/* Return next tree node after <node> which must still be in the tree, or be
* NULL. Lookup wraps around the end to the beginning. If the next node is the
diff --git a/src/lb_fas.c b/src/lb_fas.c
index fc9ae51..be2ce47 100644
--- a/src/lb_fas.c
+++ b/src/lb_fas.c
@@ -16,12 +16,11 @@
*
*/
+#include <import/eb32tree.h>
#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <haproxy/queue.h>
-#include <import/eb32tree.h>
-
-#include <types/server.h>
+#include <haproxy/server-t.h>
/* Remove a server from a tree. It must have previously been dequeued. This
diff --git a/src/lb_fwlc.c b/src/lb_fwlc.c
index d7c6953..a835f01 100644
--- a/src/lb_fwlc.c
+++ b/src/lb_fwlc.c
@@ -10,12 +10,11 @@
*
*/
+#include <import/eb32tree.h>
#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <haproxy/queue.h>
-#include <import/eb32tree.h>
-
-#include <types/server.h>
+#include <haproxy/server-t.h>
/* Remove a server from a tree. It must have previously been dequeued. This
diff --git a/src/lb_fwrr.c b/src/lb_fwrr.c
index 145d097..6183433 100644
--- a/src/lb_fwrr.c
+++ b/src/lb_fwrr.c
@@ -10,12 +10,12 @@
*
*/
+#include <import/eb32tree.h>
#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <haproxy/queue.h>
-#include <import/eb32tree.h>
+#include <haproxy/server-t.h>
-#include <types/server.h>
static inline void fwrr_remove_from_tree(struct server *s);
static inline void fwrr_queue_by_weight(struct eb_root *root, struct server *s);
diff --git a/src/lb_map.c b/src/lb_map.c
index c963180..61debf8 100644
--- a/src/lb_map.c
+++ b/src/lb_map.c
@@ -10,13 +10,12 @@
*
*/
+#include <import/eb32tree.h>
#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <haproxy/lb_map.h>
#include <haproxy/queue.h>
-#include <import/eb32tree.h>
-
-#include <types/server.h>
+#include <haproxy/server-t.h>
/* this function updates the map according to server <srv>'s new state.
*
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index c2a1869..4ca4100 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -42,6 +42,7 @@
#include <haproxy/log.h>
#include <haproxy/proxy-t.h>
#include <haproxy/sample.h>
+#include <haproxy/server.h>
#include <haproxy/tools.h>
#include <haproxy/namespace.h>
@@ -52,7 +53,6 @@
#include <haproxy/port_range.h>
#include <haproxy/protocol.h>
#include <haproxy/proto_tcp.h>
-#include <proto/server.h>
#include <haproxy/tcp_rules.h>
static int tcp_bind_listeners(struct protocol *proto, char *errmsg, int errlen);
diff --git a/src/proxy.c b/src/proxy.c
index 173f17d..12cbd46 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -31,6 +31,7 @@
#include <haproxy/peers.h>
#include <haproxy/pool.h>
#include <haproxy/proxy.h>
+#include <haproxy/server-t.h>
#include <haproxy/stats-t.h>
#include <haproxy/stream_interface.h>
#include <haproxy/task.h>
@@ -43,7 +44,6 @@
#include <haproxy/fd.h>
#include <haproxy/proto_tcp.h>
-#include <proto/server.h>
#include <haproxy/signal.h>
#include <proto/stream.h>
diff --git a/src/queue.c b/src/queue.c
index ea0b64a..c2853a9 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -75,6 +75,7 @@
#include <haproxy/pool.h>
#include <haproxy/queue.h>
#include <haproxy/sample.h>
+#include <haproxy/server-t.h>
#include <haproxy/stream_interface.h>
#include <haproxy/task.h>
#include <haproxy/tcp_rules.h>
@@ -82,7 +83,6 @@
#include <haproxy/thread.h>
#include <import/eb32tree.h>
-#include <proto/server.h>
#include <proto/stream.h>
diff --git a/src/server.c b/src/server.c
index 4751065..63aa6ea 100644
--- a/src/server.c
+++ b/src/server.c
@@ -30,6 +30,7 @@
#include <haproxy/namespace.h>
#include <haproxy/queue.h>
#include <haproxy/sample.h>
+#include <haproxy/server.h>
#include <haproxy/stats-t.h>
#include <haproxy/stream_interface.h>
#include <haproxy/task.h>
@@ -37,7 +38,6 @@
#include <haproxy/port_range.h>
#include <haproxy/protocol.h>
-#include <proto/server.h>
#include <proto/stream.h>
#include <netinet/tcp.h>
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 3a0918f..4cbe2dc 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -57,6 +57,7 @@
#include <haproxy/openssl-compat.h>
#include <haproxy/pattern-t.h>
#include <haproxy/proxy.h>
+#include <haproxy/server.h>
#include <haproxy/shctx.h>
#include <haproxy/ssl_ckch.h>
#include <haproxy/ssl_crtlist.h>
@@ -78,7 +79,6 @@
#include <haproxy/fd.h>
#include <haproxy/freq_ctr.h>
#include <haproxy/proto_tcp.h>
-#include <proto/server.h>
#include <proto/stream.h>
/* ***** READ THIS before adding code here! *****
diff --git a/src/stats.c b/src/stats.c
index 4f6f6c0..21d8dad 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -46,6 +46,7 @@
#include <haproxy/map-t.h>
#include <haproxy/pattern-t.h>
#include <haproxy/proxy.h>
+#include <haproxy/server.h>
#include <haproxy/session.h>
#include <haproxy/ssl_sock.h>
#include <haproxy/stats.h>
@@ -62,7 +63,6 @@
#include <haproxy/freq_ctr.h>
#include <haproxy/pipe.h>
#include <proto/stream.h>
-#include <proto/server.h>
/* status codes available for the stats admin page (strictly 4 chars length) */
const char *stat_status_codes[STAT_STATUS_SIZE] = {
diff --git a/src/stream.c b/src/stream.c
index 45c1bc8..52fcf9b 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -43,6 +43,7 @@
#include <haproxy/pool.h>
#include <haproxy/proxy.h>
#include <haproxy/queue.h>
+#include <haproxy/server.h>
#include <haproxy/session.h>
#include <haproxy/stats-t.h>
#include <haproxy/stream_interface.h>
@@ -56,7 +57,6 @@
#include <haproxy/freq_ctr.h>
#include <proto/stream.h>
#include <haproxy/pipe.h>
-#include <proto/server.h>
#include <haproxy/stick_table.h>
DECLARE_POOL(pool_head_stream, "stream", sizeof(struct stream));