-removing 2nd argument from GNUNET_CLIENT_disconnect as it was virtually always GNUNE...

diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index c352cbdae2beca55b34e973569ecae5cff416c70..bb4b355fcdc437e06a86c4e0f623dd2d35a4d87c 100644 (file)
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -128,7 +128,7 @@ service_shutdown_handler (void *cls, const struct GNUNET_MessageHeader *msg)
       }
     }
     GNUNET_SCHEDULER_cancel (shutdown_ctx->cancel_task);
-    GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (shutdown_ctx->sock);
     GNUNET_free (shutdown_ctx);
     return;
   }
@@ -142,7 +142,7 @@ service_shutdown_handler (void *cls, const struct GNUNET_MessageHeader *msg)
       /* ARM is not shutting down, well, report the error and be done with it... */
       shutdown_ctx->cont (shutdown_ctx->cont_cls, shutdown_ctx->confirmed);
       GNUNET_SCHEDULER_cancel (shutdown_ctx->cancel_task);
-      GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO);
+      GNUNET_CLIENT_disconnect (shutdown_ctx->sock);
       GNUNET_free (shutdown_ctx);
       return;
     }
@@ -165,7 +165,7 @@ service_shutdown_cancel (void *cls,
   struct ShutdownContext *shutdown_ctx = cls;
 
   shutdown_ctx->cont (shutdown_ctx->cont_cls, GNUNET_ARM_PROCESS_COMMUNICATION_TIMEOUT);
-  GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (shutdown_ctx->sock);
   GNUNET_free (shutdown_ctx);
 }
 
@@ -191,7 +191,7 @@ write_shutdown (void *cls, size_t size, void *buf)
       LOG (GNUNET_ERROR_TYPE_WARNING,
           _("Failed to transmit shutdown request to client.\n"));
       shutdown_ctx->cont (shutdown_ctx->cont_cls, GNUNET_ARM_PROCESS_COMMUNICATION_ERROR);
-      GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO);
+      GNUNET_CLIENT_disconnect (shutdown_ctx->sock);
       GNUNET_free (shutdown_ctx);
       return 0;                        /* client disconnected */
     }
@@ -273,7 +273,7 @@ void
 GNUNET_ARM_disconnect (struct GNUNET_ARM_Handle *h)
 {
   if (h->client != NULL)
-    GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (h->client);
   GNUNET_CONFIGURATION_destroy (h->cfg);
   GNUNET_free (h);
 }
@@ -471,7 +471,7 @@ handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
           ("Error receiving response to `%s' request from ARM for service `%s'\n"),
           (sc->type == GNUNET_MESSAGE_TYPE_ARM_START) ? "START" : "STOP",
           (const char *) &sc[1]);
-      GNUNET_CLIENT_disconnect (sc->h->client, GNUNET_NO);
+      GNUNET_CLIENT_disconnect (sc->h->client);
       sc->h->client = GNUNET_CLIENT_connect ("arm", sc->h->cfg);
       GNUNET_assert (NULL != sc->h->client);
       if (sc->callback != NULL)
@@ -730,7 +730,7 @@ handle_list_response (void *cls, const struct GNUNET_MessageHeader *msg)
   {
     LOG (GNUNET_ERROR_TYPE_WARNING,
         "Error receiving response to LIST request from ARM\n");
-    GNUNET_CLIENT_disconnect (sc->h->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (sc->h->client);
     sc->h->client = GNUNET_CLIENT_connect ("arm", sc->h->cfg);
     GNUNET_assert (NULL != sc->h->client);
     if (sc->callback != NULL)

diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c
index edd5cbf835d61853ec9c8f2e47709a53d3698661..15756657f665058c1e93562d5b6a7bd6aa91665a 100644 (file)
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -121,7 +121,7 @@ service_shutdown_handler (void *cls, const struct GNUNET_MessageHeader *msg)
       if (shutdown_ctx->cont != NULL)
        shutdown_ctx->cont (shutdown_ctx->cont_cls, GNUNET_SYSERR);
       GNUNET_SCHEDULER_cancel (shutdown_ctx->cancel_task);
-      GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO);
+      GNUNET_CLIENT_disconnect (shutdown_ctx->sock);
       GNUNET_free (shutdown_ctx);
     }
   else if ((msg == NULL) && (shutdown_ctx->confirmed == GNUNET_YES))
@@ -133,7 +133,7 @@ service_shutdown_handler (void *cls, const struct GNUNET_MessageHeader *msg)
        shutdown_ctx->cont (shutdown_ctx->cont_cls, GNUNET_NO);
 
       GNUNET_SCHEDULER_cancel (shutdown_ctx->cancel_task);
-      GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO);
+      GNUNET_CLIENT_disconnect (shutdown_ctx->sock);
       GNUNET_free (shutdown_ctx);
     }
   else
@@ -159,7 +159,7 @@ service_shutdown_handler (void *cls, const struct GNUNET_MessageHeader *msg)
            shutdown_ctx->cont (shutdown_ctx->cont_cls, GNUNET_YES);
 
          GNUNET_SCHEDULER_cancel (shutdown_ctx->cancel_task);
-         GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO);
+         GNUNET_CLIENT_disconnect (shutdown_ctx->sock);
          GNUNET_free (shutdown_ctx);
          break;
        }
@@ -180,7 +180,7 @@ service_shutdown_cancel (void *cls,
 
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "service_shutdown_cancel called!\n");
   shutdown_ctx->cont (shutdown_ctx->cont_cls, GNUNET_SYSERR);
-  GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (shutdown_ctx->sock);
   GNUNET_free (shutdown_ctx);
 }
 
@@ -205,7 +205,7 @@ write_shutdown (void *cls, size_t size, void *buf)
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  _("Failed to transmit shutdown request to client.\n"));
       shutdown_ctx->cont (shutdown_ctx->cont_cls, GNUNET_SYSERR);
-      GNUNET_CLIENT_disconnect (shutdown_ctx->sock, GNUNET_NO);
+      GNUNET_CLIENT_disconnect (shutdown_ctx->sock);
       GNUNET_free (shutdown_ctx);
       return 0;                        /* client disconnected */
     }
@@ -358,7 +358,7 @@ kill_task (void *cbData, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_assert (doNothingConnection != NULL);
   if (trialCount == 12)
     {
-      GNUNET_CLIENT_disconnect (doNothingConnection, GNUNET_NO);
+      GNUNET_CLIENT_disconnect (doNothingConnection);
       GNUNET_ARM_stop_service (arm, "do-nothing", TIMEOUT, &arm_notify_stop,
                               NULL);
       ok = 0;

diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c
index 848c7ec4dc59c5fa09bf9bb5ad1b3403e4ea190f..c98e1c243e898cc76aba6a5b2071ee7589400495 100644 (file)
--- a/src/ats/ats_api_performance.c
+++ b/src/ats/ats_api_performance.c
@@ -395,7 +395,7 @@ process_ats_message (void *cls, const struct GNUNET_MessageHeader *msg)
                          GNUNET_TIME_UNIT_FOREVER_REL);
   return;
 reconnect:
-  GNUNET_CLIENT_disconnect (ph->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (ph->client);
   ph->client = NULL;
   ph->task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect_task,
@@ -493,7 +493,7 @@ GNUNET_ATS_performance_done (struct GNUNET_ATS_PerformanceHandle *ph)
   }
   if (NULL != ph->client)
   {
-    GNUNET_CLIENT_disconnect (ph->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (ph->client);
     ph->client = NULL;
   }
   GNUNET_free (ph);

diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index ec14e0e132f0aab534a22e2820658bc22eac54eb..ddb4f41c89631a2a8585217630b3694c51c13080 100644 (file)
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -27,7 +27,6 @@
 #include "gnunet_ats_service.h"
 #include "ats.h"
 
-#define DEBUG_ATS GNUNET_EXTRA_LOGGING
 
 #define INTERFACE_PROCESSING_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
 
@@ -213,7 +212,7 @@ static void
 force_reconnect (struct GNUNET_ATS_SchedulingHandle *sh)
 {
   sh->reconnect = GNUNET_NO;
-  GNUNET_CLIENT_disconnect (sh->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (sh->client);
   sh->client = NULL;
   sh->task =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect_task,
@@ -918,7 +917,7 @@ GNUNET_ATS_scheduling_done (struct GNUNET_ATS_SchedulingHandle *sh)
   }
   if (NULL != sh->client)
   {
-    GNUNET_CLIENT_disconnect (sh->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (sh->client);
     sh->client = NULL;
   }
   if (GNUNET_SCHEDULER_NO_TASK != sh->task)

diff --git a/src/core/core_api.c b/src/core/core_api.c
index 69dcfecf8f989d4c69ab06b1c63647252b48214c..1a4b233336fa0edbc0edbdb2d42232dce4623ba8 100644 (file)
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -448,7 +448,7 @@ reconnect_later (struct GNUNET_CORE_Handle *h)
   }
   if (h->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
   h->currently_down = GNUNET_YES;
@@ -1243,7 +1243,7 @@ GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle)
   }
   if (handle->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (handle->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (handle->client);
     handle->client = NULL;
   }
   GNUNET_CONTAINER_multihashmap_iterate (handle->peers,

diff --git a/src/core/core_api_iterate_peers.c b/src/core/core_api_iterate_peers.c
index 7b28842fd58d9e52055e28208e8a0c9ab9ba8a58..0ecd98ed71bc2b032c3bc2da9b50addd6e10524a 100644 (file)
--- a/src/core/core_api_iterate_peers.c
+++ b/src/core/core_api_iterate_peers.c
@@ -80,7 +80,7 @@ receive_info (void *cls, const struct GNUNET_MessageHeader *msg)
   {
     if (request_context->peer_cb != NULL)
       request_context->peer_cb (request_context->cb_cls, NULL, NULL, 0);
-    GNUNET_CLIENT_disconnect (request_context->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (request_context->client);
     GNUNET_free (request_context);
     return;
   }
@@ -93,7 +93,7 @@ receive_info (void *cls, const struct GNUNET_MessageHeader *msg)
     GNUNET_break (0);
     if (request_context->peer_cb != NULL)
       request_context->peer_cb (request_context->cb_cls, NULL, NULL, 0);
-    GNUNET_CLIENT_disconnect (request_context->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (request_context->client);
     GNUNET_free (request_context);
     return;
   }
@@ -106,7 +106,7 @@ receive_info (void *cls, const struct GNUNET_MessageHeader *msg)
     GNUNET_break (0);
     if (request_context->peer_cb != NULL)
       request_context->peer_cb (request_context->cb_cls, NULL, NULL, 0);
-    GNUNET_CLIENT_disconnect (request_context->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (request_context->client);
     GNUNET_free (request_context);
     return;
   }

diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index 4f406a2bcadfa01db5395038347172dc64338359..f4096c66512588457c2567f5415aaf6554cf8820 100644 (file)
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -321,7 +321,7 @@ GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h, int drop)
   }
   if (h->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
   if (h->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
@@ -346,7 +346,7 @@ GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h, int drop)
                                                GNUNET_TIME_UNIT_MINUTES,
                                                GNUNET_YES, &transmit_drop, h))
         return;
-      GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+      GNUNET_CLIENT_disconnect (h->client);
       h->client = NULL;
     }
     GNUNET_break (0);
@@ -540,7 +540,7 @@ do_disconnect (struct GNUNET_DATASTORE_Handle *h)
   GNUNET_STATISTICS_update (stats, gettext_noop ("# reconnected to DATASTORE"),
                             1, GNUNET_NO);
 #endif
-  GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (h->client);
   h->skip_next_messages = 0;
   h->client = NULL;
   h->reconnect_task =

diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c
index 41096b2f251b31a3de8a2894b695ae7708d6ef3f..1030b79999020b078db0d20ae0d63559b63f92c8 100644 (file)
--- a/src/dht/dht_api.c
+++ b/src/dht/dht_api.c
@@ -368,7 +368,7 @@ do_disconnect (struct GNUNET_DHT_Handle *handle)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Disconnecting from DHT service, will try to reconnect in %llu ms\n",
               (unsigned long long) handle->retry_time.rel_value);
-  GNUNET_CLIENT_disconnect (handle->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (handle->client);
   handle->client = NULL;
   handle->reconnect_task =
       GNUNET_SCHEDULER_add_delayed (handle->retry_time, &try_reconnect, handle);
@@ -701,7 +701,7 @@ GNUNET_DHT_disconnect (struct GNUNET_DHT_Handle *handle)
   }
   if (handle->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (handle->client, GNUNET_YES);
+    GNUNET_CLIENT_disconnect (handle->client);
     handle->client = NULL;
   }
   if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
@@ -735,7 +735,11 @@ timeout_put_request (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 /**
- * Perform a PUT operation storing data in the DHT.
+ * Perform a PUT operation storing data in the DHT.  FIXME: we should
+ * change the protocol to get a confirmation for the PUT from the DHT
+ * and call 'cont' only after getting the confirmation; otherwise, the
+ * client has no good way of telling if the 'PUT' message actually got
+ * to the DHT service!
  *
  * @param handle handle to DHT service
  * @param key the key to store under

diff --git a/src/dns/dns_api.c b/src/dns/dns_api.c
index a280265da0d588297b83676b17caec384babb5ce..e0069936dc34532e425147dfbc7211b1a1349abf 100644 (file)
--- a/src/dns/dns_api.c
+++ b/src/dns/dns_api.c
@@ -202,7 +202,7 @@ disconnect (struct GNUNET_DNS_Handle *dh)
   }
   if (NULL != dh->dns_connection)
   {
-    GNUNET_CLIENT_disconnect (dh->dns_connection, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (dh->dns_connection);
     dh->dns_connection = NULL;
   }
   while (NULL != (qe = dh->rq_head))

diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 8ae4a29fb51f8249cddf71db66bf08a8af7ac03a..e93db4cfde356354fc609a658c8c6e3efc24a750 100644 (file)
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -1166,7 +1166,7 @@ signal_error:
     GNUNET_CLIENT_notify_transmit_ready_cancel (dc->th);
     dc->th = NULL;
   }
-  GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (dc->client);
   dc->in_receive = GNUNET_NO;
   dc->client = NULL;
   GNUNET_FS_free_download_request_ (dc->top_request);
@@ -1404,7 +1404,7 @@ try_reconnect (struct GNUNET_FS_DownloadContext *dc)
     dc->pending_head = NULL;
     dc->pending_tail = NULL;
     GNUNET_CONTAINER_multihashmap_iterate (dc->active, &retry_entry, dc);
-    GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (dc->client);
     dc->in_receive = GNUNET_NO;
     dc->client = NULL;
   }
@@ -1471,7 +1471,7 @@ deactivate_fs_download (void *cls)
   }
   if (NULL != dc->client)
   {
-    GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (dc->client);
     dc->in_receive = GNUNET_NO;
     dc->client = NULL;
   }

diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c
index 784c9881a4ce65857b03aa70e754e2048757bbcc..ef03dee760bad2d0ab619dcaab4a91f771dde945 100644 (file)
--- a/src/fs/fs_list_indexed.c
+++ b/src/fs/fs_list_indexed.c
@@ -176,7 +176,7 @@ GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
 void
 GNUNET_FS_get_indexed_files_cancel (struct GNUNET_FS_GetIndexedContext *gic)
 {
-  GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (gic->client);
   GNUNET_free (gic);
 }
 

diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index e0a6f046a3837d3f04e17f11f25a2eebec6ebfff..3d83beef866a0a119f9fc0d95e8a766c550f4589 100644 (file)
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -98,7 +98,7 @@ publish_cleanup (struct GNUNET_FS_PublishContext *pc)
   }
   if (pc->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (pc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (pc->client);
     pc->client = NULL;
   }
   GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task);
@@ -611,7 +611,7 @@ process_index_start_response (void *cls, const struct GNUNET_MessageHeader *msg)
   const char *emsg;
   uint16_t msize;
 
-  GNUNET_CLIENT_disconnect (pc->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (pc->client);
   pc->client = NULL;
   p = pc->fi_pos;
   if (msg == NULL)

diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 94a77e13645837b5246932af3b8f4e63acdd4ba7..ef3e66fbc9f01db332537a177a56b5dcca0aabe5 100644 (file)
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -30,7 +30,6 @@
 #include "gnunet_protocols.h"
 #include "fs_api.h"
 
-#define DEBUG_SEARCH GNUNET_EXTRA_LOGGING
 
 /**
  * Number of availability trials we perform per search result.
@@ -1152,7 +1151,7 @@ try_reconnect (struct GNUNET_FS_SearchContext *sc)
 {
   if (NULL != sc->client)
   {
-    GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (sc->client);
     sc->client = NULL;
   }
   sc->task =
@@ -1369,7 +1368,7 @@ GNUNET_FS_search_signal_suspend_ (void *cls)
   if (sc->task != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (sc->task);
   if (NULL != sc->client)
-    GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (sc->client);
   GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);
   if (sc->requests != NULL)
   {
@@ -1425,7 +1424,7 @@ GNUNET_FS_search_pause (struct GNUNET_FS_SearchContext *sc)
     GNUNET_SCHEDULER_cancel (sc->task);
   sc->task = GNUNET_SCHEDULER_NO_TASK;
   if (NULL != sc->client)
-    GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (sc->client);
   sc->client = NULL;
   GNUNET_FS_search_sync_ (sc);
   GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
@@ -1569,7 +1568,7 @@ GNUNET_FS_search_stop (struct GNUNET_FS_SearchContext *sc)
   if (sc->task != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (sc->task);
   if (NULL != sc->client)
-    GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (sc->client);
   GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
                                          &search_result_free, sc);
   GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);

diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index bf619b75acf127c48e66969231b7b984044d99ea..fa71b56bcb94fbbecbb20dfad893206a84f7aee4 100644 (file)
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -223,7 +223,7 @@ process_fs_response (void *cls, const struct GNUNET_MessageHeader *msg)
 
   if (uc->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (uc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (uc->client);
     uc->client = NULL;
   }
   if (uc->state != UNINDEX_STATE_FS_NOTIFY)
@@ -708,7 +708,7 @@ GNUNET_FS_unindex_signal_suspend_ (void *cls)
   }
   if (uc->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (uc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (uc->client);
     uc->client = NULL;
   }
   if (NULL != uc->dsh)
@@ -803,7 +803,7 @@ GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc)
   }
   if (uc->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (uc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (uc->client);
     uc->client = NULL;
   }
   if (NULL != uc->dsh)

diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 4b7d6b9f8a7e6cd742f541da1070e6ece3f5aafe..1a06f34e07620823345b3f115f3ec30a8964f0a4 100644 (file)
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -229,7 +229,7 @@ static void
 force_reconnect (struct GNUNET_GNS_Handle *h)
 {
   h->reconnect = GNUNET_NO;
-  GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (h->client);
   h->client = NULL;
   h->reconnect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
                                                     &reconnect_task,
@@ -610,7 +610,7 @@ GNUNET_GNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
 void
 GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle)
 {
-  GNUNET_CLIENT_disconnect (handle->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (handle->client);
   if (GNUNET_SCHEDULER_NO_TASK != handle->reconnect_task)
   {
     GNUNET_SCHEDULER_cancel (handle->reconnect_task);

diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index 60fa938c80b6cbc6bcbeff7dd606148317bc200f..100de326f52ada5b282588d6aa66869b09f1c8c7 100644 (file)
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -70,12 +70,9 @@ GNUNET_CLIENT_connect (const char *service_name,
  * which case the message may still be lost).
  *
  * @param sock handle to the service connection
- * @param finish_pending_write should a transmission already passed to the
- *          handle be completed?
  */
 void
-GNUNET_CLIENT_disconnect (struct GNUNET_CLIENT_Connection *sock,
-                          int finish_pending_write);
+GNUNET_CLIENT_disconnect (struct GNUNET_CLIENT_Connection *sock);
 
 
 /**

diff --git a/src/mesh/mesh_api.c b/src/mesh/mesh_api.c
index c8d2162bc6fb766590f3cda3ce41ccf1160260c5..4b6d6c4f95eb0d3b10777c05e11424b698752d9e 100644 (file)
--- a/src/mesh/mesh_api.c
+++ b/src/mesh/mesh_api.c
@@ -675,7 +675,7 @@ do_reconnect (struct GNUNET_MESH_Handle *h)
   }
   if (NULL != h->client)
   {
-    GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (h->client);
   }
 
   /* connect again */
@@ -1375,7 +1375,7 @@ GNUNET_MESH_disconnect (struct GNUNET_MESH_Handle *handle)
   }
   if (NULL != handle->client)
   {
-    GNUNET_CLIENT_disconnect (handle->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (handle->client);
     handle->client = NULL;
   }
   if (GNUNET_SCHEDULER_NO_TASK != handle->reconnect_task)

diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index bdb53e27f5e826011a514f004f8f650bdecd4846..b965ebefbb65f11cf38be12444f9fd75a01bc3f1 100644 (file)
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -35,7 +35,6 @@
 #include "gnunet_namestore_service.h"
 #include "namestore.h"
 
-#define DEBUG_GNS_API GNUNET_EXTRA_LOGGING
 
 #define LOG(kind,...) GNUNET_log_from (kind, "gns-api",__VA_ARGS__)
 
@@ -864,7 +863,7 @@ static void
 force_reconnect (struct GNUNET_NAMESTORE_Handle *h)
 {
   h->reconnect = GNUNET_NO;
-  GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (h->client);
   h->client = NULL;
   h->reconnect_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
                                     &reconnect_task,
@@ -926,7 +925,7 @@ clean_up_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   if (NULL != h->client)
   {
-    GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
   if (GNUNET_SCHEDULER_NO_TASK != h->reconnect_task)

diff --git a/src/nat/nat_test.c b/src/nat/nat_test.c
index 92f72e4beacb940a8f44f6df24d09dd28ccaa987..98ce82e73248353f9bf26522e3de3754e2a97cf1 100644 (file)
--- a/src/nat/nat_test.c
+++ b/src/nat/nat_test.c
@@ -460,7 +460,7 @@ GNUNET_NAT_test_stop (struct GNUNET_NAT_Test *tst)
   while (NULL != (cpos = tst->ca_head))
   {
     GNUNET_CONTAINER_DLL_remove (tst->ca_head, tst->ca_tail, cpos);
-    GNUNET_CLIENT_disconnect (cpos->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (cpos->client);
     GNUNET_free (cpos);
   }
   while (NULL != (pos = tst->na_head))

diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c
index 4d5f6bb714232a7b5a5ed1fa298746b8114fa5e7..2fa8af2e525fbdb54a2ea9e95cdbe25252066bfe 100644 (file)
--- a/src/nse/nse_api.c
+++ b/src/nse/nse_api.c
@@ -106,7 +106,7 @@ message_handler (void *cls, const struct GNUNET_MessageHeader *msg)
   if (msg == NULL)
   {
     /* Error, timeout, death */
-    GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
     h->reconnect_task =
         GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h);
@@ -145,7 +145,7 @@ reschedule_connect (struct GNUNET_NSE_Handle *h)
   }
   if (NULL != h->client)
   {
-    GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
 
@@ -289,7 +289,7 @@ GNUNET_NSE_disconnect (struct GNUNET_NSE_Handle *h)
   }
   if (h->client != NULL)
   {
-    GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
   GNUNET_free (h);

diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c
index 593ee8b3c28a94c896c7f99b99e5c8de979c32f6..5eb58af44df5cd0dc3b4f06df49e80854a1b1a1f 100644 (file)
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -172,7 +172,7 @@ GNUNET_PEERINFO_disconnect (struct GNUNET_PEERINFO_Handle *h)
   }
   if (NULL != h->client)
   {
-    GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
   if (GNUNET_SCHEDULER_NO_TASK != h->r_task)
@@ -238,7 +238,7 @@ reconnect (struct GNUNET_PEERINFO_Handle *h)
   }
   if (NULL != h->client)
   {
-    GNUNET_CLIENT_disconnect (h->client, GNUNET_SYSERR);
+    GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
   h->client = GNUNET_CLIENT_connect ("peerinfo", h->cfg);

diff --git a/src/peerinfo/peerinfo_api_notify.c b/src/peerinfo/peerinfo_api_notify.c
index 2557cdfde783a9a2f40fdd21e243cd61a2c4511d..b9e83c9e75344629f771fbc6371a4d977d07da3a 100644 (file)
--- a/src/peerinfo/peerinfo_api_notify.c
+++ b/src/peerinfo/peerinfo_api_notify.c
@@ -133,7 +133,7 @@ process_notification (void *cls, const struct GNUNET_MessageHeader *msg)
 
   if (msg == NULL)
   {
-    GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (nc->client);
     reconnect (nc, NULL);
     return;
   }
@@ -142,7 +142,7 @@ process_notification (void *cls, const struct GNUNET_MessageHeader *msg)
       (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_PEERINFO_INFO))
   {
     GNUNET_break (0);
-    GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (nc->client);
     nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
     request_notifications (nc);
     return;
@@ -155,7 +155,7 @@ process_notification (void *cls, const struct GNUNET_MessageHeader *msg)
     if (ms != sizeof (struct InfoMessage) + GNUNET_HELLO_size (hello))
     {
       GNUNET_break (0);
-      GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
+      GNUNET_CLIENT_disconnect (nc->client);
       nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
       request_notifications (nc);
       return;
@@ -200,7 +200,7 @@ transmit_notify_request (void *cls, size_t size, void *buf)
   nc->init = NULL;
   if (buf == NULL)
   {
-    GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (nc->client);
     nc->client = GNUNET_CLIENT_connect ("peerinfo", nc->cfg);
     request_notifications (nc);
     return 0;
@@ -281,7 +281,7 @@ GNUNET_PEERINFO_notify_cancel (struct GNUNET_PEERINFO_NotifyContext *nc)
     nc->init = NULL;
   }
   if (NULL != nc->client)
-    GNUNET_CLIENT_disconnect (nc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (nc->client);
   if (GNUNET_SCHEDULER_NO_TASK != nc->task)
     GNUNET_SCHEDULER_cancel (nc->task);
   GNUNET_free (nc);

diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c
index 253e597372237319eb0a2c8c892387902018f3c9..f1a22c22a405d4e9a783673d3a316f7b0606f1dd 100644 (file)
--- a/src/statistics/statistics_api.c
+++ b/src/statistics/statistics_api.c
@@ -337,7 +337,7 @@ do_disconnect (struct GNUNET_STATISTICS_Handle *h)
   } 
   if (NULL != h->client)
   {
-    GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
   h->receiving = GNUNET_NO;

diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 9ff5cec88ff5a2bf97ed2bc883c7e22fdeb71e27..e7f2327d9e40ae26a5e64d433d205ffeac87ec70 100644 (file)
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -940,7 +940,7 @@ disconnect_and_schedule_reconnect (struct GNUNET_TRANSPORT_Handle *h)
   }
   if (NULL != h->client)
   {
-    GNUNET_CLIENT_disconnect (h->client, GNUNET_YES);
+    GNUNET_CLIENT_disconnect (h->client);
     h->client = NULL;
   }
   /* Forget about all neighbours that we used to be connected to */

diff --git a/src/transport/transport_api_address_lookup.c b/src/transport/transport_api_address_lookup.c
index 797b95f07d2eed14561f6beb53d603fab7055887..655be833f239c83ff89038cf3466ea0296aadcbf 100644 (file)
--- a/src/transport/transport_api_address_lookup.c
+++ b/src/transport/transport_api_address_lookup.c
@@ -155,7 +155,7 @@ static void
 reconnect (struct GNUNET_TRANSPORT_PeerIterateContext *pal_ctx)
 {
   GNUNET_assert (GNUNET_NO == pal_ctx->one_shot);
-  GNUNET_CLIENT_disconnect (pal_ctx->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (pal_ctx->client);
   pal_ctx->client = NULL;
   pal_ctx->backoff = GNUNET_TIME_relative_max (GNUNET_TIME_UNIT_MILLISECONDS,
                                               GNUNET_TIME_relative_min (GNUNET_TIME_relative_multiply (pal_ctx->backoff, 2),
@@ -354,7 +354,7 @@ GNUNET_TRANSPORT_peer_get_active_addresses_cancel (struct
 {
   if (NULL != alc->client)
   {
-    GNUNET_CLIENT_disconnect (alc->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (alc->client);
     alc->client = NULL;
   }
   if (GNUNET_SCHEDULER_NO_TASK != alc->reconnect_task)

diff --git a/src/transport/transport_api_address_to_string.c b/src/transport/transport_api_address_to_string.c
index 73ea09f854508189f685ef9f4c4c696fe16dd72b..237c0b657cd1496fbb22f5820185e96e72b8d6d6 100644 (file)
--- a/src/transport/transport_api_address_to_string.c
+++ b/src/transport/transport_api_address_to_string.c
@@ -71,7 +71,7 @@ address_response_processor (void *cls, const struct GNUNET_MessageHeader *msg)
   if (msg == NULL)
   {
     alucb->cb (alucb->cb_cls, NULL);
-    GNUNET_CLIENT_disconnect (alucb->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (alucb->client);
     GNUNET_free (alucb);
     return;
   }
@@ -82,7 +82,7 @@ address_response_processor (void *cls, const struct GNUNET_MessageHeader *msg)
   {
     /* done! */
     alucb->cb (alucb->cb_cls, NULL);
-    GNUNET_CLIENT_disconnect (alucb->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (alucb->client);
     GNUNET_free (alucb);
     return;
   }
@@ -92,7 +92,7 @@ address_response_processor (void *cls, const struct GNUNET_MessageHeader *msg)
     /* invalid reply */
     GNUNET_break (0);
     alucb->cb (alucb->cb_cls, NULL);
-    GNUNET_CLIENT_disconnect (alucb->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (alucb->client);
     GNUNET_free (alucb);
     return;
   }
@@ -180,7 +180,7 @@ GNUNET_TRANSPORT_address_to_string_cancel (struct
                                            GNUNET_TRANSPORT_AddressToStringContext
                                            *alc)
 {
-  GNUNET_CLIENT_disconnect (alc->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (alc->client);
   GNUNET_free (alc);
 }
 

diff --git a/src/transport/transport_api_blacklist.c b/src/transport/transport_api_blacklist.c
index be52623bb6e42501e0b56fbaf799250e8558786d..04646204f0db0a6b63dc5f18be6df668e8be72e2 100644 (file)
--- a/src/transport/transport_api_blacklist.c
+++ b/src/transport/transport_api_blacklist.c
@@ -168,7 +168,7 @@ static void
 reconnect (struct GNUNET_TRANSPORT_Blacklist *br)
 {
   if (br->client != NULL)
-    GNUNET_CLIENT_disconnect (br->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (br->client);
   br->client = GNUNET_CLIENT_connect ("transport", br->cfg);
   GNUNET_assert (br->client != NULL);
   br->th =
@@ -288,7 +288,7 @@ GNUNET_TRANSPORT_blacklist_cancel (struct GNUNET_TRANSPORT_Blacklist *br)
     GNUNET_CLIENT_notify_transmit_ready_cancel (br->th);
     br->th = NULL;
   }
-  GNUNET_CLIENT_disconnect (br->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (br->client);
   GNUNET_free (br);
 }
 

diff --git a/src/util/client.c b/src/util/client.c
index f8690dfbc95f163663125edacce546a4775adb5f..72c83e29bf1e2c2b272d08426cc6ce474f2cae37 100644 (file)
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -389,13 +389,10 @@ GNUNET_CLIENT_connect (const char *service_name,
  * destroyed (unless, of course, there is an error with the server in
  * which case the message may still be lost).
  *
- * @param finish_pending_write should a transmission already passed to the
- *          handle be completed?
  * @param sock handle to the service connection
  */
 void
-GNUNET_CLIENT_disconnect (struct GNUNET_CLIENT_Connection *sock,
-                          int finish_pending_write)
+GNUNET_CLIENT_disconnect (struct GNUNET_CLIENT_Connection *sock)
 {
   if (sock->in_receive == GNUNET_YES)
   {
@@ -409,7 +406,7 @@ GNUNET_CLIENT_disconnect (struct GNUNET_CLIENT_Connection *sock,
   }
   if (NULL != sock->sock)
   {
-    GNUNET_CONNECTION_destroy (sock->sock, finish_pending_write);
+    GNUNET_CONNECTION_destroy (sock->sock, GNUNET_NO);
     sock->sock = NULL;
   }
   if (sock->receive_task != GNUNET_SCHEDULER_NO_TASK)
@@ -619,7 +616,7 @@ confirm_handler (void *cls, const struct GNUNET_MessageHeader *msg)
   {
     service_test_error (conn->test_cb, conn->test_cb_cls);
   }
-  GNUNET_CLIENT_disconnect (conn, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (conn);
 }
 
 
@@ -642,7 +639,7 @@ write_test (void *cls, size_t size, void *buf)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG, _("Failure to transmit TEST request.\n"));
     service_test_error (conn->test_cb, conn->test_cb_cls);
-    GNUNET_CLIENT_disconnect (conn, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (conn);
     return 0;                   /* client disconnected */
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Transmitting `%s' request.\n", "TEST");
@@ -855,7 +852,7 @@ GNUNET_CLIENT_service_test (const char *service,
     LOG (GNUNET_ERROR_TYPE_WARNING,
          _("Failure to transmit request to service `%s'\n"), service);
     service_test_error (task, task_cls);
-    GNUNET_CLIENT_disconnect (conn, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (conn);
     return;
   }
 }

diff --git a/src/util/connection.c b/src/util/connection.c
index da7ba599d6504f14ae564ff62fdda6d9e9f03559..6908144b790ca7f7a5ec7b4db53974534b228663 100644 (file)
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -323,6 +323,7 @@ GNUNET_CONNECTION_disable_corking (struct GNUNET_CONNECTION_Handle *sock)
   return GNUNET_NETWORK_socket_disable_corking (sock->sock);
 }
 
+
 /**
  * Create a socket handle by boxing an existing OS socket.  The OS
  * socket should henceforth be no longer used directly.
@@ -477,6 +478,7 @@ GNUNET_CONNECTION_create_from_accept (GNUNET_CONNECTION_AccessCheck access,
   return ret;
 }
 
+
 /**
  * Obtain the network address of the other party.
  *
@@ -1041,7 +1043,6 @@ GNUNET_CONNECTION_destroy (struct GNUNET_CONNECTION_Handle *sock,
     GNUNET_RESOLVER_request_cancel (sock->dns_active);
     sock->dns_active = NULL;
   }
-
   GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == sock->destroy_task);
   sock->destroy_task = GNUNET_SCHEDULER_add_now (&destroy_continuation, sock);
 }

diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index 9d5ae6c0a9b02ccf46dc69c9278acdb3d6f63195..0c12afad403949ccc37e9dcea076d423ab7da462 100644 (file)
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -253,7 +253,7 @@ GNUNET_RESOLVER_disconnect ()
 #if DEBUG_RESOLVER
     LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from DNS service\n");
 #endif
-    GNUNET_CLIENT_disconnect (client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (client);
     client = NULL;
   }
   if (r_task != GNUNET_SCHEDULER_NO_TASK)
@@ -374,7 +374,7 @@ handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
     }
     GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
     GNUNET_free (rh);
-    GNUNET_CLIENT_disconnect (client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (client);
     client = NULL;
     reconnect ();
     return;
@@ -382,7 +382,7 @@ handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
   if (GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE != ntohs (msg->type))
   {
     GNUNET_break (0);
-    GNUNET_CLIENT_disconnect (client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (client);
     client = NULL;
     reconnect ();
     return;
@@ -417,7 +417,7 @@ handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
         rh->name_callback (rh->cls, NULL);
       GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
       GNUNET_free (rh);
-      GNUNET_CLIENT_disconnect (client, GNUNET_NO);
+      GNUNET_CLIENT_disconnect (client);
       client = NULL;
       reconnect ();
       return;
@@ -473,7 +473,7 @@ handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
         rh->addr_callback (rh->cls, NULL, 0);
       GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
       GNUNET_free (rh);
-      GNUNET_CLIENT_disconnect (client, GNUNET_NO);
+      GNUNET_CLIENT_disconnect (client);
       client = NULL;
       reconnect ();
       return;
@@ -643,7 +643,7 @@ process_requests ()
                                                (rh->timeout), GNUNET_YES,
                                                &handle_response, rh))
   {
-    GNUNET_CLIENT_disconnect (client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (client);
     client = NULL;
     reconnect ();
     return;

diff --git a/src/util/test_client.c b/src/util/test_client.c
index f9d961ab6229098a0ccd6bf8e4a105969f533ce3..92b9ed49fdf5e210786e48cef7f8e71a0539298b 100644 (file)
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -109,7 +109,7 @@ recv_bounce (void *cls, const struct GNUNET_MessageHeader *got)
   msg.type = htons (MY_TYPE);
   msg.size = htons (sizeof (struct GNUNET_MessageHeader));
   GNUNET_assert (0 == memcmp (got, &msg, sizeof (struct GNUNET_MessageHeader)));
-  GNUNET_CLIENT_disconnect (client, GNUNET_YES);
+  GNUNET_CLIENT_disconnect (client);
   client = NULL;
   GNUNET_SERVER_destroy (server);
   server = NULL;

diff --git a/src/util/test_server.c b/src/util/test_server.c
index 6718c65d8b7b8eb0634adff2090e7d1d9da327f1..0faf61bee665295788c134df8784f4d2258d9637 100644 (file)
--- a/src/util/test_server.c
+++ b/src/util/test_server.c
@@ -54,7 +54,7 @@ finish_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_assert (ok == 6);
   ok = 0;
   GNUNET_SERVER_destroy (server);
-  GNUNET_CLIENT_disconnect (cc, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (cc);
   GNUNET_CONFIGURATION_destroy (cfg);
 }
 

diff --git a/src/util/test_server_disconnect.c b/src/util/test_server_disconnect.c
index 8010695e8449f394c930350625bd068a9a0aa897..c54f9cbc81362c8ad0d1e4dc010e7533739c07f0 100644 (file)
--- a/src/util/test_server_disconnect.c
+++ b/src/util/test_server_disconnect.c
@@ -51,7 +51,7 @@ finish_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_assert (ok == 5);
   ok = 0;
   GNUNET_SERVER_destroy (server);
-  GNUNET_CLIENT_disconnect (cc, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (cc);
   GNUNET_CONFIGURATION_destroy (cfg);
 }
 

diff --git a/src/util/test_server_with_client.c b/src/util/test_server_with_client.c
index 06a4b71d655c2f6df07bbbae03582cc8de37cfa2..ad56071fa43c4860763088da531c8059a35a9dfd 100644 (file)
--- a/src/util/test_server_with_client.c
+++ b/src/util/test_server_with_client.c
@@ -89,7 +89,7 @@ recv_cb (void *cls, struct GNUNET_SERVER_Client *argclient,
     break;
   case 4:
     ok++;
-    GNUNET_CLIENT_disconnect (client, GNUNET_YES);
+    GNUNET_CLIENT_disconnect (client);
     GNUNET_SERVER_receive_done (argclient, GNUNET_OK);
     break;
   default:

diff --git a/src/util/test_server_with_client_unix.c b/src/util/test_server_with_client_unix.c
index 99af4e8c3a6215f8e2c38bdb733be6eb135da93a..eae80e4e891bdaa4b2039da5c01aeb76690229cb 100644 (file)
--- a/src/util/test_server_with_client_unix.c
+++ b/src/util/test_server_with_client_unix.c
@@ -68,7 +68,7 @@ recv_cb (void *cls, struct GNUNET_SERVER_Client *argclient,
     break;
   case 4:
     ok++;
-    GNUNET_CLIENT_disconnect (client, GNUNET_YES);
+    GNUNET_CLIENT_disconnect (client);
     GNUNET_SERVER_receive_done (argclient, GNUNET_OK);
     break;
   default:

diff --git a/src/util/test_service.c b/src/util/test_service.c
index 049282d849ad0cb842599994a094f5393d66e592..716e90d78f0148c92abdff4c41c18139cafae694 100644 (file)
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -52,7 +52,7 @@ build_msg (void *cls, size_t size, void *buf)
   GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
   msg->type = htons (MY_TYPE);
   msg->size = htons (sizeof (struct GNUNET_MessageHeader));
-  GNUNET_CLIENT_disconnect (client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (client);
   return sizeof (struct GNUNET_MessageHeader);
 }
 

diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c
index 31d17f8c9e462e63526b318006b539ac9d273ea5..5b70d19dfdeaf89a81a239512fc1a5454acd2894 100644 (file)
--- a/src/vpn/vpn_api.c
+++ b/src/vpn/vpn_api.c
@@ -402,7 +402,7 @@ reconnect (struct GNUNET_VPN_Handle *vh)
     GNUNET_CLIENT_notify_transmit_ready_cancel (vh->th);
     vh->th = NULL;
   }  
-  GNUNET_CLIENT_disconnect (vh->client, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (vh->client);
   vh->client = NULL;
   vh->request_id_gen = 0;
   for (rr = vh->rr_head; NULL != rr; rr = rr->next)
@@ -591,7 +591,7 @@ GNUNET_VPN_disconnect (struct GNUNET_VPN_Handle *vh)
   }
   if (NULL != vh->client)
   {
-    GNUNET_CLIENT_disconnect (vh->client, GNUNET_NO);
+    GNUNET_CLIENT_disconnect (vh->client);
     vh->client = NULL;
   }
   if (GNUNET_SCHEDULER_NO_TASK != vh->rt)