diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-07-18 12:42:48 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-07-18 12:42:48 +0000 |
commit | 41f993ffa4aeb530a26fba43a1e69c776633ed11 (patch) | |
tree | 17335a76e5f0f63f80ad50196cec5441ad853ad3 /src/gns | |
parent | e59aabf0eb8ce56d3414254ab9c7b6cc90dd05c3 (diff) | |
download | gnunet-41f993ffa4aeb530a26fba43a1e69c776633ed11.tar.gz gnunet-41f993ffa4aeb530a26fba43a1e69c776633ed11.zip |
-mhd use no listen socket
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 310416f6f..0768f1d78 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -2485,18 +2485,24 @@ add_handle_to_ssl_mhd (struct GNUNET_NETWORK_Handle *h, const char* domain) | |||
2485 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2485 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2486 | "No previous SSL instance found... starting new one for %s\n", | 2486 | "No previous SSL instance found... starting new one for %s\n", |
2487 | domain); | 2487 | domain); |
2488 | 2488 | hd->daemon = MHD_start_daemon (MHD_USE_DEBUG | |
2489 | hd->daemon = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_SSL, 4444, | 2489 | | MHD_USE_SSL |
2490 | &accept_cb, NULL, | 2490 | #if MHD_USE_NO_LISTEN_SOCKET |
2491 | &create_response, hd, | 2491 | | MHD_USE_NO_LISTEN_SOCKET, |
2492 | #endif | ||
2493 | , 4444, | ||
2494 | &accept_cb, NULL, | ||
2495 | &create_response, hd, | ||
2496 | #ifndef MHD_USE_NO_LISTEN_SOCKET | ||
2492 | MHD_OPTION_LISTEN_SOCKET, GNUNET_NETWORK_get_fd (mhd_unix_socket), | 2497 | MHD_OPTION_LISTEN_SOCKET, GNUNET_NETWORK_get_fd (mhd_unix_socket), |
2493 | MHD_OPTION_CONNECTION_LIMIT, MHD_MAX_CONNECTIONS, | 2498 | #endif |
2494 | MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 16, | 2499 | MHD_OPTION_CONNECTION_LIMIT, |
2495 | MHD_OPTION_NOTIFY_COMPLETED, | 2500 | MHD_MAX_CONNECTIONS, |
2496 | NULL, NULL, | 2501 | MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 16, |
2497 | MHD_OPTION_HTTPS_MEM_KEY, pgc->key, | 2502 | MHD_OPTION_NOTIFY_COMPLETED, NULL, NULL, |
2498 | MHD_OPTION_HTTPS_MEM_CERT, pgc->cert, | 2503 | MHD_OPTION_HTTPS_MEM_KEY, pgc->key, |
2499 | MHD_OPTION_END); | 2504 | MHD_OPTION_HTTPS_MEM_CERT, pgc->cert, |
2505 | MHD_OPTION_END); | ||
2500 | 2506 | ||
2501 | GNUNET_assert (hd->daemon != NULL); | 2507 | GNUNET_assert (hd->daemon != NULL); |
2502 | hd->httpd_task = GNUNET_SCHEDULER_NO_TASK; | 2508 | hd->httpd_task = GNUNET_SCHEDULER_NO_TASK; |
@@ -3219,7 +3225,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
3219 | "Specify PROXY_UNIXPATH in gns-proxy config section!\n"); | 3225 | "Specify PROXY_UNIXPATH in gns-proxy config section!\n"); |
3220 | return; | 3226 | return; |
3221 | } | 3227 | } |
3222 | 3228 | ||
3229 | #ifndef MHD_USE_NO_LISTEN_SOCKET | ||
3223 | mhd_unix_socket = GNUNET_NETWORK_socket_create (AF_UNIX, | 3230 | mhd_unix_socket = GNUNET_NETWORK_socket_create (AF_UNIX, |
3224 | SOCK_STREAM, | 3231 | SOCK_STREAM, |
3225 | 0); | 3232 | 0); |
@@ -3261,14 +3268,21 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
3261 | "Unable to listen on unix domain socket!\n"); | 3268 | "Unable to listen on unix domain socket!\n"); |
3262 | return; | 3269 | return; |
3263 | } | 3270 | } |
3271 | #endif | ||
3264 | 3272 | ||
3265 | hd = GNUNET_malloc (sizeof (struct MhdHttpList)); | 3273 | hd = GNUNET_malloc (sizeof (struct MhdHttpList)); |
3266 | hd->is_ssl = GNUNET_NO; | 3274 | hd->is_ssl = GNUNET_NO; |
3267 | strcpy (hd->domain, ""); | 3275 | strcpy (hd->domain, ""); |
3268 | httpd = MHD_start_daemon (MHD_USE_DEBUG, 4444, //Dummy port | 3276 | httpd = MHD_start_daemon (MHD_USE_DEBUG |
3277 | #if MHD_USE_NO_LISTEN_SOCKET | ||
3278 | | MHD_USE_NO_LISTEN_SOCKET, | ||
3279 | #endif | ||
3280 | , 4444, //Dummy port | ||
3269 | &accept_cb, NULL, | 3281 | &accept_cb, NULL, |
3270 | &create_response, hd, | 3282 | &create_response, hd, |
3283 | #ifndef MHD_USE_NO_LISTEN_SOCKET | ||
3271 | MHD_OPTION_LISTEN_SOCKET, GNUNET_NETWORK_get_fd (mhd_unix_socket), | 3284 | MHD_OPTION_LISTEN_SOCKET, GNUNET_NETWORK_get_fd (mhd_unix_socket), |
3285 | #endif | ||
3272 | MHD_OPTION_CONNECTION_LIMIT, MHD_MAX_CONNECTIONS, | 3286 | MHD_OPTION_CONNECTION_LIMIT, MHD_MAX_CONNECTIONS, |
3273 | MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 16, | 3287 | MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 16, |
3274 | MHD_OPTION_NOTIFY_COMPLETED, | 3288 | MHD_OPTION_NOTIFY_COMPLETED, |