aboutsummaryrefslogtreecommitdiff
path: root/src/core/core_api.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-06-05 13:26:22 +0000
committerChristian Grothoff <christian@grothoff.org>2011-06-05 13:26:22 +0000
commitab1bf63f1ed7637297c90b5b284f40a797f44805 (patch)
tree64bedd1cc5620f690d6ad099c2fb4b45a9a41f03 /src/core/core_api.c
parent446dcf7697ebdd7c78a48573a5c73fbf25448c74 (diff)
downloadgnunet-ab1bf63f1ed7637297c90b5b284f40a797f44805.tar.gz
gnunet-ab1bf63f1ed7637297c90b5b284f40a797f44805.zip
use new transport API, minor core API change
Diffstat (limited to 'src/core/core_api.c')
-rw-r--r--src/core/core_api.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/core_api.c b/src/core/core_api.c
index f66eb6d2f..55b693cd1 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -1783,7 +1783,6 @@ peer_request_connect_cont (void *cls,
1783 * be called with the TIMEOUT reason code. 1783 * be called with the TIMEOUT reason code.
1784 * 1784 *
1785 * @param h core handle 1785 * @param h core handle
1786 * @param timeout how long to try to talk to core
1787 * @param peer who should we connect to 1786 * @param peer who should we connect to
1788 * @param cont function to call once the request has been completed (or timed out) 1787 * @param cont function to call once the request has been completed (or timed out)
1789 * @param cont_cls closure for cont 1788 * @param cont_cls closure for cont
@@ -1793,7 +1792,6 @@ peer_request_connect_cont (void *cls,
1793 */ 1792 */
1794struct GNUNET_CORE_PeerRequestHandle * 1793struct GNUNET_CORE_PeerRequestHandle *
1795GNUNET_CORE_peer_request_connect (struct GNUNET_CORE_Handle *h, 1794GNUNET_CORE_peer_request_connect (struct GNUNET_CORE_Handle *h,
1796 struct GNUNET_TIME_Relative timeout,
1797 const struct GNUNET_PeerIdentity * peer, 1795 const struct GNUNET_PeerIdentity * peer,
1798 GNUNET_CORE_ControlContinuation cont, 1796 GNUNET_CORE_ControlContinuation cont,
1799 void *cont_cls) 1797 void *cont_cls)
@@ -1803,7 +1801,7 @@ GNUNET_CORE_peer_request_connect (struct GNUNET_CORE_Handle *h,
1803 struct ConnectMessage *msg; 1801 struct ConnectMessage *msg;
1804 1802
1805 if (NULL != GNUNET_CONTAINER_multihashmap_get (h->peers, 1803 if (NULL != GNUNET_CONTAINER_multihashmap_get (h->peers,
1806 &peer->hashPubKey)) 1804 &peer->hashPubKey))
1807 { 1805 {
1808#if DEBUG_CORE 1806#if DEBUG_CORE
1809 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, 1807 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
@@ -1818,7 +1816,6 @@ GNUNET_CORE_peer_request_connect (struct GNUNET_CORE_Handle *h,
1818 msg->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_REQUEST_CONNECT); 1816 msg->header.type = htons (GNUNET_MESSAGE_TYPE_CORE_REQUEST_CONNECT);
1819 msg->header.size = htons (sizeof (struct ConnectMessage)); 1817 msg->header.size = htons (sizeof (struct ConnectMessage));
1820 msg->reserved = htonl (0); 1818 msg->reserved = htonl (0);
1821 msg->timeout = GNUNET_TIME_relative_hton (timeout);
1822 msg->peer = *peer; 1819 msg->peer = *peer;
1823 GNUNET_CONTAINER_DLL_insert_tail (h->control_pending_head, 1820 GNUNET_CONTAINER_DLL_insert_tail (h->control_pending_head,
1824 h->control_pending_tail, 1821 h->control_pending_tail,