Fixed reconnect

[oweals/gnunet.git] / src / fs / gnunet-service-fs_pe.c

diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c
index d3ab5026beafe3cb873be21022bab14bed371bcf..1ed7085c40e9d258254f0e81eb0a1417bc7c24ab 100644 (file)
--- a/src/fs/gnunet-service-fs_pe.c
+++ b/src/fs/gnunet-service-fs_pe.c
@@ -31,7 +31,7 @@
 
 
 /**
- * List of GSF_PendingRequests this request plan 
+ * List of GSF_PendingRequests this request plan
  * participates with.
  */
 struct PendingRequestList;
@@ -67,7 +67,7 @@ struct GSF_RequestPlanReference
 
 
 /**
- * List of GSF_PendingRequests this request plan 
+ * List of GSF_PendingRequests this request plan
  * participates with.
  */
 struct PendingRequestList
@@ -228,10 +228,11 @@ plan (struct PeerPlan *pp, struct GSF_RequestPlan *rp)
                          gettext_noop ("# average retransmission delay (ms)"),
                          total_delay * 1000LL / plan_count, GNUNET_NO);
   prd = GSF_pending_request_get_data_ (rp->prl_head->pr);
-  // FIXME: calculate 'rp->priority'!  
+  // FIXME: calculate 'rp->priority'!
   if (rp->transmission_counter < 32)
-    delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
-                                           1LL << rp->transmission_counter);
+    delay =
+        GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
+                                       1LL << rp->transmission_counter);
   else
     delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, UINT_MAX);
   rp->earliest_transmission = GNUNET_TIME_relative_to_absolute (delay);
@@ -246,9 +247,9 @@ plan (struct PeerPlan *pp, struct GSF_RequestPlan *rp)
       == 0)
     rp->hn = GNUNET_CONTAINER_heap_insert (pp->priority_heap, rp, rp->priority);
   else
-    rp->hn = GNUNET_CONTAINER_heap_insert (pp->delay_heap,
-                                           rp,
-                                           rp->earliest_transmission.abs_value);
+    rp->hn =
+        GNUNET_CONTAINER_heap_insert (pp->delay_heap, rp,
+                                      rp->earliest_transmission.abs_value);
   if (GNUNET_SCHEDULER_NO_TASK != pp->task)
     GNUNET_SCHEDULER_cancel (pp->task);
   pp->task = GNUNET_SCHEDULER_add_now (&schedule_peer_transmission, pp);
@@ -371,8 +372,8 @@ schedule_peer_transmission (void *cls,
     if (NULL == rp)
     {
 #if DEBUG_FS
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "No active requests for plan %p.\n", pp);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No active requests for plan %p.\n",
+                  pp);
 #endif
       return;                   /* both queues empty */
     }
@@ -396,11 +397,10 @@ schedule_peer_transmission (void *cls,
 #endif
   GNUNET_assert (NULL != rp);
   msize = GSF_pending_request_get_message_ (get_latest (rp), 0, NULL);
-  pp->pth = GSF_peer_transmit_ (pp->cp,
-                                GNUNET_YES,
-                                rp->priority,
-                                GNUNET_TIME_UNIT_FOREVER_REL,
-                                msize, &transmit_message_callback, pp);
+  pp->pth =
+      GSF_peer_transmit_ (pp->cp, GNUNET_YES, rp->priority,
+                          GNUNET_TIME_UNIT_FOREVER_REL, msize,
+                          &transmit_message_callback, pp);
   GNUNET_assert (NULL != pp->pth);
 }
 
@@ -430,9 +430,8 @@ struct MergeContext
  *         GNUNET_NO if not (merge success)
  */
 static int
-merge_pr (void *cls,
-          struct GNUNET_CONTAINER_HeapNode *node,
-          void *element, GNUNET_CONTAINER_HeapCostType cost)
+merge_pr (void *cls, struct GNUNET_CONTAINER_HeapNode *node, void *element,
+          GNUNET_CONTAINER_HeapCostType cost)
 {
   struct MergeContext *mpr = cls;
   struct GSF_RequestPlan *rp = element;
@@ -455,14 +454,13 @@ merge_pr (void *cls,
   GNUNET_CONTAINER_DLL_insert (prd->rpr_head, prd->rpr_tail, rpr);
   GNUNET_CONTAINER_DLL_insert (rp->prl_head, rp->prl_tail, prl);
   mpr->merged = GNUNET_YES;
-  GNUNET_STATISTICS_update (GSF_stats,
-                            gettext_noop ("# requests merged"), 1, GNUNET_NO);
+  GNUNET_STATISTICS_update (GSF_stats, gettext_noop ("# requests merged"), 1,
+                            GNUNET_NO);
   latest = get_latest (rp);
   if (GSF_pending_request_get_data_ (latest)->ttl.abs_value <
       prd->ttl.abs_value)
   {
-    GNUNET_STATISTICS_update (GSF_stats,
-                              gettext_noop ("# requests refreshed"),
+    GNUNET_STATISTICS_update (GSF_stats, gettext_noop ("# requests refreshed"),
                               1, GNUNET_NO);
     rp->transmission_counter = 0;       /* reset */
   }
@@ -498,9 +496,7 @@ GSF_plan_add_ (struct GSF_ConnectedPeer *cp, struct GSF_PendingRequest *pr)
     pp->delay_heap =
         GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
     pp->cp = cp;
-    GNUNET_CONTAINER_multihashmap_put (plans,
-                                       &id.hashPubKey,
-                                       pp,
+    GNUNET_CONTAINER_multihashmap_put (plans, &id.hashPubKey, pp,
                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
   }
   mpc.merged = GNUNET_NO;
@@ -512,9 +508,8 @@ GSF_plan_add_ (struct GSF_ConnectedPeer *cp, struct GSF_PendingRequest *pr)
   if (mpc.merged != GNUNET_NO)
     return;
   plan_count++;
-  GNUNET_STATISTICS_update (GSF_stats,
-                            gettext_noop ("# query plan entries"),
-                            1, GNUNET_NO);
+  GNUNET_STATISTICS_update (GSF_stats, gettext_noop ("# query plan entries"), 1,
+                            GNUNET_NO);
   prd = GSF_pending_request_get_data_ (pr);
 #if DEBUG_FS
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -538,7 +533,7 @@ GSF_plan_add_ (struct GSF_ConnectedPeer *cp, struct GSF_PendingRequest *pr)
  * Notify the plan about a peer being no longer available;
  * destroy all entries associated with this peer.
  *
- * @param cp connected peer 
+ * @param cp connected peer
  */
 void
 GSF_plan_notify_peer_disconnect_ (const struct GSF_ConnectedPeer *cp)
@@ -554,8 +549,8 @@ GSF_plan_notify_peer_disconnect_ (const struct GSF_ConnectedPeer *cp)
   if (NULL == pp)
     return;                     /* nothing was ever planned for this peer */
   GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multihashmap_remove (plans,
-                                                       &id.hashPubKey, pp));
+                 GNUNET_CONTAINER_multihashmap_remove (plans, &id.hashPubKey,
+                                                       pp));
   if (NULL != pp->pth)
     GSF_peer_transmit_cancel_ (pp->pth);
   if (GNUNET_SCHEDULER_NO_TASK != pp->task)
@@ -588,8 +583,7 @@ GSF_plan_notify_peer_disconnect_ (const struct GSF_ConnectedPeer *cp)
     }
     GNUNET_free (rp);
   }
-  GNUNET_STATISTICS_set (GSF_stats,
-                         gettext_noop ("# query plan entries"),
+  GNUNET_STATISTICS_set (GSF_stats, gettext_noop ("# query plan entries"),
                          plan_count, GNUNET_NO);
 
   GNUNET_CONTAINER_heap_destroy (pp->delay_heap);
@@ -625,8 +619,7 @@ GSF_plan_notify_request_done_ (struct GSF_PendingRequest *pr)
       GNUNET_free (rp);
     }
   }
-  GNUNET_STATISTICS_set (GSF_stats,
-                         gettext_noop ("# query plan entries"),
+  GNUNET_STATISTICS_set (GSF_stats, gettext_noop ("# query plan entries"),
                          plan_count, GNUNET_NO);
 }