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 0457607d5c684b3a18e7d17b98fc296b8900ba07..6ea47c2e291bbd33ef729e72d0f9549f10c04e27 100644 (file)
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  *
  * To use:
- * - consider re-issue GSF_dht_lookup_ after non-DHT reply received 
+ * - consider re-issue GSF_dht_lookup_ after non-DHT reply received
  * - implement 'SUPPORT_DELAYS'
  *
  */
@@ -59,7 +59,7 @@
 
 
 /**
- * How quickly do we age cover traffic?  At the given 
+ * How quickly do we age cover traffic?  At the given
  * time interval, remaining cover traffic counters are
  * decremented by 1/16th.
  */
@@ -106,13 +106,13 @@ struct GNUNET_LOAD_Value *GSF_rt_entry_lifetime;
 double GSF_current_priorities;
 
 /**
- * How many query messages have we received 'recently' that 
+ * How many query messages have we received 'recently' that
  * have not yet been claimed as cover traffic?
  */
 unsigned int GSF_cover_query_count;
 
 /**
- * How many content messages have we received 'recently' that 
+ * How many content messages have we received 'recently' that
  * have not yet been claimed as cover traffic?
  */
 unsigned int GSF_cover_content_count;
@@ -192,8 +192,8 @@ GSF_update_datastore_delay_ (struct GNUNET_TIME_Absolute start)
 /**
  * Test if the DATABASE (GET) load on this peer is too high
  * to even consider processing the query at
- * all.  
- * 
+ * all.
+ *
  * @return GNUNET_YES if the load is too high to do anything (load high)
  *         GNUNET_NO to process normally (load normal)
  *         GNUNET_SYSERR to process for free (load low)
@@ -226,7 +226,7 @@ GSF_test_get_load_too_high_ (uint32_t priority)
 static int
 handle_p2p_put (void *cls, const struct GNUNET_PeerIdentity *other,
                 const struct GNUNET_MessageHeader *message,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_ATS_Information *atsi)
 {
   struct GSF_ConnectedPeer *cp;
 
@@ -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);
 }
 
@@ -296,7 +305,7 @@ consider_forwarding (void *cls, struct GSF_PendingRequest *pr,
 static int
 handle_p2p_get (void *cls, const struct GNUNET_PeerIdentity *other,
                 const struct GNUNET_MessageHeader *message,
-                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                const struct GNUNET_ATS_Information *atsi)
 {
   struct GSF_PendingRequest *pr;
 
@@ -311,7 +320,7 @@ handle_p2p_get (void *cls, const struct GNUNET_PeerIdentity *other,
 /**
  * We're done with the local lookup, now consider
  * P2P processing (depending on request options and
- * result status).  Also signal that we can now 
+ * result status).  Also signal that we can now
  * receive more request information from the client.
  *
  * @param cls the client doing the request ('struct GNUNET_SERVER_Client')
@@ -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;
 }
@@ -439,7 +459,7 @@ consider_peer_for_forwarding (void *cls, const GNUNET_HashCode * key,
  */
 static void
 peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
-                      const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+                      const struct GNUNET_ATS_Information *atsi)
 {
   struct GSF_ConnectedPeer *cp;
 
@@ -462,13 +482,10 @@ peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
  * @param cls closure
  * @param server handle to the server, NULL if we failed
  * @param my_identity ID of this peer, NULL if we failed
- * @param publicKey public key of this peer, NULL if we failed
  */
 static void
 peer_init_handler (void *cls, struct GNUNET_CORE_Handle *server,
-                   const struct GNUNET_PeerIdentity *my_identity,
-                   const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
-                   *publicKey)
+                   const struct GNUNET_PeerIdentity *my_identity)
 {
   my_id = *my_identity;
 }
@@ -511,7 +528,7 @@ main_init (struct GNUNET_SERVER_Handle *server,
                                   NULL, &peer_init_handler,
                                   &peer_connect_handler,
                                   &GSF_peer_disconnect_handler_,
-                                  &GSF_peer_status_handler_, NULL, GNUNET_NO,
+                                  NULL, GNUNET_NO,
                                   NULL, GNUNET_NO, p2p_handlers);
   if (NULL == GSF_core)
   {