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.

6 files changed, 108 insertions, 18 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70c234d5..9705dcf4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -530,10 +530,12 @@ if(BUILD_TOXAV AND CHECK_FOUND)
 endif()
 
 auto_test(TCP)
+auto_test(bootstrap)
 auto_test(conference)
 auto_test(crypto                        MSVC_DONT_BUILD)
 auto_test(dht                           MSVC_DONT_BUILD)
 auto_test(encryptsave)
+auto_test(lan_discovery)
 auto_test(messenger                     MSVC_DONT_BUILD)
 auto_test(network)
 auto_test(onion)
diff --git a/auto_tests/bootstrap_test.c b/auto_tests/bootstrap_test.c
new file mode 100644
index 00000000..488bd48e
--- /dev/null
+++ b/auto_tests/bootstrap_test.c
@@ -0,0 +1,34 @@
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600
+#endif
+
+#include "helpers.h"
+
+static uint8_t const key[] = {
+    0xF4, 0x04, 0xAB, 0xAA, 0x1C, 0x99, 0xA9, 0xD3,
+    0x7D, 0x61, 0xAB, 0x54, 0x89, 0x8F, 0x56, 0x79,
+    0x3E, 0x1D, 0xEF, 0x8B, 0xD4, 0x6B, 0x10, 0x38,
+    0xB9, 0xD8, 0x22, 0xE8, 0x46, 0x0F, 0xAB, 0x67,
+};
+
+int main(void)
+{
+    Tox *tox = tox_new_log(nullptr, nullptr, nullptr);
+
+    tox_bootstrap(tox, "node.tox.biribiri.org", 33445, key, nullptr);
+
+    printf("Waiting for connection");
+
+    while (tox_self_get_connection_status(tox) == TOX_CONNECTION_NONE) {
+        printf(".");
+        fflush(stdout);
+
+        tox_iterate(tox, nullptr);
+        c_sleep(1000);
+    }
+
+    printf("Connection: %d\n", tox_self_get_connection_status(tox));
+
+    tox_kill(tox);
+    return 0;
+}
diff --git a/auto_tests/lan_discovery_test.c b/auto_tests/lan_discovery_test.c
new file mode 100644
index 00000000..6918c232
--- /dev/null
+++ b/auto_tests/lan_discovery_test.c
@@ -0,0 +1,31 @@
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600
+#endif
+
+#include "helpers.h"
+
+int main(void)
+{
+    Tox *tox1 = tox_new_log(nullptr, nullptr, nullptr);
+    Tox *tox2 = tox_new_log(nullptr, nullptr, nullptr);
+
+    printf("Waiting for LAN discovery");
+
+    while (tox_self_get_connection_status(tox1) == TOX_CONNECTION_NONE ||
+            tox_self_get_connection_status(tox2) == TOX_CONNECTION_NONE) {
+        printf(".");
+        fflush(stdout);
+
+        tox_iterate(tox1, nullptr);
+        tox_iterate(tox2, nullptr);
+        c_sleep(1000);
+    }
+
+    printf(" %d <-> %d\n",
+           tox_self_get_connection_status(tox1),
+           tox_self_get_connection_status(tox2));
+
+    tox_kill(tox2);
+    tox_kill(tox1);
+    return 0;
+}
diff --git a/auto_tests/monolith_test.cpp b/auto_tests/monolith_test.cpp
index 088b4e01..b1e13448 100644
--- a/auto_tests/monolith_test.cpp
+++ b/auto_tests/monolith_test.cpp
@@ -1,6 +1,13 @@
-/* Auto Tests: One instance.
+/* Nop-test, just to make sure our code compiles as C++.
  */
 
+#ifdef __FreeBSD__
+// Include this here, because _XOPEN_SOURCE hides symbols we need.
+//
+// https://lists.freebsd.org/pipermail/freebsd-standards/2004-March/000474.html.
+#include <net/if.h>
+#endif
+
 #define _DARWIN_C_SOURCE
 #define _XOPEN_SOURCE 600
 
@@ -21,6 +28,10 @@ namespace TCP_test
 {
 #include "TCP_test.c"
 }
+namespace bootstrap_test
+{
+#include "bootstrap_test.c"
+}
 namespace conference_test
 {
 #include "conference_test.c"
@@ -41,6 +52,10 @@ namespace file_saving_test
 {
 #include "file_saving_test.c"
 }
+namespace lan_discovery_test
+{
+#include "lan_discovery_test.c"
+}
 namespace messenger_test
 {
 #include "messenger_test.c"
diff --git a/other/fun/bootstrap_node_info.py b/other/fun/bootstrap_node_info.py
index 17349334..ffda41e3 100644
--- a/other/fun/bootstrap_node_info.py
+++ b/other/fun/bootstrap_node_info.py
@@ -32,7 +32,7 @@ def printHelp():
     print("Usage: " + sys.argv[0] + " <ipv4|ipv6> <ip/hostname> <port>")
     print("  Example: " + sys.argv[0] + " ipv4 192.210.149.121 33445")
     print("  Example: " + sys.argv[0] + " ipv4 23.226.230.47 33445")
-    print("  Example: " + sys.argv[0] + " ipv4 biribiri.org 33445")
+    print("  Example: " + sys.argv[0] + " ipv4 node.tox.biribiri.org 33445")
     print("  Example: " + sys.argv[0] + " ipv4 cerberus.zodiaclabs.org 33445")
     print("  Example: " + sys.argv[0] + " ipv6 2604:180:1::3ded:b280 33445")
     print("")
@@ -95,4 +95,4 @@ version = int.from_bytes(data[PACKET_ID_LENGTH:PACKET_ID_LENGTH + VERSION_LENGTH
 motd = data[PACKET_ID_LENGTH + VERSION_LENGTH:].decode("utf-8")
 print("Version: " + str(version))
 print("MOTD:    " + motd)
-sys.exit(0)
\ No newline at end of file
+sys.exit(0)
diff --git a/toxcore/LAN_discovery.c b/toxcore/LAN_discovery.c
index 742b91ab..cb10b0aa 100644
--- a/toxcore/LAN_discovery.c
+++ b/toxcore/LAN_discovery.c
@@ -29,12 +29,6 @@
 
 #include "util.h"
 
-/* Used for get_broadcast(). */
-#ifdef __linux
-#include <linux/netdevice.h>
-#include <sys/ioctl.h>
-#endif
-
 #define MAX_INTERFACES 16
 
 
@@ -112,7 +106,17 @@ static void fetch_broadcast_info(uint16_t port)
     }
 }
 
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
+
+#ifdef __linux__
+#include <linux/netdevice.h>
+#endif
+
+#ifdef __FreeBSD__
+#include <net/if.h>
+#endif
+
+#include <sys/ioctl.h>
 
 static void fetch_broadcast_info(uint16_t port)
 {
@@ -121,9 +125,9 @@ static void fetch_broadcast_info(uint16_t port)
      * Definitely won't work like this on Windows...
      */
     broadcast_count = 0;
-    Socket sock = 0;
+    const Socket sock = net_socket(TOX_AF_INET, TOX_SOCK_STREAM, 0);
 
-    if ((sock = net_socket(TOX_AF_INET, TOX_SOCK_STREAM, 0)) < 0) {
+    if (sock < 0) {
         return;
     }
 
@@ -217,9 +221,7 @@ static uint32_t send_broadcasts(Networking_Core *net, uint16_t port, const uint8
         return 0;
     }
 
-    int i;
-
-    for (i = 0; i < broadcast_count; i++) {
+    for (int i = 0; i < broadcast_count; i++) {
         sendpacket(net, broadcast_ip_ports[i], data, length);
     }
 
@@ -346,17 +348,23 @@ static int handle_LANdiscovery(void *object, IP_Port source, const uint8_t *pack
 {
     DHT *dht = (DHT *)object;
 
+    char ip_str[IP_NTOA_LEN] = { 0 };
+    ip_ntoa(&source.ip, ip_str, sizeof(ip_str));
+
+    // TODO(iphydf): Add logging for this case.
+    // Why should we reject discovery packets from outside the LAN?
+#if 0
+
     if (ip_is_lan(source.ip) == -1) {
         return 1;
     }
 
+#endif
+
     if (length != CRYPTO_PUBLIC_KEY_SIZE + 1) {
         return 1;
     }
 
-    char ip_str[IP_NTOA_LEN] = { 0 };
-    ip_ntoa(&source.ip, ip_str, sizeof(ip_str));
-
     DHT_bootstrap(dht, source, packet + 1);
     return 0;
 }