X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcore_api.c;h=e9a38271bf317cce14072f629e842e521ca4fa6d;hb=9706e822ff61a85bf2353d2c233eb766ffc13323;hp=d2308d8455a383e73b555f0571e405a3a903e8d0;hpb=6dbfbce235dfce58ba33f6a3849dcf908178fd58;p=oweals%2Fgnunet.git

diff --git a/src/core/core_api.c b/src/core/core_api.c
index d2308d845..e9a38271b 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -129,12 +129,10 @@ struct ControlMessage
   struct ControlMessage *prev;
 
   /**
-   * Function to run after successful transmission (or call with
-   * reason 'TIMEOUT' on error); called with scheduler context 'NULL'
-   * on disconnect.
+   * Function to run after transmission failed/succeeded.
    */
-  GNUNET_SCHEDULER_Task cont;
-
+  GNUNET_CORE_ControlContinuation cont;
+  
   /**
    * Closure for 'cont'.
    */
@@ -462,17 +460,7 @@ reconnect_later (struct GNUNET_CORE_Handle *h)
   struct ControlMessage *cm;
   struct PeerRecord *pr;
 
-  while (NULL != (cm = h->control_pending_head))
-    {
-      GNUNET_CONTAINER_DLL_remove (h->control_pending_head,
-				   h->control_pending_tail,
-				   cm);
-      if (cm->th != NULL)
-	cm->th->cm = NULL; 
-      if (cm->cont != NULL)
-	cm->cont (cm->cont_cls, NULL);
-      GNUNET_free (cm);
-    }
+  GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
   if (h->client != NULL)
     {
       GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
@@ -486,15 +474,24 @@ reconnect_later (struct GNUNET_CORE_Handle *h)
     GNUNET_CONTAINER_DLL_remove (h->ready_peer_head,
 				 h->ready_peer_tail,
 				 pr);
-  
-  GNUNET_assert (h->control_pending_head == NULL);
   h->currently_down = GNUNET_YES;
-  GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
-  h->retry_backoff = GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS,
-					       h->retry_backoff);
   h->reconnect_task = GNUNET_SCHEDULER_add_delayed (h->retry_backoff,
 						    &reconnect_task,
 						    h);
+  while (NULL != (cm = h->control_pending_head))
+    {
+      GNUNET_CONTAINER_DLL_remove (h->control_pending_head,
+				   h->control_pending_tail,
+				   cm);
+      if (cm->th != NULL)
+	cm->th->cm = NULL; 
+      if (cm->cont != NULL)
+	cm->cont (cm->cont_cls, GNUNET_NO);
+      GNUNET_free (cm);
+    }
+  GNUNET_assert (h->control_pending_head == NULL);
+  h->retry_backoff = GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS,
+					       h->retry_backoff);
   h->retry_backoff = GNUNET_TIME_relative_multiply (h->retry_backoff, 2);
 }
 
@@ -547,6 +544,8 @@ request_next_transmission (struct PeerRecord *pr)
       trigger_next_request (h, GNUNET_NO);
       return;
     }
+  if (th->cm != NULL)
+    return; /* already done */
   GNUNET_assert (pr->prev == NULL);
   GNUNET_assert (pr->next == NULL);
   pr->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (th->timeout),
@@ -636,6 +635,7 @@ transmit_message (void *cls,
   uint16_t msize;
   size_t ret;
 
+  GNUNET_assert (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
   h->cth = NULL;
   if (buf == NULL)
     {
@@ -669,9 +669,7 @@ transmit_message (void *cls,
       if (cm->th != NULL)
 	cm->th->cm = NULL;
       if (NULL != cm->cont)
-	GNUNET_SCHEDULER_add_continuation (cm->cont, 
-					   cm->cont_cls,
-					   GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+	cm->cont (cm->cont_cls, GNUNET_OK);
       GNUNET_free (cm);
       trigger_next_request (h, GNUNET_NO);
       return msize;
@@ -923,7 +921,7 @@ main_notify_handler (void *cls,
 		       &cnm->peer,
 		       sizeof (struct GNUNET_PeerIdentity)))
 	{
-	  /* disconnect from self!? */
+	  /* connect to self!? */
 	  GNUNET_break (0);
 	  return;
 	}
@@ -989,7 +987,6 @@ main_notify_handler (void *cls,
       if (NULL == h->status_events)
         {
           GNUNET_break (0);
-          break;
         }
       if (msize < sizeof (struct PeerStatusNotifyMessage))
         {
@@ -1042,14 +1039,7 @@ main_notify_handler (void *cls,
 	  return;
         }
       ntm = (const struct NotifyTrafficMessage *) msg;
-      if (0 == memcmp (&h->me,
-		       &ntm->peer,
-		       sizeof (struct GNUNET_PeerIdentity)))
-	{
-	  /* self-change!? */
-	  GNUNET_break (0);
-	  return;
-	}
+
       ats_count = ntohl (ntm->ats_count);
       if ( (msize < sizeof (struct NotifyTrafficMessage) + ats_count * sizeof (struct GNUNET_TRANSPORT_ATS_Information)
 	    + sizeof (struct GNUNET_MessageHeader)) ||
@@ -1241,7 +1231,13 @@ main_notify_handler (void *cls,
 	  return;
 	}
       if (pr->rim_id != ntohl (cim->rim_id))
-	break;
+	{
+#if DEBUG_CORE
+	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		      "Reservation ID mismatch in notification...\n");
+#endif
+	  break;
+	}
       pcic = pr->pcic;
       pr->pcic = NULL;
       if (pcic != NULL)
@@ -1266,23 +1262,24 @@ main_notify_handler (void *cls,
  * Starts our 'receive' loop.
  *
  * @param cls the 'struct GNUNET_CORE_Handle'
- * @param tc task context
+ * @param success were we successful
  */
 static void
 init_done_task (void *cls, 
-		const struct GNUNET_SCHEDULER_TaskContext *tc)
+		int success)
 {
   struct GNUNET_CORE_Handle *h = cls;
 
-  if (tc == NULL)
-    return; /* error */
-  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+  if (success == GNUNET_SYSERR)
+    return; /* shutdown */
+  if (success == GNUNET_NO)
     {
 #if DEBUG_CORE
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 		  "Failed to exchange INIT with core, retrying\n");
 #endif
-      reconnect_later (h);
+      if (h->reconnect_task == GNUNET_SCHEDULER_NO_TASK)
+	reconnect_later (h);
       return;
     }
   GNUNET_CLIENT_receive (h->client,
@@ -1454,11 +1451,6 @@ GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle)
       GNUNET_CLIENT_disconnect (handle->client, GNUNET_NO);
       handle->client = NULL;
     }
-  if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (handle->reconnect_task);
-      handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
-    }
   while (NULL != (cm = handle->control_pending_head))
     {
       GNUNET_CONTAINER_DLL_remove (handle->control_pending_head,
@@ -1467,9 +1459,14 @@ GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle)
       if (cm->th != NULL)
 	cm->th->cm = NULL;
       if (cm->cont != NULL)
-	cm->cont (cm->cont_cls, NULL);
+	cm->cont (cm->cont_cls, GNUNET_SYSERR);
       GNUNET_free (cm);
     }
+  if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
+    {
+      GNUNET_SCHEDULER_cancel (handle->reconnect_task);
+      handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+    }
   GNUNET_CONTAINER_multihashmap_iterate (handle->peers,
 					 &disconnect_and_free_peer_entry,
 					 handle);
@@ -1481,9 +1478,9 @@ GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle)
 
 /**
  * Ask the core to call "notify" once it is ready to transmit the
- * given number of bytes to the specified "target".  If we are not yet
- * connected to the specified peer, a call to this function will cause
- * us to try to establish a connection.
+ * given number of bytes to the specified "target".    Must only be
+ * called after a connection to the respective peer has been
+ * established (and the client has been informed about this).
  *
  * @param handle connection to core service
  * @param priority how important is the message?
@@ -1527,6 +1524,7 @@ GNUNET_CORE_notify_transmit_ready (struct GNUNET_CORE_Handle *handle,
                  GNUNET_SERVER_MAX_MESSAGE_SIZE);
   th = GNUNET_malloc (sizeof (struct GNUNET_CORE_TransmitHandle));
   th->peer = pr;
+  GNUNET_assert(NULL != notify);
   th->get_message = notify;
   th->get_message_cls = notify_cls;
   th->timeout = GNUNET_TIME_relative_to_absolute (maxdelay);
@@ -1672,7 +1670,7 @@ struct GNUNET_CORE_PeerRequestHandle
   /**
    * Continuation to run when done.
    */
-  GNUNET_SCHEDULER_Task cont;
+  GNUNET_CORE_ControlContinuation cont;
 
   /**
    * Closure for 'cont'.
@@ -1688,22 +1686,16 @@ struct GNUNET_CORE_PeerRequestHandle
  * resources.
  *
  * @param cls the 'struct GNUNET_CORE_PeerRequestHandle'
- * @param tc scheduler context
+ * @param success was the request transmitted?
  */
 static void
 peer_request_connect_cont (void *cls,
-			   const struct GNUNET_SCHEDULER_TaskContext *tc)
+			   int success)
 {
   struct GNUNET_CORE_PeerRequestHandle *ret = cls;
   
   if (ret->cont != NULL)
-    {
-      if (tc == NULL)
-	GNUNET_SCHEDULER_add_now (ret->cont,
-				  ret->cont_cls);
-      else
-	ret->cont (ret->cont_cls, tc);
-    }
+    ret->cont (ret->cont_cls, success);    
   GNUNET_free (ret);
 }
 
@@ -1724,18 +1716,25 @@ peer_request_connect_cont (void *cls,
  * @param peer who should we connect to
  * @param cont function to call once the request has been completed (or timed out)
  * @param cont_cls closure for cont
- * @return NULL on error (cont will not be called), otherwise handle for cancellation
+ *
+ * @return NULL on error or already connected,
+ *         otherwise handle for cancellation
  */
 struct GNUNET_CORE_PeerRequestHandle *
 GNUNET_CORE_peer_request_connect (struct GNUNET_CORE_Handle *h,
 				  struct GNUNET_TIME_Relative timeout,
 				  const struct GNUNET_PeerIdentity * peer,
-				  GNUNET_SCHEDULER_Task cont,
+				  GNUNET_CORE_ControlContinuation cont,
 				  void *cont_cls)
 {
   struct GNUNET_CORE_PeerRequestHandle *ret;
   struct ControlMessage *cm;
   struct ConnectMessage *msg;
+
+  if (NULL != GNUNET_CONTAINER_multihashmap_get (h->peers,
+                                          &peer->hashPubKey))
+    return NULL; /* Already connected, means callback should have happened already! */
+
   
   cm = GNUNET_malloc (sizeof (struct ControlMessage) + 
 		      sizeof (struct ConnectMessage));
@@ -1822,11 +1821,11 @@ struct GNUNET_CORE_InformationRequestContext
  * CM was sent, remove link so we don't double-free.
  *
  * @param cls the 'struct GNUNET_CORE_InformationRequestContext'
- * @param tc scheduler context
+ * @param success were we successful?
  */
 static void
 change_preference_send_continuation (void *cls,
-				     const struct GNUNET_SCHEDULER_TaskContext *tc)
+				     int success)
 {
   struct GNUNET_CORE_InformationRequestContext *irc = cls;