[GNUnet-SVN] r11949 - in gnunet: . contrib src/arm

[gnunet]

Author: grothoff
Date: 2010-06-25 16:00:45 +0200 (Fri, 25 Jun 2010)
New Revision: 11949

Modified:
   gnunet/TODO
   gnunet/contrib/defaults.conf
   gnunet/src/arm/gnunet-service-arm_interceptor.c
Log:
add option to disable socket forwarding -- useful for debugging

Modified: gnunet/TODO
===================================================================
--- gnunet/TODO 2010-06-25 12:57:38 UTC (rev 11948)
+++ gnunet/TODO 2010-06-25 14:00:45 UTC (rev 11949)
@@ -1,10 +1,6 @@
 0.9.0pre1:
 * TRANSPORT:
-  - PING Signing [CG]
   - HTTP backend [MW]
-* ARM:
-  - make listen socket forwarding to child processes on supported platforms
-    optional for debugging [CG/Nate]
 * CORE:
   - derived key generation [Nils]
 * UTIL:

Modified: gnunet/contrib/defaults.conf
===================================================================
--- gnunet/contrib/defaults.conf        2010-06-25 12:57:38 UTC (rev 11948)
+++ gnunet/contrib/defaults.conf        2010-06-25 14:00:45 UTC (rev 11949)
@@ -57,6 +57,7 @@
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 UNIXPATH = /tmp/gnunet-service-statistics.sock
+# DISABLE_SOCKET_FORWARDING = NO
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -76,6 +77,7 @@
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 UNIXPATH = /tmp/gnunet-service-resolver.sock
+# DISABLE_SOCKET_FORWARDING = NO
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -95,6 +97,7 @@
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 UNIXPATH = /tmp/gnunet-service-peerinfo.sock
+# DISABLE_SOCKET_FORWARDING = NO
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -119,6 +122,7 @@
 ACCEPT_FROM6 = ::1;
 PLUGINS = tcp
 UNIXPATH = /tmp/gnunet-service-transport.sock
+# DISABLE_SOCKET_FORWARDING = NO
 # USERNAME = 
 # MAXBUF =
 # TIMEOUT =
@@ -141,6 +145,7 @@
 TOTAL_QUOTA_IN = 65536
 TOTAL_QUOTA_OUT = 65536
 UNIXPATH = /tmp/gnunet-service-core.sock
+# DISABLE_SOCKET_FORWARDING = NO
 # DEBUG = YES
 # USERNAME = 
 # MAXBUF =
@@ -188,6 +193,7 @@
 QUOTA = 100000000
 BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
 DATABASE = sqlite
+# DISABLE_SOCKET_FORWARDING = NO
 
 [datastore-sqlite]
 FILENAME = $SERVICEHOME/datastore/sqlite.db
@@ -206,5 +212,6 @@
 ACCEPT_FROM6 = ::1;
 ACTIVEMIGRATION = YES
 UNIXPATH = /tmp/gnunet-service-fs.sock
+# DISABLE_SOCKET_FORWARDING = NO
 # DEBUG = YES
 

Modified: gnunet/src/arm/gnunet-service-arm_interceptor.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm_interceptor.c     2010-06-25 12:57:38 UTC 
(rev 11948)
+++ gnunet/src/arm/gnunet-service-arm_interceptor.c     2010-06-25 14:00:45 UTC 
(rev 11949)
@@ -858,7 +858,6 @@
 acceptConnection (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 
-#if MINGW 
 static void
 accept_and_forward (struct ServiceListeningInfo *serviceListeningInfo)
 {
@@ -909,7 +908,6 @@
                                &start_forwarding,
                                fc);
 }
-#endif
 
 
 /**
@@ -927,6 +925,7 @@
   struct ServiceListeningInfo *next;
   int *lsocks;
   unsigned int ls;
+  int use_lsocks;
 
   sli->acceptTask = GNUNET_SCHEDULER_NO_TASK;
   if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
@@ -935,6 +934,21 @@
                               serviceListeningInfoList_tail, 
                               sli);  
 #ifndef MINGW
+  use_lsocks = GNUNET_YES;
+  if (GNUNET_YES == GNUNET_CONFIGURATION_have_value (cfg,
+                                                    sli->serviceName,
+                                                    
"DISABLE_SOCKET_FORWARDING"))
+    use_lsocks = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+                                                      sli->serviceName,
+                                                      
"DISABLE_SOCKET_FORWARDING");
+#else
+  use_lsocks = GNUNET_NO;
+#endif
+  if (GNUNET_YES != use_lsocks)
+    {
+      accept_and_forward (sli);
+      return;
+    }
   lsocks = NULL;
   ls = 0;
   next = serviceListeningInfoList_head;
@@ -971,9 +985,6 @@
   GNUNET_array_grow (lsocks, ls, 0);
   GNUNET_free (sli->serviceName);
   GNUNET_free (sli); 
-#else
-  accept_and_forward (sli);  
-#endif
 }