[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24729 - gnunet/src/topology
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24729 - gnunet/src/topology |
Date: |
Mon, 5 Nov 2012 14:18:12 +0100 |
Author: grothoff
Date: 2012-11-05 14:18:12 +0100 (Mon, 05 Nov 2012)
New Revision: 24729
Modified:
gnunet/src/topology/gnunet-daemon-topology.c
gnunet/src/topology/topology.conf
Log:
-fixing #2617 --- removing dead autoconnect option
Modified: gnunet/src/topology/gnunet-daemon-topology.c
===================================================================
--- gnunet/src/topology/gnunet-daemon-topology.c 2012-11-05 13:07:58 UTC
(rev 24728)
+++ gnunet/src/topology/gnunet-daemon-topology.c 2012-11-05 13:18:12 UTC
(rev 24729)
@@ -233,12 +233,7 @@
*/
static unsigned int friend_count;
-/**
- * Should the topology daemon try to establish connections?
- */
-static int autoconnect;
-
/**
* Function that decides if a connection is acceptable or not.
* If we have a blacklist, only friends are allowed, so the check
@@ -1292,8 +1287,6 @@
cfg = c;
stats = GNUNET_STATISTICS_create ("topology", cfg);
- autoconnect =
- GNUNET_CONFIGURATION_get_value_yesno (cfg, "TOPOLOGY", "AUTOCONNECT");
friends_only =
GNUNET_CONFIGURATION_get_value_yesno (cfg, "TOPOLOGY", "FRIENDS-ONLY");
if (GNUNET_OK !=
@@ -1311,9 +1304,8 @@
if ((friends_only == GNUNET_YES) || (minimum_friend_count > 0))
read_friends_file (cfg);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Topology would like %u connections with at least %u friends
(%s)\n",
- target_connection_count, minimum_friend_count,
- autoconnect ? "autoconnect enabled" : "autoconnect disabled");
+ "Topology would like %u connections with at least %u friends\n",
+ target_connection_count, minimum_friend_count);
if ((friend_count < minimum_friend_count) && (blacklist == NULL))
blacklist = GNUNET_TRANSPORT_blacklist (cfg, &blacklist_check, NULL);
transport = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, NULL, NULL, NULL);
Modified: gnunet/src/topology/topology.conf
===================================================================
--- gnunet/src/topology/topology.conf 2012-11-05 13:07:58 UTC (rev 24728)
+++ gnunet/src/topology/topology.conf 2012-11-05 13:18:12 UTC (rev 24729)
@@ -1,7 +1,6 @@
[topology]
MINIMUM-FRIENDS = 0
FRIENDS-ONLY = NO
-AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
BINARY = gnunet-daemon-topology
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24729 - gnunet/src/topology,
gnunet <=