diff options
author | aunsane <aunsane@gmail.com> | 2017-12-30 00:42:35 +0300 |
---|---|---|
committer | aunsane <aunsane@gmail.com> | 2017-12-30 00:42:49 +0300 |
commit | cc65f8dbead036bfdd29d397195f9152839d4919 (patch) | |
tree | 8e8188f7db65f8a538d5e423e1d0b3491706efc4 /protocols/Tox/libtox/src/toxcore | |
parent | 81cd378b0a0ee5e26d58c085a3b10bd89a7244c2 (diff) |
Tox: project cleanup
- updated libtox
- removed deprecated toxDNS support
- removed unused references
Diffstat (limited to 'protocols/Tox/libtox/src/toxcore')
-rw-r--r-- | protocols/Tox/libtox/src/toxcore/network.c | 14 | ||||
-rw-r--r-- | protocols/Tox/libtox/src/toxcore/network.h | 2 | ||||
-rw-r--r-- | protocols/Tox/libtox/src/toxcore/tox.api.h | 2 | ||||
-rw-r--r-- | protocols/Tox/libtox/src/toxcore/tox.h | 2 |
4 files changed, 2 insertions, 18 deletions
diff --git a/protocols/Tox/libtox/src/toxcore/network.c b/protocols/Tox/libtox/src/toxcore/network.c index 5c43bf5779..7587826b51 100644 --- a/protocols/Tox/libtox/src/toxcore/network.c +++ b/protocols/Tox/libtox/src/toxcore/network.c @@ -1411,20 +1411,6 @@ Socket net_socket(int domain, int type, int protocol) return socket(platform_domain, platform_type, platform_prot); } -/* TODO: Remove, when tox DNS support will be removed. - * Used only by dns3_test.c - */ -size_t net_sendto_ip4(Socket sock, const char *buf, size_t n, IP_Port ip_port) -{ - struct sockaddr_in target; - size_t addrsize = sizeof(target); - target.sin_family = make_family(ip_port.ip.family); - target.sin_port = net_htons(ip_port.port); - fill_addr4(ip_port.ip.ip4, &target.sin_addr); - - return (size_t)sendto(sock, buf, n, 0, (struct sockaddr *)&target, addrsize); -} - uint32_t net_htonl(uint32_t hostlong) { return htonl(hostlong); diff --git a/protocols/Tox/libtox/src/toxcore/network.h b/protocols/Tox/libtox/src/toxcore/network.h index 0b9da5a40f..41d1307a36 100644 --- a/protocols/Tox/libtox/src/toxcore/network.h +++ b/protocols/Tox/libtox/src/toxcore/network.h @@ -403,8 +403,6 @@ void net_freeipport(IP_Port *ip_ports); */ int bind_to_port(Socket sock, int family, uint16_t port); -size_t net_sendto_ip4(Socket sock, const char *buf, size_t n, IP_Port ip_port); - /* Initialize networking. * bind to ip and port. * ip must be in network order EX: 127.0.0.1 = (7F000001). diff --git a/protocols/Tox/libtox/src/toxcore/tox.api.h b/protocols/Tox/libtox/src/toxcore/tox.api.h index 0763c7789d..ce0b3a36c4 100644 --- a/protocols/Tox/libtox/src/toxcore/tox.api.h +++ b/protocols/Tox/libtox/src/toxcore/tox.api.h @@ -179,7 +179,7 @@ const VERSION_MINOR = 1; * The patch or revision number. Incremented when bugfixes are applied without * changing any functionality or API or ABI. */ -const VERSION_PATCH = 10; +const VERSION_PATCH = 11; /** * A macro to check at preprocessing time whether the client code is compatible diff --git a/protocols/Tox/libtox/src/toxcore/tox.h b/protocols/Tox/libtox/src/toxcore/tox.h index 30bc950964..cb9c4fa0e0 100644 --- a/protocols/Tox/libtox/src/toxcore/tox.h +++ b/protocols/Tox/libtox/src/toxcore/tox.h @@ -180,7 +180,7 @@ uint32_t tox_version_minor(void); * The patch or revision number. Incremented when bugfixes are applied without * changing any functionality or API or ABI. */ -#define TOX_VERSION_PATCH 10 +#define TOX_VERSION_PATCH 11 uint32_t tox_version_patch(void); |