hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Johan Wikman
2018-11-28 11:27:44 +02:00
parent c92e485b3b 590e489be0
commit cf66cc6968
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/core/utils.cc
View File

@ -1064,8 +1064,6 @@ int open_network_socket(enum mxs_socket_type type,
memcpy(addr, ai->ai_addr, ai->ai_addrlen);
set_port(addr, port);
freeaddrinfo(ai);
if ((type == MXS_SOCKET_NETWORK && !configure_network_socket(so, addr->ss_family))
|| (type == MXS_SOCKET_LISTENER && !configure_listener_socket(so)))
{
@ -1088,12 +1086,15 @@ int open_network_socket(enum mxs_socket_type type,
if (config->local_address)
{
freeaddrinfo(ai);
ai = NULL;
if ((rc = getaddrinfo(config->local_address, NULL, &hint, &ai)) == 0)
{
struct sockaddr_storage local_address = {};
memcpy(&local_address, ai->ai_addr, ai->ai_addrlen);
freeaddrinfo(ai);
if (bind(so, (struct sockaddr*)&local_address, sizeof(local_address)) == 0)
{
@ -1117,6 +1118,8 @@ int open_network_socket(enum mxs_socket_type type,
}
}
}
freeaddrinfo(ai);
}
return so;