diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-09-14 15:27:31 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-09-14 15:27:31 +0000 |
commit | df0c5db3bc76cd35143334658c4ddd22784bd98c (patch) | |
tree | 8bda67d2b0227a56a915755c43d5682e835637f8 /src/transport/transport_api.c | |
parent | b89a079f8021ee89d55939cdebbb5a144d7fe01f (diff) | |
download | gnunet-df0c5db3bc76cd35143334658c4ddd22784bd98c.tar.gz gnunet-df0c5db3bc76cd35143334658c4ddd22784bd98c.zip |
- fix for connect
Diffstat (limited to 'src/transport/transport_api.c')
-rw-r--r-- | src/transport/transport_api.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c index 2e50b4901..c905a1549 100644 --- a/src/transport/transport_api.c +++ b/src/transport/transport_api.c | |||
@@ -988,9 +988,8 @@ GNUNET_TRANSPORT_try_connect (struct GNUNET_TRANSPORT_Handle *handle, | |||
988 | const struct GNUNET_PeerIdentity *target) | 988 | const struct GNUNET_PeerIdentity *target) |
989 | { | 989 | { |
990 | struct GNUNET_PeerIdentity *pid; | 990 | struct GNUNET_PeerIdentity *pid; |
991 | GNUNET_assert (NULL != handle->client); | ||
991 | 992 | ||
992 | if (NULL == handle->client) | ||
993 | return; | ||
994 | pid = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity)); | 993 | pid = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity)); |
995 | *pid = *target; | 994 | *pid = *target; |
996 | schedule_control_transmit (handle, | 995 | schedule_control_transmit (handle, |
@@ -1190,7 +1189,14 @@ GNUNET_TRANSPORT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
1190 | GNUNET_CONTAINER_multihashmap_create (STARTING_NEIGHBOURS_SIZE); | 1189 | GNUNET_CONTAINER_multihashmap_create (STARTING_NEIGHBOURS_SIZE); |
1191 | ret->ready_heap = | 1190 | ret->ready_heap = |
1192 | GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); | 1191 | GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); |
1193 | ret->reconnect_task = GNUNET_SCHEDULER_add_now (&reconnect, ret); | 1192 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to transport service.\n"); |
1193 | ret->client = GNUNET_CLIENT_connect ("transport", cfg); | ||
1194 | if (ret->client == NULL) | ||
1195 | { | ||
1196 | GNUNET_free (ret); | ||
1197 | return NULL; | ||
1198 | } | ||
1199 | schedule_control_transmit (ret, sizeof (struct StartMessage), &send_start, ret); | ||
1194 | return ret; | 1200 | return ret; |
1195 | } | 1201 | } |
1196 | 1202 | ||