[GNUnet-SVN] r33631 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2014-06-11 10:42:40 +0200 (Wed, 11 Jun 2014)
New Revision: 33631

Modified:
   gnunet/src/transport/gnunet-service-transport_clients.c
   gnunet/src/transport/plugin_transport_tcp.c
   gnunet/src/transport/transport_api_address_to_string.c
Log:
-send proper termination on error

Modified: gnunet/src/transport/gnunet-service-transport_clients.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_clients.c     2014-06-11 
06:02:48 UTC (rev 33630)
+++ gnunet/src/transport/gnunet-service-transport_clients.c     2014-06-11 
08:42:40 UTC (rev 33631)
@@ -987,8 +987,14 @@
     atsm.res = htonl (GNUNET_SYSERR);
     atsm.addr_len = htonl (0);
     GNUNET_SERVER_transmit_context_append_message (tc,
-        (const struct GNUNET_MessageHeader *) &atsm);
-    GNUNET_SERVER_transmit_context_run (tc, rtimeout);
+                                                   &atsm.header);
+    atsm.header.size = ntohs (sizeof (struct AddressToStringResultMessage));
+    atsm.header.type = ntohs 
(GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING_REPLY);
+    atsm.res = htonl (GNUNET_OK);
+    atsm.addr_len = htonl (0);
+    GNUNET_SERVER_transmit_context_append_message (tc,
+                                                   &atsm.header);
+    GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
     return;
   }
   actx = GNUNET_new (struct AddressToStringContext);

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2014-06-11 06:02:48 UTC (rev 
33630)
+++ gnunet/src/transport/plugin_transport_tcp.c 2014-06-11 08:42:40 UTC (rev 
33631)
@@ -1636,7 +1636,8 @@
 {
   struct Plugin *plugin = cls;
 
-  LOG(GNUNET_ERROR_TYPE_DEBUG, "Disconnecting peer `%4s'\n",
+  LOG(GNUNET_ERROR_TYPE_DEBUG,
+      "Disconnecting peer `%4s'\n",
       GNUNET_i2s (target));
   GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessionmap, target,
       &session_disconnect_it, plugin);
@@ -2275,7 +2276,8 @@
   }
   else
   {
-    LOG(GNUNET_ERROR_TYPE_DEBUG, "Throttling receiving from `%s' for %s\n",
+    LOG(GNUNET_ERROR_TYPE_DEBUG,
+        "Throttling receiving from `%s' for %s\n",
         GNUNET_i2s (&session->target),
         GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
     GNUNET_SERVER_disable_receive_done_warning (client);

Modified: gnunet/src/transport/transport_api_address_to_string.c
===================================================================
--- gnunet/src/transport/transport_api_address_to_string.c      2014-06-11 
06:02:48 UTC (rev 33630)
+++ gnunet/src/transport/transport_api_address_to_string.c      2014-06-11 
08:42:40 UTC (rev 33631)
@@ -76,8 +76,7 @@
     alucb->cb (alucb->cb_cls,
                NULL,
                GNUNET_SYSERR);
-    GNUNET_CLIENT_disconnect (alucb->client);
-    GNUNET_free (alucb);
+    GNUNET_TRANSPORT_address_to_string_cancel (alucb);
     return;
   }
   GNUNET_break (ntohs (msg->type) ==
@@ -90,8 +89,7 @@
     alucb->cb (alucb->cb_cls,
                NULL,
                GNUNET_SYSERR);
-    GNUNET_CLIENT_disconnect (alucb->client);
-    GNUNET_free (alucb);
+    GNUNET_TRANSPORT_address_to_string_cancel (alucb);
     return;
   }
   atsm = (const struct AddressToStringResultMessage *) msg;
@@ -126,8 +124,7 @@
     alucb->cb (alucb->cb_cls,
                NULL,
                GNUNET_OK);
-    GNUNET_CLIENT_disconnect (alucb->client);
-    GNUNET_free (alucb);
+    GNUNET_TRANSPORT_address_to_string_cancel (alucb);
     return;
   }
   address = (const char *) &atsm[1];
@@ -139,8 +136,7 @@
     alucb->cb (alucb->cb_cls,
                NULL,
                GNUNET_SYSERR);
-    GNUNET_CLIENT_disconnect (alucb->client);
-    GNUNET_free (alucb);
+    GNUNET_TRANSPORT_address_to_string_cancel (alucb);
     return;
   }
   /* expect more replies */