reduce messages in initial KX

3 files changed, 17 insertions, 3 deletions

diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c
index 07f51cb49..d5e8a20d4 100644
--- a/src/core/gnunet-service-core_kx.c
+++ b/src/core/gnunet-service-core_kx.c
@@ -671,8 +671,15 @@ GSC_KX_start (const struct GNUNET_PeerIdentity *pid)
   GNUNET_CONTAINER_DLL_insert (kx_head,
                                kx_tail,
                                kx);
-  kx->status = KX_STATE_KEY_SENT;
-  send_key (kx);
+  if (0 < GNUNET_CRYPTO_hash_cmp (&pid->hashPubKey,
+                                  &GSC_my_identity.hashPubKey))
+  {
+    /* peer with "lower" identity starts KX, otherwise we typically end up
+       with both peers starting the exchange and transmit the 'set key' 
+       message twice */
+    kx->status = KX_STATE_KEY_SENT;
+    send_key (kx);
+  }
   return kx;
 }
 
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c
index bea4aad56..7316f4b25 100644
--- a/src/core/gnunet-service-core_sessions.c
+++ b/src/core/gnunet-service-core_sessions.c
@@ -37,6 +37,11 @@
  */
 #define TYPEMAP_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
 
+/**
+ * How often do we transmit our typemap on first attempt?
+ */
+#define TYPEMAP_FREQUENCY_FIRST GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+
 
 /**
  * Message ready for encryption.  This struct is followed by the
@@ -227,7 +232,7 @@ transmit_typemap_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   if (0 == session->first_typemap)
   {
-    delay = GNUNET_TIME_UNIT_ZERO;
+    delay = TYPEMAP_FREQUENCY_FIRST;
     session->first_typemap = 1;
   }
   else
diff --git a/src/core/gnunet-service-core_typemap.c b/src/core/gnunet-service-core_typemap.c
index d2dab5d99..627363b34 100644
--- a/src/core/gnunet-service-core_typemap.c
+++ b/src/core/gnunet-service-core_typemap.c
@@ -146,6 +146,8 @@ broadcast_my_type_map ()
 {
   struct GNUNET_MessageHeader *hdr;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "broadcasting typemap\n");
   hdr = GSC_TYPEMAP_compute_type_map_message ();
   GNUNET_STATISTICS_update (GSC_stats,
                             gettext_noop ("# updates to my type map"), 1,