[GNUnet-SVN] r24744 - in gnunet: contrib src/mesh

[gnunet]

Author: szengel
Date: 2012-11-05 15:33:16 +0100 (Mon, 05 Nov 2012)
New Revision: 24744

Added:
   gnunet/contrib/regex_profiler_infiniband.conf
Removed:
   gnunet/src/mesh/regex_profiler_test.conf
Modified:
   gnunet/src/mesh/Makefile.am
Log:
Moving regex profiler config to contrib


Copied: gnunet/contrib/regex_profiler_infiniband.conf (from rev 24743, 
gnunet/src/mesh/regex_profiler_test.conf)
===================================================================
--- gnunet/contrib/regex_profiler_infiniband.conf                               
(rev 0)
+++ gnunet/contrib/regex_profiler_infiniband.conf       2012-11-05 14:33:16 UTC 
(rev 24744)
@@ -0,0 +1,99 @@
+[testbed]
+AUTOSTART = NO
+PORT = 11999
+ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
+HOSTNAME = localhost
+MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10
+MAX_PARALLEL_OPERATIONS = 1000
+MAX_PARALLEL_SERVICE_CONNECTIONS = 1000
+MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 50
+
+[regexprofiler]
+AUTOSTART = YES
+PORT = 12000
+BINARY = /home/szengel/gnunet/src/mesh/gnunet-service-regexprofiler
+
+[mesh]
+AUTOSTART = YES
+ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
+APP_ANNOUNCE_TIME = 10 s
+ID_ANNOUNCE_TIME = 10 s
+CONNECT_TIMEOUT = 10 m
+PORT = 12001
+
+[dht]
+AUTOSTART = YES
+ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
+PORT = 12002
+HOSTNAME = localhost
+DISABLE_TRY_CONNECT = YES
+
+[arm]
+DEFAULTSERVICES = core mesh dht statistics regexprofiler
+PORT = 12003
+
+[fs]
+AUTOSTART = NO
+
+[resolver]
+AUTOSTART = NO
+
+[block]
+plugins = dht mesh
+
+[transport]
+AUTOSTART = YES
+PLUGINS = udp
+ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
+ACCEPT_FROM6 = ::1;
+NEIGHBOUR_LIMIT = 50
+PORT = 12004
+
+[ats]
+WAN_QUOTA_OUT = 3932160
+WAN_QUOTA_IN = 3932160
+
+[core]
+PORT = 12005
+AUTOSTART = YES
+
+[transport-tcp]
+TIMEOUT = 300 s
+PORT = 12006
+ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
+
+[transport-udp]
+TIMEOUT = 300 s
+PORT = 12007
+ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
+
+[statistics]
+PORT = 12008
+AUTOSTART = YES
+ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
+
+[TESTING]
+NUM_PEERS = 5
+WEAKRANDOM = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+MAX_CONCURRENT_SSH = 10
+USE_PROGRESSBARS = YES
+PEERGROUP_TIMEOUT = 2400 s
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+[PATHS]
+SERVICEHOME = /tmp/test-testbed/
+
+[dns]
+AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO
+
+[vpn]
+AUTOSTART = NO
+
+[nat]
+RETURN_LOCAL_ADDRESSES = YES

Modified: gnunet/src/mesh/Makefile.am
===================================================================
--- gnunet/src/mesh/Makefile.am 2012-11-05 14:30:01 UTC (rev 24743)
+++ gnunet/src/mesh/Makefile.am 2012-11-05 14:33:16 UTC (rev 24744)
@@ -340,5 +340,4 @@
 EXTRA_DIST = \
   test_mesh.conf \
   test_mesh_2dtorus.conf \
-  test_mesh_small.conf \
-  regex_profiler_test.conf
+  test_mesh_small.conf

Deleted: gnunet/src/mesh/regex_profiler_test.conf
===================================================================
--- gnunet/src/mesh/regex_profiler_test.conf    2012-11-05 14:30:01 UTC (rev 
24743)
+++ gnunet/src/mesh/regex_profiler_test.conf    2012-11-05 14:33:16 UTC (rev 
24744)
@@ -1,99 +0,0 @@
-[testbed]
-AUTOSTART = NO
-PORT = 11999
-ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
-HOSTNAME = localhost
-MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10
-MAX_PARALLEL_OPERATIONS = 1000
-MAX_PARALLEL_SERVICE_CONNECTIONS = 1000
-MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 50
-
-[regexprofiler]
-AUTOSTART = YES
-PORT = 12000
-BINARY = /home/szengel/gnunet/src/mesh/gnunet-service-regexprofiler
-
-[mesh]
-AUTOSTART = YES
-ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
-APP_ANNOUNCE_TIME = 10 s
-ID_ANNOUNCE_TIME = 10 s
-CONNECT_TIMEOUT = 10 m
-PORT = 12001
-
-[dht]
-AUTOSTART = YES
-ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
-PORT = 12002
-HOSTNAME = localhost
-DISABLE_TRY_CONNECT = YES
-
-[arm]
-DEFAULTSERVICES = core mesh dht statistics regexprofiler
-PORT = 12003
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[block]
-plugins = dht mesh
-
-[transport]
-AUTOSTART = YES
-PLUGINS = udp
-ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
-ACCEPT_FROM6 = ::1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12004
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12005
-AUTOSTART = YES
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12006
-ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
-
-[transport-udp]
-TIMEOUT = 300 s
-PORT = 12007
-ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
-
-[statistics]
-PORT = 12008
-AUTOSTART = YES
-ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
-
-[TESTING]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-SERVICEHOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES