[GNUnet-SVN] r31355 - gnunet/src/dv

[gnunet]

Author: grothoff
Date: 2013-12-13 13:52:22 +0100 (Fri, 13 Dec 2013)
New Revision: 31355

Modified:
   gnunet/src/dv/gnunet-service-dv.c
   gnunet/src/dv/plugin_transport_dv.c
Log:
-adding a few more assertions to debug #3191

Modified: gnunet/src/dv/gnunet-service-dv.c
===================================================================
--- gnunet/src/dv/gnunet-service-dv.c   2013-12-13 12:49:15 UTC (rev 31354)
+++ gnunet/src/dv/gnunet-service-dv.c   2013-12-13 12:52:22 UTC (rev 31355)
@@ -521,6 +521,7 @@
 {
   struct GNUNET_DV_DistanceUpdateMessage du_msg;
 
+  GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != network);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Delivering DISTANCE_CHANGED for message about peer `%s'\n",
               GNUNET_i2s (peer));
@@ -969,6 +970,7 @@
                                                peer);
   if (NULL != neighbor)
   {
+    GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != neighbor->network);
     GNUNET_break (GNUNET_YES != neighbor->connected);
     neighbor->connected = GNUNET_YES;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1295,14 +1297,13 @@
     return;
   distance = get_atsi_distance (ats, ats_count);
   network = get_atsi_network (ats, ats_count);
-
+  GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != network);
   /* check if entry exists */
   neighbor = GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
                                                &address->peer);
   if (NULL != neighbor)
   {
-    if (GNUNET_ATS_NET_UNSPECIFIED != network)
-      neighbor->network = network;
+    neighbor->network = network;
     if (neighbor->distance == distance)
       return; /* nothing new to see here, move along */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

Modified: gnunet/src/dv/plugin_transport_dv.c
===================================================================
--- gnunet/src/dv/plugin_transport_dv.c 2013-12-13 12:49:15 UTC (rev 31354)
+++ gnunet/src/dv/plugin_transport_dv.c 2013-12-13 12:52:22 UTC (rev 31355)
@@ -362,6 +362,7 @@
   struct Plugin *plugin = cls;
   struct Session *session;
 
+  GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != network);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Received `%s' message for peer `%s': new distance %u\n",
        "DV_DISTANCE_CHANGED",