projects / oweals / gnunet.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixed coverity bug #10042
[oweals/gnunet.git] / src / transport / transport_api.c
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 0ea1705ae68e916ed19609b00e6f4c9927ae58c7..6fb35b5d6b1855b07bf770ac4b24d01e8a0f131d 100644 (file)
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -326,11 +326,6 @@ struct GNUNET_TRANSPORT_Handle
    */
   struct HelloWaitList *hwl_head;
 
-  /**
-   * My scheduler.
-   */
-  struct GNUNET_SCHEDULER_Handle *sched;
-
   /**
    * My configuration.
    */
@@ -444,8 +439,7 @@ schedule_peer_transmission (struct GNUNET_TRANSPORT_Handle *h)
 
   if (h->quota_task != GNUNET_SCHEDULER_NO_TASK)
     {
-      GNUNET_SCHEDULER_cancel (h->sched,
-                              h->quota_task);
+      GNUNET_SCHEDULER_cancel (h->quota_task);
       h->quota_task = GNUNET_SCHEDULER_NO_TASK;
     }
   retry_time = GNUNET_TIME_UNIT_FOREVER_REL;
@@ -464,18 +458,19 @@ schedule_peer_transmission (struct GNUNET_TRANSPORT_Handle *h)
       /* check outgoing quota */
       duration = GNUNET_BANDWIDTH_tracker_get_delay (&n->out_tracker,
                                                     th->notify_size - sizeof (struct OutboundMessage));
-      if (th->timeout.value < duration.value)
+      struct GNUNET_TIME_Absolute duration_abs = GNUNET_TIME_relative_to_absolute (duration);
+      if (th->timeout.abs_value < duration_abs.abs_value)
        {
          /* signal timeout! */
 #if DEBUG_TRANSPORT
          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                      "Would need %llu ms before bandwidth is available for delivery to `%4s', that is too long.  Signaling timeout.\n",
-                     duration.value,
+                     duration.rel_value,
                      GNUNET_i2s (&n->id));
 #endif
          if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
            {
-             GNUNET_SCHEDULER_cancel (h->sched, th->notify_delay_task);
+             GNUNET_SCHEDULER_cancel (th->notify_delay_task);
              th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
            }   
          n->transmit_stage = TS_NEW;
@@ -483,7 +478,7 @@ schedule_peer_transmission (struct GNUNET_TRANSPORT_Handle *h)
            GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
          continue;
        }
-      if (duration.value > 0)
+      if (duration.rel_value > 0)
        {
 #if DEBUG_TRANSPORT
          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -491,7 +486,7 @@ schedule_peer_transmission (struct GNUNET_TRANSPORT_Handle *h)
                      (unsigned int) n->out_tracker.available_bytes_per_s__,
                      (unsigned int) th->notify_size - sizeof (struct OutboundMessage),
                      GNUNET_i2s (&n->id),
-                     duration.value);
+                     duration.rel_value);
 #endif
          retry_time = GNUNET_TIME_relative_min (retry_time,
                                                 duration);
@@ -509,8 +504,7 @@ schedule_peer_transmission (struct GNUNET_TRANSPORT_Handle *h)
        ret = th;
     }
   if (ret == NULL)
-    h->quota_task = GNUNET_SCHEDULER_add_delayed (h->sched,
-                                                 retry_time,
+    h->quota_task = GNUNET_SCHEDULER_add_delayed (retry_time,
                                                  &quota_transmit_ready,
                                                  h);
   return ret;
@@ -555,7 +549,7 @@ transport_notify_ready (void *cls, size_t size, void *buf)
     {
       if (cm->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
         {
-          GNUNET_SCHEDULER_cancel (h->sched, cm->notify_delay_task);
+          GNUNET_SCHEDULER_cancel (cm->notify_delay_task);
           cm->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
         }
       GNUNET_CONTAINER_DLL_remove (h->control_head,
@@ -577,7 +571,7 @@ transport_notify_ready (void *cls, size_t size, void *buf)
     {
       if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
         {
-          GNUNET_SCHEDULER_cancel (h->sched, th->notify_delay_task);
+          GNUNET_SCHEDULER_cancel (th->notify_delay_task);
           th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
         }
       n = th->neighbour;
@@ -607,7 +601,7 @@ transport_notify_ready (void *cls, size_t size, void *buf)
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Message of %u bytes with timeout %llums constructed for `%4s'\n",
                  (unsigned int) mret,
-                 (unsigned long long) GNUNET_TIME_absolute_get_remaining (th->timeout).value,
+                 (unsigned long long) GNUNET_TIME_absolute_get_remaining (th->timeout).rel_value,
                  GNUNET_i2s (&n->id));
 #endif
       if (mret != 0)   
@@ -754,7 +748,7 @@ schedule_control_transmit (struct GNUNET_TRANSPORT_Handle *h,
 #if DEBUG_TRANSPORT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Control transmit of %u bytes within %llums requested\n",
-              size, (unsigned long long) timeout.value);
+              size, (unsigned long long) timeout.rel_value);
 #endif
   th = GNUNET_malloc (sizeof (struct ControlMessage));
   th->h = h;
@@ -762,8 +756,7 @@ schedule_control_transmit (struct GNUNET_TRANSPORT_Handle *h,
   th->notify_cls = notify_cls;
   th->notify_size = size;
   th->notify_delay_task
-    = GNUNET_SCHEDULER_add_delayed (h->sched,
-                                    timeout, &control_transmit_timeout, th);
+    = GNUNET_SCHEDULER_add_delayed (timeout, &control_transmit_timeout, th);
   if (at_head)
     GNUNET_CONTAINER_DLL_insert (h->control_head,
                                 h->control_tail,
@@ -809,8 +802,7 @@ send_set_quota (void *cls, size_t size, void *buf)
 
   if (buf == NULL)
     {
-      GNUNET_SCHEDULER_add_continuation (sqc->handle->sched,
-                                         sqc->cont,
+      GNUNET_SCHEDULER_add_continuation (sqc->cont,
                                          sqc->cont_cls,
                                          GNUNET_SCHEDULER_REASON_TIMEOUT);
       GNUNET_free (sqc);
@@ -829,8 +821,7 @@ send_set_quota (void *cls, size_t size, void *buf)
   msg->quota = sqc->quota_in;
   memcpy (&msg->peer, &sqc->target, sizeof (struct GNUNET_PeerIdentity));
   if (sqc->cont != NULL)
-    GNUNET_SCHEDULER_add_continuation (sqc->handle->sched,
-                                       sqc->cont,
+    GNUNET_SCHEDULER_add_continuation (sqc->cont,
                                        sqc->cont_cls,
                                        GNUNET_SCHEDULER_REASON_PREREQ_DONE);
   GNUNET_free (sqc);
@@ -1191,7 +1182,7 @@ reconnect (void *cls,
              "Connecting to transport service.\n");
 #endif
   GNUNET_assert (h->client == NULL);
-  h->client = GNUNET_CLIENT_connect (h->sched, "transport", h->cfg);
+  h->client = GNUNET_CLIENT_connect ("transport", h->cfg);
   GNUNET_assert (h->client != NULL);
   /* make sure we don't send "START" twice, remove existing entry from
      queue (if present) */
@@ -1205,7 +1196,7 @@ reconnect (void *cls,
                                       pos);
           if (GNUNET_SCHEDULER_NO_TASK != pos->notify_delay_task)
             {
-              GNUNET_SCHEDULER_cancel (h->sched, pos->notify_delay_task);
+              GNUNET_SCHEDULER_cancel (pos->notify_delay_task);
               pos->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
             }
           GNUNET_free (pos);
@@ -1234,14 +1225,13 @@ schedule_reconnect (struct GNUNET_TRANSPORT_Handle *h)
 #if DEBUG_TRANSPORT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Scheduling task to reconnect to transport service in %llu ms.\n",
-              h->reconnect_delay.value);
+              h->reconnect_delay.rel_value);
 #endif
   GNUNET_assert (h->client == NULL);
   GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
   h->reconnect_task
-    = GNUNET_SCHEDULER_add_delayed (h->sched,
-                                    h->reconnect_delay, &reconnect, h);
-  if (h->reconnect_delay.value == 0)
+    = GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h);
+  if (h->reconnect_delay.rel_value == 0)
     {
       h->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
     }
@@ -1352,7 +1342,6 @@ neighbour_add (struct GNUNET_TRANSPORT_Handle *h,
  * Connect to the transport service.  Note that the connection may
  * complete (or fail) asynchronously.
  *
- * @param sched scheduler to use
  * @param cfg configuration to use
  * @param self our own identity (API should check that it matches
  *             the identity found by transport), or NULL (no check)
@@ -1362,8 +1351,7 @@ neighbour_add (struct GNUNET_TRANSPORT_Handle *h,
  * @param nd function to call on disconnect events
  */
 struct GNUNET_TRANSPORT_Handle *
-GNUNET_TRANSPORT_connect (struct GNUNET_SCHEDULER_Handle *sched,
-                          const struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_TRANSPORT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
                          const struct GNUNET_PeerIdentity *self,
                           void *cls,
                           GNUNET_TRANSPORT_ReceiveCallback rec,
@@ -1378,7 +1366,6 @@ GNUNET_TRANSPORT_connect (struct GNUNET_SCHEDULER_Handle *sched,
       ret->self = *self;
       ret->check_self = GNUNET_YES;
     }
-  ret->sched = sched;
   ret->cfg = cfg;
   ret->cls = cls;
   ret->rec = rec;
@@ -1420,8 +1407,7 @@ GNUNET_TRANSPORT_disconnect (struct GNUNET_TRANSPORT_Handle *handle)
          th = &n->transmit_handle;
          if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
            {
-             GNUNET_SCHEDULER_cancel (handle->sched,
-                                      th->notify_delay_task);
+             GNUNET_SCHEDULER_cancel (th->notify_delay_task);
              th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
            }
          GNUNET_assert (0 == th->notify (th->notify_cls, 0, NULL));
@@ -1453,7 +1439,7 @@ GNUNET_TRANSPORT_disconnect (struct GNUNET_TRANSPORT_Handle *handle)
 #endif
       if (cm->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
         {
-          GNUNET_SCHEDULER_cancel (handle->sched, cm->notify_delay_task);
+          GNUNET_SCHEDULER_cancel (cm->notify_delay_task);
           cm->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
         }
       GNUNET_CONTAINER_DLL_remove (handle->control_head,
@@ -1465,12 +1451,12 @@ GNUNET_TRANSPORT_disconnect (struct GNUNET_TRANSPORT_Handle *handle)
 
   if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
     {
-      GNUNET_SCHEDULER_cancel (handle->sched, handle->reconnect_task);
+      GNUNET_SCHEDULER_cancel (handle->reconnect_task);
       handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
     }
   if (handle->quota_task != GNUNET_SCHEDULER_NO_TASK)
     {
-      GNUNET_SCHEDULER_cancel (handle->sched, handle->quota_task);
+      GNUNET_SCHEDULER_cancel (handle->quota_task);
       handle->quota_task = GNUNET_SCHEDULER_NO_TASK;
     }
   GNUNET_free_non_null (handle->my_hello);
@@ -1797,12 +1783,12 @@ GNUNET_TRANSPORT_notify_transmit_ready (struct GNUNET_TRANSPORT_Handle
       GNUNET_break (0);
       return NULL;
     }
-
+#if DEBUG_TRANSPORT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Asking transport service for transmission of %u bytes to peer `%4s' within %llu ms.\n",
               size, GNUNET_i2s (target),
-             (unsigned long long) timeout.value);
-
+             (unsigned long long) timeout.rel_value);
+#endif
   n = neighbour_find (handle, target);
   if (n == NULL)
     {
@@ -1856,7 +1842,7 @@ GNUNET_TRANSPORT_notify_transmit_ready (struct GNUNET_TRANSPORT_Handle
   th->notify_size = size + sizeof (struct OutboundMessage);
   th->priority = priority;
   th->notify_delay_task
-    = GNUNET_SCHEDULER_add_delayed (handle->sched, timeout,
+    = GNUNET_SCHEDULER_add_delayed (timeout,
                                     &peer_transmit_timeout, th);
   schedule_transmission (handle);
   return th;
@@ -1899,6 +1885,11 @@ GNUNET_TRANSPORT_notify_transmit_ready_cancel (struct
     default:
       GNUNET_break (0);
     }
+  if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
+    {
+      GNUNET_SCHEDULER_cancel (th->notify_delay_task);
+      th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
+    }
 }
 
 
Unnamed repository; edit this file 'description' to name the repository.