diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-11-05 13:18:12 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-11-05 13:18:12 +0000 |
commit | d3559dfeba42df474ea33f627d7d3f1b0f1e4566 (patch) | |
tree | 2380b8247e49271e5fdf9f394b01b2ab6130ae8e /src/topology | |
parent | 126f5ff854422efb5fe33dfef68f0606872e9532 (diff) | |
download | gnunet-d3559dfeba42df474ea33f627d7d3f1b0f1e4566.tar.gz gnunet-d3559dfeba42df474ea33f627d7d3f1b0f1e4566.zip |
-fixing #2617 --- removing dead autoconnect option
Diffstat (limited to 'src/topology')
-rw-r--r-- | src/topology/gnunet-daemon-topology.c | 12 | ||||
-rw-r--r-- | src/topology/topology.conf | 1 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index fc1f461ed..d6e95ad18 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c | |||
@@ -233,11 +233,6 @@ static unsigned int target_connection_count; | |||
233 | */ | 233 | */ |
234 | static unsigned int friend_count; | 234 | static unsigned int friend_count; |
235 | 235 | ||
236 | /** | ||
237 | * Should the topology daemon try to establish connections? | ||
238 | */ | ||
239 | static int autoconnect; | ||
240 | |||
241 | 236 | ||
242 | /** | 237 | /** |
243 | * Function that decides if a connection is acceptable or not. | 238 | * Function that decides if a connection is acceptable or not. |
@@ -1292,8 +1287,6 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
1292 | 1287 | ||
1293 | cfg = c; | 1288 | cfg = c; |
1294 | stats = GNUNET_STATISTICS_create ("topology", cfg); | 1289 | stats = GNUNET_STATISTICS_create ("topology", cfg); |
1295 | autoconnect = | ||
1296 | GNUNET_CONFIGURATION_get_value_yesno (cfg, "TOPOLOGY", "AUTOCONNECT"); | ||
1297 | friends_only = | 1290 | friends_only = |
1298 | GNUNET_CONFIGURATION_get_value_yesno (cfg, "TOPOLOGY", "FRIENDS-ONLY"); | 1291 | GNUNET_CONFIGURATION_get_value_yesno (cfg, "TOPOLOGY", "FRIENDS-ONLY"); |
1299 | if (GNUNET_OK != | 1292 | if (GNUNET_OK != |
@@ -1311,9 +1304,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
1311 | if ((friends_only == GNUNET_YES) || (minimum_friend_count > 0)) | 1304 | if ((friends_only == GNUNET_YES) || (minimum_friend_count > 0)) |
1312 | read_friends_file (cfg); | 1305 | read_friends_file (cfg); |
1313 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1306 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1314 | "Topology would like %u connections with at least %u friends (%s)\n", | 1307 | "Topology would like %u connections with at least %u friends\n", |
1315 | target_connection_count, minimum_friend_count, | 1308 | target_connection_count, minimum_friend_count); |
1316 | autoconnect ? "autoconnect enabled" : "autoconnect disabled"); | ||
1317 | if ((friend_count < minimum_friend_count) && (blacklist == NULL)) | 1309 | if ((friend_count < minimum_friend_count) && (blacklist == NULL)) |
1318 | blacklist = GNUNET_TRANSPORT_blacklist (cfg, &blacklist_check, NULL); | 1310 | blacklist = GNUNET_TRANSPORT_blacklist (cfg, &blacklist_check, NULL); |
1319 | transport = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, NULL, NULL, NULL); | 1311 | transport = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, NULL, NULL, NULL); |
diff --git a/src/topology/topology.conf b/src/topology/topology.conf index 15723ee0d..278445352 100644 --- a/src/topology/topology.conf +++ b/src/topology/topology.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | [topology] | 1 | [topology] |
2 | MINIMUM-FRIENDS = 0 | 2 | MINIMUM-FRIENDS = 0 |
3 | FRIENDS-ONLY = NO | 3 | FRIENDS-ONLY = NO |
4 | AUTOCONNECT = YES | ||
5 | TARGET-CONNECTION-COUNT = 16 | 4 | TARGET-CONNECTION-COUNT = 16 |
6 | FRIENDS = $SERVICEHOME/friends | 5 | FRIENDS = $SERVICEHOME/friends |
7 | BINARY = gnunet-daemon-topology | 6 | BINARY = gnunet-daemon-topology |