mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: config: add complete support for str2sa_range() in 'peer'

Browse Source 
The peer addresses are now completely parsed using str2sa_range()
and the resulting protocol is checked for support for connect().
This commit is contained in:
Willy Tarreau 2013-03-10 18:37:42 +01:00
parent 4217a7dbab
commit b36487e106
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/cfgparse.c
View File

@ -1465,6 +1465,7 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
struct sockaddr_storage *sk; struct sockaddr_storage *sk;
int port1, port2; int port1, port2;
char *err_msg = NULL; char *err_msg = NULL;
struct protocol *proto;
if (!*args[2]) { if (!*args[2]) {
Alert("parsing [%s:%d] : '%s' expects <name> and <addr>[:<port>] as arguments.\n", Alert("parsing [%s:%d] : '%s' expects <name> and <addr>[:<port>] as arguments.\n",
@ -1498,9 +1499,19 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
newpeer->last_change = now.tv_sec; newpeer->last_change = now.tv_sec;
newpeer->id = strdup(args[1]); newpeer->id = strdup(args[1]);
sk = str2sa_range(args[2], &port1, &port2, NULL, NULL); sk = str2sa_range(args[2], &port1, &port2, &err_msg, NULL);
if (!sk) { if (!sk) {
Alert("parsing [%s:%d] : '%s %s' : unknown host in '%s'\n", file, linenum, args[0], args[1], args[2]); Alert("parsing [%s:%d] : '%s %s' : %s\n", file, linenum, args[0], args[1], 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; err_code |= ERR_ALERT | ERR_FATAL;
goto out; goto out;
} }
@ -1520,17 +1531,10 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
} }
newpeer->addr = *sk; newpeer->addr = *sk;
newpeer->proto = protocol_by_family(newpeer->addr.ss_family); newpeer->proto = proto;
newpeer->xprt = &raw_sock; newpeer->xprt = &raw_sock;
newpeer->sock_init_arg = NULL; newpeer->sock_init_arg = NULL;
if (!newpeer->proto) {
Alert("parsing [%s:%d] : Unknown protocol family %d '%s'\n",
file, linenum, newpeer->addr.ss_family, args[2]);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}
if (strcmp(newpeer->id, localpeer) == 0) { if (strcmp(newpeer->id, localpeer) == 0) {
/* Current is local peer, it define a frontend */ /* Current is local peer, it define a frontend */
newpeer->local = 1; newpeer->local = 1;