diff options
author | Coren[m] <Break@Ocean> | 2013-09-12 18:39:21 +0200 |
---|---|---|
committer | Coren[m] <Break@Ocean> | 2013-09-12 18:39:21 +0200 |
commit | 591d6c70c635406830486deb561343e4dc06af2a (patch) | |
tree | e427dc378ad3f2c0744249896d3e165063aae7be /toxcore/tox.c | |
parent | 0cfbe004ef30e5a601f965e625ab42a490e13e15 (diff) |
network.*:
- addr_resolv(_or_parse_ip)(): added an optional parameter to return both an IPv6 and an IPv4 address if requested address family was AF_UNSPEC
- logging of unhandled packets
DHT.c:
- bootstrap_from_address(): use the additional return from addr_resolv_or_parse_ip() to bootstrap in both network types at once
Lossless_UDP_testclient.c:
- main(): adapt to signature change of addr_resolve()
Messenger.c. LAN_discovery.h:
- lost a htons(), readded
- moved LAN_DISCOVERY_INTERVAL #define into LAN_discovery.h
LAN_discovery.c:
- added IPv4-in-IPv6 local address test
Diffstat (limited to 'toxcore/tox.c')
-rw-r--r-- | toxcore/tox.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/toxcore/tox.c b/toxcore/tox.c index f5c6c8ba..3eb80d22 100644 --- a/toxcore/tox.c +++ b/toxcore/tox.c | |||
@@ -395,14 +395,10 @@ int tox_isconnected(void *tox) | |||
395 | * return allocated instance of tox on success. | 395 | * return allocated instance of tox on success. |
396 | * return 0 if there are problems. | 396 | * return 0 if there are problems. |
397 | */ | 397 | */ |
398 | void *tox_new_ex(uint8_t ipv6enabled) | 398 | void *tox_new(uint8_t ipv6enabled) |
399 | { | 399 | { |
400 | return initMessenger(ipv6enabled); | 400 | return initMessenger(ipv6enabled); |
401 | } | 401 | } |
402 | void *tox_new(void) | ||
403 | { | ||
404 | return tox_new_ex(0); | ||
405 | } | ||
406 | 402 | ||
407 | /* Run this before closing shop. | 403 | /* Run this before closing shop. |
408 | * Free all datastructures. | 404 | * Free all datastructures. |