StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity
571897cecb
toxcore/toxcore/LAN_discovery.c

429 lines
12 KiB
C
Raw Normal View History

Update license headers and remove redundant file name comment. "All rights reserved" was incorrect. The project was licensed under GPL3, which means a lot of rights are licensed to everybody in the world, i.e. not reserved to the "Tox Project".
2017-01-14 23:46:31 +08:00
/*
* LAN discovery implementation.
*/
/*
Update copyright to 2018.
2018-08-26 07:36:42 +08:00
* Copyright © 2016-2018 The TokTok team.
Update license headers and remove redundant file name comment. "All rights reserved" was incorrect. The project was licensed under GPL3, which means a lot of rights are licensed to everybody in the world, i.e. not reserved to the "Tox Project".
2017-01-14 23:46:31 +08:00
* Copyright © 2013 Tox project.
Fixed the multiple friends request recieved at the same time problem.
2013-07-27 05:06:03 +08:00
*
Update license headers and remove redundant file name comment. "All rights reserved" was incorrect. The project was licensed under GPL3, which means a lot of rights are licensed to everybody in the world, i.e. not reserved to the "Tox Project".
2017-01-14 23:46:31 +08:00
* This file is part of Tox, the free peer to peer instant messenger.
Fixed the multiple friends request recieved at the same time problem.
2013-07-27 05:06:03 +08:00
*
Update license headers and remove redundant file name comment. "All rights reserved" was incorrect. The project was licensed under GPL3, which means a lot of rights are licensed to everybody in the world, i.e. not reserved to the "Tox Project".
2017-01-14 23:46:31 +08:00
* Tox is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
Fixed the multiple friends request recieved at the same time problem.
2013-07-27 05:06:03 +08:00
*
Update license headers and remove redundant file name comment. "All rights reserved" was incorrect. The project was licensed under GPL3, which means a lot of rights are licensed to everybody in the world, i.e. not reserved to the "Tox Project".
2017-01-14 23:46:31 +08:00
* Tox is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
Ran the code through: astyle --style=linux
2013-07-27 20:43:36 +08:00
*
Update license headers and remove redundant file name comment. "All rights reserved" was incorrect. The project was licensed under GPL3, which means a lot of rights are licensed to everybody in the world, i.e. not reserved to the "Tox Project".
2017-01-14 23:46:31 +08:00
* You should have received a copy of the GNU General Public License
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
*/
Allow to build vs nacl instead of libsodium By default libsodium is used. Only if --enable-nacl is specified, then nacl will be used instead of libsodium. Pass locations of nacl headers and libraries by using the following options: --with-nacl-headers=/home/me/somewhere/nacl-20110221/build/469/include/amd64/ --with-nacl-libs=/home/me/somewhere/nacl-20110221/build/469/lib/amd64/
2013-09-05 18:02:26 +08:00
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
I don't know how this happened.
2013-07-26 22:31:49 +08:00
#include "LAN_discovery.h"
Group #include directives in 3-4 groups. 1. Current module (if C file). 2. Headers from current library. 3. Headers from other library (e.g. toxcore includes in toxav). 4. System headers.
2016-09-11 22:47:51 +08:00
Move system header includes from network.h to network.c
2018-02-27 10:07:59 +08:00
#include <string.h>
Move unix_time(), id_cpy()/id_eq(), is_timeout() to util.* unix_time(): - returns local value for current epoch - value is updated explicitly with unix_time_update() called at new_DHT()/doMessenger()/do_DHT() is_timeout(): - uses the local value for current epoch id_cpy()/id_eq() => id_copy()/id_equal(): - centralized duplicate definitions - replaced (most) memcpy()/memcmp() of (*, *, CLIENT_ID_SIZE) with id_copy()/id_equal()
2013-10-25 04:32:28 +08:00
#include "util.h"
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
redid get_broadcast(), looks like it should work now
2013-08-02 04:25:22 +08:00
#define MAX_INTERFACES 16
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
reduce thread-unsafe use of static variables - rework ip_ntoa() to avoid use of static variables - rework sort_client_list() to avoid use of static variables - move static 'lastdump' into Messenger struct - rework ID2String() to avoid use of static variables; rename to id_to_string() - fetch_broadcast_info(): attempt to mitigate risks from concurrent execution - current_time_monotonic(): attempt to mitigate risks from concurrent execution - comment on non-thread-safety of unix_time_update
2017-01-20 01:51:14 +08:00
/* TODO: multiple threads might concurrently try to set these, and it isn't clear that this couldn't lead to undesirable
* behaviour. Consider storing the data in per-instance variables instead. */
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
//!TOKSTYLE-
// No global mutable state in Tokstyle.
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
static int broadcast_count = -1;
reduce thread-unsafe use of static variables - rework ip_ntoa() to avoid use of static variables - rework sort_client_list() to avoid use of static variables - move static 'lastdump' into Messenger struct - rework ID2String() to avoid use of static variables; rename to id_to_string() - fetch_broadcast_info(): attempt to mitigate risks from concurrent execution - current_time_monotonic(): attempt to mitigate risks from concurrent execution - comment on non-thread-safety of unix_time_update
2017-01-20 01:51:14 +08:00
static IP_Port broadcast_ip_ports[MAX_INTERFACES];
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
//!TOKSTYLE+
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
Move system header includes from network.h to network.c
2018-02-27 10:07:59 +08:00
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
// The mingw32/64 Windows library warns about including winsock2.h after
// windows.h even though with the above it's a valid thing to do. So, to make
// mingw32 headers happy, we include winsock2.h first.
#include <winsock2.h>
#include <windows.h>
#include <ws2tcpip.h>
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
#include <iphlpapi.h>
static void fetch_broadcast_info(uint16_t port)
{
Compile as C++ for windows builds. Compiling as C++ changes nothing semantically, but ensures that we don't break C++ compatibility while also retaining C compatibility. C++ compatibility is useful for tooling and additional diagnostics and analyses.
2016-11-02 22:34:33 +08:00
IP_ADAPTER_INFO *pAdapterInfo = (IP_ADAPTER_INFO *)malloc(sizeof(IP_ADAPTER_INFO));
Allocate sizeof(IP_ADAPTER_INFO) bytes instead of sizeof(T*). https://msdn.microsoft.com/en-gb/library/windows/desktop/aa365917(v=vs.85).aspx shows an example use of GetAdaptersInfo that does it this way.
2016-09-06 08:10:15 +08:00
unsigned long ulOutBufLen = sizeof(IP_ADAPTER_INFO);
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
Use nullptr as NULL pointer constant instead of NULL or 0. This changes only code, no string literals or comments.
2018-01-29 05:30:39 +08:00
if (pAdapterInfo == nullptr) {
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
return;
}
if (GetAdaptersInfo(pAdapterInfo, &ulOutBufLen) == ERROR_BUFFER_OVERFLOW) {
free(pAdapterInfo);
Compile as C++ for windows builds. Compiling as C++ changes nothing semantically, but ensures that we don't break C++ compatibility while also retaining C compatibility. C++ compatibility is useful for tooling and additional diagnostics and analyses.
2016-11-02 22:34:33 +08:00
pAdapterInfo = (IP_ADAPTER_INFO *)malloc(ulOutBufLen);
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
Use nullptr as NULL pointer constant instead of NULL or 0. This changes only code, no string literals or comments.
2018-01-29 05:30:39 +08:00
if (pAdapterInfo == nullptr) {
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
return;
}
}
reduce thread-unsafe use of static variables - rework ip_ntoa() to avoid use of static variables - rework sort_client_list() to avoid use of static variables - move static 'lastdump' into Messenger struct - rework ID2String() to avoid use of static variables; rename to id_to_string() - fetch_broadcast_info(): attempt to mitigate risks from concurrent execution - current_time_monotonic(): attempt to mitigate risks from concurrent execution - comment on non-thread-safety of unix_time_update
2017-01-20 01:51:14 +08:00
/* We copy these to the static variables broadcast_* only at the end of fetch_broadcast_info().
* The intention is to ensure that even if multiple threads enter fetch_broadcast_info() concurrently, only valid
* interfaces will be set to be broadcast to.
* */
int count = 0;
IP_Port ip_ports[MAX_INTERFACES];
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
const int ret = GetAdaptersInfo(pAdapterInfo, &ulOutBufLen);
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
if (ret == NO_ERROR) {
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
IP_ADAPTER_INFO *pAdapter = pAdapterInfo;
while (pAdapter) {
IP gateway = {0}, subnet_mask = {0};
if (addr_parse_ip(pAdapter->IpAddressList.IpMask.String, &subnet_mask)
&& addr_parse_ip(pAdapter->GatewayList.IpAddress.String, &gateway)) {
Finish @Diadlo's network Family abstraction. The Family stuff in toxcore is a big mess. I'm sure I saw a bunch of bugs on the way, but I'm not verifying that code now, so the bugs stay.
2018-02-27 09:07:46 +08:00
if (net_family_is_ipv4(gateway.family) && net_family_is_ipv4(subnet_mask.family)) {
reduce thread-unsafe use of static variables - rework ip_ntoa() to avoid use of static variables - rework sort_client_list() to avoid use of static variables - move static 'lastdump' into Messenger struct - rework ID2String() to avoid use of static variables; rename to id_to_string() - fetch_broadcast_info(): attempt to mitigate risks from concurrent execution - current_time_monotonic(): attempt to mitigate risks from concurrent execution - comment on non-thread-safety of unix_time_update
2017-01-20 01:51:14 +08:00
IP_Port *ip_port = &ip_ports[count];
Finish @Diadlo's network Family abstraction. The Family stuff in toxcore is a big mess. I'm sure I saw a bunch of bugs on the way, but I'm not verifying that code now, so the bugs stay.
2018-02-27 09:07:46 +08:00
ip_port->ip.family = net_family_ipv4;
Get rid of the only GNU extension we used.
2018-02-15 04:51:55 +08:00
uint32_t gateway_ip = net_ntohl(gateway.ip.v4.uint32), subnet_ip = net_ntohl(subnet_mask.ip.v4.uint32);
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
uint32_t broadcast_ip = gateway_ip + ~subnet_ip - 1;
Get rid of the only GNU extension we used.
2018-02-15 04:51:55 +08:00
ip_port->ip.ip.v4.uint32 = net_htonl(broadcast_ip);
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
ip_port->port = port;
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
++count;
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
reduce thread-unsafe use of static variables - rework ip_ntoa() to avoid use of static variables - rework sort_client_list() to avoid use of static variables - move static 'lastdump' into Messenger struct - rework ID2String() to avoid use of static variables; rename to id_to_string() - fetch_broadcast_info(): attempt to mitigate risks from concurrent execution - current_time_monotonic(): attempt to mitigate risks from concurrent execution - comment on non-thread-safety of unix_time_update
2017-01-20 01:51:14 +08:00
if (count >= MAX_INTERFACES) {
break;
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
}
}
}
pAdapter = pAdapter->Next;
}
}
Merge branch 'master' of https://github.com/xor2003/toxcore
2014-10-18 04:03:02 +08:00
forgotten to free memory in pAdapterInfo
2014-10-17 15:22:18 +08:00
if (pAdapterInfo) {
free(pAdapterInfo);
}
reduce thread-unsafe use of static variables - rework ip_ntoa() to avoid use of static variables - rework sort_client_list() to avoid use of static variables - move static 'lastdump' into Messenger struct - rework ID2String() to avoid use of static variables; rename to id_to_string() - fetch_broadcast_info(): attempt to mitigate risks from concurrent execution - current_time_monotonic(): attempt to mitigate risks from concurrent execution - comment on non-thread-safety of unix_time_update
2017-01-20 01:51:14 +08:00
broadcast_count = count;
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
for (uint32_t i = 0; i < count; ++i) {
reduce thread-unsafe use of static variables - rework ip_ntoa() to avoid use of static variables - rework sort_client_list() to avoid use of static variables - move static 'lastdump' into Messenger struct - rework ID2String() to avoid use of static variables; rename to id_to_string() - fetch_broadcast_info(): attempt to mitigate risks from concurrent execution - current_time_monotonic(): attempt to mitigate risks from concurrent execution - comment on non-thread-safety of unix_time_update
2017-01-20 01:51:14 +08:00
broadcast_ip_ports[i] = ip_ports[i];
}
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
}
Support DragonFlyBSD and prune unused variables.
2018-09-30 23:13:27 +08:00
#elif defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
Fix LAN discovery on FreeBSD. Also, add an auto-test for bootstrap and for LAN discovery. Bootstrap is never tested otherwise, and LAN discovery is a prerequisite for everything else. Having these two tests lets us rule out or identify LAN discovery as a possible cause for test failures.
2018-02-06 00:11:49 +08:00
Move system header includes from network.h to network.c
2018-02-27 10:07:59 +08:00
#include <netinet/in.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
Fix LAN discovery on FreeBSD. Also, add an auto-test for bootstrap and for LAN discovery. Bootstrap is never tested otherwise, and LAN discovery is a prerequisite for everything else. Having these two tests lets us rule out or identify LAN discovery as a possible cause for test failures.
2018-02-06 00:11:49 +08:00
#ifdef __linux__
#include <linux/netdevice.h>
#endif
Support DragonFlyBSD and prune unused variables.
2018-09-30 23:13:27 +08:00
#if defined(__FreeBSD__) || defined(__DragonFly__)
Fix LAN discovery on FreeBSD. Also, add an auto-test for bootstrap and for LAN discovery. Bootstrap is never tested otherwise, and LAN discovery is a prerequisite for everything else. Having these two tests lets us rule out or identify LAN discovery as a possible cause for test failures.
2018-02-06 00:11:49 +08:00
#include <net/if.h>
#endif
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
static void fetch_broadcast_info(uint16_t port)
redid get_broadcast(), looks like it should work now
2013-08-02 04:25:22 +08:00
{
Correct a lot of the grammar and spelling. Also spent a few hours fixing the comments so they follow a standard.
2013-08-30 05:17:51 +08:00
/* Not sure how many platforms this will run on,
* so it's wrapped in __linux for now.
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
* Definitely won't work like this on Windows...
Correct a lot of the grammar and spelling. Also spent a few hours fixing the comments so they follow a standard.
2013-08-30 05:17:51 +08:00
*/
Add platform-independent Socket and IP implementation
2017-01-04 00:26:15 +08:00
broadcast_count = 0;
Finish @Diadlo's network Family abstraction. The Family stuff in toxcore is a big mess. I'm sure I saw a bunch of bugs on the way, but I'm not verifying that code now, so the bugs stay.
2018-02-27 09:07:46 +08:00
const Socket sock = net_socket(net_family_ipv4, TOX_SOCK_STREAM, 0);
Fixed possible bug.
2013-10-21 04:00:30 +08:00
Move system header includes from network.h to network.c
2018-02-27 10:07:59 +08:00
if (!sock_valid(sock)) {
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
return;
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
}
redid get_broadcast(), looks like it should work now
2013-08-02 04:25:22 +08:00
Correct a lot of the grammar and spelling. Also spent a few hours fixing the comments so they follow a standard.
2013-08-30 05:17:51 +08:00
/* Configure ifconf for the ioctl call. */
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
struct ifreq i_faces[MAX_INTERFACES];
redid get_broadcast(), looks like it should work now
2013-08-02 04:25:22 +08:00
memset(i_faces, 0, sizeof(struct ifreq) * MAX_INTERFACES);
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
struct ifconf ifc;
ifc.ifc_buf = (char *)i_faces;
ifc.ifc_len = sizeof(i_faces);
Passed everything through astyle.
2013-08-17 01:11:09 +08:00
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
if (ioctl(sock.socket, SIOCGIFCONF, &ifc) < 0) {
Move system header includes from network.h to network.c
2018-02-27 10:07:59 +08:00
kill_sock(sock);
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
return;
redid get_broadcast(), looks like it should work now
2013-08-02 04:25:22 +08:00
}
reduce thread-unsafe use of static variables - rework ip_ntoa() to avoid use of static variables - rework sort_client_list() to avoid use of static variables - move static 'lastdump' into Messenger struct - rework ID2String() to avoid use of static variables; rename to id_to_string() - fetch_broadcast_info(): attempt to mitigate risks from concurrent execution - current_time_monotonic(): attempt to mitigate risks from concurrent execution - comment on non-thread-safety of unix_time_update
2017-01-20 01:51:14 +08:00
/* We copy these to the static variables broadcast_* only at the end of fetch_broadcast_info().
* The intention is to ensure that even if multiple threads enter fetch_broadcast_info() concurrently, only valid
* interfaces will be set to be broadcast to.
* */
int count = 0;
IP_Port ip_ports[MAX_INTERFACES];
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
/* ifc.ifc_len is set by the ioctl() to the actual length used;
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
* on usage of the complete array the call should be repeated with
* a larger array, not done (640kB and 16 interfaces shall be
* enough, for everybody!)
*/
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
int n = ifc.ifc_len / sizeof(struct ifreq);
Fixed possible bug.
2013-10-21 04:00:30 +08:00
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
for (int i = 0; i < n; ++i) {
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
/* there are interfaces with are incapable of broadcast */
Move system header includes from network.h to network.c
2018-02-27 10:07:59 +08:00
if (ioctl(sock.socket, SIOCGIFBRDADDR, &i_faces[i]) < 0) {
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
continue;
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
}
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
Move system header includes from network.h to network.c
2018-02-27 10:07:59 +08:00
/* moot check: only AF_INET returned (backwards compat.) */
if (i_faces[i].ifr_broadaddr.sa_family != AF_INET) {
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
continue;
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
}
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
struct sockaddr_in *sock4 = (struct sockaddr_in *)&i_faces[i].ifr_broadaddr;
Fixed possible bug.
2013-10-21 04:00:30 +08:00
reduce thread-unsafe use of static variables - rework ip_ntoa() to avoid use of static variables - rework sort_client_list() to avoid use of static variables - move static 'lastdump' into Messenger struct - rework ID2String() to avoid use of static variables; rename to id_to_string() - fetch_broadcast_info(): attempt to mitigate risks from concurrent execution - current_time_monotonic(): attempt to mitigate risks from concurrent execution - comment on non-thread-safety of unix_time_update
2017-01-20 01:51:14 +08:00
if (count >= MAX_INTERFACES) {
break;
Fixed minor issue. Socket used to find the broadcast ip was not closed when there was more than 16 broadcast interfaces.
2014-04-27 00:30:29 +08:00
}
Fixed possible bug.
2013-10-21 04:00:30 +08:00
reduce thread-unsafe use of static variables - rework ip_ntoa() to avoid use of static variables - rework sort_client_list() to avoid use of static variables - move static 'lastdump' into Messenger struct - rework ID2String() to avoid use of static variables; rename to id_to_string() - fetch_broadcast_info(): attempt to mitigate risks from concurrent execution - current_time_monotonic(): attempt to mitigate risks from concurrent execution - comment on non-thread-safety of unix_time_update
2017-01-20 01:51:14 +08:00
IP_Port *ip_port = &ip_ports[count];
Finish @Diadlo's network Family abstraction. The Family stuff in toxcore is a big mess. I'm sure I saw a bunch of bugs on the way, but I'm not verifying that code now, so the bugs stay.
2018-02-27 09:07:46 +08:00
ip_port->ip.family = net_family_ipv4;
Get rid of the only GNU extension we used.
2018-02-15 04:51:55 +08:00
ip_port->ip.ip.v4.uint32 = sock4->sin_addr.s_addr;
Zero broadcast ips are invalid.
2015-01-23 09:32:09 +08:00
Get rid of the only GNU extension we used.
2018-02-15 04:51:55 +08:00
if (ip_port->ip.ip.v4.uint32 == 0) {
Zero broadcast ips are invalid.
2015-01-23 09:32:09 +08:00
continue;
}
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
ip_port->port = port;
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
++count;
redid get_broadcast(), looks like it should work now
2013-08-02 04:25:22 +08:00
}
Passed everything through astyle.
2013-08-17 01:11:09 +08:00
Move system header includes from network.h to network.c
2018-02-27 10:07:59 +08:00
kill_sock(sock);
reduce thread-unsafe use of static variables - rework ip_ntoa() to avoid use of static variables - rework sort_client_list() to avoid use of static variables - move static 'lastdump' into Messenger struct - rework ID2String() to avoid use of static variables; rename to id_to_string() - fetch_broadcast_info(): attempt to mitigate risks from concurrent execution - current_time_monotonic(): attempt to mitigate risks from concurrent execution - comment on non-thread-safety of unix_time_update
2017-01-20 01:51:14 +08:00
broadcast_count = count;
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
for (uint32_t i = 0; i < count; ++i) {
reduce thread-unsafe use of static variables - rework ip_ntoa() to avoid use of static variables - rework sort_client_list() to avoid use of static variables - move static 'lastdump' into Messenger struct - rework ID2String() to avoid use of static variables; rename to id_to_string() - fetch_broadcast_info(): attempt to mitigate risks from concurrent execution - current_time_monotonic(): attempt to mitigate risks from concurrent execution - comment on non-thread-safety of unix_time_update
2017-01-20 01:51:14 +08:00
broadcast_ip_ports[i] = ip_ports[i];
}
redid get_broadcast(), looks like it should work now
2013-08-02 04:25:22 +08:00
}
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
Ensure that all TODOs have an owner. In the future, all TODOs added either need a bug number (TODO(#NN)) or a person's github user name. By default, I made irungentoo the owner of all toxcore TODOs, mannol the owner of toxav TODOs, and myself the owner of API TODOs.
2016-09-12 23:48:35 +08:00
#else // TODO(irungentoo): Other platforms?
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
static void fetch_broadcast_info(uint16_t port)
{
broadcast_count = 0;
}
#endif
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
/* Send packet to all IPv4 broadcast addresses
*
* return 1 if sent to at least one broadcast target.
* return 0 on failure to find any valid broadcast target.
*/
Const correctness for various packet callbacks
2014-06-14 04:55:15 +08:00
static uint32_t send_broadcasts(Networking_Core *net, uint16_t port, const uint8_t *data, uint16_t length)
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
{
/* fetch only once? on every packet? every X seconds?
* old: every packet, new: once */
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
if (broadcast_count < 0) {
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
fetch_broadcast_info(port);
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
}
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
if (!broadcast_count) {
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
return 0;
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
}
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
for (int i = 0; i < broadcast_count; ++i) {
reduce thread-unsafe use of static variables - rework ip_ntoa() to avoid use of static variables - rework sort_client_list() to avoid use of static variables - move static 'lastdump' into Messenger struct - rework ID2String() to avoid use of static variables; rename to id_to_string() - fetch_broadcast_info(): attempt to mitigate risks from concurrent execution - current_time_monotonic(): attempt to mitigate risks from concurrent execution - comment on non-thread-safety of unix_time_update
2017-01-20 01:51:14 +08:00
sendpacket(net, broadcast_ip_ports[i], data, length);
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
}
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
return 1;
}
redid get_broadcast(), looks like it should work now
2013-08-02 04:25:22 +08:00
Correct a lot of the grammar and spelling. Also spent a few hours fixing the comments so they follow a standard.
2013-08-30 05:17:51 +08:00
/* Return the broadcast ip. */
Add part of platform-independent network API implementation socket -> net_socket htons -> net_htons htonl -> net_htonl connect -> net_connect sendto -> net_sendto_ip4 getaddrinfo -> net_getipport sa_family_t -> Family
2017-01-07 16:28:53 +08:00
static IP broadcast_ip(Family family_socket, Family family_broadcast)
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
{
big push, putting all the infrastructure in place behind TOX_ENABLE_IPV6
2013-09-10 22:36:20 +08:00
IP ip;
ip_reset(&ip);
Finish @Diadlo's network Family abstraction. The Family stuff in toxcore is a big mess. I'm sure I saw a bunch of bugs on the way, but I'm not verifying that code now, so the bugs stay.
2018-02-27 09:07:46 +08:00
if (net_family_is_ipv6(family_socket)) {
if (net_family_is_ipv6(family_broadcast)) {
ip.family = net_family_ipv6;
network.c: logging more details, fixing poll LAN_discovery.c: IPv6: send both v6 multicast and v4 broadcast if socket allows
2013-09-11 17:44:05 +08:00
/* FF02::1 is - according to RFC 4291 - multicast all-nodes link-local */
/* FE80::*: MUST be exact, for that we would need to look over all
* interfaces and check in which status they are */
Get rid of the only GNU extension we used.
2018-02-15 04:51:55 +08:00
ip.ip.v6.uint8[ 0] = 0xFF;
ip.ip.v6.uint8[ 1] = 0x02;
ip.ip.v6.uint8[15] = 0x01;
Finish @Diadlo's network Family abstraction. The Family stuff in toxcore is a big mess. I'm sure I saw a bunch of bugs on the way, but I'm not verifying that code now, so the bugs stay.
2018-02-27 09:07:46 +08:00
} else if (net_family_is_ipv4(family_broadcast)) {
ip.family = net_family_ipv6;
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
ip.ip.v6 = ip6_broadcast;
network.c: logging more details, fixing poll LAN_discovery.c: IPv6: send both v6 multicast and v4 broadcast if socket allows
2013-09-11 17:44:05 +08:00
}
Finish @Diadlo's network Family abstraction. The Family stuff in toxcore is a big mess. I'm sure I saw a bunch of bugs on the way, but I'm not verifying that code now, so the bugs stay.
2018-02-27 09:07:46 +08:00
} else if (net_family_is_ipv4(family_socket) && net_family_is_ipv4(family_broadcast)) {
ip.family = net_family_ipv4;
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
ip.ip.v4 = ip4_broadcast;
big push, putting all the infrastructure in place behind TOX_ENABLE_IPV6
2013-09-10 22:36:20 +08:00
}
astyled everything.
2013-09-15 00:42:17 +08:00
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
return ip;
}
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
static bool ip4_is_local(IP4 ip4)
{
/* Loopback. */
return ip4.uint8[0] == 127;
}
If we get the ip/port of a relay on a local ip, assume that our friend is hosting a relay on his ip.
2015-05-19 08:40:18 +08:00
/* Is IP a local ip or not. */
Use apidsl to generate LAN_discovery.h.
2018-01-15 08:48:35 +08:00
bool ip_is_local(IP ip)
If we get the ip/port of a relay on a local ip, assume that our friend is hosting a relay on his ip.
2015-05-19 08:40:18 +08:00
{
Finish @Diadlo's network Family abstraction. The Family stuff in toxcore is a big mess. I'm sure I saw a bunch of bugs on the way, but I'm not verifying that code now, so the bugs stay.
2018-02-27 09:07:46 +08:00
if (net_family_is_ipv4(ip.family)) {
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
return ip4_is_local(ip.ip.v4);
}
If we get the ip/port of a relay on a local ip, assume that our friend is hosting a relay on his ip.
2015-05-19 08:40:18 +08:00
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
/* embedded IPv4-in-IPv6 */
if (ipv6_ipv4_in_v6(ip.ip.v6)) {
IP4 ip4;
ip4.uint32 = ip.ip.v6.uint32[3];
return ip4_is_local(ip4);
}
If we get the ip/port of a relay on a local ip, assume that our friend is hosting a relay on his ip.
2015-05-19 08:40:18 +08:00
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
/* localhost in IPv6 (::1) */
if (ip.ip.v6.uint64[0] == 0 && ip.ip.v6.uint32[2] == 0 && ip.ip.v6.uint32[3] == net_htonl(1)) {
return true;
If we get the ip/port of a relay on a local ip, assume that our friend is hosting a relay on his ip.
2015-05-19 08:40:18 +08:00
}
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
return false;
If we get the ip/port of a relay on a local ip, assume that our friend is hosting a relay on his ip.
2015-05-19 08:40:18 +08:00
}
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
static bool ip4_is_lan(IP4 ip4)
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
{
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
/* 10.0.0.0 to 10.255.255.255 range. */
if (ip4.uint8[0] == 10) {
Make `ip_is_lan` return bool instead of 0/-1. This inverts the truthiness of the return value. Previously, 0 meant `true` and -1 meant `false`. Now, `true` (1) means `true` and `false` (0) means `false`.
2018-08-27 20:52:34 +08:00
return true;
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
}
If we get the ip/port of a relay on a local ip, assume that our friend is hosting a relay on his ip.
2015-05-19 08:40:18 +08:00
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
/* 172.16.0.0 to 172.31.255.255 range. */
if (ip4.uint8[0] == 172 && ip4.uint8[1] >= 16 && ip4.uint8[1] <= 31) {
return true;
}
astyled everything.
2013-09-15 00:42:17 +08:00
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
/* 192.168.0.0 to 192.168.255.255 range. */
if (ip4.uint8[0] == 192 && ip4.uint8[1] == 168) {
return true;
}
big push, putting all the infrastructure in place behind TOX_ENABLE_IPV6
2013-09-10 22:36:20 +08:00
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
/* 169.254.1.0 to 169.254.254.255 range. */
if (ip4.uint8[0] == 169 && ip4.uint8[1] == 254 && ip4.uint8[2] != 0
&& ip4.uint8[2] != 255) {
return true;
}
big push, putting all the infrastructure in place behind TOX_ENABLE_IPV6
2013-09-10 22:36:20 +08:00
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
/* RFC 6598: 100.64.0.0 to 100.127.255.255 (100.64.0.0/10)
* (shared address space to stack another layer of NAT) */
if ((ip4.uint8[0] == 100) && ((ip4.uint8[1] & 0xC0) == 0x40)) {
return true;
}
big push, putting all the infrastructure in place behind TOX_ENABLE_IPV6
2013-09-10 22:36:20 +08:00
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
return false;
}
astyled everything.
2013-09-15 00:42:17 +08:00
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
bool ip_is_lan(IP ip)
{
if (ip_is_local(ip)) {
return true;
}
if (net_family_is_ipv4(ip.family)) {
return ip4_is_lan(ip.ip.v4);
}
Main: Eliminate TOX_ENABLE_IPV6 (then always on), CLIENT_ONETOONE_IP (then always off). Additionally (besides cleanups): network.h/tox.h: - WIN32: fix a strange sa_family_t definition - WIN32: define EWOULDBLOCK to WSAEWOULDBLOCK - WIN32: kill macro for an existing function (IN6_ADDR_EQUAL) network.c: - use EWOULDBLOCK instead of EAGAIN (same value, but EWOULDBLOCK is more "popular") - new_networking(): only try to enable IPv4-in-IPv6 if it's not already enabled per default - inet_ntop()/inet_pton(): WIN32: remove partial initializers in favor of a simple memset() - ip_equal(): WIN32: use an existing function - logging: networking_wait_execute(): only dump result if not timeout - logging: loglogdata(): kill an unused variable LAN_discovery.c: - send_broadcasts(): re-enabled, can only support IPv4 by principle, split into fetch_broadcast_info() (to fetch the addresses once) and send_broadcasts() (actual sending) DHT.c: - DHT_load_state_callback(): enclosed a fprintf(stderr, ...) into #ifdef DEBUG Lossless_UDP.c: - change_handshake(): harden against strange sa_family_t definitions Messenger.c: - logging: fix ID to string conversion util.c: - logging: eliminate a signed-warning
2013-10-20 22:56:12 +08:00
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
if (net_family_is_ipv6(ip.family)) {
big push, putting all the infrastructure in place behind TOX_ENABLE_IPV6
2013-09-10 22:36:20 +08:00
/* autogenerated for each interface: FE80::* (up to FEBF::*)
Fixed warnings.
2013-09-15 07:15:26 +08:00
FF02::1 is - according to RFC 4291 - multicast all-nodes link-local */
Get rid of the only GNU extension we used.
2018-02-15 04:51:55 +08:00
if (((ip.ip.v6.uint8[0] == 0xFF) && (ip.ip.v6.uint8[1] < 3) && (ip.ip.v6.uint8[15] == 1)) ||
((ip.ip.v6.uint8[0] == 0xFE) && ((ip.ip.v6.uint8[1] & 0xC0) == 0x80))) {
Make `ip_is_lan` return bool instead of 0/-1. This inverts the truthiness of the return value. Previously, 0 meant `true` and -1 meant `false`. Now, `true` (1) means `true` and `false` (0) means `false`.
2018-08-27 20:52:34 +08:00
return true;
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
}
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
2013-09-13 00:39:21 +08:00
/* embedded IPv4-in-IPv6 */
Style fixes in TCP code; remove MIN and PAIR from util.h. * Moved PAIR to toxav, where it's used (but really this should die). * Replace most MIN calls with typed `min_*` calls. Didn't replace the ones where the desired semantics are unclear. Moved the MIN macro to the one place where it's still used. * Avoid assignments in `while` loops. Instead, factored out the loop body into a separate `bool`-returning function. * Use named types for callbacks (`_cb` types). * Avoid assignments in `if` conditions. * Removed `MAKE_REALLOC` and expanded its two calls. We can't have templates in C, and this fake templating is ugly and hard to analyse and debug (it expands on a single line). * Moved epoll system include to the .c file, out of the .h file. * Avoid assignments in expressions (`a = b = c;`). * Avoid multiple declarators per struct member declaration. * Fix naming inconsistencies. * Replace `net_to_host` macro with function.
2018-07-13 01:22:20 +08:00
if (ipv6_ipv4_in_v6(ip.ip.v6)) {
Avoid recursion in `ip_is_lan` and `ip_is_local`.
2018-08-28 00:06:40 +08:00
IP4 ip4;
ip4.uint32 = ip.ip.v6.uint32[3];
return ip4_is_lan(ip4);
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
2013-09-13 00:39:21 +08:00
}
big push, putting all the infrastructure in place behind TOX_ENABLE_IPV6
2013-09-10 22:36:20 +08:00
}
astyled everything.
2013-09-15 00:42:17 +08:00
Make `ip_is_lan` return bool instead of 0/-1. This inverts the truthiness of the return value. Previously, 0 meant `true` and -1 meant `false`. Now, `true` (1) means `true` and `false` (0) means `false`.
2018-08-27 20:52:34 +08:00
return false;
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
}
Make tox_callback_friend_name stateless. See #27 and #40 for details.
2016-08-17 17:52:04 +08:00
static int handle_LANdiscovery(void *object, IP_Port source, const uint8_t *packet, uint16_t length, void *userdata)
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
{
Make toxcore code C++ compatible. It is still C code, so still compatible with C compilers as well. This change lets us see more clearly where implicit conversions occur by making them explicit.
2016-09-18 08:31:55 +08:00
DHT *dht = (DHT *)object;
astyle --options=tools/astylerc -r ./*.{c,h}
2013-08-21 07:37:05 +08:00
Fix LAN discovery on FreeBSD. Also, add an auto-test for bootstrap and for LAN discovery. Bootstrap is never tested otherwise, and LAN discovery is a prerequisite for everything else. Having these two tests lets us rule out or identify LAN discovery as a possible cause for test failures.
2018-02-06 00:11:49 +08:00
char ip_str[IP_NTOA_LEN] = { 0 };
ip_ntoa(&source.ip, ip_str, sizeof(ip_str));
Make `ip_is_lan` return bool instead of 0/-1. This inverts the truthiness of the return value. Previously, 0 meant `true` and -1 meant `false`. Now, `true` (1) means `true` and `false` (0) means `false`.
2018-08-27 20:52:34 +08:00
if (!ip_is_lan(source.ip)) {
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
return 1;
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
}
Passed everything through astyle.
2013-08-17 01:11:09 +08:00
Wrap all sodium/nacl functions in crypto_core.c.
2016-12-19 10:47:42 +08:00
if (length != CRYPTO_PUBLIC_KEY_SIZE + 1) {
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
return 1;
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
}
Passed everything through astyle.
2013-08-17 01:11:09 +08:00
Make tox.c unambiguously parseable. Rules: 1. Constants are uppercase names: THE_CONSTANT. 2. SUE[1] types start with an uppercase letter and have at least one lowercase letter in it: The_Type, THE_Type. 3. Function types end in "_cb": tox_friend_connection_cb. 4. Variable and function names are all lowercase: the_function. This makes it easier for humans reading the code to determine what an identifier means. I'm not convinced by the enum type name change, but I don't know a better rule. Currently, a lot of enum types are spelled like constants, which is confusing. [1] struct/union/enum
2018-07-05 18:31:29 +08:00
dht_bootstrap(dht, source, packet + 1);
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
return 0;
}
Use apidsl to generate LAN_discovery.h.
2018-01-15 08:48:35 +08:00
int lan_discovery_send(uint16_t port, DHT *dht)
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
{
Wrap all sodium/nacl functions in crypto_core.c.
2016-12-19 10:47:42 +08:00
uint8_t data[CRYPTO_PUBLIC_KEY_SIZE + 1];
refactoring packet IDs
2013-08-21 15:55:43 +08:00
data[0] = NET_PACKET_LAN_DISCOVERY;
Make DHT a module-private type.
2018-01-15 09:23:08 +08:00
id_copy(data + 1, dht_get_self_public_key(dht));
network.c: logging more details, fixing poll LAN_discovery.c: IPv6: send both v6 multicast and v4 broadcast if socket allows
2013-09-11 17:44:05 +08:00
Make DHT a module-private type.
2018-01-15 09:23:08 +08:00
send_broadcasts(dht_get_net(dht), port, data, 1 + CRYPTO_PUBLIC_KEY_SIZE);
LAN discovery should now work on windows machines with multiple ethernet devices. Added some code to get real adapter broadcast addresses on windows.
2014-07-21 08:50:53 +08:00
network.c: logging more details, fixing poll LAN_discovery.c: IPv6: send both v6 multicast and v4 broadcast if socket allows
2013-09-11 17:44:05 +08:00
int res = -1;
big push, putting all the infrastructure in place behind TOX_ENABLE_IPV6
2013-09-10 22:36:20 +08:00
IP_Port ip_port;
ip_port.port = port;
network.c: logging more details, fixing poll LAN_discovery.c: IPv6: send both v6 multicast and v4 broadcast if socket allows
2013-09-11 17:44:05 +08:00
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
2013-09-12 02:50:15 +08:00
/* IPv6 multicast */
Finish @Diadlo's network Family abstraction. The Family stuff in toxcore is a big mess. I'm sure I saw a bunch of bugs on the way, but I'm not verifying that code now, so the bugs stay.
2018-02-27 09:07:46 +08:00
if (net_family_is_ipv6(net_family(dht_get_net(dht)))) {
ip_port.ip = broadcast_ip(net_family_ipv6, net_family_ipv6);
astyled everything.
2013-09-15 00:42:17 +08:00
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
if (ip_isset(&ip_port.ip)) {
Make DHT a module-private type.
2018-01-15 09:23:08 +08:00
if (sendpacket(dht_get_net(dht), ip_port, data, 1 + CRYPTO_PUBLIC_KEY_SIZE) > 0) {
network.c: logging more details, fixing poll LAN_discovery.c: IPv6: send both v6 multicast and v4 broadcast if socket allows
2013-09-11 17:44:05 +08:00
res = 1;
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
}
}
network.c: logging more details, fixing poll LAN_discovery.c: IPv6: send both v6 multicast and v4 broadcast if socket allows
2013-09-11 17:44:05 +08:00
}
Finish @Diadlo's network Family abstraction. The Family stuff in toxcore is a big mess. I'm sure I saw a bunch of bugs on the way, but I'm not verifying that code now, so the bugs stay.
2018-02-27 09:07:46 +08:00
/* IPv4 broadcast (has to be IPv4-in-IPv6 mapping if socket is IPv6 */
ip_port.ip = broadcast_ip(net_family(dht_get_net(dht)), net_family_ipv4);
astyled everything.
2013-09-15 00:42:17 +08:00
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
if (ip_isset(&ip_port.ip)) {
Make DHT a module-private type.
2018-01-15 09:23:08 +08:00
if (sendpacket(dht_get_net(dht), ip_port, data, 1 + CRYPTO_PUBLIC_KEY_SIZE)) {
network.c: logging more details, fixing poll LAN_discovery.c: IPv6: send both v6 multicast and v4 broadcast if socket allows
2013-09-11 17:44:05 +08:00
res = 1;
Add braces to all if statements.
2016-09-01 02:12:19 +08:00
}
}
network.c: logging more details, fixing poll LAN_discovery.c: IPv6: send both v6 multicast and v4 broadcast if socket allows
2013-09-11 17:44:05 +08:00
return res;
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
}
Use apidsl to generate LAN_discovery.h.
2018-01-15 08:48:35 +08:00
void lan_discovery_init(DHT *dht)
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
{
Make DHT a module-private type.
2018-01-15 09:23:08 +08:00
networking_registerhandler(dht_get_net(dht), NET_PACKET_LAN_DISCOVERY, &handle_LANdiscovery, dht);
Added basic Local/LAN discovery.
2013-07-26 22:24:56 +08:00
}
Move LAN discovery from Messenger to friend_connection.
2015-04-28 04:13:04 +08:00
Use apidsl to generate LAN_discovery.h.
2018-01-15 08:48:35 +08:00
void lan_discovery_kill(DHT *dht)
Move LAN discovery from Messenger to friend_connection.
2015-04-28 04:13:04 +08:00
{
Use nullptr as NULL pointer constant instead of NULL or 0. This changes only code, no string literals or comments.
2018-01-29 05:30:39 +08:00
networking_registerhandler(dht_get_net(dht), NET_PACKET_LAN_DISCOVERY, nullptr, nullptr);
Move LAN discovery from Messenger to friend_connection.
2015-04-28 04:13:04 +08:00
}
Reference in New Issue Copy Permalink