[GNUnet-SVN] r21021 - in gnunet/src: include transport util

[gnunet]

Author: grothoff
Date: 2012-04-19 12:51:26 +0200 (Thu, 19 Apr 2012)
New Revision: 21021

Modified:
   gnunet/src/include/gnunet_connection_lib.h
   gnunet/src/transport/plugin_transport_tcp.c
   gnunet/src/util/client.c
   gnunet/src/util/connection.c
   gnunet/src/util/server.c
   gnunet/src/util/test_connection.c
   gnunet/src/util/test_connection_addressing.c
   gnunet/src/util/test_connection_receive_cancel.c
   gnunet/src/util/test_connection_timeout.c
   gnunet/src/util/test_connection_transmit_cancel.c
Log:
-removing obsolete argument from GNUNET_CONNECTION_destroy

Modified: gnunet/src/include/gnunet_connection_lib.h
===================================================================
--- gnunet/src/include/gnunet_connection_lib.h  2012-04-19 09:54:09 UTC (rev 
21020)
+++ gnunet/src/include/gnunet_connection_lib.h  2012-04-19 10:51:26 UTC (rev 
21021)
@@ -237,14 +237,9 @@
  * 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);
 
 
 /**

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2012-04-19 09:54:09 UTC (rev 
21020)
+++ gnunet/src/transport/plugin_transport_tcp.c 2012-04-19 10:51:26 UTC (rev 
21021)
@@ -2026,7 +2026,7 @@
                                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 @@
   {
     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);

Modified: gnunet/src/util/client.c
===================================================================
--- gnunet/src/util/client.c    2012-04-19 09:54:09 UTC (rev 21020)
+++ gnunet/src/util/client.c    2012-04-19 10:51:26 UTC (rev 21021)
@@ -406,7 +406,7 @@
   }
   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 @@
     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 =

Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c        2012-04-19 09:54:09 UTC (rev 21020)
+++ gnunet/src/util/connection.c        2012-04-19 10:51:26 UTC (rev 21021)
@@ -1019,15 +1019,11 @@
  * 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)

Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c    2012-04-19 09:54:09 UTC (rev 21020)
+++ gnunet/src/util/server.c    2012-04-19 10:51:26 UTC (rev 21021)
@@ -1194,7 +1194,7 @@
 
   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);

Modified: gnunet/src/util/test_connection.c
===================================================================
--- gnunet/src/util/test_connection.c   2012-04-19 09:54:09 UTC (rev 21020)
+++ gnunet/src/util/test_connection.c   2012-04-19 10:51:26 UTC (rev 21021)
@@ -102,7 +102,7 @@
     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 @@
 #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 @@
 #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;
 }
 

Modified: gnunet/src/util/test_connection_addressing.c
===================================================================
--- gnunet/src/util/test_connection_addressing.c        2012-04-19 09:54:09 UTC 
(rev 21020)
+++ gnunet/src/util/test_connection_addressing.c        2012-04-19 10:51:26 UTC 
(rev 21021)
@@ -99,7 +99,8 @@
   else
   {
     *ok = 0;
-    GNUNET_CONNECTION_destroy (asock, GNUNET_YES);
+    GNUNET_CONNECTION_destroy (csock);
+    GNUNET_CONNECTION_destroy (asock);
   }
 }
 
@@ -128,7 +129,7 @@
   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 @@
   return 12;
 }
 
+
 static void
 task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -167,7 +169,6 @@
                  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);
 }

Modified: gnunet/src/util/test_connection_receive_cancel.c
===================================================================
--- gnunet/src/util/test_connection_receive_cancel.c    2012-04-19 09:54:09 UTC 
(rev 21020)
+++ gnunet/src/util/test_connection_receive_cancel.c    2012-04-19 10:51:26 UTC 
(rev 21021)
@@ -86,11 +86,10 @@
 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 @@
   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;
 }
 

Modified: gnunet/src/util/test_connection_timeout.c
===================================================================
--- gnunet/src/util/test_connection_timeout.c   2012-04-19 09:54:09 UTC (rev 
21020)
+++ gnunet/src/util/test_connection_timeout.c   2012-04-19 10:51:26 UTC (rev 
21021)
@@ -83,8 +83,8 @@
 #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

Modified: gnunet/src/util/test_connection_transmit_cancel.c
===================================================================
--- gnunet/src/util/test_connection_transmit_cancel.c   2012-04-19 09:54:09 UTC 
(rev 21020)
+++ gnunet/src/util/test_connection_transmit_cancel.c   2012-04-19 10:51:26 UTC 
(rev 21021)
@@ -56,7 +56,7 @@
                                                 &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;
 }