X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftopology%2Fgnunet-daemon-topology.c;h=08b1ba1c3c0effb852fa29cbd34b8880afc645ca;hb=8ccc246e6c8c9ea8bc2fdd5bf50d027a13547e38;hp=fa693f13afac80884a40485b48a745b6baddb8d8;hpb=f47cc990ea9a89cb39acc9c6a9789e6474197708;p=oweals%2Fgnunet.git

diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index fa693f13a..08b1ba1c3 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -35,7 +35,7 @@
 #include "gnunet_util_lib.h"
 
 
-#define DEBUG_TOPOLOGY GNUNET_NO
+#define DEBUG_TOPOLOGY GNUNET_YES
 
 /**
  * For how long do we blacklist a peer after a failed connection
@@ -59,7 +59,7 @@
  * For how long do we blacklist anyone under any cirumstances after a failed connection
  * attempt?
  */
-#define GREYLIST_AFTER_ATTEMPT_MAX GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 18)
+#define GREYLIST_AFTER_ATTEMPT_MAX GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 1)
 
 /**
  * How often do we at most advertise any HELLO to a peer?
@@ -156,11 +156,6 @@ struct Peer
  */
 static struct GNUNET_PEERINFO_NotifyContext *peerinfo_notify;
 
-/**
- * Our scheduler.
- */
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 /**
  * Our configuration.
  */
@@ -276,11 +271,11 @@ whitelist_peers ()
  * Function called by core when our attempt to connect succeeded.
  *
  * @param cls the 'struct Peer' for which we issued the connect request
- * @param tc scheduler context
+ * @param success was the request transmitted
  */
 static void
 connect_completed_callback (void *cls,
-			    const struct GNUNET_SCHEDULER_TaskContext *tc)
+			    int success)
 {
   struct Peer *pos = cls;
 
@@ -347,11 +342,9 @@ free_peer (void *cls,
   if (pos->connect_req != NULL)
     GNUNET_CORE_peer_request_connect_cancel (pos->connect_req);	      
   if (pos->hello_delay_task != GNUNET_SCHEDULER_NO_TASK)
-    GNUNET_SCHEDULER_cancel (sched,
-			     pos->hello_delay_task);
+    GNUNET_SCHEDULER_cancel (pos->hello_delay_task);
   if (pos->greylist_clean_task != GNUNET_SCHEDULER_NO_TASK)
-    GNUNET_SCHEDULER_cancel (sched,
-			     pos->greylist_clean_task);
+    GNUNET_SCHEDULER_cancel (pos->greylist_clean_task);
   GNUNET_free_non_null (pos->hello);   
   if (pos->filter != NULL)
     GNUNET_CONTAINER_bloomfilter_free (pos->filter);
@@ -406,11 +399,9 @@ attempt_connect (struct Peer *pos)
 				  GREYLIST_AFTER_ATTEMPT_MAX);
   pos->greylisted_until = GNUNET_TIME_relative_to_absolute (rem);
   if (pos->greylist_clean_task != GNUNET_SCHEDULER_NO_TASK)
-    GNUNET_SCHEDULER_cancel (sched,
-			     pos->greylist_clean_task);
+    GNUNET_SCHEDULER_cancel (pos->greylist_clean_task);
   pos->greylist_clean_task 
-    = GNUNET_SCHEDULER_add_delayed (sched,
-				    rem,
+    = GNUNET_SCHEDULER_add_delayed (rem,
 				    &remove_from_greylist,
 				    pos);
 #if DEBUG_TOPOLOGY
@@ -422,7 +413,7 @@ attempt_connect (struct Peer *pos)
 			    gettext_noop ("# connect requests issued to core"),
 			    1,
 			    GNUNET_NO);
-  pos->connect_req = GNUNET_CORE_peer_request_connect (sched, cfg,
+  pos->connect_req = GNUNET_CORE_peer_request_connect (handle,
 						       GNUNET_TIME_UNIT_MINUTES,
 						       &pos->pid,
 						       &connect_completed_callback,
@@ -453,8 +444,7 @@ remove_from_greylist (void *cls,
   else
     {
       pos->greylist_clean_task 
-	= GNUNET_SCHEDULER_add_delayed (sched,
-					rem,
+	= GNUNET_SCHEDULER_add_delayed (rem,
 					&remove_from_greylist,
 					pos);
     }
@@ -635,8 +625,7 @@ schedule_next_hello (void *cls,
 					 &find_advertisable_hello,
 					 &fah);
   pl->hello_delay_task 
-    = GNUNET_SCHEDULER_add_delayed (sched,
-				    fah.next_adv,
+    = GNUNET_SCHEDULER_add_delayed (fah.next_adv,
 				    &schedule_next_hello,
 				    pl);
   if (fah.result == NULL)
@@ -685,13 +674,11 @@ reschedule_hellos (void *cls,
     }
   if (peer->hello_delay_task != GNUNET_SCHEDULER_NO_TASK)
     {
-      GNUNET_SCHEDULER_cancel (sched,
-			       peer->hello_delay_task);
+      GNUNET_SCHEDULER_cancel (peer->hello_delay_task);
       peer->hello_delay_task = GNUNET_SCHEDULER_NO_TASK;
     }
   peer->hello_delay_task 
-    = GNUNET_SCHEDULER_add_now (sched,
-				&schedule_next_hello,
+    = GNUNET_SCHEDULER_add_now (&schedule_next_hello,
 				peer);
   return GNUNET_YES;
 }
@@ -702,15 +689,13 @@ reschedule_hellos (void *cls,
  *
  * @param cls closure
  * @param peer peer identity this notification is about
- * @param latency reported latency of the connection with 'other'
- * @param distance reported distance (DV) to 'other' 
+ * @param atsi performance data
  */
 static void 
 connect_notify (void *cls,
 		const struct
 		GNUNET_PeerIdentity * peer,
-		struct GNUNET_TIME_Relative latency,
-		uint32_t distance)
+		const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
   struct Peer *pos;
 
@@ -719,6 +704,9 @@ connect_notify (void *cls,
 	      "Core told us that we are connecting to `%s'\n",
 	      GNUNET_i2s (peer));
 #endif
+  if (0 == memcmp(&my_identity, peer, sizeof(struct GNUNET_PeerIdentity)))
+    return;
+
   connection_count++;
   GNUNET_STATISTICS_set (stats,
 			 gettext_noop ("# peers connected"),
@@ -784,7 +772,9 @@ disconnect_notify (void *cls,
 		   GNUNET_PeerIdentity * peer)
 {
   struct Peer *pos;
- 
+
+  if (0 == memcmp(&my_identity, peer, sizeof(struct GNUNET_PeerIdentity)))
+    return;
 #if DEBUG_TOPOLOGY
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 	      "Core told us that we disconnected from `%s'\n",
@@ -822,7 +812,7 @@ disconnect_notify (void *cls,
 					   NULL);
   if ( (friend_count < minimum_friend_count) &&
        (blacklist == NULL) )
-    blacklist = GNUNET_TRANSPORT_blacklist (sched, cfg,
+    blacklist = GNUNET_TRANSPORT_blacklist (cfg,
 					    &blacklist_check, NULL);
 }
 
@@ -1021,7 +1011,7 @@ core_init (void *cls,
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
 		  _("Failed to connect to core service, can not manage topology!\n"));
-      GNUNET_SCHEDULER_shutdown (sched);
+      GNUNET_SCHEDULER_shutdown ();
       return;
     }
   handle = server;
@@ -1031,8 +1021,7 @@ core_init (void *cls,
 	      "I am peer `%s'\n",
 	      GNUNET_i2s (my_id));
 #endif 	
-  peerinfo_notify = GNUNET_PEERINFO_notify (cfg, sched,
-					    &process_peer,
+  peerinfo_notify = GNUNET_PEERINFO_notify (cfg, &process_peer,
 					    NULL);
 }
 
@@ -1181,8 +1170,7 @@ read_friends_file (const struct GNUNET_CONFIGURATION_Handle *cfg)
  * @param other the other peer involved (sender or receiver, NULL
  *        for loopback messages where we are both sender and receiver)
  * @param message the actual HELLO message
- * @param latency reported latency of the connection with 'other'
- * @param distance reported distance (DV) to 'other' 
+ * @param atsi performance data
  * @return GNUNET_OK to keep the connection open,
  *         GNUNET_SYSERR to close it (signal serious error)
  */
@@ -1191,8 +1179,7 @@ handle_encrypted_hello (void *cls,
 			const struct GNUNET_PeerIdentity * other,
 			const struct GNUNET_MessageHeader *
 			message,
-			struct GNUNET_TIME_Relative latency,
-			uint32_t distance)
+			const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
   struct Peer *peer;
   struct GNUNET_PeerIdentity pid;
@@ -1275,7 +1262,7 @@ hello_advertising_ready (void *cls,
 #if DEBUG_TOPOLOGY
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 		  "Sending `%s' with %u bytes",
-		  "HELLO"
+		  "HELLO",
 		  (unsigned int) want);
 #endif 	
       GNUNET_STATISTICS_update (stats,
@@ -1285,8 +1272,7 @@ hello_advertising_ready (void *cls,
     }
   pl->next_hello_allowed = GNUNET_TIME_relative_to_absolute (HELLO_ADVERTISEMENT_MIN_FREQUENCY);
   pl->hello_delay_task 
-    = GNUNET_SCHEDULER_add_now (sched,
-				&schedule_next_hello,
+    = GNUNET_SCHEDULER_add_now (&schedule_next_hello,
 				pl);
   return want;
 }
@@ -1332,14 +1318,12 @@ cleaning_task (void *cls,
  * Main function that will be run.
  *
  * @param cls closure
- * @param s the scheduler to use
  * @param args remaining command-line arguments
  * @param cfgfile name of the configuration file used (for saving, can be NULL!)
  * @param c configuration
  */
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle * s,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle * c)
@@ -1351,9 +1335,8 @@ run (void *cls,
     };
   unsigned long long opt;
 
-  sched = s;
   cfg = c;
-  stats = GNUNET_STATISTICS_create (sched, "topology", cfg);
+  stats = GNUNET_STATISTICS_create ("topology", cfg);
   autoconnect = GNUNET_CONFIGURATION_get_value_yesno (cfg,
 						      "TOPOLOGY",
 						      "AUTOCONNECT");
@@ -1387,18 +1370,16 @@ run (void *cls,
 	      autoconnect ? "autoconnect enabled" : "autoconnect disabled");
 #endif       
   if (friend_count < minimum_friend_count) 
-    blacklist = GNUNET_TRANSPORT_blacklist (sched, cfg,
+    blacklist = GNUNET_TRANSPORT_blacklist (cfg,
 					    &blacklist_check, NULL);
-  transport = GNUNET_TRANSPORT_connect (sched,
-					cfg,
+  transport = GNUNET_TRANSPORT_connect (cfg,
 					NULL,
 					NULL,
 					NULL,
 					NULL,
 					NULL);
-  handle = GNUNET_CORE_connect (sched,
-				cfg,
-				GNUNET_TIME_UNIT_FOREVER_REL,
+  handle = GNUNET_CORE_connect (cfg,
+				1,
 				NULL,
 				&core_init,
 				&connect_notify,
@@ -1407,15 +1388,14 @@ run (void *cls,
 				NULL, GNUNET_NO,
 				NULL, GNUNET_NO,
 				handlers);
-  GNUNET_SCHEDULER_add_delayed (sched,
-                                GNUNET_TIME_UNIT_FOREVER_REL,
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                 &cleaning_task, NULL);
   if (NULL == transport)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
 		  _("Failed to connect to `%s' service.\n"),
 		  "transport");
-      GNUNET_SCHEDULER_shutdown (sched);
+      GNUNET_SCHEDULER_shutdown ();
       return;
     }
   if (NULL == handle)
@@ -1423,7 +1403,7 @@ run (void *cls,
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
 		  _("Failed to connect to `%s' service.\n"),
 		  "core");
-      GNUNET_SCHEDULER_shutdown (sched);
+      GNUNET_SCHEDULER_shutdown ();
       return;
     }
 }