prevent loopback routing, add some statistics, faster re-transmit

[oweals/gnunet.git] / src / fs / gnunet-service-fs.c

diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index 866860c0a218db50f2dfaedee417ee7047ae3599..6ea47c2e291bbd33ef729e72d0f9549f10c04e27 100644 (file)
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -258,6 +258,15 @@ consider_request_for_forwarding (void *cls,
 {
   struct GSF_PendingRequest *pr = cls;
 
+  if (GNUNET_YES !=
+      GSF_pending_request_test_target_ (pr,
+                                       peer))
+  {
+    GNUNET_STATISTICS_update (GSF_stats,
+                             gettext_noop ("# Loopback routes suppressed"), 1,
+                             GNUNET_NO);
+    return;
+  }
   GSF_plan_add_ (cp, pr);
 }
 
@@ -424,7 +433,18 @@ consider_peer_for_forwarding (void *cls, const GNUNET_HashCode * key,
                               struct GSF_PendingRequest *pr)
 {
   struct GSF_ConnectedPeer *cp = cls;
+  struct GNUNET_PeerIdentity pid;
 
+  GSF_connected_peer_get_identity_ (cp, &pid);
+  if (GNUNET_YES !=
+      GSF_pending_request_test_target_ (pr,
+                                       &pid))
+  {
+    GNUNET_STATISTICS_update (GSF_stats,
+                             gettext_noop ("# Loopback routes suppressed"), 1,
+                             GNUNET_NO);
+    return GNUNET_YES;
+  }
   GSF_plan_add_ (cp, pr);
   return GNUNET_YES;
 }