diff options
author | Coren[m] <Break@Ocean> | 2013-09-11 20:50:15 +0200 |
---|---|---|
committer | Coren[m] <Break@Ocean> | 2013-09-11 20:50:15 +0200 |
commit | 513e37815db8319dd015bf03b588380a4e3c61d3 (patch) | |
tree | 809738c8ff2370936638565ff096d387d7222f85 /toxcore/tox.c | |
parent | d0f5ad34ae2cb88e921cf6f6d829d611b5ea2152 (diff) |
tox.h, DHT.h:
- tox_bootstrap_ex(), DHT_bootstrap_ex() renamed to tox_bootstrap_from_address(), DHT_bootstrap_from_address()
- (handle_)sendnodes_ex() renamed to (handle_)sendnodes_ipv6()
- only sending sendnodes_ipv6() if we're actually IPv6 enabled
- changed comments to conform better
nTox.c, Messenger_text.c, DHT_test.c, DHT_bootstrap.c:
- fallout from *_ex() to *_from_address()
DHT_bootstrap.c:
- corrected a potentially wrong info message
util.c:
- fixed logfile name: now (funcptr) => now() (number)
network.c:
- addead comment about the necessity of bind() to succeed
auto_test/messenger_test.c:
- defaulting ipv6enabled to TOX_ENABLE_IPV6_DEFAULT
LAN_discovery.c:
- slight cleanup and comments for clarity
Diffstat (limited to 'toxcore/tox.c')
-rw-r--r-- | toxcore/tox.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toxcore/tox.c b/toxcore/tox.c index 5e3893ec..31ae9c0f 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 | int tox_bootstrap_ex(void *tox, const char *address, uint8_t ipv6enabled, | 377 | int tox_bootstrap_from_address(void *tox, const char *address, |
378 | uint16_t port, uint8_t *public_key) | 378 | uint8_t ipv6enabled, uint16_t port, uint8_t *public_key) |
379 | { | 379 | { |
380 | Messenger *m = tox; | 380 | Messenger *m = tox; |
381 | return DHT_bootstrap_ex(m->dht, address, ipv6enabled, port, public_key); | 381 | return DHT_bootstrap_from_address(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. |