Check that you are not present in trail twice

[oweals/gnunet.git] / src / transport / transport_api.c

diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index fb2623f24846a12958ebc47dc5ea3df15a961641..3c57a83a0f2b5f1854602ac4f3c982a0d7fdd7c0 100644 (file)
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -195,18 +195,36 @@ struct GNUNET_TRANSPORT_TryConnectHandle
    */
   struct GNUNET_TRANSPORT_TryConnectHandle *next;
 
+  /**
+   *
+   */
   struct GNUNET_PeerIdentity pid;
 
+  /**
+   *
+   */
   struct GNUNET_TRANSPORT_Handle *th;
 
+  /**
+   *
+   */
   struct GNUNET_TRANSPORT_TransmitHandle *tth;
 
+  /**
+   *
+   */
   GNUNET_TRANSPORT_TryConnectCallback cb;
 
   /**
    * Closure for @e cb.
    */
   void *cb_cls;
+
+  /**
+   *
+   */
+  int connect;
+
 };
 
 
@@ -225,10 +243,19 @@ struct GNUNET_TRANSPORT_OfferHelloHandle
    */
   struct GNUNET_TRANSPORT_OfferHelloHandle *next;
 
+  /**
+   *
+   */
   struct GNUNET_TRANSPORT_Handle *th;
 
+  /**
+   *
+   */
   struct GNUNET_TRANSPORT_TransmitHandle *tth;
 
+  /**
+   *
+   */
   GNUNET_SCHEDULER_Task cont;
 
   /**
@@ -236,6 +263,9 @@ struct GNUNET_TRANSPORT_OfferHelloHandle
    */
   void *cls;
 
+  /**
+   *
+   */
   struct GNUNET_MessageHeader *msg;
 };
 
@@ -383,7 +413,6 @@ struct GNUNET_TRANSPORT_Handle
 };
 
 
-
 /**
  * Schedule the task to send one message, either from the control
  * list or the peer message queues  to the service.
@@ -520,6 +549,7 @@ neighbour_delete (void *cls,
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_CONTAINER_multipeermap_remove (handle->neighbours, key,
                                                        n));
+  GNUNET_BANDWIDTH_tracker_notification_stop (&n->out_tracker);
   GNUNET_free (n);
   return GNUNET_YES;
 }
@@ -532,7 +562,8 @@ neighbour_delete (void *cls,
  * @param msg message received, NULL on timeout or fatal error
  */
 static void
-demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
+demultiplexer (void *cls,
+               const struct GNUNET_MessageHeader *msg)
 {
   struct GNUNET_TRANSPORT_Handle *h = cls;
   const struct DisconnectInfoMessage *dim;
@@ -1131,7 +1162,6 @@ cancel_control_transmit (struct GNUNET_TRANSPORT_Handle *th,
 }
 
 
-
 /**
  * Send REQUEST_CONNECT message to the service.
  *
@@ -1165,7 +1195,7 @@ send_try_connect (void *cls, size_t size, void *buf)
   GNUNET_assert (size >= sizeof (struct TransportRequestConnectMessage));
   msg.header.size = htons (sizeof (struct TransportRequestConnectMessage));
   msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_CONNECT);
-  msg.reserved = htonl (0);
+  msg.connect = htonl (tch->connect);
   msg.peer = tch->pid;
   memcpy (buf, &msg, sizeof (msg));
   if (NULL != tch->cb)
@@ -1175,6 +1205,7 @@ send_try_connect (void *cls, size_t size, void *buf)
   return sizeof (struct TransportRequestConnectMessage);
 }
 
+
 /**
  * Ask the transport service to establish a connection to
  * the given peer.
@@ -1193,19 +1224,22 @@ GNUNET_TRANSPORT_try_connect (struct GNUNET_TRANSPORT_Handle *handle,
                               GNUNET_TRANSPORT_TryConnectCallback cb,
                               void *cb_cls)
 {
-  struct GNUNET_TRANSPORT_TryConnectHandle *tch = NULL;
+  struct GNUNET_TRANSPORT_TryConnectHandle *tch;
 
   if (NULL == handle->client)
-      return NULL;
+    return NULL;
   tch = GNUNET_new (struct GNUNET_TRANSPORT_TryConnectHandle);
   tch->th = handle;
   tch->pid = *(target);
   tch->cb = cb;
   tch->cb_cls = cb_cls;
+  tch->connect = GNUNET_YES;
   tch->tth = schedule_control_transmit (handle,
                                         sizeof (struct TransportRequestConnectMessage),
                                         &send_try_connect, tch);
-  GNUNET_CONTAINER_DLL_insert(handle->tc_head, handle->tc_tail, tch);
+  GNUNET_CONTAINER_DLL_insert (handle->tc_head,
+                               handle->tc_tail,
+                               tch);
   return tch;
 }
 
@@ -1218,9 +1252,67 @@ GNUNET_TRANSPORT_try_connect (struct GNUNET_TRANSPORT_Handle *handle,
  */
 void
 GNUNET_TRANSPORT_try_connect_cancel (struct GNUNET_TRANSPORT_TryConnectHandle *tch)
+{
+  struct GNUNET_TRANSPORT_Handle *th;
+  GNUNET_assert (GNUNET_YES == tch->connect);
+
+  th = tch->th;
+  cancel_control_transmit (th, tch->tth);
+  GNUNET_CONTAINER_DLL_remove (th->tc_head, th->tc_tail, tch);
+  GNUNET_free (tch);
+}
+
+
+/**
+ * Ask the transport service to shutdown a connection to
+ * the given peer.
+ *
+ * @param handle connection to transport service
+ * @param target who we should try to connect to
+ * @param cb callback to be called when request was transmitted to transport
+ *         service
+ * @param cb_cls closure for the callback @a cb
+ * @return a `struct GNUNET_TRANSPORT_TryConnectHandle` handle or
+ *         NULL on failure (cb will not be called)
+ */
+struct GNUNET_TRANSPORT_TryConnectHandle *
+GNUNET_TRANSPORT_try_disconnect (struct GNUNET_TRANSPORT_Handle *handle,
+                                 const struct GNUNET_PeerIdentity *target,
+                                 GNUNET_TRANSPORT_TryConnectCallback cb,
+                                 void *cb_cls)
+{
+  struct GNUNET_TRANSPORT_TryConnectHandle *tch;
+
+  if (NULL == handle->client)
+    return NULL;
+  tch = GNUNET_new (struct GNUNET_TRANSPORT_TryConnectHandle);
+  tch->th = handle;
+  tch->pid = *(target);
+  tch->cb = cb;
+  tch->cb_cls = cb_cls;
+  tch->connect = GNUNET_NO;
+  tch->tth = schedule_control_transmit (handle,
+                                        sizeof (struct TransportRequestConnectMessage),
+                                        &send_try_connect, tch);
+  GNUNET_CONTAINER_DLL_insert (handle->tc_head,
+                               handle->tc_tail,
+                               tch);
+  return tch;
+}
+
+
+/**
+ * Cancel the request to transport to try a disconnect
+ * Callback will not be called
+ *
+ * @param tch the handle to cancel
+ */
+void
+GNUNET_TRANSPORT_try_disconnect_cancel (struct GNUNET_TRANSPORT_TryConnectHandle *tch)
 {
   struct GNUNET_TRANSPORT_Handle *th;
 
+  GNUNET_assert (GNUNET_NO == tch->connect);
   th = tch->th;
   cancel_control_transmit (th, tch->tth);
   GNUNET_CONTAINER_DLL_remove (th->tc_head, th->tc_tail, tch);