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

Simplify network socket creation code

Browse Source 
The socket creation code in mysql_backend.c wasn't MySQL specific and it
could be used for all non-blocking network connections. Thus, it makes
sense to move it to a common file where other protocol modules can use
it.

The address resolution code now uses `getaddrinfo` to resolve all
addresses instead of manually handling wildcard hosts. This allows the
same code to be used for all addresses.
This commit is contained in:
Markus Mäkelä
2017-03-06 12:24:12 +02:00
parent 37dd561470
commit 66ba7f3c80
4 changed files with 98 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/core/dcb.c
View File

@ -3109,27 +3109,28 @@ dcb_listen(DCB *listener, const char *config, const char *protocol_name)
static int
dcb_listen_create_socket_inet(const char *config_bind)
{
int listener_socket;
struct sockaddr_in6 server_address = {};
int one = 1;
int sock_type = 0;
struct sockaddr_storage server_address = {};
if (!parse_bindconfig(config_bind, &server_address, &sock_type))
if (!parse_bindconfig(config_bind, &server_address))
{
MXS_ERROR("Error in parse_bindconfig for [%s]", config_bind);
return -1;
}
/** TODO: Move everything before the `bind` call to utils.c */
/** Create the TCP socket */
if ((listener_socket = socket(sock_type, SOCK_STREAM, 0)) < 0)
int listener_socket = socket(server_address.ss_family, SOCK_STREAM, 0);
if (listener_socket < 0)
{
char errbuf[MXS_STRERROR_BUFLEN];
MXS_ERROR("Can't create socket: %i, %s",
errno,
MXS_ERROR("Can't create socket: %d, %s", errno,
strerror_r(errno, errbuf, sizeof(errbuf)));
return -1;
}
int one = 1;
// socket options
if (dcb_set_socket_option(listener_socket, SOL_SOCKET, SO_REUSEADDR, (char *) &one, sizeof(one)) != 0 ||
dcb_set_socket_option(listener_socket, IPPROTO_TCP, TCP_NODELAY, (char *) &one, sizeof(one)) != 0)