[GNUnet-SVN] r21889 - gnunet/src/gns

[gnunet]

Author: schanzen
Date: 2012-06-11 15:56:55 +0200 (Mon, 11 Jun 2012)
New Revision: 21889

Modified:
   gnunet/src/gns/gns.conf.in
   gnunet/src/gns/gnunet-gns-proxy.c
Log:
-read sockfile from cfg

Modified: gnunet/src/gns/gns.conf.in
===================================================================
--- gnunet/src/gns/gns.conf.in  2012-06-11 13:49:41 UTC (rev 21888)
+++ gnunet/src/gns/gns.conf.in  2012-06-11 13:56:55 UTC (rev 21889)
@@ -14,6 +14,9 @@
 RECORD_PUT_INTERVAL = 60
 ZONE_PUT_INTERVAL = 900
 
+[gns-proxy]
+PROXY_UNIXPATH= /tmp/gnunet-gns-proxy.sock
+
 [fcfsd]
 HTTPPORT = 18080
 ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey

Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c   2012-06-11 13:49:41 UTC (rev 21888)
+++ gnunet/src/gns/gnunet-gns-proxy.c   2012-06-11 13:56:55 UTC (rev 21889)
@@ -37,8 +37,6 @@
 #define GNUNET_GNS_PROXY_PORT 7777
 #define MAX_MHD_CONNECTIONS 300
 
-#define MHD_UNIX_SOCK_FILE "mhd_unix_sock.sock"
-
 /* MHD/cURL defines */
 #define BUF_WAIT_FOR_CURL 0
 #define BUF_WAIT_FOR_MHD 1
@@ -2274,6 +2272,7 @@
   struct MhdHttpList *hd;
   struct sockaddr_un mhd_unix_sock_addr;
   size_t len;
+  char* proxy_sockfile;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Loading CA\n");
@@ -2359,6 +2358,15 @@
   mhd_httpd_head = NULL;
   mhd_httpd_tail = NULL;
   total_mhd_connections = 0;
+
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns-proxy",
+                                                            "PROXY_UNIXPATH",
+                                                            &proxy_sockfile))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Specify PROXY_UNIX_SOCK in gns-proxy config section!\n");
+    return;
+  }
   
   mhd_unix_socket = GNUNET_NETWORK_socket_create (AF_UNIX,
                                                 SOCK_STREAM,
@@ -2372,10 +2380,12 @@
   }
 
   mhd_unix_sock_addr.sun_family = AF_UNIX;
-  strcpy (mhd_unix_sock_addr.sun_path, MHD_UNIX_SOCK_FILE);
-  unlink (MHD_UNIX_SOCK_FILE);
-  len = strlen (MHD_UNIX_SOCK_FILE) + sizeof(AF_UNIX);
+  strcpy (mhd_unix_sock_addr.sun_path, proxy_sockfile);
+  unlink (proxy_sockfile);
+  len = strlen (proxy_sockfile) + sizeof(AF_UNIX);
 
+  GNUNET_free (proxy_sockfile);
+
   if (GNUNET_OK != GNUNET_NETWORK_socket_bind (mhd_unix_socket,
                                (struct sockaddr*)&mhd_unix_sock_addr,
                                len))