summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2013-05-12 11:33:33 +0000
committerBart Polot <bart@net.in.tum.de>2013-05-12 11:33:33 +0000
commitfa75ce82dfcf5b0a093fcbc67ae03454d5c4f53e (patch)
tree2638beafd5f2eea8c20233ff44fa612459d1bd7e
parent4591b824ef44038a7d81a0ba5a9d8e6f2530e40f (diff)
- re-added APP_ANNOUNCE_TIME, still needed for mesh v1
-rw-r--r--src/mesh/Makefile.am6
-rw-r--r--src/mesh/mesh.conf.in4
-rw-r--r--src/mesh/test_mesh_local_1.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am
index 84d4838b3..5ce504e44 100644
--- a/src/mesh/Makefile.am
+++ b/src/mesh/Makefile.am
@@ -156,7 +156,7 @@ test_mesh_api_SOURCES = \
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_SOURCES = \
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_SOURCES = \
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
diff --git a/src/mesh/mesh.conf.in b/src/mesh/mesh.conf.in
index 816c0a3ce..55314e5b5 100644
--- a/src/mesh/mesh.conf.in
+++ b/src/mesh/mesh.conf.in
@@ -11,10 +11,10 @@ UNIX_MATCH_UID = YES
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
diff --git a/src/mesh/test_mesh_local_1.c b/src/mesh/test_mesh_local_1.c
index 4f40688f5..6b8dc28e9 100644
--- a/src/mesh/test_mesh_local_1.c
+++ b/src/mesh/test_mesh_local_1.c
@@ -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;