REORG: include: move backend.h to haproxy/backend{,-t}.h
The files remained mostly unchanged since they were OK. However, half of
the users didn't need to include them, and about as many actually needed
to have it and used to find functions like srv_currently_usable() through
a long chain that broke when moving the file.
diff --git a/src/backend.c b/src/backend.c
index 18a5697..6e6280a 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -20,6 +20,7 @@
#include <sys/types.h>
#include <haproxy/acl.h>
+#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <haproxy/channel.h>
#include <haproxy/check.h>
@@ -49,7 +50,6 @@
#include <haproxy/global.h>
#include <haproxy/arg.h>
-#include <proto/backend.h>
#include <haproxy/protocol.h>
#include <haproxy/proto_tcp.h>
#include <proto/queue.h>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index 0be9834..631f100 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -36,6 +36,7 @@
#include <haproxy/acl.h>
#include <haproxy/action-t.h>
#include <haproxy/auth.h>
+#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <haproxy/capture.h>
#include <common/cfgparse.h>
@@ -72,7 +73,6 @@
#include <haproxy/global.h>
-#include <proto/backend.h>
#include <haproxy/protocol.h>
#include <haproxy/peers.h>
#include <haproxy/sample.h>
diff --git a/src/check.c b/src/check.c
index d328350..4e898b0 100644
--- a/src/check.c
+++ b/src/check.c
@@ -58,7 +58,6 @@
#include <haproxy/global.h>
#include <haproxy/arg.h>
-#include <proto/backend.h>
#include <haproxy/fd.h>
#include <proto/queue.h>
#include <haproxy/port_range.h>
diff --git a/src/cli.c b/src/cli.c
index dd4ef0d..321a974 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -55,7 +55,6 @@
#include <haproxy/global.h>
#include <haproxy/activity.h>
-#include <proto/backend.h>
#include <haproxy/compression.h>
#include <haproxy/fd.h>
#include <haproxy/freq_ctr.h>
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 35a99c6..47a43e6 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -37,7 +37,6 @@
#include <haproxy/global.h>
#include <haproxy/arg.h>
-#include <proto/backend.h>
#include <haproxy/freq_ctr.h>
#include <proto/stream.h>
diff --git a/src/haproxy.c b/src/haproxy.c
index b617249..d2aebce 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -123,7 +123,6 @@
#include <haproxy/activity.h>
#include <haproxy/arg.h>
-#include <proto/backend.h>
#include <haproxy/fd.h>
#include <haproxy/protocol.h>
#include <proto/queue.h>
diff --git a/src/http_ana.c b/src/http_ana.c
index c420d79..c6b292e 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -12,6 +12,7 @@
#include <haproxy/acl.h>
#include <haproxy/action-t.h>
+#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <haproxy/base64.h>
#include <haproxy/channel.h>
diff --git a/src/lb_chash.c b/src/lb_chash.c
index 4cb97ad..508b90c 100644
--- a/src/lb_chash.c
+++ b/src/lb_chash.c
@@ -16,13 +16,12 @@
*
*/
+#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <haproxy/tools.h>
#include <import/eb32tree.h>
#include <types/server.h>
-
-#include <proto/backend.h>
#include <proto/queue.h>
/* Return next tree node after <node> which must still be in the tree, or be
diff --git a/src/lb_fas.c b/src/lb_fas.c
index ae1297e..8967406 100644
--- a/src/lb_fas.c
+++ b/src/lb_fas.c
@@ -16,12 +16,11 @@
*
*/
+#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <import/eb32tree.h>
#include <types/server.h>
-
-#include <proto/backend.h>
#include <proto/queue.h>
diff --git a/src/lb_fwlc.c b/src/lb_fwlc.c
index 3aa050f..aef9353 100644
--- a/src/lb_fwlc.c
+++ b/src/lb_fwlc.c
@@ -10,12 +10,11 @@
*
*/
+#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <import/eb32tree.h>
#include <types/server.h>
-
-#include <proto/backend.h>
#include <proto/queue.h>
diff --git a/src/lb_fwrr.c b/src/lb_fwrr.c
index 7eafe48..72029a6 100644
--- a/src/lb_fwrr.c
+++ b/src/lb_fwrr.c
@@ -10,12 +10,11 @@
*
*/
+#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <import/eb32tree.h>
#include <types/server.h>
-
-#include <proto/backend.h>
#include <proto/queue.h>
static inline void fwrr_remove_from_tree(struct server *s);
diff --git a/src/lb_map.c b/src/lb_map.c
index 2b00fdb..a6d1cf8 100644
--- a/src/lb_map.c
+++ b/src/lb_map.c
@@ -10,13 +10,12 @@
*
*/
+#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <haproxy/lb_map.h>
#include <import/eb32tree.h>
#include <types/server.h>
-
-#include <proto/backend.h>
#include <proto/queue.h>
/* this function updates the map according to server <srv>'s new state.
diff --git a/src/proxy.c b/src/proxy.c
index 1ca6ab2..173f17d 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -41,7 +41,6 @@
#include <haproxy/capture-t.h>
-#include <proto/backend.h>
#include <haproxy/fd.h>
#include <haproxy/proto_tcp.h>
#include <proto/server.h>
diff --git a/src/queue.c b/src/queue.c
index 6e99769..9cdce01 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -44,7 +44,7 @@
* - a pendconn_add() is only performed by the stream which will own the
* pendconn ; the pendconn is allocated at this moment and returned ; it is
* added to either the server or the proxy's queue while holding this
- * queue's lock.
+s * queue's lock.
*
* - the pendconn is then met by a thread walking over the proxy or server's
* queue with the respective lock held. This lock is exclusive and the
@@ -69,6 +69,7 @@
* - a pendconn doesn't switch between queues, it stays where it is.
*/
+#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <haproxy/http_rules.h>
#include <haproxy/pool.h>
diff --git a/src/server.c b/src/server.c
index 7ac8905..df90b22 100644
--- a/src/server.c
+++ b/src/server.c
@@ -15,6 +15,7 @@
#include <errno.h>
#include <haproxy/applet-t.h>
+#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <import/xxhash.h>
diff --git a/src/stats.c b/src/stats.c
index 477b0ab..4f6f6c0 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -25,6 +25,7 @@
#include <sys/types.h>
#include <haproxy/applet-t.h>
+#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <common/cfgparse.h>
#include <haproxy/channel.h>
@@ -57,7 +58,6 @@
#include <haproxy/version.h>
#include <haproxy/base64.h>
-#include <proto/backend.h>
#include <haproxy/fd.h>
#include <haproxy/freq_ctr.h>
#include <haproxy/pipe.h>
diff --git a/src/stream.c b/src/stream.c
index 4bf1bdc..b73060d 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -19,6 +19,7 @@
#include <haproxy/acl.h>
#include <haproxy/action.h>
#include <haproxy/applet.h>
+#include <haproxy/backend.h>
#include <haproxy/api.h>
#include <haproxy/capture.h>
#include <common/cfgparse.h>
@@ -50,7 +51,6 @@
#include <haproxy/activity.h>
#include <haproxy/arg.h>
-#include <proto/backend.h>
#include <haproxy/fd.h>
#include <haproxy/freq_ctr.h>
#include <proto/stream.h>