-removing obsolete argument from GNUNET_CONNECTION_destroy

diff --git a/src/include/gnunet_connection_lib.h b/src/include/gnunet_connection_lib.h
index 3e48d32ea3b0459606584b7c8388df3e0d9c5ca0..7f74de59eb3abb531329e1ed95a9d734c39a8235 100644 (file)
--- a/src/include/gnunet_connection_lib.h
+++ b/src/include/gnunet_connection_lib.h
@@ -237,14 +237,9 @@ GNUNET_CONNECTION_get_address (struct GNUNET_CONNECTION_Handle *sock,
  * should be called explicitly first.
  *
  * @param sock socket to destroy
- * @param finish_pending_write should pending writes be completed or aborted?
- *        (this applies to transmissions where the data has already been
- *        read from the application; all other transmissions should be
- *        aborted using 'GNUNET_CONNECTION_notify_transmit_ready_cancel').
  */
 void
-GNUNET_CONNECTION_destroy (struct GNUNET_CONNECTION_Handle *sock,
-                           int finish_pending_write);
+GNUNET_CONNECTION_destroy (struct GNUNET_CONNECTION_Handle *sock);
 
 
 /**

diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 9831070dd5e759adc0b67608f2e19f56d5210bb9..ee94970e5cc16273f026dec9bc97d96d5c1ad7bb 100644 (file)
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -2026,7 +2026,7 @@ notify_send_probe (void *cls, size_t size, void *buf)
                                tcp_probe_ctx);
   if (buf == NULL)
   {
-    GNUNET_CONNECTION_destroy (tcp_probe_ctx->sock, GNUNET_NO);
+    GNUNET_CONNECTION_destroy (tcp_probe_ctx->sock);
     GNUNET_free (tcp_probe_ctx);
     return 0;
   }
@@ -2301,7 +2301,7 @@ libgnunet_plugin_transport_tcp_done (void *cls)
   {
     GNUNET_CONTAINER_DLL_remove (plugin->probe_head, plugin->probe_tail,
                                  tcp_probe);
-    GNUNET_CONNECTION_destroy (tcp_probe->sock, GNUNET_NO);
+    GNUNET_CONNECTION_destroy (tcp_probe->sock);
     GNUNET_free (tcp_probe);
   }
   GNUNET_CONTAINER_multihashmap_destroy (plugin->nat_wait_conns);

diff --git a/src/util/client.c b/src/util/client.c
index 72c83e29bf1e2c2b272d08426cc6ce474f2cae37..f6bc27381d7d1834329a9ec4cc8bc46654321e18 100644 (file)
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -406,7 +406,7 @@ GNUNET_CLIENT_disconnect (struct GNUNET_CLIENT_Connection *sock)
   }
   if (NULL != sock->sock)
   {
-    GNUNET_CONNECTION_destroy (sock->sock, GNUNET_NO);
+    GNUNET_CONNECTION_destroy (sock->sock);
     sock->sock = NULL;
   }
   if (sock->receive_task != GNUNET_SCHEDULER_NO_TASK)
@@ -968,7 +968,7 @@ client_notify (void *cls, size_t size, void *buf)
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Failed to connect to `%s', automatically trying again.\n",
          th->sock->service_name);
-    GNUNET_CONNECTION_destroy (th->sock->sock, GNUNET_NO);
+    GNUNET_CONNECTION_destroy (th->sock->sock);
     th->sock->sock = NULL;
     delay = GNUNET_TIME_relative_min (delay, th->sock->back_off);
     th->sock->back_off =

diff --git a/src/util/connection.c b/src/util/connection.c
index 6908144b790ca7f7a5ec7b4db53974534b228663..2953d9ca7f348127fd2352f2d6a636842c87dece 100644 (file)
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -1019,15 +1019,11 @@ GNUNET_CONNECTION_check (struct GNUNET_CONNECTION_Handle *sock)
  * should be called explicitly first.
  *
  * @param sock socket to destroy
- * @param finish_pending_write should pending writes be completed or aborted?
- *        (this applies to transmissions where the data has already been
- *        read from the application; all other transmissions should be
- *        aborted using 'GNUNET_CONNECTION_notify_transmit_ready_cancel').
  */
 void
-GNUNET_CONNECTION_destroy (struct GNUNET_CONNECTION_Handle *sock,
-                           int finish_pending_write)
+GNUNET_CONNECTION_destroy (struct GNUNET_CONNECTION_Handle *sock)
 {
+  int finish_pending_write = GNUNET_NO;
   if (GNUNET_NO == finish_pending_write)
   {
     if (sock->write_task != GNUNET_SCHEDULER_NO_TASK)

diff --git a/src/util/server.c b/src/util/server.c
index 9f3d8929cfd44a35e59db833f79d9ed1b252b997..4b3ebb7d970a44834a60d6c77072b886b0ad3290 100644 (file)
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -1194,7 +1194,7 @@ GNUNET_SERVER_client_disconnect (struct GNUNET_SERVER_Client *client)
 
   if (client->persist == GNUNET_YES)
     GNUNET_CONNECTION_persist_ (client->connection);
-  GNUNET_CONNECTION_destroy (client->connection, GNUNET_NO);
+  GNUNET_CONNECTION_destroy (client->connection);
 
   if (client->server->mst_destroy != NULL)
     client->server->mst_destroy (client->server->mst_cls, client->mst);

diff --git a/src/util/test_connection.c b/src/util/test_connection.c
index cb69f40366ab1e51c038078075b54dcd9b1e56a8..8664ca16f11a2760d8c0cb4586e1a50dcf20382e 100644 (file)
--- a/src/util/test_connection.c
+++ b/src/util/test_connection.c
@@ -102,7 +102,7 @@ receive_check (void *cls, const void *buf, size_t available,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receive closes accepted socket\n");
 #endif
     *ok = 0;
-    GNUNET_CONNECTION_destroy (asock, GNUNET_YES);
+    GNUNET_CONNECTION_destroy (asock);
   }
 }
 
@@ -119,7 +119,7 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test destroys listen socket\n");
 #endif
-  GNUNET_CONNECTION_destroy (lsock, GNUNET_YES);
+  GNUNET_CONNECTION_destroy (lsock);
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Test asks to receive on accepted socket\n");
@@ -142,7 +142,7 @@ make_hello (void *cls, size_t size, void *buf)
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test destroys client socket\n");
 #endif
-  GNUNET_CONNECTION_destroy (csock, GNUNET_YES);
+  GNUNET_CONNECTION_destroy (csock);
   return 12;
 }
 

diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c
index 2d08acc3cd1421b25af7a914e8d207260ef17473..ba7acaefcc3bb72d32a854cfbae256e60cab4b4a 100644 (file)
--- a/src/util/test_connection_addressing.c
+++ b/src/util/test_connection_addressing.c
@@ -99,7 +99,8 @@ receive_check (void *cls, const void *buf, size_t available,
   else
   {
     *ok = 0;
-    GNUNET_CONNECTION_destroy (asock, GNUNET_YES);
+    GNUNET_CONNECTION_destroy (csock);
+    GNUNET_CONNECTION_destroy (asock);
   }
 }
 
@@ -128,7 +129,7 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   expect.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
   GNUNET_assert (0 == memcmp (&expect, v4, alen));
   GNUNET_free (addr);
-  GNUNET_CONNECTION_destroy (lsock, GNUNET_YES);
+  GNUNET_CONNECTION_destroy (lsock);
   GNUNET_CONNECTION_receive (asock, 1024,
                              GNUNET_TIME_relative_multiply
                              (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check,
@@ -143,6 +144,7 @@ make_hello (void *cls, size_t size, void *buf)
   return 12;
 }
 
+
 static void
 task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -167,7 +169,6 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                  GNUNET_CONNECTION_notify_transmit_ready (csock, 12,
                                                           GNUNET_TIME_UNIT_SECONDS,
                                                           &make_hello, NULL));
-  GNUNET_CONNECTION_destroy (csock, GNUNET_YES);
   GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, ls, &run_accept,
                                  cls);
 }

diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c
index aa16724558ea03b0162e336d489e1a4617b4c004..93fcd5fdfdca5929b99f9d6b1b716edc138305dd 100644 (file)
--- a/src/util/test_connection_receive_cancel.c
+++ b/src/util/test_connection_receive_cancel.c
@@ -86,11 +86,10 @@ dead_receive (void *cls, const void *buf, size_t available,
 static void
 run_accept_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-
   asock = GNUNET_CONNECTION_create_from_accept (NULL, NULL, ls);
   GNUNET_assert (asock != NULL);
   GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock));
-  GNUNET_CONNECTION_destroy (lsock, GNUNET_YES);
+  GNUNET_CONNECTION_destroy (lsock);
   GNUNET_CONNECTION_receive (asock, 1024,
                              GNUNET_TIME_relative_multiply
                              (GNUNET_TIME_UNIT_SECONDS, 5), &dead_receive, cls);
@@ -103,8 +102,8 @@ receive_cancel_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   int *ok = cls;
 
   GNUNET_CONNECTION_receive_cancel (asock);
-  GNUNET_CONNECTION_destroy (csock, GNUNET_YES);
-  GNUNET_CONNECTION_destroy (asock, GNUNET_YES);
+  GNUNET_CONNECTION_destroy (csock);
+  GNUNET_CONNECTION_destroy (asock);
   *ok = 0;
 }
 

diff --git a/src/util/test_connection_timeout.c b/src/util/test_connection_timeout.c
index 2338665cb4e8ec91695af1b43f08d0fb2f904adb..c0597b24be17fa48e6db6f66098858a57246e03f 100644 (file)
--- a/src/util/test_connection_timeout.c
+++ b/src/util/test_connection_timeout.c
@@ -83,8 +83,8 @@ send_kilo (void *cls, size_t size, void *buf)
 #endif
     GNUNET_assert (buf == NULL);
     *ok = 0;
-    GNUNET_CONNECTION_destroy (lsock, GNUNET_YES);
-    GNUNET_CONNECTION_destroy (csock, GNUNET_YES);
+    GNUNET_CONNECTION_destroy (lsock);
+    GNUNET_CONNECTION_destroy (csock);
     return 0;
   }
 #if VERBOSE

diff --git a/src/util/test_connection_transmit_cancel.c b/src/util/test_connection_transmit_cancel.c
index d81c32a6ca9d6eb37e05957e60c614081ef62eb9..fec72d273b2ec768e9687e4ed75601e47836cffc 100644 (file)
--- a/src/util/test_connection_transmit_cancel.c
+++ b/src/util/test_connection_transmit_cancel.c
@@ -56,7 +56,7 @@ task_transmit_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                                 &not_run, cls);
   GNUNET_assert (NULL != th);
   GNUNET_CONNECTION_notify_transmit_ready_cancel (th);
-  GNUNET_CONNECTION_destroy (csock, GNUNET_YES);
+  GNUNET_CONNECTION_destroy (csock);
   *ok = 0;
 }