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

[gnunet]

Author: schanzen
Date: 2012-06-12 20:52:34 +0200 (Tue, 12 Jun 2012)
New Revision: 21924

Modified:
   gnunet/src/gns/gnunet-gns-proxy-setup-ca
   gnunet/src/gns/gnunet-gns-proxy.c
Log:
-make CA info better, connection limit mhd

Modified: gnunet/src/gns/gnunet-gns-proxy-setup-ca
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy-setup-ca    2012-06-12 17:23:06 UTC (rev 
21923)
+++ gnunet/src/gns/gnunet-gns-proxy-setup-ca    2012-06-12 18:52:34 UTC (rev 
21924)
@@ -1,6 +1,6 @@
 echo "Generating CA"
 
-openssl req -new -x509 -days 3650 -extensions v3_ca -keyout gnscakey.pem -out 
gnscacert.pem -subj "/C=DE/ST=Bavaria/L=Munich/O=TUM/OU=IN/CN=GNS Proxy 
CA/address@hidden" -passout pass:"GNUnet Naming System"
+openssl req -new -x509 -days 3650 -extensions v3_ca -keyout gnscakey.pem -out 
gnscacert.pem -subj "/C=DE/ST=Bavaria/L=Munich/O=GNUnet Naming 
System/OU=GNUnet/CN=GNS Proxy CA/address@hidden" -passout pass:"GNUnet Naming 
System"
 
 echo "Removing passphrase from key"
 openssl rsa -passin pass:"GNUnet Naming System" -in gnscakey.pem -out 
gnscakeynoenc.pem

Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c   2012-06-12 17:23:06 UTC (rev 21923)
+++ gnunet/src/gns/gnunet-gns-proxy.c   2012-06-12 18:52:34 UTC (rev 21924)
@@ -35,7 +35,7 @@
 #include <time.h>
 
 #define GNUNET_GNS_PROXY_PORT 7777
-#define MAX_MHD_CONNECTIONS 300
+#define MHD_MAX_CONNECTIONS 300
 
 /* MHD/cURL defines */
 #define BUF_WAIT_FOR_CURL 0
@@ -1796,11 +1796,9 @@
       return MHD_NO;
   }
 
-  if (total_mhd_connections >= MAX_MHD_CONNECTIONS)
-    return MHD_NO;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Connection accepted\n");
 
-  total_mhd_connections++;
-
   return MHD_YES;
 }
 
@@ -1846,7 +1844,7 @@
             &accept_cb, NULL,
             &create_response, hd,
             MHD_OPTION_LISTEN_SOCKET, GNUNET_NETWORK_get_fd (mhd_unix_socket),
-            MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 128,
+            MHD_OPTION_CONNECTION_LIMIT, MHD_MAX_CONNECTIONS,
             MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 16,
             MHD_OPTION_NOTIFY_COMPLETED,
             NULL, NULL,
@@ -2598,7 +2596,7 @@
             &accept_cb, NULL,
             &create_response, hd,
             MHD_OPTION_LISTEN_SOCKET, GNUNET_NETWORK_get_fd (mhd_unix_socket),
-            MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 128,
+            MHD_OPTION_CONNECTION_LIMIT, MHD_MAX_CONNECTIONS,
             MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 16,
             MHD_OPTION_NOTIFY_COMPLETED,
             NULL, NULL,