another assertion, possible fix to 1840

2 files changed, 9 insertions, 0 deletions

diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c
index ccc76f765..5cdac7d81 100644
--- a/src/core/gnunet-service-core_clients.c
+++ b/src/core/gnunet-service-core_clients.c
@@ -669,7 +669,12 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client,
   old_match = GSC_TYPEMAP_test_match (tmap_old, client->types, client->tcnt);
   new_match = GSC_TYPEMAP_test_match (tmap_new, client->types, client->tcnt);
   if (old_match == new_match)
+  {
+    GNUNET_assert (old_match ==
+                   GNUNET_CONTAINER_multihashmap_contains (client->connectmap,
+                                                           &neighbour->hashPubKey));
     return; /* no change */
+  }
   if (old_match == GNUNET_NO)
   {
     /* send connect */  
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c
index f159da205..db3bc532b 100644
--- a/src/core/gnunet-service-core_sessions.c
+++ b/src/core/gnunet-service-core_sessions.c
@@ -271,6 +271,10 @@ GSC_SESSIONS_create (const struct GNUNET_PeerIdentity *peer,
                          gettext_noop ("# entries in session map"),
                          GNUNET_CONTAINER_multihashmap_size (sessions), 
                          GNUNET_NO);
+  GSC_CLIENTS_notify_clients_about_neighbour (peer,
+                                              NULL, 0 /* FIXME: ATSI */,
+                                              NULL,
+                                              session->tmap);
 }