From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 28 Oct 2015 10:27:16 +0000 (+0000)
Subject: log rekeying operation, do not log distracting garbage for #4019
X-Git-Tag: initial-import-from-subversion-38251~1181
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=78b3c3c0c977d4686cabfc8291d082e517f66998;p=oweals%2Fgnunet.git

log rekeying operation, do not log distracting garbage for #4019
---

diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c
index 9673782a1..0cf287d24 100644
--- a/src/core/gnunet-service-core_kx.c
+++ b/src/core/gnunet-service-core_kx.c
@@ -1060,22 +1060,9 @@ GSC_KX_handle_ping (struct GSC_KeyExchangeInfo *kx,
               &GSC_my_identity,
               sizeof (struct GNUNET_PeerIdentity)))
   {
-    char sender[5];
-    char peer[5];
-
-    GNUNET_snprintf (sender,
-                     sizeof (sender),
-                     "%4s",
-                     GNUNET_i2s (&kx->peer));
-    GNUNET_snprintf (peer,
-                     sizeof (peer),
-                     "%4s",
-                     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);
+                "Decryption of PING from peer `%s'\n",
+                GNUNET_i2s (sender));
     GNUNET_break_op (0);
     return;
   }
@@ -1719,6 +1706,8 @@ do_rekey (void *cls,
 					     NULL);
   if (NULL != my_ephemeral_key)
     GNUNET_free (my_ephemeral_key);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Rekeying\n");
   my_ephemeral_key = GNUNET_CRYPTO_ecdhe_key_create ();
   GNUNET_assert (NULL != my_ephemeral_key);
   sign_ephemeral_key ();