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

[gnunet]

Author: grothoff
Date: 2013-12-19 00:16:05 +0100 (Thu, 19 Dec 2013)
New Revision: 31555

Modified:
   gnunet/src/dv/gnunet-service-dv.c
Log:
-consider possibility that DV message arrives after direct connection was 
established

Modified: gnunet/src/dv/gnunet-service-dv.c
===================================================================
--- gnunet/src/dv/gnunet-service-dv.c   2013-12-18 22:57:56 UTC (rev 31554)
+++ gnunet/src/dv/gnunet-service-dv.c   2013-12-18 23:16:05 UTC (rev 31555)
@@ -1812,12 +1812,21 @@
                   &my_identity,
                   sizeof (struct GNUNET_PeerIdentity)))
   {
+    if (NULL != GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
+                                                   &rm->sender))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Discarding DV message, as %s is a direct neighbor\n",
+                  GNUNET_i2s (&rm->sender));
+      GNUNET_STATISTICS_update (stats,
+                                "# messages discarded (direct neighbor)",
+                                1, GNUNET_NO);
+      return GNUNET_OK;
+    }
     /* message is for me, check reverse route! */
     route = GNUNET_CONTAINER_multipeermap_get (all_routes,
                                               &rm->sender);
     if ( (NULL == route) &&
-         (NULL == GNUNET_CONTAINER_multipeermap_get (direct_neighbors,
-                                                     &rm->sender)) &&
          (distance < DEFAULT_FISHEYE_DEPTH) )
     {
       /* don't have reverse route yet, learn it! */