diff options
author | Coren[m] <Break@Ocean> | 2013-09-10 22:59:33 +0200 |
---|---|---|
committer | Coren[m] <Break@Ocean> | 2013-09-10 22:59:33 +0200 |
commit | 64ca4b5db23dbb68d1b01e307837c9fb89283256 (patch) | |
tree | b8544dbb4146415dc48caa37946e6651c37ce519 /toxcore/tox.c | |
parent | e89dda5cea04f217d7981d567de963cc8f2e76c7 (diff) |
tox.*, DHT.*:
- return to the caller if the string could be resolved into an IP
other/DHT_bootstrap.c, testing/*_test.c, testing/nTox.c:
- parse cmdline for --ipv4/--ipv6 switch to allow user a choice
util.h:
- proper old-style C-comment
Diffstat (limited to 'toxcore/tox.c')
-rw-r--r-- | toxcore/tox.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toxcore/tox.c b/toxcore/tox.c index 6417b16a..5e3893ec 100644 --- a/toxcore/tox.c +++ b/toxcore/tox.c | |||
@@ -374,11 +374,11 @@ void tox_bootstrap(void *tox, IP_Port ip_port, uint8_t *public_key) | |||
374 | Messenger *m = tox; | 374 | Messenger *m = tox; |
375 | DHT_bootstrap(m->dht, ip_port, public_key); | 375 | DHT_bootstrap(m->dht, ip_port, public_key); |
376 | } | 376 | } |
377 | void tox_bootstrap_ex(void *tox, const char *address, uint8_t ipv6enabled, | 377 | int tox_bootstrap_ex(void *tox, const char *address, uint8_t ipv6enabled, |
378 | uint16_t port, uint8_t *public_key) | 378 | uint16_t port, uint8_t *public_key) |
379 | { | 379 | { |
380 | Messenger *m = tox; | 380 | Messenger *m = tox; |
381 | DHT_bootstrap_ex(m->dht, address, ipv6enabled, port, public_key); | 381 | return DHT_bootstrap_ex(m->dht, address, ipv6enabled, port, public_key); |
382 | }; | 382 | }; |
383 | 383 | ||
384 | /* return 0 if we are not connected to the DHT. | 384 | /* return 0 if we are not connected to the DHT. |