[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36001 - gnunet/src/cadet
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36001 - gnunet/src/cadet |
Date: |
Fri, 26 Jun 2015 12:07:08 +0200 |
Author: bartpolot
Date: 2015-06-26 12:07:07 +0200 (Fri, 26 Jun 2015)
New Revision: 36001
Modified:
gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- don't log old mesh versions as errors
Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c 2015-06-26 10:07:06 UTC
(rev 36000)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c 2015-06-26 10:07:07 UTC
(rev 36001)
@@ -773,17 +773,35 @@
{
/* Check message size */
if (ntohs (msg->header.size) != sizeof (struct GNUNET_CADET_KX_Ephemeral))
+ {
+ /* This is probably an old "MESH" version. */
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "Expected ephemeral of size %u, got %u\n",
+ sizeof (struct GNUNET_CADET_KX_Ephemeral),
+ ntohs (msg->header.size));
return GNUNET_SYSERR;
+ }
/* Check signature size */
if (ntohl (msg->purpose.size) != ephemeral_purpose_size ())
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Expected signature purpose of size %u, got %u\n",
+ ephemeral_purpose_size (),
+ ntohs (msg->purpose.size));
return GNUNET_SYSERR;
+ }
/* Check origin */
if (0 != memcmp (&msg->origin_identity,
GCP_get_id (t->peer),
sizeof (struct GNUNET_PeerIdentity)))
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Unexpected origin, got %s\n",
+ GNUNET_i2s (&msg->origin_identity));
return GNUNET_SYSERR;
+ }
/* Check signature */
if (GNUNET_OK !=
@@ -791,7 +809,10 @@
&msg->purpose,
&msg->signature,
&msg->origin_identity.public_key))
+ {
+ LOG (GNUNET_ERROR_TYPE_WARNING, "Signature invalid\n");
return GNUNET_SYSERR;
+ }
return GNUNET_OK;
}
@@ -2711,11 +2732,9 @@
{
LOG (GNUNET_ERROR_TYPE_INFO, "<=== EPHM for %s\n", GCT_2s (t));
+ /* Some old versions are still around, don't log as error. */
if (GNUNET_OK != check_ephemeral (t, msg))
- {
- GNUNET_break_op (0);
return;
- }
/* If we get a proper OTR-style ephemeral, fallback to old crypto. */
if (NULL != t->ax)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36001 - gnunet/src/cadet,
gnunet <=