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

[gnunet]

Author: bartpolot
Date: 2013-05-12 13:33:33 +0200 (Sun, 12 May 2013)
New Revision: 27101

Modified:
   gnunet/src/mesh/Makefile.am
   gnunet/src/mesh/mesh.conf.in
   gnunet/src/mesh/test_mesh_local_1.c
Log:
- re-added APP_ANNOUNCE_TIME, still needed for mesh v1

Modified: gnunet/src/mesh/Makefile.am
===================================================================
--- gnunet/src/mesh/Makefile.am 2013-05-12 11:08:07 UTC (rev 27100)
+++ gnunet/src/mesh/Makefile.am 2013-05-12 11:33:33 UTC (rev 27101)
@@ -156,7 +156,7 @@
 test_mesh_api_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la
+ $(top_builddir)/src/mesh/libgnunetmesh2.la
 test_mesh_api_DEPENDENCIES = \
   libgnunetmesh.la \
    $(top_builddir)/src/util/libgnunetutil.la
@@ -175,7 +175,7 @@
 test_mesh_local_1_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la
+ $(top_builddir)/src/mesh/libgnunetmesh2.la
 test_mesh_local_1_DEPENDENCIES = \
   libgnunetmesh.la
 
@@ -184,7 +184,7 @@
 test_mesh_local_2_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/mesh/libgnunetmesh.la
+ $(top_builddir)/src/mesh/libgnunetmesh2.la
 test_mesh_local_2_DEPENDENCIES = \
   libgnunetmesh.la
 

Modified: gnunet/src/mesh/mesh.conf.in
===================================================================
--- gnunet/src/mesh/mesh.conf.in        2013-05-12 11:08:07 UTC (rev 27100)
+++ gnunet/src/mesh/mesh.conf.in        2013-05-12 11:33:33 UTC (rev 27101)
@@ -11,10 +11,10 @@
 UNIX_MATCH_GID = YES
 REFRESH_PATH_TIME = 30 min
 ID_ANNOUNCE_TIME = 1 h
+APP_ANNOUNCE_TIME = 1 h
 CONNECT_TIMEOUT = 30 s
 DEFAULT_TTL = 64
 DHT_REPLICATION_LEVEL = 3
 MAX_TUNNELS = 1000
 MAX_MSGS_QUEUE = 10000
-MAX_PEERS=1000
-APP_ANNOUNCE_TIME = 5 s
+MAX_PEERS = 1000

Modified: gnunet/src/mesh/test_mesh_local_1.c
===================================================================
--- gnunet/src/mesh/test_mesh_local_1.c 2013-05-12 11:08:07 UTC (rev 27100)
+++ gnunet/src/mesh/test_mesh_local_1.c 2013-05-12 11:33:33 UTC (rev 27101)
@@ -28,7 +28,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_testing_lib.h"
-#include "gnunet_mesh_service.h"
+#include "gnunet_mesh2_service.h"
 
 
 static struct GNUNET_MESH_Handle *mesh_peer_1;