[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21269 - gnunet/src/peerinfo
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21269 - gnunet/src/peerinfo |
Date: |
Fri, 4 May 2012 14:41:19 +0200 |
Author: grothoff
Date: 2012-05-04 14:41:19 +0200 (Fri, 04 May 2012)
New Revision: 21269
Modified:
gnunet/src/peerinfo/peerinfo_api.c
Log:
-fixing #1969
Modified: gnunet/src/peerinfo/peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/peerinfo_api.c 2012-05-04 12:26:15 UTC (rev 21268)
+++ gnunet/src/peerinfo/peerinfo_api.c 2012-05-04 12:41:19 UTC (rev 21269)
@@ -481,8 +481,8 @@
static void
peerinfo_handler (void *cls, const struct GNUNET_MessageHeader *msg)
{
- struct GNUNET_PEERINFO_IteratorContext *ic = cls;
- struct GNUNET_PEERINFO_Handle *h = ic->h;
+ struct GNUNET_PEERINFO_Handle *h = cls;
+ struct GNUNET_PEERINFO_IteratorContext *ic = h->ic_head;
const struct InfoMessage *im;
const struct GNUNET_HELLO_Message *hello;
GNUNET_PEERINFO_Processor cb;
@@ -534,6 +534,11 @@
(0 != memcmp (&ic->peer, &im->peer, sizeof (struct
GNUNET_PeerIdentity))) )
{
/* bogus message (from a different iteration call?); out of sequence! */
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Received HELLO for peer `%s', expected peer `%s'\n",
+ GNUNET_h2s (&im->peer.hashPubKey),
+ GNUNET_i2s (&ic->peer));
+
GNUNET_break (0);
GNUNET_PEERINFO_iterate_cancel (ic);
reconnect (h);
@@ -627,7 +632,7 @@
if (GNUNET_NO == h->in_receive)
{
h->in_receive = GNUNET_YES;
- GNUNET_CLIENT_receive (h->client, &peerinfo_handler, ic,
+ GNUNET_CLIENT_receive (h->client, &peerinfo_handler, h,
GNUNET_TIME_absolute_get_remaining (ic->timeout));
}
}
@@ -721,10 +726,10 @@
GNUNET_SCHEDULER_add_delayed (timeout, &signal_timeout, ic);
ac->cont = &iterator_start_receive;
ac->cont_cls = ic;
- GNUNET_CONTAINER_DLL_insert_after (h->ac_head, h->ac_tail, h->ac_tail, ac);
- GNUNET_CONTAINER_DLL_insert (h->ic_head,
- h->ic_tail,
- ic);
+ GNUNET_CONTAINER_DLL_insert_tail (h->ac_head, h->ac_tail, ac);
+ GNUNET_CONTAINER_DLL_insert_tail (h->ic_head,
+ h->ic_tail,
+ ic);
trigger_transmit (h);
return ic;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21269 - gnunet/src/peerinfo,
gnunet <=