REORG: cfgparse: move server keyword parsing to server.c
The cfgparse.c file becomes huge, and a large part of it comes from the
server keyword parser. Since the configuration is a bit more modular now,
move this parser to server.c.
This patch also moves the check of the "server" keyword earlier in the
supported keywords list, resulting in a slightly faster config parsing
for configs with large numbers of servers (about 10%).
No functional change was made, only the code was moved.
diff --git a/include/common/cfgparse.h b/include/common/cfgparse.h
index 106bad7..80310ae 100644
--- a/include/common/cfgparse.h
+++ b/include/common/cfgparse.h
@@ -26,7 +26,8 @@
#include <common/config.h>
#include <common/mini-clist.h>
-#include <types/proxy.h>
+#include <proto/log.h>
+#include <proto/proxy.h>
/* configuration sections */
#define CFG_NONE 0
@@ -73,6 +74,32 @@
int cfg_register_section(char *section_name,
int (*section_parser)(const char *, int, char **, int));
+/*
+ * Sends a warning if proxy <proxy> does not have at least one of the
+ * capabilities in <cap>. An optionnal <hint> may be added at the end
+ * of the warning to help the user. Returns 1 if a warning was emitted
+ * or 0 if the condition is valid.
+ */
+static inline int warnifnotcap(struct proxy *proxy, int cap, const char *file, int line, const char *arg, const char *hint)
+{
+ char *msg;
+
+ switch (cap) {
+ case PR_CAP_BE: msg = "no backend"; break;
+ case PR_CAP_FE: msg = "no frontend"; break;
+ case PR_CAP_RS: msg = "no ruleset"; break;
+ case PR_CAP_BE|PR_CAP_FE: msg = "neither frontend nor backend"; break;
+ default: msg = "not enough"; break;
+ }
+
+ if (!(proxy->cap & cap)) {
+ Warning("parsing [%s:%d] : '%s' ignored because %s '%s' has %s capability.%s\n",
+ file, line, arg, proxy_type_str(proxy), proxy->id, msg, hint ? hint : "");
+ return 1;
+ }
+ return 0;
+}
+
#endif /* _COMMON_CFGPARSE_H */
/*
diff --git a/include/proto/server.h b/include/proto/server.h
index 750d8d5..f030962 100644
--- a/include/proto/server.h
+++ b/include/proto/server.h
@@ -37,6 +37,7 @@
int srv_downtime(const struct server *s);
int srv_lastsession(const struct server *s);
int srv_getinter(const struct check *check);
+int parse_server(const char *file, int linenum, char **args, struct proxy *curproxy, struct proxy *defproxy);
/* increase the number of cumulated connections on the designated server */
static void inline srv_inc_sess_ctr(struct server *s)