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

[gnunet]

Author: wachs
Date: 2012-07-06 14:57:14 +0200 (Fri, 06 Jul 2012)
New Revision: 22523

Modified:
   gnunet/src/transport/gnunet-transport.c
Log:
- fix


Modified: gnunet/src/transport/gnunet-transport.c
===================================================================
--- gnunet/src/transport/gnunet-transport.c     2012-07-06 12:34:26 UTC (rev 
22522)
+++ gnunet/src/transport/gnunet-transport.c     2012-07-06 12:57:14 UTC (rev 
22523)
@@ -356,7 +356,10 @@
   struct GNUNET_MessageHeader *m = buf;
 
   if ((NULL == buf) && (0 == size))
+  {
+    th = NULL;
     return 0;
+  }
 
   GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
   GNUNET_assert (size < GNUNET_SERVER_MAX_MESSAGE_SIZE);
@@ -395,7 +398,8 @@
   if (benchmark_send)
   {
     start_time = GNUNET_TIME_absolute_get ();
-    th = GNUNET_TRANSPORT_notify_transmit_ready (handle, peer, 32 * 1024, 0,
+    if (NULL == th)
+      th = GNUNET_TRANSPORT_notify_transmit_ready (handle, peer, 32 * 1024, 0,
                                                  GNUNET_TIME_UNIT_FOREVER_REL,
                                                  &transmit_data, NULL);
   }
@@ -585,6 +589,11 @@
 shutdown_task (void *cls,
               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+  if (NULL != th)
+  {
+    GNUNET_TRANSPORT_notify_transmit_ready_cancel(th);
+    th = NULL;
+  }
   if (NULL != handle)
   {
     GNUNET_TRANSPORT_disconnect(handle);