aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-05-28 01:51:01 +0200
committerChristian Grothoff <christian@grothoff.org>2018-05-28 01:51:01 +0200
commit6f0c1fd78400bbf1d6808e9266a364b063ad36a2 (patch)
tree0072ef6e520a82fbeb3441c8555989f21761be95
parentb6b79a4c4b97c40b510bc60e93664496492a604e (diff)
downloadgnunet-6f0c1fd78400bbf1d6808e9266a364b063ad36a2.tar.gz
gnunet-6f0c1fd78400bbf1d6808e9266a364b063ad36a2.zip
skip validation logic
-rw-r--r--src/topology/gnunet-daemon-topology.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index 4415d0a24..da4f62351 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -137,6 +137,11 @@ static const struct GNUNET_CONFIGURATION_Handle *cfg;
137static struct GNUNET_CORE_Handle *handle; 137static struct GNUNET_CORE_Handle *handle;
138 138
139/** 139/**
140 * Handle to the PEERINFO service.
141 */
142static struct GNUNET_PEERINFO_Handle *pi;
143
144/**
140 * Handle to the ATS service. 145 * Handle to the ATS service.
141 */ 146 */
142static struct GNUNET_ATS_ConnectivityHandle *ats; 147static struct GNUNET_ATS_ConnectivityHandle *ats;
@@ -999,16 +1004,6 @@ read_friends_file (const struct GNUNET_CONFIGURATION_Handle *cfg)
999 1004
1000 1005
1001/** 1006/**
1002 * Hello offer complete. Clean up.
1003 */
1004static void
1005done_offer_hello (void *cls)
1006{
1007 oh = NULL;
1008}
1009
1010
1011/**
1012 * This function is called whenever an encrypted HELLO message is 1007 * This function is called whenever an encrypted HELLO message is
1013 * received. 1008 * received.
1014 * 1009 *
@@ -1076,12 +1071,10 @@ handle_hello (void *cls,
1076 (friend_count < minimum_friend_count)) 1071 (friend_count < minimum_friend_count))
1077 return; 1072 return;
1078 } 1073 }
1079 if (NULL != oh) 1074 (void) GNUNET_PEERINFO_add_peer (pi,
1080 GNUNET_TRANSPORT_offer_hello_cancel (oh); 1075 message,
1081 oh = GNUNET_TRANSPORT_offer_hello (cfg, 1076 NULL,
1082 &message->header, 1077 NULL);
1083 &done_offer_hello,
1084 NULL);
1085} 1078}
1086 1079
1087 1080
@@ -1125,6 +1118,11 @@ cleaning_task (void *cls)
1125 GNUNET_ATS_connectivity_done (ats); 1118 GNUNET_ATS_connectivity_done (ats);
1126 ats = NULL; 1119 ats = NULL;
1127 } 1120 }
1121 if (NULL != pi)
1122 {
1123 GNUNET_PEERINFO_disconnect (pi);
1124 pi = NULL;
1125 }
1128 if (NULL != stats) 1126 if (NULL != stats)
1129 { 1127 {
1130 GNUNET_STATISTICS_destroy (stats, GNUNET_NO); 1128 GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
@@ -1189,6 +1187,7 @@ run (void *cls,
1189 &blacklist_check, 1187 &blacklist_check,
1190 NULL); 1188 NULL);
1191 ats = GNUNET_ATS_connectivity_init (cfg); 1189 ats = GNUNET_ATS_connectivity_init (cfg);
1190 pi = GNUNET_PEERINFO_connect (cfg);
1192 handle = GNUNET_CORE_connect (cfg, 1191 handle = GNUNET_CORE_connect (cfg,
1193 NULL, 1192 NULL,
1194 &core_init, 1193 &core_init,