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

Reindented server/core/gw_utils.c

Browse Source
This commit is contained in:
Johan Wikman
2015-11-30 13:22:49 +02:00
parent d2aebe2bf0
commit 26d1cf0c1f
2 changed files with 144 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

272
server/core/gw_utils.c
View File

@ -3,18 +3,18 @@
* software: you can redistribute it and/or modify it under the terms of the * software: you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation, * GNU General Public License as published by the Free Software Foundation,
* version 2. * version 2.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 51 * this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* Copyright MariaDB Corporation Ab 2013-2014 * Copyright MariaDB Corporation Ab 2013-2014
* *
*/ */
/** /**
@ -24,16 +24,16 @@
* @verbatim * @verbatim
* Revision History * Revision History
* *
* Date Who Description * Date Who Description
* 03-06-2013 Massimiliano Pinto gateway utils * 03-06-2013 Massimiliano Pinto gateway utils
* 12-06-2013 Massimiliano Pinto gw_read_gwbuff * 12-06-2013 Massimiliano Pinto gw_read_gwbuff
* with error detection * with error detection
* and its handling * and its handling
* 01-07-2013 Massimiliano Pinto Removed session->backends * 01-07-2013 Massimiliano Pinto Removed session->backends
* from gw_read_gwbuff() * from gw_read_gwbuff()
* 25-09-2013 Massimiliano Pinto setipaddress uses getaddrinfo * 25-09-2013 Massimiliano Pinto setipaddress uses getaddrinfo
* 06-02-2014 Mark Riddoch Added parse_bindconfig * 06-02-2014 Mark Riddoch Added parse_bindconfig
* 10-02-2014 Massimiliano Pinto Added return code to setipaddress * 10-02-2014 Massimiliano Pinto Added return code to setipaddress
* 02-09-2014 Martin Brampton Replace C++ comment with C comment * 02-09-2014 Martin Brampton Replace C++ comment with C comment
* *
*@endverbatim *@endverbatim
@ -51,106 +51,121 @@ SPINLOCK tmplock = SPINLOCK_INIT;
/* /*
* Set IP address in socket structure in_addr * Set IP address in socket structure in_addr
* *
* @param a Pointer to a struct in_addr into which the address is written * @param a Pointer to a struct in_addr into which the address is written
* @param p The hostname to lookup * @param p The hostname to lookup
* @return 1 on success, 0 on failure * @return 1 on success, 0 on failure
*/ */
int int
setipaddress(struct in_addr *a, char *p) { setipaddress(struct in_addr *a, char *p)
{
#ifdef __USE_POSIX #ifdef __USE_POSIX
struct addrinfo *ai = NULL, hint; struct addrinfo *ai = NULL, hint;
int rc; int rc;
struct sockaddr_in * res_addr; struct sockaddr_in *res_addr;
memset(&hint, 0, sizeof (hint)); memset(&hint, 0, sizeof (hint));
hint.ai_socktype = SOCK_STREAM; hint.ai_socktype = SOCK_STREAM;
/* /*
* This is for the listening socket, matching INADDR_ANY only for now. * This is for the listening socket, matching INADDR_ANY only for now.
* For future specific addresses bind, a dedicated routine woulbd be better * For future specific addresses bind, a dedicated routine woulbd be better
*/ */
if (strcmp(p, "0.0.0.0") == 0) { if (strcmp(p, "0.0.0.0") == 0)
hint.ai_flags = AI_PASSIVE; {
hint.ai_family = AF_UNSPEC; hint.ai_flags = AI_PASSIVE;
if ((rc = getaddrinfo(p, NULL, &hint, &ai)) != 0) { hint.ai_family = AF_UNSPEC;
MXS_ERROR("Failed to obtain address for host %s, %s", if ((rc = getaddrinfo(p, NULL, &hint, &ai)) != 0)
p, {
gai_strerror(rc)); MXS_ERROR("Failed to obtain address for host %s, %s",
p,
gai_strerror(rc));
return 0; return 0;
} }
} else { }
hint.ai_flags = AI_CANONNAME; else
hint.ai_family = AF_INET; {
hint.ai_flags = AI_CANONNAME;
hint.ai_family = AF_INET;
if ((rc = getaddrinfo(p, NULL, &hint, &ai)) != 0) { if ((rc = getaddrinfo(p, NULL, &hint, &ai)) != 0)
MXS_ERROR("Failed to obtain address for host %s, %s", {
p, MXS_ERROR("Failed to obtain address for host %s, %s",
gai_strerror(rc)); p,
gai_strerror(rc));
return 0; return 0;
} }
} }
/* take the first one */ /* take the first one */
if (ai != NULL) { if (ai != NULL)
res_addr = (struct sockaddr_in *)(ai->ai_addr); {
memcpy(a, &res_addr->sin_addr, sizeof(struct in_addr)); res_addr = (struct sockaddr_in *)(ai->ai_addr);
memcpy(a, &res_addr->sin_addr, sizeof(struct in_addr));
freeaddrinfo(ai); freeaddrinfo(ai);
return 1; return 1;
} }
#else #else
struct hostent *h; struct hostent *h;
spinlock_acquire(&tmplock); spinlock_acquire(&tmplock);
h = gethostbyname(p); h = gethostbyname(p);
spinlock_release(&tmplock); spinlock_release(&tmplock);
if (h == NULL) {
if ((a->s_addr = inet_addr(p)) == -1) {
MXS_ERROR("gethostbyname failed for [%s]", p);
return 0; if (h == NULL)
} {
} else { if ((a->s_addr = inet_addr(p)) == -1)
/* take the first one */ {
memcpy(a, h->h_addr, h->h_length); MXS_ERROR("gethostbyname failed for [%s]", p);
return 1; return 0;
} }
}
else
{
/* take the first one */
memcpy(a, h->h_addr, h->h_length);
return 1;
}
#endif #endif
return 0; return 0;
} }
/** /**
* Daemonize the process by forking and putting the process into the * Daemonize the process by forking and putting the process into the
* background. * background.
*/ */
bool gw_daemonize(void) { bool gw_daemonize(void)
pid_t pid; {
pid_t pid;
pid = fork(); pid = fork();
if (pid < 0) { if (pid < 0)
char errbuf[STRERROR_BUFLEN]; {
fprintf(stderr, "fork() error %s\n", strerror_r(errno, errbuf, sizeof(errbuf))); char errbuf[STRERROR_BUFLEN];
exit(1); fprintf(stderr, "fork() error %s\n", strerror_r(errno, errbuf, sizeof(errbuf)));
} exit(1);
}
if (pid != 0) { if (pid != 0)
/* exit from main */ {
return true; /* exit from main */
} return true;
}
if (setsid() < 0) { if (setsid() < 0)
char errbuf[STRERROR_BUFLEN]; {
fprintf(stderr, "setsid() error %s\n", strerror_r(errno, errbuf, sizeof(errbuf))); char errbuf[STRERROR_BUFLEN];
exit(1); fprintf(stderr, "setsid() error %s\n", strerror_r(errno, errbuf, sizeof(errbuf)));
} exit(1);
return false; }
return false;
} }
/** /**
@ -161,55 +176,54 @@ bool gw_daemonize(void) {
* The ':' and port may be omitted, in which case the default port is * The ':' and port may be omitted, in which case the default port is
* used. * used.
* *
* @param config The bind address and port seperated by a ':' * @param config The bind address and port seperated by a ':'
* @param def_port The default port to use * @param def_port The default port to use
* @param addr The sockaddr_in in which the data is written * @param addr The sockaddr_in in which the data is written
* @return 0 on failure * @return 0 on failure
*/ */
int int
parse_bindconfig(char *config, unsigned short def_port, struct sockaddr_in *addr) parse_bindconfig(char *config, unsigned short def_port, struct sockaddr_in *addr)
{ {
char *port, buf[1024 + 1]; char *port, buf[1024 + 1];
short pnum; short pnum;
struct hostent *hp; struct hostent *hp;
strncpy(buf, config, 1024);
port = strrchr(buf, ':');
if (port)
{
*port = 0;
port++;
pnum = atoi(port);
}
else
{
pnum = def_port;
}
strncpy(buf, config, 1024); if (!strcmp(buf, "0.0.0.0"))
port = strrchr(buf, ':'); {
if (port) addr->sin_addr.s_addr = htonl(INADDR_ANY);
{ }
*port = 0; else
port++; {
pnum = atoi(port); if (!inet_aton(buf, &addr->sin_addr))
} {
else if ((hp = gethostbyname(buf)) != NULL)
{ {
pnum = def_port; bcopy(hp->h_addr, &(addr->sin_addr.s_addr), hp->h_length);
} }
else
{
MXS_ERROR("Failed to lookup host '%s'.", buf);
return 0;
}
}
}
if (!strcmp(buf, "0.0.0.0")) addr->sin_family = AF_INET;
{ addr->sin_port = htons(pnum);
addr->sin_addr.s_addr = htonl(INADDR_ANY); return 1;
}
else
{
if (!inet_aton(buf, &addr->sin_addr))
{
if ((hp = gethostbyname(buf)) != NULL)
{
bcopy(hp->h_addr, &(addr->sin_addr.s_addr), hp->h_length);
}
else
{
MXS_ERROR("Failed to lookup host '%s'.", buf);
return 0;
}
}
}
addr->sin_family = AF_INET;
addr->sin_port = htons(pnum);
return 1;
} }
/** /**

2
server/include/gw.h
View File

@ -55,7 +55,7 @@
#define GW_CLIENT_SO_SNDBUF (128 * 1024) #define GW_CLIENT_SO_SNDBUF (128 * 1024)
#define GW_CLIENT_SO_RCVBUF (128 * 1024) #define GW_CLIENT_SO_RCVBUF (128 * 1024)
#define GW_NOINTR_CALL(A) do { errno = 0; A; } while (errno == EINTR) #define GW_NOINTR_CALL(A) do { errno = 0; A; } while (errno == EINTR)
#define GW_MYSQL_LOOP_TIMEOUT 300000000 #define GW_MYSQL_LOOP_TIMEOUT 300000000
#define GW_MYSQL_READ 0 #define GW_MYSQL_READ 0
#define GW_MYSQL_WRITE 1 #define GW_MYSQL_WRITE 1