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

MEDIUM: config: use str2sa_range() to parse peers addresses

Browse Source 
Similarly to previous changes, use str2sa_range() so that we can
detect invalid addresses or port configurations in peers.
This commit is contained in:
Willy Tarreau 2013-02-20 19:20:59 +01:00
parent dbfa445bbc
commit 2aa388025f
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/cfgparse.c
View File

@ -1480,9 +1480,8 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
curpeers->id = strdup(args[1]); curpeers->id = strdup(args[1]);
} }
else if (strcmp(args[0], "peer") == 0) { /* peer definition */ else if (strcmp(args[0], "peer") == 0) { /* peer definition */
char *rport, *raddr;
short realport = 0;
struct sockaddr_storage *sk; struct sockaddr_storage *sk;
int port1, port2;
char *err_msg = NULL; char *err_msg = NULL;
if (!*args[2]) { if (!*args[2]) {
@ -1517,26 +1516,27 @@ 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]);
raddr = strdup(args[2]); sk = str2sa_range(args[2], &port1, &port2);
rport = strrchr(raddr, ':'); if (!sk) {
if (rport) { Alert("parsing [%s:%d] : '%s %s' : unknown host in '%s'\n", file, linenum, args[0], args[1], args[2]);
*rport++ = 0;
realport = atol(rport);
}
if (!realport) {
Alert("parsing [%s:%d] : Missing or invalid port in '%s'\n", file, linenum, args[2]);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
free(raddr);
goto out; goto out;
} }
sk = str2ip(raddr); if (port1 != port2) {
free(raddr); Alert("parsing [%s:%d] : '%s %s' : port ranges and offsets are not allowed in '%s'\n",
if (!sk) { file, linenum, args[0], args[1], args[2]);
Alert("parsing [%s:%d] : Unknown host in '%s'\n", file, linenum, args[2]);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
goto out; goto out;
} }
if (!port1) {
Alert("parsing [%s:%d] : '%s %s' : missing or invalid port in '%s'\n",
file, linenum, args[0], args[1], args[2]);
err_code |= ERR_ALERT | ERR_FATAL;
goto out;
}
newpeer->addr = *sk; newpeer->addr = *sk;
newpeer->proto = protocol_by_family(newpeer->addr.ss_family); newpeer->proto = protocol_by_family(newpeer->addr.ss_family);
newpeer->xprt = &raw_sock; newpeer->xprt = &raw_sock;
@ -1549,8 +1549,6 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
goto out; goto out;
} }
set_host_port(&newpeer->addr, realport);
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;