diff options
-rw-r--r-- | src/gns/gns.conf.in | 3 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 20 |
2 files changed, 18 insertions, 5 deletions
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in index 80fb8c859..6a44ae40c 100644 --- a/src/gns/gns.conf.in +++ b/src/gns/gns.conf.in | |||
@@ -14,6 +14,9 @@ DEFAULT_LOOKUP_TIMEOUT = 10 | |||
14 | RECORD_PUT_INTERVAL = 60 | 14 | RECORD_PUT_INTERVAL = 60 |
15 | ZONE_PUT_INTERVAL = 900 | 15 | ZONE_PUT_INTERVAL = 900 |
16 | 16 | ||
17 | [gns-proxy] | ||
18 | PROXY_UNIXPATH= /tmp/gnunet-gns-proxy.sock | ||
19 | |||
17 | [fcfsd] | 20 | [fcfsd] |
18 | HTTPPORT = 18080 | 21 | HTTPPORT = 18080 |
19 | ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey | 22 | ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey |
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 4e523ac74..367eb02ec 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -37,8 +37,6 @@ | |||
37 | #define GNUNET_GNS_PROXY_PORT 7777 | 37 | #define GNUNET_GNS_PROXY_PORT 7777 |
38 | #define MAX_MHD_CONNECTIONS 300 | 38 | #define MAX_MHD_CONNECTIONS 300 |
39 | 39 | ||
40 | #define MHD_UNIX_SOCK_FILE "mhd_unix_sock.sock" | ||
41 | |||
42 | /* MHD/cURL defines */ | 40 | /* MHD/cURL defines */ |
43 | #define BUF_WAIT_FOR_CURL 0 | 41 | #define BUF_WAIT_FOR_CURL 0 |
44 | #define BUF_WAIT_FOR_MHD 1 | 42 | #define BUF_WAIT_FOR_MHD 1 |
@@ -2274,6 +2272,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
2274 | struct MhdHttpList *hd; | 2272 | struct MhdHttpList *hd; |
2275 | struct sockaddr_un mhd_unix_sock_addr; | 2273 | struct sockaddr_un mhd_unix_sock_addr; |
2276 | size_t len; | 2274 | size_t len; |
2275 | char* proxy_sockfile; | ||
2277 | 2276 | ||
2278 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2277 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2279 | "Loading CA\n"); | 2278 | "Loading CA\n"); |
@@ -2359,6 +2358,15 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
2359 | mhd_httpd_head = NULL; | 2358 | mhd_httpd_head = NULL; |
2360 | mhd_httpd_tail = NULL; | 2359 | mhd_httpd_tail = NULL; |
2361 | total_mhd_connections = 0; | 2360 | total_mhd_connections = 0; |
2361 | |||
2362 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns-proxy", | ||
2363 | "PROXY_UNIXPATH", | ||
2364 | &proxy_sockfile)) | ||
2365 | { | ||
2366 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
2367 | "Specify PROXY_UNIX_SOCK in gns-proxy config section!\n"); | ||
2368 | return; | ||
2369 | } | ||
2362 | 2370 | ||
2363 | mhd_unix_socket = GNUNET_NETWORK_socket_create (AF_UNIX, | 2371 | mhd_unix_socket = GNUNET_NETWORK_socket_create (AF_UNIX, |
2364 | SOCK_STREAM, | 2372 | SOCK_STREAM, |
@@ -2372,9 +2380,11 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
2372 | } | 2380 | } |
2373 | 2381 | ||
2374 | mhd_unix_sock_addr.sun_family = AF_UNIX; | 2382 | mhd_unix_sock_addr.sun_family = AF_UNIX; |
2375 | strcpy (mhd_unix_sock_addr.sun_path, MHD_UNIX_SOCK_FILE); | 2383 | strcpy (mhd_unix_sock_addr.sun_path, proxy_sockfile); |
2376 | unlink (MHD_UNIX_SOCK_FILE); | 2384 | unlink (proxy_sockfile); |
2377 | len = strlen (MHD_UNIX_SOCK_FILE) + sizeof(AF_UNIX); | 2385 | len = strlen (proxy_sockfile) + sizeof(AF_UNIX); |
2386 | |||
2387 | GNUNET_free (proxy_sockfile); | ||
2378 | 2388 | ||
2379 | if (GNUNET_OK != GNUNET_NETWORK_socket_bind (mhd_unix_socket, | 2389 | if (GNUNET_OK != GNUNET_NETWORK_socket_bind (mhd_unix_socket, |
2380 | (struct sockaddr*)&mhd_unix_sock_addr, | 2390 | (struct sockaddr*)&mhd_unix_sock_addr, |