diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-05-12 11:33:33 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-05-12 11:33:33 +0000 |
commit | fa75ce82dfcf5b0a093fcbc67ae03454d5c4f53e (patch) | |
tree | 2638beafd5f2eea8c20233ff44fa612459d1bd7e /src | |
parent | 4591b824ef44038a7d81a0ba5a9d8e6f2530e40f (diff) | |
download | gnunet-fa75ce82dfcf5b0a093fcbc67ae03454d5c4f53e.tar.gz gnunet-fa75ce82dfcf5b0a093fcbc67ae03454d5c4f53e.zip |
- re-added APP_ANNOUNCE_TIME, still needed for mesh v1
Diffstat (limited to 'src')
-rw-r--r-- | src/mesh/Makefile.am | 6 | ||||
-rw-r--r-- | src/mesh/mesh.conf.in | 4 | ||||
-rw-r--r-- | src/mesh/test_mesh_local_1.c | 2 |
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 = \ | |||
156 | test_mesh_api_LDADD = \ | 156 | test_mesh_api_LDADD = \ |
157 | $(top_builddir)/src/util/libgnunetutil.la \ | 157 | $(top_builddir)/src/util/libgnunetutil.la \ |
158 | $(top_builddir)/src/testing/libgnunettesting.la \ | 158 | $(top_builddir)/src/testing/libgnunettesting.la \ |
159 | $(top_builddir)/src/mesh/libgnunetmesh.la | 159 | $(top_builddir)/src/mesh/libgnunetmesh2.la |
160 | test_mesh_api_DEPENDENCIES = \ | 160 | test_mesh_api_DEPENDENCIES = \ |
161 | libgnunetmesh.la \ | 161 | libgnunetmesh.la \ |
162 | $(top_builddir)/src/util/libgnunetutil.la | 162 | $(top_builddir)/src/util/libgnunetutil.la |
@@ -175,7 +175,7 @@ test_mesh_local_1_SOURCES = \ | |||
175 | test_mesh_local_1_LDADD = \ | 175 | test_mesh_local_1_LDADD = \ |
176 | $(top_builddir)/src/util/libgnunetutil.la \ | 176 | $(top_builddir)/src/util/libgnunetutil.la \ |
177 | $(top_builddir)/src/testing/libgnunettesting.la \ | 177 | $(top_builddir)/src/testing/libgnunettesting.la \ |
178 | $(top_builddir)/src/mesh/libgnunetmesh.la | 178 | $(top_builddir)/src/mesh/libgnunetmesh2.la |
179 | test_mesh_local_1_DEPENDENCIES = \ | 179 | test_mesh_local_1_DEPENDENCIES = \ |
180 | libgnunetmesh.la | 180 | libgnunetmesh.la |
181 | 181 | ||
@@ -184,7 +184,7 @@ test_mesh_local_2_SOURCES = \ | |||
184 | test_mesh_local_2_LDADD = \ | 184 | test_mesh_local_2_LDADD = \ |
185 | $(top_builddir)/src/util/libgnunetutil.la \ | 185 | $(top_builddir)/src/util/libgnunetutil.la \ |
186 | $(top_builddir)/src/testing/libgnunettesting.la \ | 186 | $(top_builddir)/src/testing/libgnunettesting.la \ |
187 | $(top_builddir)/src/mesh/libgnunetmesh.la | 187 | $(top_builddir)/src/mesh/libgnunetmesh2.la |
188 | test_mesh_local_2_DEPENDENCIES = \ | 188 | test_mesh_local_2_DEPENDENCIES = \ |
189 | libgnunetmesh.la | 189 | libgnunetmesh.la |
190 | 190 | ||
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 | |||
11 | UNIX_MATCH_GID = YES | 11 | UNIX_MATCH_GID = YES |
12 | REFRESH_PATH_TIME = 30 min | 12 | REFRESH_PATH_TIME = 30 min |
13 | ID_ANNOUNCE_TIME = 1 h | 13 | ID_ANNOUNCE_TIME = 1 h |
14 | APP_ANNOUNCE_TIME = 1 h | ||
14 | CONNECT_TIMEOUT = 30 s | 15 | CONNECT_TIMEOUT = 30 s |
15 | DEFAULT_TTL = 64 | 16 | DEFAULT_TTL = 64 |
16 | DHT_REPLICATION_LEVEL = 3 | 17 | DHT_REPLICATION_LEVEL = 3 |
17 | MAX_TUNNELS = 1000 | 18 | MAX_TUNNELS = 1000 |
18 | MAX_MSGS_QUEUE = 10000 | 19 | MAX_MSGS_QUEUE = 10000 |
19 | MAX_PEERS=1000 | 20 | MAX_PEERS = 1000 |
20 | APP_ANNOUNCE_TIME = 5 s | ||
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 @@ | |||
28 | #include "gnunet_util_lib.h" | 28 | #include "gnunet_util_lib.h" |
29 | #include "gnunet_dht_service.h" | 29 | #include "gnunet_dht_service.h" |
30 | #include "gnunet_testing_lib.h" | 30 | #include "gnunet_testing_lib.h" |
31 | #include "gnunet_mesh_service.h" | 31 | #include "gnunet_mesh2_service.h" |
32 | 32 | ||
33 | 33 | ||
34 | static struct GNUNET_MESH_Handle *mesh_peer_1; | 34 | static struct GNUNET_MESH_Handle *mesh_peer_1; |