[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26548 - in gnunet/src: chat core dht fs include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26548 - in gnunet/src: chat core dht fs include |
Date: |
Thu, 21 Mar 2013 15:43:47 +0100 |
Author: wachs
Date: 2013-03-21 15:43:47 +0100 (Thu, 21 Mar 2013)
New Revision: 26548
Modified:
gnunet/src/chat/gnunet-service-chat.c
gnunet/src/core/core_api.c
gnunet/src/core/core_api_is_connected.c
gnunet/src/core/core_api_iterate_peers.c
gnunet/src/core/gnunet-core.c
gnunet/src/core/test_core_api.c
gnunet/src/core/test_core_api_reliability.c
gnunet/src/core/test_core_api_send_to_self.c
gnunet/src/core/test_core_api_start_only.c
gnunet/src/core/test_core_quota_compliance.c
gnunet/src/dht/gnunet-service-dht_neighbours.c
gnunet/src/fs/gnunet-service-fs.c
gnunet/src/fs/gnunet-service-fs_cp.c
gnunet/src/fs/gnunet-service-fs_cp.h
gnunet/src/include/gnunet_core_service.h
Log:
change to core pai
Modified: gnunet/src/chat/gnunet-service-chat.c
===================================================================
--- gnunet/src/chat/gnunet-service-chat.c 2013-03-21 14:39:23 UTC (rev
26547)
+++ gnunet/src/chat/gnunet-service-chat.c 2013-03-21 14:43:47 UTC (rev
26548)
@@ -979,17 +979,14 @@
* @param cls closure, always NULL
* @param other the other peer involved
* @param message the actual message
- * @param atsi performance information
- * @param atsi_count number of entries in atsi
+
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
*/
static int
handle_p2p_join_notification (void *cls,
const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
const struct P2PJoinNotificationMessage *p2p_jnmsg;
char *room_name;
@@ -1096,17 +1093,13 @@
* @param cls closure, always NULL
* @param other the other peer involved
* @param message the actual message
- * @param atsi performance information
- * @param atsi_count number of entries in atsi
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
*/
static int
handle_p2p_leave_notification (void *cls,
const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
const struct P2PLeaveNotificationMessage *p2p_lnmsg;
struct GNUNET_HashCode id;
@@ -1178,17 +1171,13 @@
* @param cls closure, always NULL
* @param other the other peer involved
* @param message the actual message
- * @param atsi performance information
- * @param atsi_count number of entries in atsi
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
*/
static int
handle_p2p_message_notification (void *cls,
const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
const struct P2PReceiveNotificationMessage *p2p_rnmsg;
struct P2PReceiveNotificationMessage *my_p2p_rnmsg;
@@ -1330,16 +1319,12 @@
* @param cls closure, always NULL
* @param other the other peer involved
* @param message the actual message
- * @param atsi performance information
- * @param atsi_count number of entries in atsi
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
*/
static int
handle_p2p_sync_request (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
struct ChatClient *entry;
struct GNUNET_CORE_TransmitHandle *th;
@@ -1381,9 +1366,7 @@
static int
handle_p2p_confirmation_receipt (void *cls,
const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
const struct P2PConfirmationReceiptMessage *p2p_crmsg;
struct P2PConfirmationReceiptMessage *my_p2p_crmsg;
@@ -1519,13 +1502,9 @@
*
* @param cls closure
* @param peer peer identity this notification is about
- * @param atsi performance data
- * @param atsi_count number of entries in atsi
*/
static void
-peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
{
struct ConnectedPeer *cp;
struct GNUNET_CORE_TransmitHandle *th;
Modified: gnunet/src/core/core_api.c
===================================================================
--- gnunet/src/core/core_api.c 2013-03-21 14:39:23 UTC (rev 26547)
+++ gnunet/src/core/core_api.c 2013-03-21 14:43:47 UTC (rev 26548)
@@ -800,7 +800,7 @@
&h->me.hashPubKey, pr,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
if (NULL != h->connects)
- h->connects (h->cls, &h->me, NULL, 0);
+ h->connects (h->cls, &h->me);
break;
case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT:
if (msize < sizeof (struct ConnectNotifyMessage))
@@ -841,7 +841,7 @@
&cnm->peer.hashPubKey,
pr,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
if (NULL != h->connects)
- h->connects (h->cls, &cnm->peer, NULL, 0);
+ h->connects (h->cls, &cnm->peer);
break;
case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT:
if (msize != sizeof (struct DisconnectNotifyMessage))
@@ -924,14 +924,14 @@
return;
}
if (GNUNET_OK !=
- h->handlers[hpos].callback (h->cls, &ntm->peer, em, NULL,0))
+ h->handlers[hpos].callback (h->cls, &ntm->peer, em))
{
/* error in processing, do not process other messages! */
break;
}
}
if (NULL != h->inbound_notify)
- h->inbound_notify (h->cls, &ntm->peer, em, NULL, 0);
+ h->inbound_notify (h->cls, &ntm->peer, em);
break;
case GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND:
if (msize < sizeof (struct NotifyTrafficMessage))
@@ -966,7 +966,7 @@
GNUNET_break (0);
break;
}
- h->outbound_notify (h->cls, &ntm->peer, em, NULL, 0);
+ h->outbound_notify (h->cls, &ntm->peer, em);
break;
case GNUNET_MESSAGE_TYPE_CORE_SEND_READY:
if (msize != sizeof (struct SendMessageReady))
Modified: gnunet/src/core/core_api_is_connected.c
===================================================================
--- gnunet/src/core/core_api_is_connected.c 2013-03-21 14:39:23 UTC (rev
26547)
+++ gnunet/src/core/core_api_is_connected.c 2013-03-21 14:43:47 UTC (rev
26548)
@@ -83,7 +83,7 @@
if (NULL == msg)
{
/* core died, failure */
- cth->peer_cb (cth->cb_cls, NULL, NULL, 0);
+ cth->peer_cb (cth->cb_cls, NULL);
GNUNET_CORE_is_peer_connected_cancel (cth);
return;
}
@@ -91,7 +91,7 @@
(ntohs (msg->size) == sizeof (struct GNUNET_MessageHeader)))
{
/* end of transmissions */
- cth->peer_cb (cth->cb_cls, NULL, NULL, 0);
+ cth->peer_cb (cth->cb_cls, NULL);
GNUNET_CORE_is_peer_connected_cancel (cth);
return;
}
@@ -101,7 +101,7 @@
(msize < sizeof (struct ConnectNotifyMessage)))
{
GNUNET_break (0);
- cth->peer_cb (cth->cb_cls, NULL, NULL, 0);
+ cth->peer_cb (cth->cb_cls, NULL);
GNUNET_CORE_is_peer_connected_cancel (cth);
return;
}
@@ -109,12 +109,12 @@
if (msize != sizeof (struct ConnectNotifyMessage))
{
GNUNET_break (0);
- cth->peer_cb (cth->cb_cls, NULL, NULL, 0);
+ cth->peer_cb (cth->cb_cls, NULL);
GNUNET_CORE_is_peer_connected_cancel (cth);
return;
}
/* Normal case */
- cth->peer_cb (cth->cb_cls, &connect_message->peer, NULL, 0);
+ cth->peer_cb (cth->cb_cls, &connect_message->peer);
GNUNET_CLIENT_receive (cth->client, &receive_connect_info,
cth, GNUNET_TIME_UNIT_FOREVER_REL);
}
@@ -144,9 +144,7 @@
sizeof (struct GNUNET_PeerIdentity);
if ( (NULL == buf) || (0 == size) )
{
- cth->peer_cb (cth->cb_cls,
- NULL,
- NULL, 0);
+ cth->peer_cb (cth->cb_cls, NULL);
GNUNET_CLIENT_disconnect (cth->client);
GNUNET_free (cth);
return 0;
Modified: gnunet/src/core/core_api_iterate_peers.c
===================================================================
--- gnunet/src/core/core_api_iterate_peers.c 2013-03-21 14:39:23 UTC (rev
26547)
+++ gnunet/src/core/core_api_iterate_peers.c 2013-03-21 14:43:47 UTC (rev
26548)
@@ -78,7 +78,7 @@
(ntohs (msg->size) == sizeof (struct GNUNET_MessageHeader))))
{
if (request_context->peer_cb != NULL)
- request_context->peer_cb (request_context->cb_cls, NULL, NULL, 0);
+ request_context->peer_cb (request_context->cb_cls, NULL);
GNUNET_CLIENT_disconnect (request_context->client);
GNUNET_free (request_context);
return;
@@ -91,7 +91,7 @@
{
GNUNET_break (0);
if (request_context->peer_cb != NULL)
- request_context->peer_cb (request_context->cb_cls, NULL, NULL, 0);
+ request_context->peer_cb (request_context->cb_cls, NULL);
GNUNET_CLIENT_disconnect (request_context->client);
GNUNET_free (request_context);
return;
@@ -101,15 +101,14 @@
{
GNUNET_break (0);
if (request_context->peer_cb != NULL)
- request_context->peer_cb (request_context->cb_cls, NULL, NULL, 0);
+ request_context->peer_cb (request_context->cb_cls, NULL);
GNUNET_CLIENT_disconnect (request_context->client);
GNUNET_free (request_context);
return;
}
/* Normal case */
if (request_context->peer_cb != NULL)
- request_context->peer_cb (request_context->cb_cls, &connect_message->peer,
- NULL , 0);
+ request_context->peer_cb (request_context->cb_cls, &connect_message->peer);
GNUNET_CLIENT_receive (request_context->client, &receive_info,
request_context, GNUNET_TIME_UNIT_FOREVER_REL);
}
Modified: gnunet/src/core/gnunet-core.c
===================================================================
--- gnunet/src/core/gnunet-core.c 2013-03-21 14:39:23 UTC (rev 26547)
+++ gnunet/src/core/gnunet-core.c 2013-03-21 14:43:47 UTC (rev 26548)
@@ -74,9 +74,7 @@
* @param atsi_count number of records in 'atsi'
*/
static void
-connected_peer_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+connected_peer_callback (void *cls, const struct GNUNET_PeerIdentity *peer)
{
struct GNUNET_CRYPTO_HashAsciiEncoded enc;
@@ -102,12 +100,9 @@
*
* @param cls closure
* @param peer the peer that connected
- * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
*/
static void
-monitor_notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+monitor_notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get();
const char *now_str;
Modified: gnunet/src/core/test_core_api.c
===================================================================
--- gnunet/src/core/test_core_api.c 2013-03-21 14:39:23 UTC (rev 26547)
+++ gnunet/src/core/test_core_api.c 2013-03-21 14:43:47 UTC (rev 26548)
@@ -153,9 +153,7 @@
static void
-connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
{
struct PeerContext *pc = cls;
@@ -207,9 +205,7 @@
static int
inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Core provides inbound data from `%4s'.\n", GNUNET_i2s (other));
@@ -219,9 +215,7 @@
static int
outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Core notifies about outbound data for `%4s'.\n",
@@ -233,9 +227,7 @@
static int
process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving message from `%4s'.\n",
GNUNET_i2s (peer));
Modified: gnunet/src/core/test_core_api_reliability.c
===================================================================
--- gnunet/src/core/test_core_api_reliability.c 2013-03-21 14:39:23 UTC (rev
26547)
+++ gnunet/src/core/test_core_api_reliability.c 2013-03-21 14:43:47 UTC (rev
26548)
@@ -231,9 +231,7 @@
static void
-connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
{
struct PeerContext *pc = cls;
@@ -277,9 +275,7 @@
static int
inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Core provides inbound data from `%4s'.\n", GNUNET_i2s (other));
@@ -289,9 +285,7 @@
static int
outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Core notifies about outbound data for `%4s'.\n",
@@ -306,9 +300,7 @@
static int
process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
static int n;
unsigned int s;
Modified: gnunet/src/core/test_core_api_send_to_self.c
===================================================================
--- gnunet/src/core/test_core_api_send_to_self.c 2013-03-21 14:39:23 UTC
(rev 26547)
+++ gnunet/src/core/test_core_api_send_to_self.c 2013-03-21 14:43:47 UTC
(rev 26548)
@@ -71,8 +71,7 @@
static int
receive (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi, unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
if (die_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (die_task);
@@ -120,8 +119,7 @@
static void
-connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *atsi, unsigned int atsi_count)
+connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected to peer %s.\n",
GNUNET_i2s (peer));
Modified: gnunet/src/core/test_core_api_start_only.c
===================================================================
--- gnunet/src/core/test_core_api_start_only.c 2013-03-21 14:39:23 UTC (rev
26547)
+++ gnunet/src/core/test_core_api_start_only.c 2013-03-21 14:43:47 UTC (rev
26548)
@@ -60,9 +60,7 @@
static void
-connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
{
}
@@ -75,9 +73,7 @@
static int
inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
return GNUNET_OK;
}
@@ -85,9 +81,7 @@
static int
outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
return GNUNET_OK;
}
Modified: gnunet/src/core/test_core_quota_compliance.c
===================================================================
--- gnunet/src/core/test_core_quota_compliance.c 2013-03-21 14:39:23 UTC
(rev 26547)
+++ gnunet/src/core/test_core_quota_compliance.c 2013-03-21 14:43:47 UTC
(rev 26548)
@@ -360,9 +360,7 @@
static void
-connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
{
struct PeerContext *pc = cls;
@@ -425,9 +423,7 @@
static int
inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Core provides inbound data from `%4s' %llu.\n",
@@ -439,9 +435,7 @@
static int
outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Core notifies about outbound data for `%4s'.\n",
@@ -455,9 +449,7 @@
static int
process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
static int n;
const struct TestMessage *hdr;
Modified: gnunet/src/dht/gnunet-service-dht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_neighbours.c 2013-03-21 14:39:23 UTC
(rev 26547)
+++ gnunet/src/dht/gnunet-service-dht_neighbours.c 2013-03-21 14:43:47 UTC
(rev 26548)
@@ -626,9 +626,7 @@
* @param atsi_count number of records in 'atsi'
*/
static void
-handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
struct PeerInfo *ret;
int peer_bucket;
@@ -1548,9 +1546,7 @@
*/
static int
handle_dht_p2p_put (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
const struct PeerPutMessage *put;
const struct GNUNET_PeerIdentity *put_path;
@@ -1801,9 +1797,7 @@
*/
static int
handle_dht_p2p_get (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
struct PeerGetMessage *get;
uint32_t xquery_size;
@@ -1943,9 +1937,7 @@
*/
static int
handle_dht_p2p_result (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
const struct PeerResultMessage *prm;
const struct GNUNET_PeerIdentity *put_path;
Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c 2013-03-21 14:39:23 UTC (rev 26547)
+++ gnunet/src/fs/gnunet-service-fs.c 2013-03-21 14:43:47 UTC (rev 26548)
@@ -267,9 +267,7 @@
*/
static int
handle_p2p_put (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
struct GSF_ConnectedPeer *cp;
@@ -280,7 +278,8 @@
return GNUNET_OK;
}
GSF_cover_content_count++;
- update_latencies (atsi, atsi_count);
+ fprintf (stderr, "FIX ATS DATA!\n");
+ update_latencies (NULL, 0);
return GSF_handle_p2p_content_ (cp, message);
}
@@ -349,9 +348,7 @@
*/
static int
handle_p2p_get (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
struct GSF_PendingRequest *pr;
@@ -360,7 +357,8 @@
return GNUNET_SYSERR;
GSF_pending_request_get_data_ (pr)->has_started = GNUNET_YES;
GSF_local_lookup_ (pr, &consider_forwarding, NULL);
- update_latencies (atsi, atsi_count);
+ fprintf (stderr, "FIX ATS DATA!\n");
+ update_latencies (NULL, 0);
return GNUNET_OK;
}
@@ -536,15 +534,14 @@
* @param atsi_count number of records in 'atsi'
*/
static void
-peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
{
struct GSF_ConnectedPeer *cp;
if (0 == memcmp (&my_id, peer, sizeof (struct GNUNET_PeerIdentity)))
return;
- cp = GSF_peer_connect_handler_ (peer, atsi, atsi_count);
+ fprintf (stderr, "FIX ATS DATA!\n");
+ cp = GSF_peer_connect_handler_ (peer, NULL, 0);
if (NULL == cp)
return;
GSF_iterate_pending_requests_ (&consider_peer_for_forwarding, cp);
Modified: gnunet/src/fs/gnunet-service-fs_cp.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_cp.c 2013-03-21 14:39:23 UTC (rev
26547)
+++ gnunet/src/fs/gnunet-service-fs_cp.c 2013-03-21 14:43:47 UTC (rev
26548)
@@ -692,9 +692,7 @@
int
GSF_handle_p2p_migration_stop_ (void *cls,
const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count)
+ const struct GNUNET_MessageHeader *message)
{
struct GSF_ConnectedPeer *cp;
const struct MigrationStopMessage *msm;
@@ -722,7 +720,8 @@
cp->mig_revive_task =
GNUNET_SCHEDULER_add_delayed (bt, &revive_migration, cp);
}
- update_atsi (cp, atsi, atsi_count);
+ fprintf (stderr, "FIX ATS DATA!\n");
+ update_atsi (cp, NULL, 0);
return GNUNET_OK;
}
Modified: gnunet/src/fs/gnunet-service-fs_cp.h
===================================================================
--- gnunet/src/fs/gnunet-service-fs_cp.h 2013-03-21 14:39:23 UTC (rev
26547)
+++ gnunet/src/fs/gnunet-service-fs_cp.h 2013-03-21 14:43:47 UTC (rev
26548)
@@ -302,9 +302,7 @@
int
GSF_handle_p2p_migration_stop_ (void *cls,
const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *atsi,
- unsigned int atsi_count);
+ const struct GNUNET_MessageHeader *message);
/**
Modified: gnunet/src/include/gnunet_core_service.h
===================================================================
--- gnunet/src/include/gnunet_core_service.h 2013-03-21 14:39:23 UTC (rev
26547)
+++ gnunet/src/include/gnunet_core_service.h 2013-03-21 14:43:47 UTC (rev
26548)
@@ -56,15 +56,10 @@
*
* @param cls closure
* @param peer peer identity this notification is about
- * @param atsi performance data for the connection
- * @param atsi_count number of records in 'atsi'
*/
typedef void (*GNUNET_CORE_ConnectEventHandler) (void *cls,
const struct
- GNUNET_PeerIdentity * peer,
- const struct
- GNUNET_ATS_Information * atsi,
- unsigned int atsi_count);
+ GNUNET_PeerIdentity * peer);
/**
@@ -86,8 +81,6 @@
* @param peer the other peer involved (sender or receiver, NULL
* for loopback messages where we are both sender and receiver)
* @param message the actual message
- * @param atsi performance data for the connection
- * @param atsi_count number of records in 'atsi'
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
*/
@@ -95,9 +88,7 @@
const struct GNUNET_PeerIdentity *
other,
const struct GNUNET_MessageHeader *
- message,
- const struct GNUNET_ATS_Information
- * atsi, unsigned int atsi_count);
+ message);
/**
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26548 - in gnunet/src: chat core dht fs include,
gnunet <=