const char *proxy_cap_str(int cap);
const char *proxy_mode_str(int mode);
-struct proxy *findproxy(const char *name, int mode, int cap);
+struct proxy *findproxy_mode(const char *name, int mode, int cap);
+struct proxy *findproxy(const char *name, int cap);
struct server *findserver(const struct proxy *px, const char *name);
int proxy_cfg_ensure_no_http(struct proxy *curproxy);
int get_backend_server(const char *bk_name, const char *sv_name,
if (curproxy->defbe.name) {
struct proxy *target;
- target = findproxy(curproxy->defbe.name, curproxy->mode, PR_CAP_BE);
+ target = findproxy_mode(curproxy->defbe.name, curproxy->mode, PR_CAP_BE);
if (!target) {
Alert("Proxy '%s': unable to find required default_backend: '%s'.\n",
curproxy->id, curproxy->defbe.name);
if (exp->action != ACT_SETBE)
continue;
- target = findproxy(exp->replace, PR_MODE_HTTP, PR_CAP_BE);
+ target = findproxy_mode(exp->replace, PR_MODE_HTTP, PR_CAP_BE);
if (!target) {
Alert("Proxy '%s': unable to find required setbe: '%s'.\n",
curproxy->id, exp->replace);
list_for_each_entry(rule, &curproxy->switching_rules, list) {
struct proxy *target;
- target = findproxy(rule->be.name, curproxy->mode, PR_CAP_BE);
+ target = findproxy_mode(rule->be.name, curproxy->mode, PR_CAP_BE);
if (!target) {
Alert("Proxy '%s': unable to find required use_backend: '%s'.\n",
}
if (pname) {
- px = findproxy(pname, curproxy->mode, PR_CAP_BE);
+ px = findproxy(pname, PR_CAP_BE);
if (!px) {
Alert("config : %s '%s', server '%s': unable to find required proxy '%s' for tracking.\n",
proxy_type_str(curproxy), curproxy->id,
if (!(srv->state & SRV_CHECKED)) {
Alert("config : %s '%s', server '%s': unable to use %s/%s for "
- "tracing as it does not have checks enabled.\n",
+ "tracking as it does not have checks enabled.\n",
proxy_type_str(curproxy), curproxy->id,
newsrv->id, px->id, srv->id);
cfgerr++;
* requested name as this often leads into unexpected situations.
*/
-struct proxy *findproxy(const char *name, int mode, int cap) {
+struct proxy *findproxy_mode(const char *name, int mode, int cap) {
struct proxy *curproxy, *target = NULL;
return target;
}
+struct proxy *findproxy(const char *name, int cap) {
+
+ struct proxy *curproxy, *target = NULL;
+
+ for (curproxy = proxy; curproxy; curproxy = curproxy->next) {
+ if ((curproxy->cap & cap)!=cap || strcmp(curproxy->id, name))
+ continue;
+
+ if (!target) {
+ target = curproxy;
+ continue;
+ }
+
+ return NULL;
+ }
+
+ return target;
+}
+
/*
* This function finds a server with matching name within selected proxy.
* It also checks if there are more matching servers with