diff options
Diffstat (limited to 'other')
-rw-r--r-- | other/DHT_bootstrap.c | 6 | ||||
-rw-r--r-- | other/bootstrap_daemon/src/tox-bootstrapd.c | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c index 60298544..6460be9d 100644 --- a/other/DHT_bootstrap.c +++ b/other/DHT_bootstrap.c | |||
@@ -30,8 +30,9 @@ | |||
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #include "../toxcore/DHT.h" | 32 | #include "../toxcore/DHT.h" |
33 | #include "../toxcore/friend_requests.h" | ||
34 | #include "../toxcore/LAN_discovery.h" | 33 | #include "../toxcore/LAN_discovery.h" |
34 | #include "../toxcore/friend_requests.h" | ||
35 | #include "../toxcore/logger.h" | ||
35 | #include "../toxcore/tox.h" | 36 | #include "../toxcore/tox.h" |
36 | #include "../toxcore/util.h" | 37 | #include "../toxcore/util.h" |
37 | 38 | ||
@@ -115,7 +116,8 @@ int main(int argc, char *argv[]) | |||
115 | IP ip; | 116 | IP ip; |
116 | ip_init(&ip, ipv6enabled); | 117 | ip_init(&ip, ipv6enabled); |
117 | 118 | ||
118 | DHT *dht = new_DHT(nullptr, new_networking(nullptr, ip, PORT), true); | 119 | Logger *logger = logger_new(); |
120 | DHT *dht = new_DHT(logger, new_networking(nullptr, ip, PORT), true); | ||
119 | Onion *onion = new_onion(dht); | 121 | Onion *onion = new_onion(dht); |
120 | Onion_Announce *onion_a = new_onion_announce(dht); | 122 | Onion_Announce *onion_a = new_onion_announce(dht); |
121 | 123 | ||
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c index 9f1a2db4..cbf81d92 100644 --- a/other/bootstrap_daemon/src/tox-bootstrapd.c +++ b/other/bootstrap_daemon/src/tox-bootstrapd.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include "../../../toxcore/tox.h" | 37 | #include "../../../toxcore/tox.h" |
38 | #include "../../../toxcore/LAN_discovery.h" | 38 | #include "../../../toxcore/LAN_discovery.h" |
39 | #include "../../../toxcore/TCP_server.h" | 39 | #include "../../../toxcore/TCP_server.h" |
40 | #include "../../../toxcore/logger.h" | ||
40 | #include "../../../toxcore/onion_announce.h" | 41 | #include "../../../toxcore/onion_announce.h" |
41 | #include "../../../toxcore/util.h" | 42 | #include "../../../toxcore/util.h" |
42 | 43 | ||
@@ -245,10 +246,12 @@ int main(int argc, char *argv[]) | |||
245 | } | 246 | } |
246 | } | 247 | } |
247 | 248 | ||
248 | DHT *dht = new_DHT(nullptr, net, true); | 249 | Logger *logger = logger_new(); |
250 | DHT *dht = new_DHT(logger, net, true); | ||
249 | 251 | ||
250 | if (dht == nullptr) { | 252 | if (dht == nullptr) { |
251 | log_write(LOG_LEVEL_ERROR, "Couldn't initialize Tox DHT instance. Exiting.\n"); | 253 | log_write(LOG_LEVEL_ERROR, "Couldn't initialize Tox DHT instance. Exiting.\n"); |
254 | logger_kill(logger); | ||
252 | return 1; | 255 | return 1; |
253 | } | 256 | } |
254 | 257 | ||
@@ -257,6 +260,7 @@ int main(int argc, char *argv[]) | |||
257 | 260 | ||
258 | if (!(onion && onion_a)) { | 261 | if (!(onion && onion_a)) { |
259 | log_write(LOG_LEVEL_ERROR, "Couldn't initialize Tox Onion. Exiting.\n"); | 262 | log_write(LOG_LEVEL_ERROR, "Couldn't initialize Tox Onion. Exiting.\n"); |
263 | logger_kill(logger); | ||
260 | return 1; | 264 | return 1; |
261 | } | 265 | } |
262 | 266 | ||
@@ -265,6 +269,7 @@ int main(int argc, char *argv[]) | |||
265 | log_write(LOG_LEVEL_INFO, "Set MOTD successfully.\n"); | 269 | log_write(LOG_LEVEL_INFO, "Set MOTD successfully.\n"); |
266 | } else { | 270 | } else { |
267 | log_write(LOG_LEVEL_ERROR, "Couldn't set MOTD: %s. Exiting.\n", motd); | 271 | log_write(LOG_LEVEL_ERROR, "Couldn't set MOTD: %s. Exiting.\n", motd); |
272 | logger_kill(logger); | ||
268 | return 1; | 273 | return 1; |
269 | } | 274 | } |
270 | 275 | ||
@@ -275,6 +280,7 @@ int main(int argc, char *argv[]) | |||
275 | log_write(LOG_LEVEL_INFO, "Keys are managed successfully.\n"); | 280 | log_write(LOG_LEVEL_INFO, "Keys are managed successfully.\n"); |
276 | } else { | 281 | } else { |
277 | log_write(LOG_LEVEL_ERROR, "Couldn't read/write: %s. Exiting.\n", keys_file_path); | 282 | log_write(LOG_LEVEL_ERROR, "Couldn't read/write: %s. Exiting.\n", keys_file_path); |
283 | logger_kill(logger); | ||
278 | return 1; | 284 | return 1; |
279 | } | 285 | } |
280 | 286 | ||
@@ -285,6 +291,7 @@ int main(int argc, char *argv[]) | |||
285 | if (enable_tcp_relay) { | 291 | if (enable_tcp_relay) { |
286 | if (tcp_relay_port_count == 0) { | 292 | if (tcp_relay_port_count == 0) { |
287 | log_write(LOG_LEVEL_ERROR, "No TCP relay ports read. Exiting.\n"); | 293 | log_write(LOG_LEVEL_ERROR, "No TCP relay ports read. Exiting.\n"); |
294 | logger_kill(logger); | ||
288 | return 1; | 295 | return 1; |
289 | } | 296 | } |
290 | 297 | ||
@@ -297,6 +304,7 @@ int main(int argc, char *argv[]) | |||
297 | log_write(LOG_LEVEL_INFO, "Initialized Tox TCP server successfully.\n"); | 304 | log_write(LOG_LEVEL_INFO, "Initialized Tox TCP server successfully.\n"); |
298 | } else { | 305 | } else { |
299 | log_write(LOG_LEVEL_ERROR, "Couldn't initialize Tox TCP server. Exiting.\n"); | 306 | log_write(LOG_LEVEL_ERROR, "Couldn't initialize Tox TCP server. Exiting.\n"); |
307 | logger_kill(logger); | ||
300 | return 1; | 308 | return 1; |
301 | } | 309 | } |
302 | } | 310 | } |
@@ -305,6 +313,7 @@ int main(int argc, char *argv[]) | |||
305 | log_write(LOG_LEVEL_INFO, "List of bootstrap nodes read successfully.\n"); | 313 | log_write(LOG_LEVEL_INFO, "List of bootstrap nodes read successfully.\n"); |
306 | } else { | 314 | } else { |
307 | log_write(LOG_LEVEL_ERROR, "Couldn't read list of bootstrap nodes in %s. Exiting.\n", cfg_file_path); | 315 | log_write(LOG_LEVEL_ERROR, "Couldn't read list of bootstrap nodes in %s. Exiting.\n", cfg_file_path); |
316 | logger_kill(logger); | ||
308 | return 1; | 317 | return 1; |
309 | } | 318 | } |
310 | 319 | ||