[GNUnet-SVN] r24704 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2012-11-05 10:38:08 +0100 (Mon, 05 Nov 2012)
New Revision: 24704

Removed:
   gnunet/src/mesh/test_mesh_path.conf
Modified:
   gnunet/src/mesh/Makefile.am
   gnunet/src/mesh/gnunet-service-mesh-new.c
   gnunet/src/mesh/test_mesh_2dtorus.conf
   gnunet/src/mesh/test_mesh_small.conf
Log:
- sync

Modified: gnunet/src/mesh/Makefile.am
===================================================================
--- gnunet/src/mesh/Makefile.am 2012-11-05 09:20:01 UTC (rev 24703)
+++ gnunet/src/mesh/Makefile.am 2012-11-05 09:38:08 UTC (rev 24704)
@@ -331,6 +331,5 @@
   test_mesh.conf \
   test_mesh_2dtorus.conf \
   test_mesh_small.conf \
-  test_mesh_path.conf \
   regex_profiler_test.conf
 

Modified: gnunet/src/mesh/gnunet-service-mesh-new.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh-new.c   2012-11-05 09:20:01 UTC (rev 
24703)
+++ gnunet/src/mesh/gnunet-service-mesh-new.c   2012-11-05 09:38:08 UTC (rev 
24704)
@@ -4948,6 +4948,7 @@
     {
       case 0:
       case GNUNET_MESSAGE_TYPE_MESH_ACK:
+      case GNUNET_MESSAGE_TYPE_MESH_POLL:
       case GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN:
       case GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY:
       case GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY:
@@ -7708,7 +7709,7 @@
     GNUNET_PEER_resolve (t->id.oid, &copy->oid);
     copy->tid = htonl (t->id.tid);
     copy->ttl = htonl (default_ttl);
-    copy->pid = htonl (++(t->bck_pid));
+    copy->pid = htonl (t->bck_pid + 1);
 
     copy->sender = my_full_id;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

Modified: gnunet/src/mesh/test_mesh_2dtorus.conf
===================================================================
--- gnunet/src/mesh/test_mesh_2dtorus.conf      2012-11-05 09:20:01 UTC (rev 
24703)
+++ gnunet/src/mesh/test_mesh_2dtorus.conf      2012-11-05 09:38:08 UTC (rev 
24704)
@@ -36,6 +36,7 @@
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 RETURN_LOCAL_ADDRESSES = YES
+USE_LOCALADDR = YES
 
 [ats]
 WAN_QUOTA_IN = 1 GB

Deleted: gnunet/src/mesh/test_mesh_path.conf
===================================================================
--- gnunet/src/mesh/test_mesh_path.conf 2012-11-05 09:20:01 UTC (rev 24703)
+++ gnunet/src/mesh/test_mesh_path.conf 2012-11-05 09:38:08 UTC (rev 24704)
@@ -1,74 +0,0 @@
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = YES
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 10511
-# PREFIX = valgrind --leak-check=full
-# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-
-[dht]
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 12100
-
-[block]
-plugins = dht test
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = sqlite
-
-[transport]
-PLUGINS = tcp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[nat]
-DISABLEV6 = YES
-BINDTO = 127.0.0.1
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-RETURN_LOCAL_ADDRESSES = YES
-
-[core]
-PORT = 12092
-
-[arm]
-DEFAULTSERVICES = core
-PORT = 12366
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-SERVICEHOME = /tmp/test-mesh/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO

Modified: gnunet/src/mesh/test_mesh_small.conf
===================================================================
--- gnunet/src/mesh/test_mesh_small.conf        2012-11-05 09:20:01 UTC (rev 
24703)
+++ gnunet/src/mesh/test_mesh_small.conf        2012-11-05 09:38:08 UTC (rev 
24704)
@@ -56,6 +56,7 @@
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 RETURN_LOCAL_ADDRESSES = YES
+USE_LOCALADDR = YES
 
 [ats]
 WAN_QUOTA_IN = 1 GB