[GNUnet-SVN] r17688 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2011-10-23 16:15:52 +0200 (Sun, 23 Oct 2011)
New Revision: 17688

Modified:
   gnunet/src/core/gnunet-service-core_clients.c
   gnunet/src/core/gnunet-service-core_sessions.c
Log:
another assertion, possible fix to 1840

Modified: gnunet/src/core/gnunet-service-core_clients.c
===================================================================
--- gnunet/src/core/gnunet-service-core_clients.c       2011-10-23 14:02:52 UTC 
(rev 17687)
+++ gnunet/src/core/gnunet-service-core_clients.c       2011-10-23 14:15:52 UTC 
(rev 17688)
@@ -669,7 +669,12 @@
   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 */  

Modified: gnunet/src/core/gnunet-service-core_sessions.c
===================================================================
--- gnunet/src/core/gnunet-service-core_sessions.c      2011-10-23 14:02:52 UTC 
(rev 17687)
+++ gnunet/src/core/gnunet-service-core_sessions.c      2011-10-23 14:15:52 UTC 
(rev 17688)
@@ -271,6 +271,10 @@
                         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);
 }