From 68403e7293a5f350fee15684f89f59592c70a9f8 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 25 Oct 2009 11:05:40 +0000 Subject: [PATCH] better --- src/util/client.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/util/client.c b/src/util/client.c index fb4c1c280..4135a15a1 100644 --- a/src/util/client.c +++ b/src/util/client.c @@ -221,11 +221,8 @@ finish_cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) void GNUNET_CLIENT_disconnect (struct GNUNET_CLIENT_Connection *sock) { - if (sock->sock != NULL) - { - GNUNET_CONNECTION_destroy (sock->sock); - sock->sock = NULL; - } + GNUNET_assert (sock->sock != NULL); + GNUNET_CONNECTION_destroy (sock->sock); sock->receiver_handler = NULL; if (sock->in_receive == GNUNET_YES) sock->in_receive = GNUNET_SYSERR; @@ -639,9 +636,6 @@ client_delayed_retry (void *cls, struct GNUNET_CLIENT_TransmitHandle *th = cls; th->task = GNUNET_SCHEDULER_NO_TASK; - th->sock->sock = do_connect (th->sock->sched, - th->sock->service_name, - th->sock->cfg); th->th = GNUNET_CONNECTION_notify_transmit_ready (th->sock->sock, th->size, GNUNET_TIME_absolute_get_remaining (th->timeout), @@ -693,7 +687,9 @@ client_notify (void *cls, } /* auto-retry */ GNUNET_CONNECTION_destroy (th->sock->sock); - th->sock->sock = NULL; + th->sock->sock = do_connect (th->sock->sched, + th->sock->service_name, + th->sock->cfg); delay = GNUNET_TIME_relative_min (delay, GNUNET_TIME_UNIT_SECONDS); th->task = GNUNET_SCHEDULER_add_delayed (th->sock->sched, GNUNET_NO, -- 2.25.1