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

[gnunet]

Author: wachs
Date: 2012-08-08 14:25:30 +0200 (Wed, 08 Aug 2012)
New Revision: 23163

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


Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2012-08-08 10:31:02 UTC (rev 
23162)
+++ gnunet/src/transport/transport_api.c        2012-08-08 12:25:30 UTC (rev 
23163)
@@ -1023,15 +1023,16 @@
   struct GNUNET_MessageHeader *msg = shc->msg;
   uint16_t ssize;
   struct GNUNET_SCHEDULER_TaskContext tc;
+  tc.read_ready = NULL;
+  tc.write_ready = NULL;
+  tc.reason = GNUNET_SCHEDULER_REASON_TIMEOUT;
 
   if (buf == NULL)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Timeout while trying to transmit `%s' request.\n", "HELLO");
-       tc.read_ready = NULL;
-       tc.write_ready = NULL;
-       tc.reason = GNUNET_SCHEDULER_REASON_TIMEOUT;
-       shc->cont (shc->cls, &tc);
+    if (NULL != shc->cont)
+      shc->cont (shc->cls, &tc);
     GNUNET_free (msg);
     GNUNET_free (shc);
     return 0;
@@ -1041,10 +1042,9 @@
   GNUNET_assert (size >= ssize);
   memcpy (buf, msg, ssize);
   GNUNET_free (msg);
-  tc.read_ready = NULL;
-  tc.write_ready = NULL;
   tc.reason = GNUNET_SCHEDULER_REASON_READ_READY;
-  shc->cont (shc->cls, &tc);
+  if (NULL != shc->cont)
+    shc->cont (shc->cls, &tc);
   GNUNET_free (shc);
   return ssize;
 }
@@ -1074,12 +1074,14 @@
   struct SendHelloContext * shc;
   struct GNUNET_SCHEDULER_TaskContext tc;
 
+  tc.read_ready = NULL;
+  tc.write_ready = NULL;
+  tc.reason = GNUNET_SCHEDULER_REASON_TIMEOUT;
+
   if (NULL == handle->client)
   {
-       tc.read_ready = NULL;
-       tc.write_ready = NULL;
-       tc.reason = GNUNET_SCHEDULER_REASON_TIMEOUT;
-       cont (cls, &tc);
+    if (NULL != cont)
+      cont (cls, &tc);
     return;
   }
   GNUNET_break (ntohs (hello->type) == GNUNET_MESSAGE_TYPE_HELLO);
@@ -1089,10 +1091,9 @@
       GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) hello, &peer))
   {
     GNUNET_break (0);
-       tc.read_ready = NULL;
-       tc.write_ready = NULL;
-       tc.reason = GNUNET_SCHEDULER_REASON_TIMEOUT;
-       cont (cls, &tc);
+    if (NULL != cont)
+      if (NULL != cont)
+        cont (cls, &tc);
     return;
   }
   msg = GNUNET_malloc (size);