diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-11-11 11:05:29 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-11-11 11:05:29 +0000 |
commit | 1b18069ef2567ffe0994c799d1d179329d629ca9 (patch) | |
tree | 187639305dfb68861d7391648a3ae33329e2a6ad | |
parent | 9ab4762f15c31781e369db9d1358697f243ee650 (diff) | |
download | gnunet-1b18069ef2567ffe0994c799d1d179329d629ca9.tar.gz gnunet-1b18069ef2567ffe0994c799d1d179329d629ca9.zip |
adding argument to GNUNET_CORE_connect -- not yet implemented
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | src/core/core_api.c | 8 | ||||
-rw-r--r-- | src/core/test_core_api.c | 4 | ||||
-rw-r--r-- | src/core/test_core_api_reliability.c | 4 | ||||
-rw-r--r-- | src/core/test_core_api_start_only.c | 4 | ||||
-rw-r--r-- | src/core/test_core_quota_compliance.c | 4 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht.c | 3 | ||||
-rw-r--r-- | src/dv/gnunet-service-dv.c | 1 | ||||
-rw-r--r-- | src/dv/test_transport_api_dv.c | 11 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs.c | 1 | ||||
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist.c | 1 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_learning.c | 1 | ||||
-rw-r--r-- | src/include/gnunet_core_service.h | 7 | ||||
-rw-r--r-- | src/testing/test_testing_topology.c | 2 | ||||
-rw-r--r-- | src/testing/testing.c | 4 | ||||
-rw-r--r-- | src/topology/gnunet-daemon-topology.c | 1 |
16 files changed, 47 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index eddb10ff0..8c747d283 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -21,8 +21,8 @@ | |||
21 | # | 21 | # |
22 | # | 22 | # |
23 | AC_PREREQ(2.61) | 23 | AC_PREREQ(2.61) |
24 | AC_INIT([gnunet], [0.9.0pre1],[bug-gnunet@gnu.org]) | 24 | AC_INIT([gnunet], [0.9.0pre2],[bug-gnunet@gnu.org]) |
25 | AM_INIT_AUTOMAKE([gnunet], [0.9.0pre1]) | 25 | AM_INIT_AUTOMAKE([gnunet], [0.9.0pre2]) |
26 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | 26 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
27 | AC_CONFIG_HEADERS([gnunet_config.h]) | 27 | AC_CONFIG_HEADERS([gnunet_config.h]) |
28 | 28 | ||
diff --git a/src/core/core_api.c b/src/core/core_api.c index cb5ba3ecb..a1e6aea65 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c | |||
@@ -129,6 +129,11 @@ struct GNUNET_CORE_Handle | |||
129 | GNUNET_SCHEDULER_TaskIdentifier reconnect_task; | 129 | GNUNET_SCHEDULER_TaskIdentifier reconnect_task; |
130 | 130 | ||
131 | /** | 131 | /** |
132 | * Number of messages we should queue per target. | ||
133 | */ | ||
134 | unsigned int queue_size; | ||
135 | |||
136 | /** | ||
132 | * Number of entries in the handlers array. | 137 | * Number of entries in the handlers array. |
133 | */ | 138 | */ |
134 | unsigned int hcnt; | 139 | unsigned int hcnt; |
@@ -722,6 +727,7 @@ transmit_start (void *cls, size_t size, void *buf) | |||
722 | * complete (or fail) asynchronously. | 727 | * complete (or fail) asynchronously. |
723 | * | 728 | * |
724 | * @param cfg configuration to use | 729 | * @param cfg configuration to use |
730 | * @param queue_size size of the per-peer message queue | ||
725 | * @param timeout after how long should we give up trying to connect to the core service? | 731 | * @param timeout after how long should we give up trying to connect to the core service? |
726 | * @param cls closure for the various callbacks that follow (including handlers in the handlers array) | 732 | * @param cls closure for the various callbacks that follow (including handlers in the handlers array) |
727 | * @param init callback to call on timeout or once we have successfully | 733 | * @param init callback to call on timeout or once we have successfully |
@@ -743,6 +749,7 @@ transmit_start (void *cls, size_t size, void *buf) | |||
743 | */ | 749 | */ |
744 | struct GNUNET_CORE_Handle * | 750 | struct GNUNET_CORE_Handle * |
745 | GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, | 751 | GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, |
752 | unsigned int queue_size, | ||
746 | struct GNUNET_TIME_Relative timeout, | 753 | struct GNUNET_TIME_Relative timeout, |
747 | void *cls, | 754 | void *cls, |
748 | GNUNET_CORE_StartupCallback init, | 755 | GNUNET_CORE_StartupCallback init, |
@@ -769,6 +776,7 @@ GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
769 | h->inbound_hdr_only = inbound_hdr_only; | 776 | h->inbound_hdr_only = inbound_hdr_only; |
770 | h->outbound_hdr_only = outbound_hdr_only; | 777 | h->outbound_hdr_only = outbound_hdr_only; |
771 | h->handlers = handlers; | 778 | h->handlers = handlers; |
779 | h->queue_size = queue_size; | ||
772 | h->client_notifications = GNUNET_CLIENT_connect ("core", cfg); | 780 | h->client_notifications = GNUNET_CLIENT_connect ("core", cfg); |
773 | if (h->client_notifications == NULL) | 781 | if (h->client_notifications == NULL) |
774 | { | 782 | { |
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index 65b09c835..129184587 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c | |||
@@ -219,7 +219,7 @@ init_notify (void *cls, | |||
219 | GNUNET_assert (ok == 2); | 219 | GNUNET_assert (ok == 2); |
220 | OKPP; | 220 | OKPP; |
221 | /* connect p2 */ | 221 | /* connect p2 */ |
222 | GNUNET_CORE_connect (p2.cfg, | 222 | GNUNET_CORE_connect (p2.cfg, 1, |
223 | TIMEOUT, | 223 | TIMEOUT, |
224 | &p2, | 224 | &p2, |
225 | &init_notify, | 225 | &init_notify, |
@@ -310,7 +310,7 @@ run (void *cls, | |||
310 | OKPP; | 310 | OKPP; |
311 | setup_peer (&p1, "test_core_api_peer1.conf"); | 311 | setup_peer (&p1, "test_core_api_peer1.conf"); |
312 | setup_peer (&p2, "test_core_api_peer2.conf"); | 312 | setup_peer (&p2, "test_core_api_peer2.conf"); |
313 | GNUNET_CORE_connect (p1.cfg, | 313 | GNUNET_CORE_connect (p1.cfg, 1, |
314 | TIMEOUT, | 314 | TIMEOUT, |
315 | &p1, | 315 | &p1, |
316 | &init_notify, | 316 | &init_notify, |
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index da67bb4d4..f22a9022e 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c | |||
@@ -365,7 +365,7 @@ init_notify (void *cls, | |||
365 | GNUNET_assert (ok == 2); | 365 | GNUNET_assert (ok == 2); |
366 | OKPP; | 366 | OKPP; |
367 | /* connect p2 */ | 367 | /* connect p2 */ |
368 | GNUNET_CORE_connect (p2.cfg, | 368 | GNUNET_CORE_connect (p2.cfg, 1, |
369 | TIMEOUT, | 369 | TIMEOUT, |
370 | &p2, | 370 | &p2, |
371 | &init_notify, | 371 | &init_notify, |
@@ -455,7 +455,7 @@ run (void *cls, | |||
455 | OKPP; | 455 | OKPP; |
456 | setup_peer (&p1, "test_core_api_peer1.conf"); | 456 | setup_peer (&p1, "test_core_api_peer1.conf"); |
457 | setup_peer (&p2, "test_core_api_peer2.conf"); | 457 | setup_peer (&p2, "test_core_api_peer2.conf"); |
458 | GNUNET_CORE_connect (p1.cfg, | 458 | GNUNET_CORE_connect (p1.cfg, 1, |
459 | TIMEOUT, | 459 | TIMEOUT, |
460 | &p1, | 460 | &p1, |
461 | &init_notify, | 461 | &init_notify, |
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index da7217f39..e39179196 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c | |||
@@ -125,7 +125,7 @@ init_notify (void *cls, | |||
125 | if (cls == &p1) | 125 | if (cls == &p1) |
126 | { | 126 | { |
127 | /* connect p2 */ | 127 | /* connect p2 */ |
128 | GNUNET_CORE_connect (p2.cfg, | 128 | GNUNET_CORE_connect (p2.cfg, 1, |
129 | TIMEOUT, | 129 | TIMEOUT, |
130 | &p2, | 130 | &p2, |
131 | &init_notify, | 131 | &init_notify, |
@@ -172,7 +172,7 @@ run (void *cls, | |||
172 | OKPP; | 172 | OKPP; |
173 | setup_peer (&p1, "test_core_api_peer1.conf"); | 173 | setup_peer (&p1, "test_core_api_peer1.conf"); |
174 | setup_peer (&p2, "test_core_api_peer2.conf"); | 174 | setup_peer (&p2, "test_core_api_peer2.conf"); |
175 | GNUNET_CORE_connect (p1.cfg, | 175 | GNUNET_CORE_connect (p1.cfg, 1, |
176 | TIMEOUT, | 176 | TIMEOUT, |
177 | &p1, | 177 | &p1, |
178 | &init_notify, | 178 | &init_notify, |
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 822dc2c46..5a3e3dc14 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -452,7 +452,7 @@ init_notify (void *cls, | |||
452 | GNUNET_assert (ok == 2); | 452 | GNUNET_assert (ok == 2); |
453 | OKPP; | 453 | OKPP; |
454 | /* connect p2 */ | 454 | /* connect p2 */ |
455 | GNUNET_CORE_connect (p2.cfg, | 455 | GNUNET_CORE_connect (p2.cfg, 1, |
456 | TIMEOUT, | 456 | TIMEOUT, |
457 | &p2, | 457 | &p2, |
458 | &init_notify, | 458 | &init_notify, |
@@ -533,7 +533,7 @@ run (void *cls, | |||
533 | OKPP; | 533 | OKPP; |
534 | setup_peer (&p1, "test_core_quota_peer1.conf"); | 534 | setup_peer (&p1, "test_core_quota_peer1.conf"); |
535 | setup_peer (&p2, "test_core_quota_peer2.conf"); | 535 | setup_peer (&p2, "test_core_quota_peer2.conf"); |
536 | GNUNET_CORE_connect (p1.cfg, | 536 | GNUNET_CORE_connect (p1.cfg, 1, |
537 | TIMEOUT, | 537 | TIMEOUT, |
538 | &p1, | 538 | &p1, |
539 | &init_notify, | 539 | &init_notify, |
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c index ae57c0ea7..714ba4753 100644 --- a/src/dht/gnunet-service-dht.c +++ b/src/dht/gnunet-service-dht.c | |||
@@ -4567,7 +4567,8 @@ run (void *cls, | |||
4567 | datacache = GNUNET_DATACACHE_create (cfg, "dhtcache"); | 4567 | datacache = GNUNET_DATACACHE_create (cfg, "dhtcache"); |
4568 | GNUNET_SERVER_add_handlers (server, plugin_handlers); | 4568 | GNUNET_SERVER_add_handlers (server, plugin_handlers); |
4569 | GNUNET_SERVER_disconnect_notify (server, &handle_client_disconnect, NULL); | 4569 | GNUNET_SERVER_disconnect_notify (server, &handle_client_disconnect, NULL); |
4570 | coreAPI = GNUNET_CORE_connect (cfg, /* Main configuration */ | 4570 | coreAPI = GNUNET_CORE_connect (cfg, /* Main configuration */ |
4571 | 1, /* queue size */ | ||
4571 | GNUNET_TIME_UNIT_FOREVER_REL, | 4572 | GNUNET_TIME_UNIT_FOREVER_REL, |
4572 | NULL, /* Closure passed to DHT functions */ | 4573 | NULL, /* Closure passed to DHT functions */ |
4573 | &core_init, /* Call core_init once connected */ | 4574 | &core_init, /* Call core_init once connected */ |
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index cfc1cd2d1..6001e33f4 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c | |||
@@ -2993,6 +2993,7 @@ run (void *cls, | |||
2993 | GNUNET_SERVER_add_handlers (server, plugin_handlers); | 2993 | GNUNET_SERVER_add_handlers (server, plugin_handlers); |
2994 | coreAPI = | 2994 | coreAPI = |
2995 | GNUNET_CORE_connect (cfg, | 2995 | GNUNET_CORE_connect (cfg, |
2996 | 1, | ||
2996 | GNUNET_TIME_relative_get_forever(), | 2997 | GNUNET_TIME_relative_get_forever(), |
2997 | NULL, /* FIXME: anything we want to pass around? */ | 2998 | NULL, /* FIXME: anything we want to pass around? */ |
2998 | &core_init, | 2999 | &core_init, |
diff --git a/src/dv/test_transport_api_dv.c b/src/dv/test_transport_api_dv.c index f53aa48f9..d4c7eef2c 100644 --- a/src/dv/test_transport_api_dv.c +++ b/src/dv/test_transport_api_dv.c | |||
@@ -529,6 +529,7 @@ init_notify_peer1 (void *cls, | |||
529 | * Connect to the receiving peer | 529 | * Connect to the receiving peer |
530 | */ | 530 | */ |
531 | pos->peer2handle = GNUNET_CORE_connect (pos->peer2->cfg, | 531 | pos->peer2handle = GNUNET_CORE_connect (pos->peer2->cfg, |
532 | 1, | ||
532 | TIMEOUT, | 533 | TIMEOUT, |
533 | pos, | 534 | pos, |
534 | &init_notify_peer2, | 535 | &init_notify_peer2, |
@@ -567,6 +568,7 @@ send_test_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc) | |||
567 | * Connect to the sending peer | 568 | * Connect to the sending peer |
568 | */ | 569 | */ |
569 | pos->peer1handle = GNUNET_CORE_connect (pos->peer1->cfg, | 570 | pos->peer1handle = GNUNET_CORE_connect (pos->peer1->cfg, |
571 | 1, | ||
570 | TIMEOUT, | 572 | TIMEOUT, |
571 | pos, | 573 | pos, |
572 | &init_notify_peer1, | 574 | &init_notify_peer1, |
@@ -880,7 +882,14 @@ peers_started_callback (void *cls, | |||
880 | GNUNET_assert(GNUNET_SYSERR != GNUNET_CONTAINER_multihashmap_put(peer_daemon_hash, &id->hashPubKey, d, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | 882 | GNUNET_assert(GNUNET_SYSERR != GNUNET_CONTAINER_multihashmap_put(peer_daemon_hash, &id->hashPubKey, d, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); |
881 | 883 | ||
882 | new_peer = GNUNET_malloc(sizeof(struct PeerContext)); | 884 | new_peer = GNUNET_malloc(sizeof(struct PeerContext)); |
883 | new_peer->peer_handle = GNUNET_CORE_connect(cfg, GNUNET_TIME_UNIT_FOREVER_REL, d, NULL, &all_connect_handler, NULL, NULL, NULL, GNUNET_NO, NULL, GNUNET_NO, no_handlers); | 885 | new_peer->peer_handle = GNUNET_CORE_connect(cfg, |
886 | 1, | ||
887 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
888 | d, NULL, | ||
889 | &all_connect_handler, | ||
890 | NULL, NULL, NULL, | ||
891 | GNUNET_NO, NULL, GNUNET_NO, | ||
892 | no_handlers); | ||
884 | new_peer->daemon = d; | 893 | new_peer->daemon = d; |
885 | new_peer->next = all_peers; | 894 | new_peer->next = all_peers; |
886 | all_peers = new_peer; | 895 | all_peers = new_peer; |
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 6889fb703..1cb5432c7 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -4488,6 +4488,7 @@ main_init (struct GNUNET_SERVER_Handle *server, | |||
4488 | peer_request_map = GNUNET_CONTAINER_multihashmap_create (enc); | 4488 | peer_request_map = GNUNET_CONTAINER_multihashmap_create (enc); |
4489 | requests_by_expiration_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); | 4489 | requests_by_expiration_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); |
4490 | core = GNUNET_CORE_connect (cfg, | 4490 | core = GNUNET_CORE_connect (cfg, |
4491 | 1, /* larger? */ | ||
4491 | GNUNET_TIME_UNIT_FOREVER_REL, | 4492 | GNUNET_TIME_UNIT_FOREVER_REL, |
4492 | NULL, | 4493 | NULL, |
4493 | NULL, | 4494 | NULL, |
diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c index f41f0add0..8c3bb9be7 100644 --- a/src/hostlist/gnunet-daemon-hostlist.c +++ b/src/hostlist/gnunet-daemon-hostlist.c | |||
@@ -269,6 +269,7 @@ run (void *cls, | |||
269 | stats = GNUNET_STATISTICS_create ("hostlist", cfg); | 269 | stats = GNUNET_STATISTICS_create ("hostlist", cfg); |
270 | 270 | ||
271 | core = GNUNET_CORE_connect (cfg, | 271 | core = GNUNET_CORE_connect (cfg, |
272 | 1, | ||
272 | GNUNET_TIME_UNIT_FOREVER_REL, | 273 | GNUNET_TIME_UNIT_FOREVER_REL, |
273 | NULL, | 274 | NULL, |
274 | &core_init, | 275 | &core_init, |
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index 7e2e2ac9e..d64fdf587 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c | |||
@@ -370,6 +370,7 @@ setup_learn_peer (struct PeerContext *p, const char *cfgname) | |||
370 | if ( NULL != filename) GNUNET_free ( filename ); | 370 | if ( NULL != filename) GNUNET_free ( filename ); |
371 | 371 | ||
372 | p->core = GNUNET_CORE_connect (p->cfg, | 372 | p->core = GNUNET_CORE_connect (p->cfg, |
373 | 1, | ||
373 | GNUNET_TIME_UNIT_FOREVER_REL, | 374 | GNUNET_TIME_UNIT_FOREVER_REL, |
374 | NULL, | 375 | NULL, |
375 | NULL, | 376 | NULL, |
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h index 7fe871741..9c102988b 100644 --- a/src/include/gnunet_core_service.h +++ b/src/include/gnunet_core_service.h | |||
@@ -179,6 +179,7 @@ typedef void | |||
179 | * subject to queue size limitations. | 179 | * subject to queue size limitations. |
180 | * | 180 | * |
181 | * @param cfg configuration to use | 181 | * @param cfg configuration to use |
182 | * @param queue_size size of the per-peer message queue | ||
182 | * @param timeout after how long should we give up trying to connect to the core service? | 183 | * @param timeout after how long should we give up trying to connect to the core service? |
183 | * @param cls closure for the various callbacks that follow (including handlers in the handlers array) | 184 | * @param cls closure for the various callbacks that follow (including handlers in the handlers array) |
184 | * @param init callback to call on timeout or once we have successfully | 185 | * @param init callback to call on timeout or once we have successfully |
@@ -215,6 +216,7 @@ typedef void | |||
215 | */ | 216 | */ |
216 | struct GNUNET_CORE_Handle * | 217 | struct GNUNET_CORE_Handle * |
217 | GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, | 218 | GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, |
219 | unsigned int queue_size, | ||
218 | struct GNUNET_TIME_Relative timeout, | 220 | struct GNUNET_TIME_Relative timeout, |
219 | void *cls, | 221 | void *cls, |
220 | GNUNET_CORE_StartupCallback init, | 222 | GNUNET_CORE_StartupCallback init, |
@@ -384,7 +386,10 @@ struct GNUNET_CORE_TransmitHandle; | |||
384 | * @param target who should receive the message, | 386 | * @param target who should receive the message, |
385 | * use NULL for this peer (loopback) | 387 | * use NULL for this peer (loopback) |
386 | * @param notify_size how many bytes of buffer space does notify want? | 388 | * @param notify_size how many bytes of buffer space does notify want? |
387 | * @param notify function to call when buffer space is available | 389 | * @param notify function to call when buffer space is available; |
390 | * will be called with NULL on timeout or if the overall queue | ||
391 | * for this peer is larger than queue_size and this is currently | ||
392 | * the message with the lowest priority | ||
388 | * @param notify_cls closure for notify | 393 | * @param notify_cls closure for notify |
389 | * @return non-NULL if the notify callback was queued, | 394 | * @return non-NULL if the notify callback was queued, |
390 | * NULL if we can not even queue the request (insufficient | 395 | * NULL if we can not even queue the request (insufficient |
diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c index d1172916e..87f90f80f 100644 --- a/src/testing/test_testing_topology.c +++ b/src/testing/test_testing_topology.c | |||
@@ -521,6 +521,7 @@ init_notify_peer1 (void *cls, | |||
521 | * Connect to the receiving peer | 521 | * Connect to the receiving peer |
522 | */ | 522 | */ |
523 | pos->peer2handle = GNUNET_CORE_connect (pos->peer2->cfg, | 523 | pos->peer2handle = GNUNET_CORE_connect (pos->peer2->cfg, |
524 | 1, | ||
524 | TIMEOUT, | 525 | TIMEOUT, |
525 | pos, | 526 | pos, |
526 | &init_notify_peer2, | 527 | &init_notify_peer2, |
@@ -562,6 +563,7 @@ send_test_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc) | |||
562 | * Connect to the sending peer | 563 | * Connect to the sending peer |
563 | */ | 564 | */ |
564 | pos->peer1handle = GNUNET_CORE_connect (pos->peer1->cfg, | 565 | pos->peer1handle = GNUNET_CORE_connect (pos->peer1->cfg, |
566 | 1, | ||
565 | TIMEOUT, | 567 | TIMEOUT, |
566 | pos, | 568 | pos, |
567 | &init_notify_peer1, | 569 | &init_notify_peer1, |
diff --git a/src/testing/testing.c b/src/testing/testing.c index cf53c4a2e..d178995e0 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -544,6 +544,7 @@ start_fsm (void *cls, | |||
544 | #endif | 544 | #endif |
545 | d->phase = SP_START_CORE; | 545 | d->phase = SP_START_CORE; |
546 | d->server = GNUNET_CORE_connect (d->cfg, | 546 | d->server = GNUNET_CORE_connect (d->cfg, |
547 | 1, | ||
547 | ARM_START_WAIT, | 548 | ARM_START_WAIT, |
548 | d, | 549 | d, |
549 | &testing_init, | 550 | &testing_init, |
@@ -1537,6 +1538,7 @@ GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1, | |||
1537 | #endif | 1538 | #endif |
1538 | 1539 | ||
1539 | ctx->d1core = GNUNET_CORE_connect (d1->cfg, | 1540 | ctx->d1core = GNUNET_CORE_connect (d1->cfg, |
1541 | 1, | ||
1540 | timeout, | 1542 | timeout, |
1541 | ctx, | 1543 | ctx, |
1542 | NULL, | 1544 | NULL, |
@@ -1554,6 +1556,7 @@ GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1, | |||
1554 | 1556 | ||
1555 | #if CONNECT_CORE2 | 1557 | #if CONNECT_CORE2 |
1556 | ctx->d2core = GNUNET_CORE_connect (d2->cfg, | 1558 | ctx->d2core = GNUNET_CORE_connect (d2->cfg, |
1559 | 1, | ||
1557 | timeout, | 1560 | timeout, |
1558 | ctx, | 1561 | ctx, |
1559 | NULL, | 1562 | NULL, |
@@ -1616,6 +1619,7 @@ reattempt_daemons_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext | |||
1616 | GNUNET_assert(ctx->d1core == NULL); | 1619 | GNUNET_assert(ctx->d1core == NULL); |
1617 | 1620 | ||
1618 | ctx->d1core = GNUNET_CORE_connect (ctx->d1->cfg, | 1621 | ctx->d1core = GNUNET_CORE_connect (ctx->d1->cfg, |
1622 | 1, | ||
1619 | GNUNET_TIME_absolute_get_remaining(ctx->timeout), | 1623 | GNUNET_TIME_absolute_get_remaining(ctx->timeout), |
1620 | ctx, | 1624 | ctx, |
1621 | NULL, | 1625 | NULL, |
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index b8bad46a6..49f460658 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c | |||
@@ -1378,6 +1378,7 @@ run (void *cls, | |||
1378 | NULL, | 1378 | NULL, |
1379 | NULL); | 1379 | NULL); |
1380 | handle = GNUNET_CORE_connect (cfg, | 1380 | handle = GNUNET_CORE_connect (cfg, |
1381 | 1, | ||
1381 | GNUNET_TIME_UNIT_FOREVER_REL, | 1382 | GNUNET_TIME_UNIT_FOREVER_REL, |
1382 | NULL, | 1383 | NULL, |
1383 | &core_init, | 1384 | &core_init, |