diff options
| author | Michael Paquier | 2012-08-23 04:01:02 +0000 |
|---|---|---|
| committer | Michael Paquier | 2012-08-23 04:01:02 +0000 |
| commit | 55927dfc3bd46e9433355945f6751594f2db53c9 (patch) | |
| tree | 7ddfa61c9063029ff8df4fe09b7e85a2ebf04b8d | |
| parent | 0ee3600141696f422d425762ae1f236cb551be98 (diff) | |
Fix GTM startup with "*" set as listen_addresses on OSX
On OSX, GTM was not able to start with default parameter values.
This had side effects on regressions with make check, making impossible
to run a simple default regression test.
| -rw-r--r-- | src/gtm/main/gtm_opt.c | 2 | ||||
| -rw-r--r-- | src/gtm/main/main.c | 6 | ||||
| -rw-r--r-- | src/gtm/proxy/gtm_proxy_opt.c | 2 | ||||
| -rw-r--r-- | src/gtm/proxy/proxy_main.c | 8 |
4 files changed, 14 insertions, 4 deletions
diff --git a/src/gtm/main/gtm_opt.c b/src/gtm/main/gtm_opt.c index 62bd4d5f99..f05be304cc 100644 --- a/src/gtm/main/gtm_opt.c +++ b/src/gtm/main/gtm_opt.c @@ -251,7 +251,7 @@ struct config_string ConfigureNamesString[] = 0 }, &ListenAddresses, - NULL, + "*", NULL, NULL }, diff --git a/src/gtm/main/main.c b/src/gtm/main/main.c index f6c5e8d58e..10d452a3ae 100644 --- a/src/gtm/main/main.c +++ b/src/gtm/main/main.c @@ -635,9 +635,15 @@ main(int argc, char *argv[]) { int success = 0; + if (strcmp(ListenAddresses, "*") == 0) + status = StreamServerPort(AF_UNSPEC, NULL, + (unsigned short) GTMPortNumber, + ListenSocket, MAXLISTEN); + else status = StreamServerPort(AF_UNSPEC, ListenAddresses, (unsigned short) GTMPortNumber, ListenSocket, MAXLISTEN); + if (status == STATUS_OK) success++; else diff --git a/src/gtm/proxy/gtm_proxy_opt.c b/src/gtm/proxy/gtm_proxy_opt.c index 4ed7722f93..96be9b56fc 100644 --- a/src/gtm/proxy/gtm_proxy_opt.c +++ b/src/gtm/proxy/gtm_proxy_opt.c @@ -278,7 +278,7 @@ struct config_string ConfigureNamesString[] = 0 }, &ListenAddresses, - NULL, + "*", NULL, NULL }, diff --git a/src/gtm/proxy/proxy_main.c b/src/gtm/proxy/proxy_main.c index 4d57a2c143..ecf883938a 100644 --- a/src/gtm/proxy/proxy_main.c +++ b/src/gtm/proxy/proxy_main.c @@ -591,9 +591,7 @@ main(int argc, char *argv[]) } } -/* ListenAddresses = strdup(GTM_PROXY_DEFAULT_HOSTNAME); -*/ GTMProxyPortNumber = GTM_PROXY_DEFAULT_PORT; GTMProxyWorkerThreads = GTM_PROXY_DEFAULT_WORKERS; @@ -814,9 +812,15 @@ main(int argc, char *argv[]) { int success = 0; + if (strcmp(ListenAddresses, "*") == 0) + status = StreamServerPort(AF_UNSPEC, NULL, + (unsigned short) GTMProxyPortNumber, + ListenSocket, MAXLISTEN); + else status = StreamServerPort(AF_UNSPEC, ListenAddresses, (unsigned short) GTMProxyPortNumber, ListenSocket, MAXLISTEN); + if (status == STATUS_OK) success++; else |