[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31690 - gnunet/src/core
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31690 - gnunet/src/core |
Date: |
Sun, 22 Dec 2013 21:09:08 +0100 |
Author: grothoff
Date: 2013-12-22 21:09:08 +0100 (Sun, 22 Dec 2013)
New Revision: 31690
Modified:
gnunet/src/core/gnunet-service-core_kx.c
Log:
-amatus says this happens with just new peers, boo
Modified: gnunet/src/core/gnunet-service-core_kx.c
===================================================================
--- gnunet/src/core/gnunet-service-core_kx.c 2013-12-22 18:08:14 UTC (rev
31689)
+++ gnunet/src/core/gnunet-service-core_kx.c 2013-12-22 20:09:08 UTC (rev
31690)
@@ -941,7 +941,7 @@
}
m = (const struct PingMessage *) msg;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Core service receives PING request from `%4s'.\n",
+ "Core service receives `%s' request from `%4s'.\n", "PING",
GNUNET_i2s (&kx->peer));
derive_iv (&iv, &kx->decrypt_key, m->iv_seed, &GSC_my_identity);
if (GNUNET_OK !=
@@ -953,29 +953,18 @@
return;
}
if (0 !=
- memcmp (&t.target,
- &GSC_my_identity,
- sizeof (struct GNUNET_PeerIdentity)))
+ memcmp (&t.target, &GSC_my_identity, sizeof (struct
GNUNET_PeerIdentity)))
{
- char sender[5];
- char peer[5];
+ char sender[9];
+ char peer[9];
- GNUNET_snprintf (sender,
- sizeof (sender),
- "%4s",
- GNUNET_i2s (&kx->peer));
- GNUNET_snprintf (peer,
- sizeof (peer),
- "%4s",
- GNUNET_i2s (&t.target));
- /* demoted ERROR to 'info' for now, as peers running < 0.10
- might be causing these, and we don't want to confuse users */
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Received PING from `%s' for different identity: I am `%s',
PONG identity: `%s'\n"),
- sender,
- GNUNET_i2s (&GSC_my_identity),
- peer);
- /* GNUNET_break_op (0); */
+ GNUNET_snprintf (sender, sizeof (sender), "%8s", GNUNET_i2s (&kx->peer));
+ GNUNET_snprintf (peer, sizeof (peer), "%8s", GNUNET_i2s (&t.target));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _
+ ("Received PING from `%s' for different identity: I am `%s',
PONG identity: `%s'\n"),
+ sender, GNUNET_i2s (&GSC_my_identity), peer);
+ GNUNET_break_op (0);
return;
}
/* construct PONG */
@@ -993,7 +982,7 @@
GNUNET_STATISTICS_update (GSC_stats, gettext_noop ("# PONG messages
created"),
1, GNUNET_NO);
GSC_NEIGHBOURS_transmit (&kx->peer, &tp.header,
- GNUNET_TIME_UNIT_FOREVER_REL);
+ GNUNET_TIME_UNIT_FOREVER_REL /* FIXME: timeout */ );
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31690 - gnunet/src/core,
gnunet <=