From: Willy Tarreau <w@1wt.eu>
Date: Wed, 6 Mar 2013 15:52:04 +0000 (+0100)
Subject: MEDIUM: config: add complete support for str2sa_range() in dispatch
X-Git-Tag: v1.5-dev18~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3559bffd69e81a72ca756aaf3a61c5502c52eb3;p=thirdparty%2Fhaproxy.git

MEDIUM: config: add complete support for str2sa_range() in dispatch

The dispatch statement now completely relies on str2sa_range() to parse
an address.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 0c08e3b09e..b42b4634fb 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -3945,6 +3945,8 @@ stats_error_parsing:
 	else if (!strcmp(args[0], "dispatch")) {  /* dispatch address */
 		struct sockaddr_storage *sk;
 		int port1, port2;
+		char *err_msg = NULL;
+		struct protocol *proto;
 
 		if (curproxy == &defproxy) {
 			Alert("parsing [%s:%d] : '%s' not allowed in 'defaults' section.\n", file, linenum, args[0]);
@@ -3954,9 +3956,19 @@ stats_error_parsing:
 		else if (warnifnotcap(curproxy, PR_CAP_BE, file, linenum, args[0], NULL))
 			err_code |= ERR_WARN;
 
-		sk = str2sa_range(args[1], &port1, &port2, NULL, NULL);
+		sk = str2sa_range(args[1], &port1, &port2, &err_msg, NULL);
 		if (!sk) {
-			Alert("parsing [%s:%d] : '%s' : unknown host in '%s'\n", file, linenum, args[0], args[1]);
+			Alert("parsing [%s:%d] : '%s' : %s\n", file, linenum, args[0], err_msg);
+			err_code |= ERR_ALERT | ERR_FATAL;
+			free(err_msg);
+			goto out;
+		}
+		free(err_msg);
+
+		proto = protocol_by_family(sk->ss_family);
+		if (!proto || !proto->connect) {
+			Alert("parsing [%s:%d] : '%s %s' : connect() not supported for this address family.\n",
+			      file, linenum, args[0], args[1]);
 			err_code |= ERR_ALERT | ERR_FATAL;
 			goto out;
 		}