[GNUnet-SVN] r17211 - gnunet/src/topology

[gnunet]

Author: grothoff
Date: 2011-10-05 15:22:58 +0200 (Wed, 05 Oct 2011)
New Revision: 17211

Modified:
   gnunet/src/topology/gnunet-daemon-topology.c
Log:
tell transport to connect, not core

Modified: gnunet/src/topology/gnunet-daemon-topology.c
===================================================================
--- gnunet/src/topology/gnunet-daemon-topology.c        2011-10-05 13:22:54 UTC 
(rev 17210)
+++ gnunet/src/topology/gnunet-daemon-topology.c        2011-10-05 13:22:58 UTC 
(rev 17211)
@@ -89,12 +89,6 @@
   struct GNUNET_CORE_TransmitHandle *hello_req;
 
   /**
-   * Our handle for the request to connect to this peer; NULL if no
-   * such request is pending.
-   */
-  struct GNUNET_CORE_PeerRequestHandle *connect_req;
-
-  /**
    * Pointer to the HELLO message of this peer; can be NULL.
    */
   struct GNUNET_HELLO_Message *hello;
@@ -269,21 +263,6 @@
 
 
 /**
- * Function called by core when our request to connect was transmitted.
- *
- * @param cls the 'struct Peer' for which we issued the connect request
- * @param success was the request transmitted
- */
-static void
-connect_completed_callback (void *cls, int success)
-{
-  struct Peer *pos = cls;
-
-  pos->connect_req = NULL;
-}
-
-
-/**
  * Check if an additional connection from the given peer is allowed.
  *
  * @param peer connection to check
@@ -334,8 +313,6 @@
                 GNUNET_CONTAINER_multihashmap_remove (peers, pid, pos));
   if (pos->hello_req != NULL)
     GNUNET_CORE_notify_transmit_ready_cancel (pos->hello_req);
-  if (pos->connect_req != NULL)
-    GNUNET_CORE_peer_request_connect_cancel (pos->connect_req);
   if (pos->hello_delay_task != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (pos->hello_delay_task);
   if (pos->greylist_clean_task != GNUNET_SCHEDULER_NO_TASK)
@@ -399,11 +376,9 @@
               GNUNET_i2s (&pos->pid));
 #endif
   GNUNET_STATISTICS_update (stats,
-                            gettext_noop ("# connect requests issued to core"),
+                            gettext_noop ("# connect requests issued to 
transport"),
                             1, GNUNET_NO);
-  pos->connect_req =
-      GNUNET_CORE_peer_request_connect (handle, &pos->pid,
-                                        &connect_completed_callback, pos);
+  GNUNET_TRANSPORT_try_connect (transport, &pos->pid);
 }