- fixes

2 files changed, 66 insertions, 26 deletions

diff --git a/src/testbed/gnunet-service-testbed_hc.c b/src/testbed/gnunet-service-testbed_hc.c
index 2f3586c45..7ca276589 100644
--- a/src/testbed/gnunet-service-testbed_hc.c
+++ b/src/testbed/gnunet-service-testbed_hc.c
@@ -26,37 +26,17 @@
 
 #include "gnunet-service-testbed.h"
 
-
+/**
+ * Redefine LOG with a changed log component string
+ */
 #ifdef LOG
 #undef LOG
 #endif
-
 #define LOG(kind,...)                                   \
   GNUNET_log_from (kind, "testbed-cache", __VA_ARGS__)
 
 
-enum CacheGetType
-{    
-  CGT_TRANSPORT_HANDLE = 1
-};
-
-
-struct GSTCacheGetHandle
-{
-  struct GSTCacheGetHandle *next;
-
-  struct GSTCacheGetHandle *prev;
-
-  struct CacheEntry *entry;
-  
-  GST_cache_callback cb;
-   
-  void *cb_cls;
-
-  enum CacheGetType type;
-
-  int notify_called;
-};
+struct GSTCacheGetHandle;
 
 
 /**
@@ -90,6 +70,37 @@ struct ConnectNotifyContext
    * The closure for the notify callback
    */
   void *cb_cls;
+
+  /**
+   * The GSTCacheGetHandle reposible for creating this context
+   */
+  struct GSTCacheGetHandle *cgh;
+};
+
+
+enum CacheGetType
+{    
+  CGT_TRANSPORT_HANDLE = 1
+};
+
+
+struct GSTCacheGetHandle
+{
+  struct GSTCacheGetHandle *next;
+
+  struct GSTCacheGetHandle *prev;
+
+  struct CacheEntry *entry;
+  
+  GST_cache_callback cb;
+   
+  void *cb_cls;
+
+  struct ConnectNotifyContext *nctxt;
+
+  enum CacheGetType type;
+
+  int notify_called;
 };
 
 /**
@@ -325,7 +336,8 @@ peer_connect_notify_cb (void *cls,
   GST_cache_peer_connect_notify cb;
   void *cb_cls;
 
-  while (NULL != (ctxt = entry->nctxt_qhead))
+  
+  for (ctxt=entry->nctxt_qhead; NULL != ctxt; ctxt=ctxt->next)
   {
     if (0 == memcmp (ctxt->target, peer, sizeof (struct GNUNET_PeerIdentity)))
       break;
@@ -334,6 +346,8 @@ peer_connect_notify_cb (void *cls,
     return;
   cb = ctxt->cb;
   cb_cls = ctxt->cb_cls;
+  GNUNET_assert (NULL != ctxt->cgh);
+  ctxt->cgh->nctxt = NULL;
   GNUNET_CONTAINER_DLL_remove (entry->nctxt_qhead, entry->nctxt_qtail, ctxt);
   GNUNET_free (ctxt);
   cb (cb_cls, peer);
@@ -426,6 +440,9 @@ cache_get_handle (unsigned int peer_id,
     ctxt->target = target;
     ctxt->cb = connect_notify_cb;
     ctxt->cb_cls = connect_notify_cb_cls;
+    GNUNET_assert (NULL == cgh->nctxt);
+    cgh->nctxt = ctxt;
+    ctxt->cgh = cgh;
     GNUNET_CONTAINER_DLL_insert_tail (entry->nctxt_qhead, entry->nctxt_qtail, ctxt);
   }
   if ((NULL != entry->transport_handle) || (NULL != entry->transport_op))
@@ -534,6 +551,13 @@ GST_cache_get_handle_done (struct GSTCacheGetHandle *cgh)
     entry->notify_task = GNUNET_SCHEDULER_NO_TASK;
   }
   GNUNET_CONTAINER_DLL_remove (entry->cgh_qhead, entry->cgh_qtail, cgh);
+  if (NULL != cgh->nctxt)
+  {
+    GNUNET_assert (cgh == cgh->nctxt->cgh);
+    GNUNET_CONTAINER_DLL_remove (entry->nctxt_qhead, entry->nctxt_qtail, cgh->nctxt);
+    GNUNET_free (cgh->nctxt);
+  }
+  
   if (0 == entry->demand)
   {
     GNUNET_CONTAINER_DLL_insert_tail (lru_cache_head, lru_cache_tail, entry);
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c
index 623b7614b..1148bb8ac 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -25,7 +25,15 @@
  */
 
 #include "gnunet-service-testbed.h"
-#include "testbed_api_operations.h"
+
+/**
+ * Redefine LOG with a changed log component string
+ */
+#ifdef LOG
+#undef LOG
+#endif
+#define LOG(kind,...)                                   \
+  GNUNET_log_from (kind, "testbed-OC", __VA_ARGS__)
 
 
 /**
@@ -1468,6 +1476,14 @@ rocc_cache_get_handle_transport_cb (void *cls, struct GNUNET_CORE_Handle *ch,
   }
   rocc->tcc.th_ = th;
   rocc->tcc.pid = &rocc->a_id;
+  if (GNUNET_YES == GNUNET_TRANSPORT_check_neighbour_connected (rocc->tcc.th_,
+                                                                rocc->tcc.pid))
+  {
+    LOG_DEBUG ("0x%llx: Target peer %4s already connected to local peer: %u\n",
+               rocc->op_id, GNUNET_i2s (&rocc->a_id), rocc->peer->id);
+    cleanup_rocc (rocc);
+    return;
+  }
   rocc->attempt_connect_task_id =
       GNUNET_SCHEDULER_add_now (&attempt_connect_task, rocc);  
 }