make toxcore work

Merge commit '9ace11a0e2843cbde4af2b6ff7b49bcc6d429f78'
Squashed 'external/toxcore/c-toxcore/' changes from f1df709b87..8f0d505f9a
2024-01-09 20:36:06 +01:00 · 2024-01-09 16:39:05 +01:00 · 2024-01-09 16:39:05 +01:00 · 2024-01-09 16:30:27 +01:00 · 2024-01-09 15:57:20 +01:00 · 2024-01-09 02:26:50 +01:00
261 changed files with 13307 additions and 6837 deletions
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -10,10 +10,40 @@ env:
  BUILD_TYPE: Release

 jobs:
+  linux-ubuntu:
+    timeout-minutes: 10
+
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Install Dependencies
+      run: sudo apt update && sudo apt -y install libsodium-dev
+
+    - name: Configure CMake
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+    - name: Build
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
+
+    - name: temp test
+      run: ${{github.workspace}}/build/bin/mono_time_test
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: ${{ github.event.repository.name }}-ubuntu20.04-x86_64
+        # TODO: do propper packing
+        path: |
+          ${{github.workspace}}/build/bin/
+
+
  windows:
    timeout-minutes: 15

-    runs-on: windows-latest
+    runs-on: windows-2019

    steps:
    - uses: actions/checkout@v3
@@ -34,10 +64,50 @@ jobs:
    - name: Build
      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4

+    - name: temp test
+      run: ${{github.workspace}}/build/bin/mono_time_test.exe
+
    - uses: actions/upload-artifact@v3
+      if: success() || failure()
      with:
        name: ${{ github.event.repository.name }}-windows-msvc-x86_64
        # TODO: do propper packing
        path: |
          ${{github.workspace}}/build/bin/

+  windows-asan:
+    timeout-minutes: 15
+
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+
+    - name: Install Dependencies
+      run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static
+
+    # setup vs env
+    - uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: amd64
+
+    - name: Configure CMake
+      run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DTOMATO_ASAN=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
+
+    - name: Build
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
+
+    - name: temp test
+      run: ${{github.workspace}}/build/bin/mono_time_test.exe
+
+    - uses: actions/upload-artifact@v3
+      if: success() || failure()
+      with:
+        name: ${{ github.event.repository.name }}-windows-msvc-asan-x86_64
+        # TODO: do propper packing
+        # TODO: also switch to asan dlls
+        path: |
+          ${{github.workspace}}/build/bin/
+
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,6 +29,9 @@ jobs:
    - name: Build
      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4

+    - name: temp test
+      run: ${{github.workspace}}/build/bin/mono_time_test
+
  macos:
    timeout-minutes: 10

@@ -72,3 +75,6 @@ jobs:
    - name: Build
      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4

+    - name: temp test
+      run: ${{github.workspace}}/build/bin/mono_time_test.exe
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.14...3.24 FATAL_ERROR)

 # cmake setup begin
 project(tomato)
@@ -6,7 +6,7 @@ project(tomato)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)

 # defaulting to debug mode, if not specified
-if(NOT CMAKE_BUILD_TYPE)
+if (NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE "Debug")
 endif()

@@ -18,6 +18,26 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")

+option(TOMATO_ASAN "Build tomato with asan (gcc/clang/msvc)" OFF)
+
+if (TOMATO_ASAN)
+	if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+		if (NOT WIN32) # exclude mingw
+			link_libraries(-fsanitize=address)
+			#link_libraries(-fsanitize=address,undefined)
+			#link_libraries(-fsanitize=undefined)
+			message("II enabled ASAN")
+		else()
+			message("!! can not enable ASAN on this platform (gcc/clang + win)")
+		endif()
+	elseif (MSVC)
+		add_compile_options("/fsanitize=address")
+		message("II enabled ASAN")
+	else()
+		message("!! can not enable ASAN on this platform")
+	endif()
+endif()
+
 # external libs
 add_subdirectory(./external) # before increasing warn levels, sad :(

@@ -33,13 +53,8 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL
 		#-Wsign-conversion # Warn on sign conversions
 		-Wshadow # Warn if a variable declaration shadows one from a parent context
 	)
-
-	if (NOT WIN32)
-		#link_libraries(-fsanitize=address,undefined)
-		#link_libraries(-fsanitize=undefined)
-	endif()
 elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
-	if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+	if (MSVC)
 		string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 	else()
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
--- a/external/solanaceae_plugin
+++ b/external/solanaceae_plugin
--- a/external/solanaceae_tox
+++ b/external/solanaceae_tox
--- a/external/solanaceae_toxcore
+++ b/external/solanaceae_toxcore
--- a/external/toxcore/CMakeLists.txt
+++ b/external/toxcore/CMakeLists.txt
@@ -127,6 +127,8 @@ add_library(toxcore STATIC
 	${TOX_DIR}toxcore/tox.c
 	${TOX_DIR}toxcore/tox_dispatch.c
 	${TOX_DIR}toxcore/tox_dispatch.h
+	${TOX_DIR}toxcore/tox_event.c
+	${TOX_DIR}toxcore/tox_event.h
 	${TOX_DIR}toxcore/tox_events.c
 	${TOX_DIR}toxcore/tox_events.h
 	${TOX_DIR}toxcore/tox.h
@@ -203,6 +205,10 @@ add_executable(DHT_Bootstrap EXCLUDE_FROM_ALL
 	${TOX_DIR}testing/misc_tools.h
 	${TOX_DIR}testing/misc_tools.c
 )
-
 target_link_libraries(DHT_Bootstrap toxcore)

+add_executable(mono_time_test
+	./mono_time_test.cc
+)
+target_link_libraries(mono_time_test toxcore)
+target_compile_features(mono_time_test PUBLIC cxx_std_11)
--- a/external/toxcore/c-toxcore/.circleci/config.yml
+++ b/external/toxcore/c-toxcore/.circleci/config.yml
@@ -15,7 +15,6 @@ workflows:
      - ubsan
      # Static analysis
      - clang-analyze
-      - clang-tidy
      - cpplint
      - infer
      - static-analysis
@@ -134,7 +133,6 @@ jobs:
      - run:
          apt-get install -y --no-install-recommends
            ca-certificates
-            cppcheck
            g++
            llvm-dev
      - checkout
@@ -142,7 +140,6 @@ jobs:
      - run: other/analysis/check_includes
      - run: other/analysis/check_logger_levels
      - run: other/analysis/run-clang
-      - run: other/analysis/run-cppcheck
      - run: other/analysis/run-gcc

  clang-analyze:
@@ -156,24 +153,6 @@ jobs:
      - run: git submodule update --init --recursive
      - run: other/analysis/run-clang-analyze

-  clang-tidy:
-    working_directory: ~/work
-    docker:
-      - image: ubuntu
-
-    steps:
-      - run: *apt_install
-      - run:
-          apt-get install -y --no-install-recommends
-            ca-certificates
-            clang-tidy-14
-      - checkout
-      - run: git submodule update --init --recursive
-      - run:
-          other/analysis/run-clang-tidy ||
-          other/analysis/run-clang-tidy ||
-          other/analysis/run-clang-tidy
-
  cpplint:
    working_directory: ~/work
    docker:
--- a/external/toxcore/c-toxcore/.clang-tidy
+++ b/external/toxcore/c-toxcore/.clang-tidy
@@ -1,4 +1,5 @@
 # vim:ft=yaml
+HeaderFilterRegex: "/c-toxcore/[^/]+/[^.].+"
 CheckOptions:
  - key:             readability-identifier-naming.ClassCase
    value:           Camel_Snake_Case
@@ -35,6 +36,12 @@ CheckOptions:
    value:           lower_case

  - key:             llvmlibc-restrict-system-libc-headers.Includes
-    value:           "arpa/inet.h,assert.h,ctype.h,errno.h,fcntl.h,getopt.h,libconfig.h,linux/netdevice.h,math.h,netdb.h,netinet/in.h,opus.h,pthread.h,signal.h,sodium/crypto_scalarmult_curve25519.h,sodium.h,sodium/randombytes.h,stdio.h,stdlib.h,string.h,sys/ioctl.h,syslog.h,sys/resource.h,sys/socket.h,sys/stat.h,sys/time.h,sys/types.h,time.h,unistd.h,vpx/vp8cx.h,vpx/vp8dx.h,vpx/vpx_decoder.h,vpx/vpx_encoder.h,vpx/vpx_image.h"
+    value:           "arpa/inet.h,assert.h,ctype.h,errno.h,fcntl.h,getopt.h,libconfig.h,limits.h,linux/if.h,math.h,netdb.h,netinet/in.h,opus.h,pthread.h,signal.h,sodium/crypto_scalarmult_curve25519.h,sodium.h,sodium/randombytes.h,stdarg.h,stdbool.h,stddef.h,stdint.h,stdio.h,stdlib.h,string.h,sys/ioctl.h,syslog.h,sys/resource.h,sys/socket.h,sys/stat.h,sys/time.h,sys/types.h,time.h,unistd.h,vpx/vp8cx.h,vpx/vp8dx.h,vpx/vpx_decoder.h,vpx/vpx_encoder.h,vpx/vpx_image.h"
  - key:             hicpp-signed-bitwise.IgnorePositiveIntegerLiterals
    value:           true
+  - key:             concurrency-mt-unsafe.FunctionSet
+    value:           posix
+  - key:             misc-include-cleaner.IgnoreHeaders
+    value:           "pthread.h;stdbool.h;stddef.h;stdint.;stdint.h;stdint...;cstdint;sodium.*;sys/.*;unistd.h;opus.*;vpx.*;attributes.h;tox_struct.h"
+  - key:             readability-function-cognitive-complexity.Threshold
+    value:           153  # TODO(iphydf): Decrease. tox_new is the highest at the moment.
--- a/external/toxcore/c-toxcore/.github/scripts/autotools-linux
+++ b/external/toxcore/c-toxcore/.github/scripts/autotools-linux
@@ -11,10 +11,7 @@ add_ld_flag -Wl,-z,defs
 # Make compilation error on a warning
 add_flag -Werror

-add_config_flag --with-nacl-libs="$CACHEDIR/lib/amd64"
-add_config_flag --with-nacl-headers="$CACHEDIR/include/amd64"
 add_config_flag --disable-ipv6
-add_config_flag --enable-nacl
 add_config_flag --enable-daemon
 add_config_flag --with-log-level=TRACE

--- a/external/toxcore/c-toxcore/.github/scripts/flags-clang.sh
+++ b/external/toxcore/c-toxcore/.github/scripts/flags-clang.sh
@@ -65,6 +65,8 @@ add_cxx_flag -Wno-c++98-compat-pedantic
 add_cxx_flag -Wno-c99-extensions
 # We're C-compatible, so use C style casts.
 add_cxx_flag -Wno-old-style-cast
+# GTest does this.
+add_cxx_flag -Wno-global-constructors

 # Downgrade to warning so we still see it.
 add_flag -Wno-error=unreachable-code
--- a/external/toxcore/c-toxcore/.github/scripts/flags-coverage.sh
+++ b/external/toxcore/c-toxcore/.github/scripts/flags-coverage.sh
@@ -14,7 +14,7 @@ add_flag --coverage
 add_c_flag -fno-inline -fno-omit-frame-pointer

 # Show useful stack traces on crash.
-add_flag -fsanitize=undefined -fno-sanitize-recover=all
+add_flag -fsanitize=undefined -fno-sanitize-recover=all -D_DEBUG

 # In test code (_test.cc and libgtest), throw away all debug information.
 # We only care about stack frames inside toxcore (which is C). Without this,
--- a/external/toxcore/c-toxcore/.github/scripts/tox-bootstrapd-docker
+++ b/external/toxcore/c-toxcore/.github/scripts/tox-bootstrapd-docker
@@ -1,12 +1,15 @@
 #!/bin/bash

-set -exu
+set -exu -o pipefail

 LOCAL="${1:-}"

 readarray -t FILES <<<"$(git ls-files)"

-tar c "${FILES[@]}" | docker build -f other/bootstrap_daemon/docker/Dockerfile -t toxchat/bootstrap-node -
+if ! tar c "${FILES[@]}" | docker build -f other/bootstrap_daemon/docker/Dockerfile -t toxchat/bootstrap-node - 2>&1 | tee docker-build.log; then
+  grep -o "::error.*::[a-f0-9]*  /usr/local/bin/tox-bootstrapd" docker-build.log
+  false
+fi
 docker tag toxchat/bootstrap-node:latest toxchat/bootstrap-node:"$(other/print-version)"

 sudo useradd \
--- a/external/toxcore/c-toxcore/.github/settings.yml
+++ b/external/toxcore/c-toxcore/.github/settings.yml
@@ -1,86 +0,0 @@
---
-_extends: .github
-
-repository:
-  name: c-toxcore
-  description: The future of online communications.
-  homepage: https://tox.chat/
-  topics: toxcore, network, p2p, security, encryption, cryptography
-
-branches:
-  - name: "master"
-    protection:
-      required_status_checks:
-        contexts:
-          - "bazel-dbg"
-          - "bazel-opt"
-          - "build-alpine-s390x"
-          - "build-android"
-          - "build-compcert"
-          - "build-macos"
-          - "build-nacl"
-          - "build-tcc"
-          - "build-win32"
-          - "build-win64"
-          - "ci/circleci: asan"
-          - "ci/circleci: bazel-asan"
-          - "ci/circleci: bazel-msan"
-          - "ci/circleci: bazel-tsan"
-          - "ci/circleci: clang-analyze"
-          - "ci/circleci: clang-tidy"
-          - "ci/circleci: cpplint"
-          - "ci/circleci: infer"
-          - "ci/circleci: static-analysis"
-          - "ci/circleci: tsan"
-          - "ci/circleci: ubsan"
-          - "cimple"
-          - "cimplefmt"
-          - "CodeFactor"
-          - "code-review/reviewable"
-          - "common / buildifier"
-          - "coverage-linux"
-          - "docker-bootstrap-node"
-          - "docker-bootstrap-node-websocket"
-          - "docker-clusterfuzz"
-          - "docker-esp32"
-          - "docker-fuzzer"
-          - "docker-toxcore-js"
-          - "docker-win32"
-          - "docker-win64"
-          - "doxygen"
-          - "freebsd"
-          - "Hound"
-          - "misra"
-          - "mypy"
-          - "program-analysis"
-          - "sonar-scan"
-          - "tokstyle"
-          - "TokTok.c-toxcore"
-          - "TokTok.c-toxcore (windows_msvc_conan shared)"
-          - "TokTok.c-toxcore (windows_msvc_conan static)"
-
-# Labels specific to c-toxcore.
-labels:
-  - name: "bootstrap"
-    color: "#01707f"
-    description: "Bootstrap"
-
-  - name: "crypto"
-    color: "#1d76db"
-    description: "Crypto"
-
-  - name: "file transfers"
-    color: "#e02abf"
-    description: "File Transfers"
-
-  - name: "messenger"
-    color: "#d93f0b"
-    description: "Messenger"
-
-  - name: "network"
-    color: "#d4c5f9"
-    description: "Network"
-
-  - name: "toxav"
-    color: "#0052cc"
-    description: "Audio/video"
--- a/external/toxcore/c-toxcore/.github/workflows/ci.yml
+++ b/external/toxcore/c-toxcore/.github/workflows/ci.yml
@@ -13,14 +13,115 @@ jobs:
  common:
    uses: TokTok/ci-tools/.github/workflows/common-ci.yml@master

+  analysis:
+    strategy:
+      matrix:
+        tool: [autotools, clang-tidy, compcert, cppcheck, doxygen, misra, tcc, tokstyle]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker Build
+        uses: docker/build-push-action@v4
+        with:
+          file: other/docker/${{ matrix.tool }}/Dockerfile
+
+  coverage-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Build, test, and upload coverage
+        run: other/docker/coverage/run
+
+  generate-events:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Run generate_event_c
+        run: |
+          other/event_tooling/run
+          git diff --exit-code
+
+  cimplefmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Run cimplefmt
+        run: other/docker/cimplefmt/run -u $(find tox* -name "*.[ch]")
+
+  build-android:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - run: .github/scripts/cmake-android armeabi-v7a
+      - run: .github/scripts/cmake-android arm64-v8a
+      - run: .github/scripts/cmake-android x86
+      - run: .github/scripts/cmake-android x86_64
+
+  build-macos:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Build and test
+        run: .github/scripts/cmake-osx
+
+  build-msvc:
+    strategy:
+      matrix:
+        version: [2019, 2022]
+    runs-on: windows-${{ matrix.version }}
+    env:
+      VCPKG_ROOT: "C:/vcpkg"
+      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+      - name: Configure CMake
+        run: cmake --preset windows-default
+      - name: Build
+        run: cmake --build _build
+      - name: Test
+        run: |
+          cd _build
+          ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:6 --build-config Debug
+
+  build-windows:
+    strategy:
+      matrix:
+        bits: [32, 64]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Cross compilation
+        run: .github/scripts/cmake-win${{ matrix.bits }} script
+
  mypy:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
      - name: Set up Python 3.9
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
        with:
          python-version: 3.9
      - name: Install mypy
@@ -29,129 +130,3 @@ jobs:
        run: |
          (find . -name "*.py" -and -not -name "conanfile.py"; grep -lR '^#!.*python') \
              | xargs -n1 -P8 mypy --strict
-
-  doxygen:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Docker Build
-        uses: docker/build-push-action@v2
-        with:
-          file: other/docker/doxygen/Dockerfile
-
-  tokstyle:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Docker Build
-        uses: docker/build-push-action@v2
-        with:
-          file: other/docker/tokstyle/Dockerfile
-
-  misra:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Docker Build
-        uses: docker/build-push-action@v2
-        with:
-          file: other/docker/misra/Dockerfile
-
-  build-nacl:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Docker Build
-        uses: docker/build-push-action@v2
-        with:
-          file: other/docker/autotools/Dockerfile
-
-  build-tcc:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Docker Build
-        uses: docker/build-push-action@v2
-        with:
-          file: other/docker/tcc/Dockerfile
-
-  build-compcert:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Docker Build
-        uses: docker/build-push-action@v2
-        with:
-          file: other/docker/compcert/Dockerfile
-
-  build-alpine-s390x:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Docker Build
-        uses: docker/build-push-action@v2
-        with:
-          file: other/docker/alpine-s390x/Dockerfile
-
-  cimplefmt:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Run cimplefmt
-        run: other/docker/cimplefmt/run -u $(find tox* -name "*.[ch]")
-
-  build-win32:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Cross compilation
-        run: .github/scripts/cmake-win32 script
-
-  build-win64:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Cross compilation
-        run: .github/scripts/cmake-win64 script
-
-  build-macos:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Build and test
-        run: .github/scripts/cmake-osx
-
-  coverage-linux:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Build, test, and upload coverage
-        run: .github/scripts/coverage-linux
-
-  build-android:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - run: .github/scripts/cmake-android armeabi-v7a
-      - run: .github/scripts/cmake-android arm64-v8a
-      - run: .github/scripts/cmake-android x86
-      - run: .github/scripts/cmake-android x86_64
--- a/external/toxcore/c-toxcore/.github/workflows/docker.yml
+++ b/external/toxcore/c-toxcore/.github/workflows/docker.yml
@@ -17,11 +17,11 @@ jobs:
    steps:
      - name: Login to DockerHub
        if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          submodules: recursive
      - name: Docker Build
@@ -38,15 +38,15 @@ jobs:
    needs: [docker-bootstrap-node]
    steps:
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
      - name: Login to DockerHub
        if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
        with:
          context: "{{defaultContext}}:other/bootstrap_daemon/websocket"
          push: ${{ github.event_name == 'push' }}
@@ -57,17 +57,17 @@ jobs:
  docker-clusterfuzz:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
      - name: Login to DockerHub
        if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
        with:
          context: "."
          file: .clusterfuzzlite/Dockerfile
@@ -80,15 +80,15 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
      - name: Login to DockerHub
        if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
        with:
          file: testing/Dockerfile
          push: ${{ github.event_name == 'push' }}
@@ -100,15 +100,15 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
      - name: Login to DockerHub
        if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
        with:
          file: other/emscripten/Dockerfile
          push: ${{ github.event_name == 'push' }}
@@ -120,22 +120,22 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
        with:
          driver: docker
      - name: Login to DockerHub
        if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build toxchat/c-toxcore:sources
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
        with:
          file: other/docker/sources/Dockerfile
          tags: toxchat/c-toxcore:sources
      - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
        with:
          file: other/docker/esp32/Dockerfile
          push: ${{ github.event_name == 'push' }}
@@ -147,15 +147,15 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
      - name: Login to DockerHub
        if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
        with:
          context: "{{defaultContext}}:other/docker/windows"
          push: ${{ github.event_name == 'push' }}
@@ -171,15 +171,15 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
      - name: Login to DockerHub
        if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
        with:
          context: "{{defaultContext}}:other/docker/windows"
          push: ${{ github.event_name == 'push' }}
--- a/external/toxcore/c-toxcore/.github/workflows/post-submit.yml
+++ b/external/toxcore/c-toxcore/.github/workflows/post-submit.yml
@@ -0,0 +1,43 @@
+name: post-submit
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  build-alpine-s390x:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker Build
+        uses: docker/build-push-action@v4
+        with:
+          file: other/docker/alpine-s390x/Dockerfile
+
+  docker-coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker
+      - name: Login to DockerHub
+        if: ${{ github.event_name == 'push' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build toxchat/c-toxcore:sources
+        uses: docker/build-push-action@v4
+        with:
+          file: other/docker/sources/Dockerfile
+          tags: toxchat/c-toxcore:sources
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: other/docker/coverage/Dockerfile
+          push: ${{ github.event_name == 'push' }}
+          tags: toxchat/c-toxcore:coverage
+          cache-from: type=registry,ref=toxchat/c-toxcore:coverage
+          cache-to: type=inline
--- a/external/toxcore/c-toxcore/.github/workflows/sonar-scan.yml
+++ b/external/toxcore/c-toxcore/.github/workflows/sonar-scan.yml
@@ -19,13 +19,14 @@ jobs:
      SONAR_SERVER_URL: "https://sonarcloud.io"
      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
        with:
          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
          submodules: recursive
      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
        with:
+          distribution: "zulu"
          java-version: 17
      - name: Download and set up sonar-scanner
        env:
--- a/external/toxcore/c-toxcore/.gitignore
+++ b/external/toxcore/c-toxcore/.gitignore
@@ -14,6 +14,8 @@ Thumbs.db
 /_build
 /_install
 /tox-0.0.0*
+/.vs
+/CppProperties.json
 CMakeCache.txt
 CMakeFiles
 Makefile
--- a/external/toxcore/c-toxcore/BUILD.bazel
+++ b/external/toxcore/c-toxcore/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//tools/project:build_defs.bzl", "project")

-project()
+project(license = "gpl3-https")

 genrule(
    name = "public_headers",
--- a/external/toxcore/c-toxcore/CMakeLists.txt
+++ b/external/toxcore/c-toxcore/CMakeLists.txt
@@ -14,8 +14,8 @@
 #
 ################################################################################

-cmake_minimum_required(VERSION 3.5)
-cmake_policy(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
+cmake_policy(VERSION 3.16)
 project(toxcore)

 list(APPEND CMAKE_MODULE_PATH ${toxcore_SOURCE_DIR}/cmake)
@@ -76,11 +76,12 @@ if(APPLE)
 endif()

 enable_testing()
+find_package(GTest)

 set(CMAKE_MACOSX_RPATH ON)

 # Set standard version for compiler.
-if(MSVC)
+if(MSVC AND MSVC_TOOLSET_VERSION LESS 143)
  # https://developercommunity.visualstudio.com/t/older-winsdk-headers-are-incompatible-with-zcprepr/1593479
  set(CMAKE_C_STANDARD 99)
 else()
@@ -93,6 +94,35 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 message(STATUS "Supported C compiler features = ${CMAKE_C_COMPILE_FEATURES}")
 message(STATUS "Supported C++ compiler features = ${CMAKE_CXX_COMPILE_FEATURES}")

+# Enable some warnings if we know the compiler.
+if(MSVC)
+  add_compile_options(/W4 /analyze)
+  add_compile_options(/wd4100)  # unreferenced formal parameter
+  add_compile_options(/wd4267)  # narrowing conversion
+  add_compile_options(/wd4244)  # narrowing conversion
+  add_compile_options(/wd4127)  # conditional expression is constant
+  add_compile_options(/wd4995)  # #pragma deprecated
+  add_compile_options(/wd4018)  # signed/unsigned compare
+  add_compile_options(/wd4310)  # cast truncates constant value
+  add_compile_options(/wd4389)  # signed/unsigned compare
+  add_compile_options(/wd4245)  # signed/unsigned assign/return/function call
+  add_compile_options(/wd4200)  # nonstandard extension used: zero-sized array in struct/union
+  add_compile_options(/wd4702)  # unreachable code
+  add_compile_options(/wd6340)  # unsigned int passed to signed parameter
+  add_compile_options(/wd6326)  # potential comparison of a constant with another constant
+
+  # TODO(iphydf): Look into these
+  add_compile_options(/wd4996)  # use WSAAddressToStringW() instead of WSAAddressToStringA()
+  add_compile_options(/wd6255)  # don't use alloca
+  add_compile_options(/wd6385)  # reading invalid data
+  add_compile_options(/wd6001)  # using uninitialized memory
+  add_compile_options(/wd6101)  # returning uninitialized memory
+  add_compile_options(/wd6386)  # buffer overrun
+  add_compile_options(/wd6011)  # NULL dereference
+  add_compile_options(/wd6031)  # sscanf return value ignored
+  add_compile_options(/wd6387)  # passing NULL to fwrite
+endif()
+
 set(MIN_LOGGER_LEVEL "" CACHE STRING "Logging level to use (TRACE, DEBUG, INFO, WARNING, ERROR)")
 if(MIN_LOGGER_LEVEL)
  if(("${MIN_LOGGER_LEVEL}" STREQUAL "TRACE") OR
@@ -111,16 +141,11 @@ if(NOT USE_IPV6)
  add_definitions(-DUSE_IPV6=0)
 endif()

-option(USE_TEST_NETWORK "Use a separate test network with different packet IDs" OFF)
-if(USE_TEST_NETWORK)
-  add_definitions(-DUSE_TEST_NETWORK=1)
-endif()
-
 option(BUILD_MISC_TESTS "Build additional tests and utilities" OFF)
 option(BUILD_FUN_UTILS "Build additional just for fun utilities" OFF)

 option(AUTOTEST "Enable autotests (mainly for CI)" OFF)
-if (AUTOTEST)
+if(AUTOTEST)
  option(NON_HERMETIC_TESTS "Whether to build and run tests that depend on an internet connection" OFF)
  option(PROXY_TEST "Enable proxy test (needs HTTP/SOCKS5 proxy on port 8080/8081)" OFF)
 endif()
@@ -320,6 +345,8 @@ set(toxcore_SOURCES
  toxcore/tox.c
  toxcore/tox_dispatch.c
  toxcore/tox_dispatch.h
+  toxcore/tox_event.c
+  toxcore/tox_event.h
  toxcore/tox_events.c
  toxcore/tox_events.h
  toxcore/tox.h
@@ -329,7 +356,14 @@ set(toxcore_SOURCES
  toxcore/tox_unpack.h
  toxcore/util.c
  toxcore/util.h)
-set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${LIBSODIUM_LIBRARIES})
+if(TARGET unofficial-sodium::sodium)
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} unofficial-sodium::sodium)
+else()
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${LIBSODIUM_LIBRARIES})
+  set(toxcore_LINK_DIRECTORIES ${toxcore_LINK_DIRECTORIES} ${LIBSODIUM_LIBRARY_DIRS})
+  set(toxcore_INCLUDE_DIRECTORIES ${toxcore_INCLUDE_DIRECTORIES} ${LIBSODIUM_INCLUDE_DIRS})
+  set(toxcore_COMPILE_OPTIONS ${toxcore_COMPILE_OPTIONS} ${LIBSODIUM_CFLAGS_OTHER})
+endif()
 set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} libsodium)
 set(toxcore_API_HEADERS
  ${toxcore_SOURCE_DIR}/toxcore/tox.h^tox
@@ -365,7 +399,14 @@ if(BUILD_TOXAV)
  set(toxcore_API_HEADERS ${toxcore_API_HEADERS}
    ${toxcore_SOURCE_DIR}/toxav/toxav.h^toxav)

-  set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${OPUS_LIBRARIES} ${VPX_LIBRARIES})
+  if(MSVC)
+    set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} PkgConfig::OPUS PkgConfig::VPX)
+  else()
+    set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${OPUS_LIBRARIES} ${VPX_LIBRARIES})
+    set(toxcore_LINK_DIRECTORIES ${toxcore_LINK_DIRECTORIES} ${OPUS_LIBRARY_DIRS} ${VPX_LIBRARY_DIRS})
+    set(toxcore_INCLUDE_DIRECTORIES ${toxcore_INCLUDE_DIRECTORIES} ${OPUS_INCLUDE_DIRS} ${VPX_INCLUDE_DIRS})
+    set(toxcore_COMPILE_OPTIONS ${toxcore_COMPILE_OPTIONS} ${OPUS_CFLAGS_OTHER} ${VPX_CFLAGS_OTHER})
+  endif()
  set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} opus vpx)
 endif()

@@ -392,29 +433,32 @@ set(toxcore_API_HEADERS ${toxcore_API_HEADERS}
 # any potential libvpx linking.
 message("CMAKE_THREAD_LIBS_INIT: ${CMAKE_THREAD_LIBS_INIT}")
 if(CMAKE_THREAD_LIBS_INIT)
-  set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${CMAKE_THREAD_LIBS_INIT})
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
  set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} ${CMAKE_THREAD_LIBS_INIT})
 endif()

-
 if(NSL_LIBRARIES)
-  set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${NSL_LIBRARIES})
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${NSL_LIBRARIES})
  set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lnsl)
 endif()

 if(RT_LIBRARIES)
-  set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${RT_LIBRARIES})
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${RT_LIBRARIES})
  set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lrt)
 endif()

 if(SOCKET_LIBRARIES)
-  set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${SOCKET_LIBRARIES})
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${SOCKET_LIBRARIES})
  set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lsocket)
 endif()

+if(TARGET PThreads4W::PThreads4W)
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} PThreads4W::PThreads4W)
+elseif(TARGET Threads::Threads)
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} Threads::Threads)
+endif()
 if(WIN32)
-  set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ws2_32 iphlpapi)
-  set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lws2_32 -liphlpapi)
+  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} iphlpapi wsock32 ws2_32)
 endif()

 ################################################################################
@@ -427,7 +471,18 @@ endif()
 add_module(toxcore ${toxcore_SOURCES})

 # Link it to all dependencies.
-target_link_modules(toxcore ${toxcore_LINK_MODULES})
+if(TARGET toxcore_static)
+  target_link_libraries(toxcore_static PRIVATE ${toxcore_LINK_LIBRARIES})
+  target_link_directories(toxcore_static PUBLIC ${toxcore_LINK_DIRECTORIES})
+  target_include_directories(toxcore_static SYSTEM PRIVATE ${toxcore_INCLUDE_DIRECTORIES})
+  target_compile_options(toxcore_static PRIVATE ${toxcore_COMPILE_OPTIONS})
+endif()
+if(TARGET toxcore_shared)
+  target_link_libraries(toxcore_shared PRIVATE ${toxcore_LINK_LIBRARIES})
+  target_link_directories(toxcore_shared PUBLIC ${toxcore_LINK_DIRECTORIES})
+  target_include_directories(toxcore_shared SYSTEM PRIVATE ${toxcore_INCLUDE_DIRECTORIES})
+  target_compile_options(toxcore_shared PRIVATE ${toxcore_COMPILE_OPTIONS})
+endif()

 # Make version script (on systems that support it) to limit symbol visibility.
 make_version_script(toxcore ${toxcore_API_HEADERS})
@@ -442,22 +497,36 @@ install_module(toxcore DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tox)
 #
 ################################################################################

-include(CompileGTest)
+function(unit_test subdir target)
+  add_executable(unit_${target}_test ${subdir}/${target}_test.cc)
+  if(TARGET toxcore_static)
+    target_link_libraries(unit_${target}_test PRIVATE toxcore_static)
+  else()
+    target_link_libraries(unit_${target}_test PRIVATE toxcore_shared)
+  endif()
+  target_link_libraries(unit_${target}_test PRIVATE GTest::GTest GTest::Main)
+  set_target_properties(unit_${target}_test PROPERTIES COMPILE_FLAGS "${TEST_CXX_FLAGS}")
+  add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} unit_${target}_test)
+  set_property(TEST ${target} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${target}.profraw")
+endfunction()

 # The actual unit tests follow.
 #
-unit_test(toxav ring_buffer)
-unit_test(toxav rtp)
-unit_test(toxcore DHT)
-unit_test(toxcore bin_pack)
-unit_test(toxcore crypto_core)
-unit_test(toxcore group_announce)
-unit_test(toxcore group_moderation)
-unit_test(toxcore mem)
-unit_test(toxcore mono_time)
-unit_test(toxcore ping_array)
-unit_test(toxcore tox)
-unit_test(toxcore util)
+if(GTEST_FOUND)
+  unit_test(toxav ring_buffer)
+  unit_test(toxav rtp)
+  unit_test(toxcore DHT)
+  unit_test(toxcore bin_pack)
+  unit_test(toxcore crypto_core)
+  unit_test(toxcore group_announce)
+  unit_test(toxcore group_moderation)
+  unit_test(toxcore list)
+  unit_test(toxcore mem)
+  unit_test(toxcore mono_time)
+  unit_test(toxcore ping_array)
+  unit_test(toxcore tox)
+  unit_test(toxcore util)
+endif()

 add_subdirectory(testing)

@@ -481,7 +550,20 @@ if(DHT_BOOTSTRAP)
  add_executable(DHT_bootstrap
    other/DHT_bootstrap.c
    other/bootstrap_node_packets.c)
-  target_link_modules(DHT_bootstrap toxcore misc_tools)
+  if(TARGET toxcore_static)
+    target_link_libraries(DHT_bootstrap PRIVATE toxcore_static)
+  else()
+    target_link_libraries(DHT_bootstrap PRIVATE toxcore_shared)
+  endif()
+  target_link_libraries(DHT_bootstrap PRIVATE misc_tools)
+  if(TARGET unofficial-sodium::sodium)
+    target_link_libraries(DHT_bootstrap PRIVATE unofficial-sodium::sodium)
+  endif()
+  if(TARGET PThreads4W::PThreads4W)
+    target_link_libraries(DHT_bootstrap PRIVATE PThreads4W::PThreads4W)
+  elseif(TARGET Threads::Threads)
+    target_link_libraries(DHT_bootstrap PRIVATE Threads::Threads)
+  endif()
  install(TARGETS DHT_bootstrap RUNTIME DESTINATION bin)
 endif()

--- a/external/toxcore/c-toxcore/CMakePresets.json
+++ b/external/toxcore/c-toxcore/CMakePresets.json
@@ -0,0 +1,21 @@
+{
+    "version": 3,
+    "configurePresets": [
+        {
+            "name": "windows-default",
+            "binaryDir": "${sourceDir}/_build",
+            "cacheVariables": {
+                "ENABLE_SHARED": true,
+                "ENABLE_STATIC": true,
+                "AUTOTEST": true,
+                "BUILD_MISC_TESTS": true,
+                "BOOTSTRAP_DAEMON": false,
+                "MUST_BUILD_TOXAV": true,
+                "TEST_TIMEOUT_SECONDS": "60",
+                "CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS": true,
+                "CMAKE_COMPILE_WARNING_AS_ERROR": true,
+                "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+            }
+        }
+    ]
+}
--- a/external/toxcore/c-toxcore/INSTALL.md
+++ b/external/toxcore/c-toxcore/INSTALL.md
@@ -32,14 +32,14 @@ These instructions will guide you through the process of building and installing

 This repository, although called `toxcore`, in fact contains several libraries besides `toxcore` which complement it, as well as several executables. However, note that although these are separate libraries, at the moment, when building the libraries, they are all merged into a single `toxcore` library. Here is the full list of the main components that can be built using the CMake, their dependencies and descriptions.

-| Name             | Type       | Dependencies                                  | Platform       | Description                                                                |
-|------------------|------------|-----------------------------------------------|----------------|----------------------------------------------------------------------------|
-| `toxcore`        | Library    | libnacl or libsodium, libm, libpthread, librt | Cross-platform | The main Tox library that provides the messenger functionality.            |
-| `toxav`          | Library    | libtoxcore, libopus, libvpx                   | Cross-platform | Provides audio/video functionality.                                        |
-| `toxencryptsave` | Library    | libtoxcore, libnacl or libsodium              | Cross-platform | Provides encryption of Tox profiles (savedata), as well as arbitrary data. |
-| `DHT_bootstrap`  | Executable | libtoxcore                                    | Cross-platform | A simple DHT bootstrap node.                                               |
-| `tox-bootstrapd` | Executable | libtoxcore, libconfig                         | Unix-like      | Highly configurable DHT bootstrap node daemon (systemd, SysVinit, Docker). |
-| `cmp`            | Library    |                                               | Cross-platform | C implementation of the MessagePack serialization format. [https://github.com/camgunz/cmp](https://github.com/camgunz/cmp) |
+| Name             | Type       | Dependencies                       | Platform       | Description                                                                |
+|------------------|------------|------------------------------------|----------------|----------------------------------------------------------------------------|
+| `toxcore`        | Library    | libsodium, libm, libpthread, librt | Cross-platform | The main Tox library that provides the messenger functionality.            |
+| `toxav`          | Library    | libtoxcore, libopus, libvpx        | Cross-platform | Provides audio/video functionality.                                        |
+| `toxencryptsave` | Library    | libtoxcore, libsodium              | Cross-platform | Provides encryption of Tox profiles (savedata), as well as arbitrary data. |
+| `DHT_bootstrap`  | Executable | libtoxcore                         | Cross-platform | A simple DHT bootstrap node.                                               |
+| `tox-bootstrapd` | Executable | libtoxcore, libconfig              | Unix-like      | Highly configurable DHT bootstrap node daemon (systemd, SysVinit, Docker). |
+| `cmp`            | Library    |                                    | Cross-platform | C implementation of the MessagePack serialization format. [https://github.com/camgunz/cmp](https://github.com/camgunz/cmp) |

 #### Secondary

@@ -83,7 +83,7 @@ Useful for generating Tox profiles from the output of the vanity key generators,
 Library dependencies are listed in the [components](#components) table. The dependencies need to be satisfied for the components to be built. Note that if you don't have a dependency for some component, e.g. you don't have `libopus` installed required for building `toxav` component, building of that component is silently disabled.


-Be advised that due to the addition of `cmp` as a submodule, you now also need to initialize the git submodules required by toxcore. This can be done by cloning the repo with the addition of `--recurse-submodules` or by running `git submodule update --init` in the root directory of the repo. 
+Be advised that due to the addition of `cmp` as a submodule, you now also need to initialize the git submodules required by toxcore. This can be done by cloning the repo with the addition of `--recurse-submodules` or by running `git submodule update --init` in the root directory of the repo.

 #### Compiler requirements

--- a/external/toxcore/c-toxcore/LICENSE
+++ b/external/toxcore/c-toxcore/LICENSE
@@ -1,7 +1,7 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

@@ -664,12 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.

  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
--- a/external/toxcore/c-toxcore/README.md
+++ b/external/toxcore/c-toxcore/README.md
@@ -8,7 +8,8 @@

 Tox is a peer to peer (serverless) instant messenger aimed at making security
 and privacy easy to obtain for regular users. It uses
-[NaCl](https://nacl.cr.yp.to/) for its encryption and authentication.
+[libsodium](https://doc.libsodium.org/) (based on
+[NaCl](https://nacl.cr.yp.to/)) for its encryption and authentication.

 ## IMPORTANT!

@@ -18,12 +19,12 @@ This is an **experimental** cryptographic network library. It has not been
 formally audited by an independent third party that specializes in
 cryptography or cryptanalysis. **Use this library at your own risk.**

-The underlying crypto library [NaCl](https://nacl.cr.yp.to/install.html)
-provides reliable encryption, but the security model has not yet been fully
-specified. See [issue 210](https://github.com/TokTok/c-toxcore/issues/210) for
-a discussion on developing a threat model. See other issues for known
-weaknesses (e.g. [issue 426](https://github.com/TokTok/c-toxcore/issues/426)
-describes what can happen if your secret key is stolen).
+The underlying crypto library [libsodium](https://doc.libsodium.org/) provides
+reliable encryption, but the security model has not yet been fully specified.
+See [issue 210](https://github.com/TokTok/c-toxcore/issues/210) for a
+discussion on developing a threat model. See other issues for known weaknesses
+(e.g. [issue 426](https://github.com/TokTok/c-toxcore/issues/426) describes
+what can happen if your secret key is stolen).

 ## Toxcore Development Roadmap

--- a/external/toxcore/c-toxcore/auto_tests/CMakeLists.txt
+++ b/external/toxcore/c-toxcore/auto_tests/CMakeLists.txt
@@ -3,19 +3,35 @@ set(TEST_TIMEOUT_SECONDS "" CACHE STRING "Limit runtime of each test to the numb
 add_library(auto_test_support
  auto_test_support.c
  auto_test_support.h)
-target_link_modules(auto_test_support toxcore misc_tools)
+target_link_libraries(auto_test_support PRIVATE misc_tools)
+if(TARGET toxcore_static)
+  target_link_libraries(auto_test_support PRIVATE toxcore_static)
+else()
+  target_link_libraries(auto_test_support PRIVATE toxcore_shared)
+endif()
+if(TARGET PThreads4W::PThreads4W)
+  target_link_libraries(auto_test_support PRIVATE PThreads4W::PThreads4W)
+elseif(TARGET Threads::Threads)
+  target_link_libraries(auto_test_support PRIVATE Threads::Threads)
+endif()

 function(auto_test target)
-  if(AUTOTEST AND NOT (MSVC AND ARGV1 STREQUAL "MSVC_DONT_BUILD"))
-    add_executable(auto_${target}_test ${target}_test.c)
-    target_link_modules(auto_${target}_test toxcore misc_tools auto_test_support)
-    if(NOT ARGV1 STREQUAL "DONT_RUN")
-      add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} auto_${target}_test)
-      set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}")
-      # add the source dir as environment variable, so the testdata can be found
-      set_tests_properties(${target} PROPERTIES ENVIRONMENT "LLVM_PROFILE_FILE=${target}.profraw;srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
-    endif()
+  add_executable(auto_${target}_test ${target}_test.c)
+  target_link_libraries(auto_${target}_test PRIVATE misc_tools auto_test_support)
+  if(TARGET toxcore_static)
+    target_link_libraries(auto_${target}_test PRIVATE toxcore_static)
+  else()
+    target_link_libraries(auto_${target}_test PRIVATE toxcore_shared)
  endif()
+  if(TARGET PThreads4W::PThreads4W)
+    target_link_libraries(auto_${target}_test PRIVATE PThreads4W::PThreads4W)
+  elseif(TARGET Threads::Threads)
+    target_link_libraries(auto_${target}_test PRIVATE Threads::Threads)
+  endif()
+  add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} auto_${target}_test)
+  set_tests_properties(${target} PROPERTIES TIMEOUT "${TEST_TIMEOUT_SECONDS}")
+  # add the source dir as environment variable, so the testdata can be found
+  set_tests_properties(${target} PROPERTIES ENVIRONMENT "LLVM_PROFILE_FILE=${target}.profraw;srcdir=${CMAKE_CURRENT_SOURCE_DIR}")
 endfunction()

 auto_test(TCP)
@@ -69,17 +85,33 @@ auto_test(typing)
 auto_test(version)
 auto_test(save_compatibility)

+target_include_directories(auto_encryptsave_test SYSTEM PRIVATE ${LIBSODIUM_INCLUDE_DIRS})
+
 if(NON_HERMETIC_TESTS)
  auto_test(bootstrap)
  auto_test(tcp_relay)
 endif()

 if(BUILD_TOXAV)
-  auto_test(conference_av MSVC_DONT_BUILD)
+  auto_test(conference_av)
  auto_test(toxav_basic)
  auto_test(toxav_many)
-endif()

+  if(MSVC)
+    target_link_libraries(auto_toxav_basic_test PRIVATE PkgConfig::VPX)
+    target_link_libraries(auto_toxav_many_test PRIVATE PkgConfig::VPX)
+  else()
+    target_link_libraries(auto_toxav_basic_test PRIVATE ${VPX_LIBRARIES})
+    target_link_directories(auto_toxav_basic_test PRIVATE ${VPX_LIBRARY_DIRS})
+    target_include_directories(auto_toxav_basic_test SYSTEM PRIVATE ${VPX_INCLUDE_DIRS})
+    target_compile_options(auto_toxav_basic_test PRIVATE ${VPX_CFLAGS_OTHER})
+
+    target_link_libraries(auto_toxav_many_test PRIVATE ${VPX_LIBRARIES})
+    target_link_directories(auto_toxav_many_test PRIVATE ${VPX_LIBRARY_DIRS})
+    target_include_directories(auto_toxav_many_test SYSTEM PRIVATE ${VPX_INCLUDE_DIRS})
+    target_compile_options(auto_toxav_many_test PRIVATE ${VPX_CFLAGS_OTHER})
+  endif()
+endif()

 if(PROXY_TEST)
  auto_test(proxy)
--- a/external/toxcore/c-toxcore/auto_tests/Makefile.inc
+++ b/external/toxcore/c-toxcore/auto_tests/Makefile.inc
@@ -5,7 +5,7 @@ libauto_test_support_la_SOURCES = ../auto_tests/auto_test_support.c ../auto_test
 libauto_test_support_la_LIBADD = libmisc_tools.la libtoxcore.la

 TESTS = \
-        announce_test \
+    announce_test \
 	conference_double_invite_test \
 	conference_invite_merge_test \
 	conference_peer_nick_test \
@@ -13,6 +13,8 @@ TESTS = \
 	conference_test \
 	conference_two_test \
 	crypto_test \
+	encryptsave_test \
+	file_saving_test \
 	file_transfer_test \
 	forwarding_test \
 	friend_connection_test \
@@ -34,34 +36,24 @@ TESTS = \
 	set_name_test \
 	set_status_message_test \
 	TCP_test \
-	tox_events_test \
 	tox_dispatch_test \
+	tox_events_test \
 	tox_many_tcp_test \
 	tox_many_test \
 	tox_strncasecmp_test \
 	typing_test \
 	version_test

-if !WITH_NACL
-TESTS += \
-	encryptsave_test \
-	file_saving_test
-endif
-
 AUTOTEST_CFLAGS = \
-	$(LIBSODIUM_CFLAGS) \
-	$(NACL_CFLAGS)
+	$(LIBSODIUM_CFLAGS)

 AUTOTEST_LDADD = \
 	$(LIBSODIUM_LDFLAGS) \
-	$(NACL_LDFLAGS) \
 	libmisc_tools.la \
 	libauto_test_support.la \
 	libtoxcore.la \
 	libtoxencryptsave.la \
-	$(LIBSODIUM_LIBS) \
-	$(NACL_OBJECTS) \
-	$(NACL_LIBS)
+	$(LIBSODIUM_LIBS)


 if BUILD_AV
--- a/external/toxcore/c-toxcore/auto_tests/announce_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/announce_test.c
@@ -61,9 +61,13 @@ static void test_store_data(void)
    ck_assert(log != nullptr);
    logger_callback_log(log, print_debug_logger, nullptr, nullptr);
    Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
+    ck_assert(mono_time != nullptr);
    Networking_Core *net = new_networking_no_udp(log, mem, ns);
+    ck_assert(net != nullptr);
    DHT *dht = new_dht(log, mem, rng, ns, mono_time, net, true, true);
+    ck_assert(dht != nullptr);
    Forwarding *forwarding = new_forwarding(log, rng, mono_time, dht);
+    ck_assert(forwarding != nullptr);
    Announcements *announce = new_announcements(log, mem, rng, mono_time, forwarding);
    ck_assert(announce != nullptr);

--- a/external/toxcore/c-toxcore/auto_tests/auto_test_support.c
+++ b/external/toxcore/c-toxcore/auto_tests/auto_test_support.c
@@ -28,7 +28,6 @@ static const struct BootstrapNodes {
    uint16_t      port;
    const uint8_t key[32];
 } bootstrap_nodes[] = {
-#ifndef USE_TEST_NETWORK
    {
        "tox.abilinski.com", 33445,
        0x10, 0xC0, 0x0E, 0xB2, 0x50, 0xC3, 0x23, 0x3E,
@@ -57,22 +56,6 @@ static const struct BootstrapNodes {
        0x6D, 0xC9, 0xD0, 0xA3, 0x00, 0xE6, 0xC3, 0x57,
        0x63, 0x4E, 0xE2, 0xDA, 0x88, 0xC3, 0x54, 0x63,
    },
-#else
-    {
-        "172.93.52.70", 33445,
-        0x79, 0xCA, 0xDA, 0x49, 0x74, 0xB0, 0x92, 0x6F,
-        0x28, 0x6F, 0x02, 0x5C, 0xD5, 0xFF, 0xDF, 0x3E,
-        0x65, 0x4A, 0x37, 0x58, 0xC5, 0x3E, 0x02, 0x73,
-        0xEC, 0xFC, 0x4D, 0x12, 0xC2, 0x1D, 0xCA, 0x48,
-    },
-    {
-        "tox.plastiras.org", 38445,
-        0x5E, 0x47, 0xBA, 0x1D, 0xC3, 0x91, 0x3E, 0xB2,
-        0xCB, 0xF2, 0xD6, 0x4C, 0xE4, 0xF2, 0x3D, 0x8B,
-        0xFE, 0x53, 0x91, 0xBF, 0xAB, 0xE5, 0xC4, 0x3C,
-        0x5B, 0xAD, 0x13, 0xF0, 0xA4, 0x14, 0xCD, 0x77,
-    },
-#endif  // USE_TEST_NETWORK
    { nullptr, 0, 0 },
 };

@@ -166,6 +149,8 @@ void set_mono_time_callback(AutoTox *autotox)
    Mono_Time *mono_time = autotox->tox->mono_time;

    autotox->clock = current_time_monotonic(mono_time);
+    ck_assert_msg(autotox->clock >= 1000,
+                  "clock is too low (not initialised?): %lu", (unsigned long)autotox->clock);
    mono_time_set_current_time_callback(mono_time, nullptr, nullptr);  // set to default first
    mono_time_set_current_time_callback(mono_time, get_state_clock_callback, &autotox->clock);
 }
@@ -332,7 +317,7 @@ static void bootstrap_autotoxes(struct Tox_Options *options, uint32_t tox_count,
    for (uint32_t i = 1; i < tox_count; ++i) {
        Tox_Err_Bootstrap err;
        tox_bootstrap(autotoxes[i].tox, "localhost", dht_port, dht_key, &err);
-        ck_assert(err == TOX_ERR_BOOTSTRAP_OK);
+        ck_assert_msg(err == TOX_ERR_BOOTSTRAP_OK, "bootstrap error for port %d: %d", dht_port, err);
    }

    if (!udp_enabled) {
--- a/external/toxcore/c-toxcore/auto_tests/encryptsave_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/encryptsave_test.c
@@ -3,7 +3,6 @@
 #include <string.h>
 #include <sys/types.h>

-#ifndef VANILLA_NACL
 #include <sodium.h>

 #include "../testing/misc_tools.h"
@@ -232,9 +231,3 @@ int main(void)

    return 0;
 }
-#else  // VANILLA_NACL
-int main(void)
-{
-    return 0;
-}
-#endif
--- a/external/toxcore/c-toxcore/auto_tests/group_general_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/group_general_test.c
@@ -9,6 +9,7 @@
 #include <string.h>

 #include "auto_test_support.h"
+#include "../toxcore/tox_private.h"

 typedef struct State {
    size_t   peer_joined_count;
@@ -42,6 +43,22 @@ typedef struct State {

 #define PEER_LIMIT 20

+static void print_ip(Tox *tox, uint32_t groupnumber, uint32_t peer_id)
+{
+    Tox_Err_Group_Peer_Query err;
+    size_t length = tox_group_peer_get_ip_address_size(tox, groupnumber, peer_id, &err);
+
+    ck_assert_msg(err == TOX_ERR_GROUP_PEER_QUERY_OK, "failed to get ip address size: error %d", err);
+
+    uint8_t ip_str[TOX_GROUP_PEER_IP_STRING_MAX_LENGTH];
+    tox_group_peer_get_ip_address(tox, groupnumber, peer_id, ip_str, &err);
+    ip_str[length] = '\0';
+
+    ck_assert_msg(err == TOX_ERR_GROUP_PEER_QUERY_OK, "failed to get ip address: error %d", err);
+
+    fprintf(stderr, "%s\n", ip_str);
+}
+
 static bool all_group_peers_connected(AutoTox *autotoxes, uint32_t tox_count, uint32_t groupnumber, size_t name_length)
 {
    for (size_t i = 0; i < tox_count; ++i) {
@@ -119,6 +136,9 @@ static void group_peer_join_handler(Tox *tox, uint32_t groupnumber, uint32_t pee
        }
    }

+    fprintf(stderr, "%s joined with IP: ", peer_name);
+    print_ip(tox, groupnumber, peer_id);
+
    state->peer_id = peer_id;
    ++state->peer_joined_count;
 }
@@ -178,6 +198,11 @@ static void group_peer_self_join_handler(Tox *tox, uint32_t groupnumber, void *u
    ck_assert_msg(query_err == TOX_ERR_GROUP_STATE_QUERIES_OK, "%d", query_err);
    ck_assert(memcmp(topic, TOPIC, TOPIC_LEN) == 0);

+    uint32_t peer_id = tox_group_self_get_peer_id(tox, groupnumber, nullptr);
+
+    fprintf(stderr, "self joined with IP: ");
+    print_ip(tox, groupnumber, peer_id);
+
    ++state->self_joined_count;
 }

@@ -234,7 +259,6 @@ static void group_peer_status_handler(Tox *tox, uint32_t groupnumber, uint32_t p

 static void group_announce_test(AutoTox *autotoxes)
 {
-#ifndef VANILLA_NACL
    ck_assert_msg(NUM_GROUP_TOXES == 2, "NUM_GROUP_TOXES needs to be 2");

    Tox *tox0 = autotoxes[0].tox;
@@ -341,6 +365,7 @@ static void group_announce_test(AutoTox *autotoxes)
    ck_assert(memcmp(tox0_pk_query, tox0_self_pk, TOX_GROUP_PEER_PUBLIC_KEY_SIZE) == 0);

    fprintf(stderr, "Peer 0 disconnecting...\n");
+
    // tox 0 disconnects then reconnects
    Tox_Err_Group_Disconnect d_err;
    tox_group_disconnect(tox0, groupnumber, &d_err);
@@ -410,7 +435,6 @@ static void group_announce_test(AutoTox *autotoxes)
    ck_assert(num_groups1 == num_groups2 && num_groups2 == 0);

    printf("All tests passed!\n");
-#endif  // VANILLA_NACL
 }

 int main(void)
--- a/external/toxcore/c-toxcore/auto_tests/group_invite_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/group_invite_test.c
@@ -102,7 +102,6 @@ static void group_peer_join_handler(Tox *tox, uint32_t group_number, uint32_t pe

 static void group_invite_test(AutoTox *autotoxes)
 {
-#ifndef VANILLA_NACL
    ck_assert_msg(NUM_GROUP_TOXES > 7, "NUM_GROUP_TOXES is too small: %d", NUM_GROUP_TOXES);

    for (size_t i = 0; i < NUM_GROUP_TOXES; ++i) {
@@ -260,8 +259,6 @@ static void group_invite_test(AutoTox *autotoxes)
    }

    printf("All tests passed!\n");
-
-#endif // VANILLA_NACL
 }

 int main(void)
--- a/external/toxcore/c-toxcore/auto_tests/group_message_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/group_message_test.c
@@ -350,7 +350,6 @@ static void group_message_handler_wraparound_test(Tox *tox, uint32_t groupnumber

 static void group_message_test(AutoTox *autotoxes)
 {
-#ifndef VANILLA_NACL
    ck_assert_msg(NUM_GROUP_TOXES >= 2, "NUM_GROUP_TOXES is too small: %d", NUM_GROUP_TOXES);

    const Random *rng = system_random();
@@ -396,8 +395,9 @@ static void group_message_test(AutoTox *autotoxes)
        iterate_all_wait(autotoxes, NUM_GROUP_TOXES, ITERATION_INTERVAL);

        if (state1->peer_joined && !state1->message_sent) {
-            tox_group_send_message(tox1, group_number, TOX_MESSAGE_TYPE_NORMAL, (const uint8_t *)TEST_MESSAGE,
-                                   TEST_MESSAGE_LEN, &state1->pseudo_msg_id, &err_send);
+            state1->pseudo_msg_id = tox_group_send_message(
+                    tox1, group_number, TOX_MESSAGE_TYPE_NORMAL, (const uint8_t *)TEST_MESSAGE,
+                    TEST_MESSAGE_LEN, &err_send);
            ck_assert(err_send == TOX_ERR_GROUP_SEND_MESSAGE_OK);
            state1->message_sent = true;
        }
@@ -420,7 +420,7 @@ static void group_message_test(AutoTox *autotoxes)

    // tox1 sends group a message which should not be seen by tox0's message handler
    tox_group_send_message(tox1, group_number, TOX_MESSAGE_TYPE_NORMAL, (const uint8_t *)IGNORE_MESSAGE,
-                           IGNORE_MESSAGE_LEN, nullptr, &err_send);
+                           IGNORE_MESSAGE_LEN, &err_send);

    iterate_all_wait(autotoxes, NUM_GROUP_TOXES, ITERATION_INTERVAL);

@@ -507,7 +507,7 @@ static void group_message_test(AutoTox *autotoxes)

        memcpy(m + 2, &checksum, sizeof(uint16_t));

-        tox_group_send_message(tox0, group_number, TOX_MESSAGE_TYPE_NORMAL, (const uint8_t *)m, message_size, nullptr, &err_send);
+        tox_group_send_message(tox0, group_number, TOX_MESSAGE_TYPE_NORMAL, (const uint8_t *)m, message_size, &err_send);

        ck_assert(err_send == TOX_ERR_GROUP_SEND_MESSAGE_OK);
    }
@@ -529,7 +529,7 @@ static void group_message_test(AutoTox *autotoxes)

        memcpy(m, &i, sizeof(uint16_t));

-        tox_group_send_message(tox0, group_number, TOX_MESSAGE_TYPE_NORMAL, (const uint8_t *)m, 2, nullptr, &err_send);
+        tox_group_send_message(tox0, group_number, TOX_MESSAGE_TYPE_NORMAL, (const uint8_t *)m, 2, &err_send);
        ck_assert(err_send == TOX_ERR_GROUP_SEND_MESSAGE_OK);
    }

@@ -544,7 +544,6 @@ static void group_message_test(AutoTox *autotoxes)
    }

    fprintf(stderr, "All tests passed!\n");
-#endif  // VANILLA_NACL
 }

 int main(void)
--- a/external/toxcore/c-toxcore/auto_tests/group_moderation_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/group_moderation_test.c
@@ -334,21 +334,21 @@ static void voice_state_message_test(AutoTox *autotox, Tox_Group_Voice_State voi
    ck_assert(sq_err == TOX_ERR_GROUP_SELF_QUERY_OK);

    Tox_Err_Group_Send_Message msg_err;
-    bool send_ret = tox_group_send_message(autotox->tox, state->group_number, TOX_MESSAGE_TYPE_NORMAL,
-                                           (const uint8_t *)"test", 4, nullptr, &msg_err);
+    tox_group_send_message(autotox->tox, state->group_number, TOX_MESSAGE_TYPE_NORMAL,
+                           (const uint8_t *)"test", 4, &msg_err);

    switch (self_role) {
        case TOX_GROUP_ROLE_OBSERVER: {
-            ck_assert(!send_ret && msg_err == TOX_ERR_GROUP_SEND_MESSAGE_PERMISSIONS);
+            ck_assert(msg_err == TOX_ERR_GROUP_SEND_MESSAGE_PERMISSIONS);
            break;
        }

        case TOX_GROUP_ROLE_USER: {
            if (voice_state != TOX_GROUP_VOICE_STATE_ALL) {
-                ck_assert_msg(!send_ret && msg_err == TOX_ERR_GROUP_SEND_MESSAGE_PERMISSIONS,
-                              "%d, %d", send_ret, msg_err);
+                ck_assert_msg(msg_err == TOX_ERR_GROUP_SEND_MESSAGE_PERMISSIONS,
+                              "%d", msg_err);
            } else {
-                ck_assert(send_ret && msg_err == TOX_ERR_GROUP_SEND_MESSAGE_OK);
+                ck_assert(msg_err == TOX_ERR_GROUP_SEND_MESSAGE_OK);
            }

            break;
@@ -356,16 +356,16 @@ static void voice_state_message_test(AutoTox *autotox, Tox_Group_Voice_State voi

        case TOX_GROUP_ROLE_MODERATOR: {
            if (voice_state != TOX_GROUP_VOICE_STATE_FOUNDER) {
-                ck_assert(send_ret && msg_err == TOX_ERR_GROUP_SEND_MESSAGE_OK);
+                ck_assert(msg_err == TOX_ERR_GROUP_SEND_MESSAGE_OK);
            } else {
-                ck_assert(!send_ret && msg_err == TOX_ERR_GROUP_SEND_MESSAGE_PERMISSIONS);
+                ck_assert(msg_err == TOX_ERR_GROUP_SEND_MESSAGE_PERMISSIONS);
            }

            break;
        }

        case TOX_GROUP_ROLE_FOUNDER: {
-            ck_assert(send_ret && msg_err == TOX_ERR_GROUP_SEND_MESSAGE_OK);
+            ck_assert(msg_err == TOX_ERR_GROUP_SEND_MESSAGE_OK);
            break;
        }
    }
@@ -432,7 +432,6 @@ static void check_voice_state(AutoTox *autotoxes, uint32_t num_toxes)

 static void group_moderation_test(AutoTox *autotoxes)
 {
-#ifndef VANILLA_NACL
    ck_assert_msg(NUM_GROUP_TOXES >= 4, "NUM_GROUP_TOXES is too small: %d", NUM_GROUP_TOXES);
    ck_assert_msg(NUM_GROUP_TOXES < 10, "NUM_GROUP_TOXES is too big: %d", NUM_GROUP_TOXES);

@@ -634,7 +633,6 @@ static void group_moderation_test(AutoTox *autotoxes)
    }

    fprintf(stderr, "All tests passed!\n");
-#endif  // VANILLA_NACL
 }

 int main(void)
--- a/external/toxcore/c-toxcore/auto_tests/group_save_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/group_save_test.c
@@ -148,7 +148,6 @@ static int has_correct_self_state(const Tox *tox, uint32_t group_number, const u

 static void group_save_test(AutoTox *autotoxes)
 {
-#ifndef VANILLA_NACL
    ck_assert_msg(NUM_GROUP_TOXES > 1, "NUM_GROUP_TOXES is too small: %d", NUM_GROUP_TOXES);

    for (size_t i = 0; i < NUM_GROUP_TOXES; ++i) {
@@ -270,8 +269,6 @@ static void group_save_test(AutoTox *autotoxes)
    tox_kill(new_tox);

    printf("All tests passed!\n");
-
-#endif  // VANILLA_NACL
 }

 int main(void)
--- a/external/toxcore/c-toxcore/auto_tests/group_state_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/group_state_test.c
@@ -238,7 +238,6 @@ static void set_group_state(Tox *tox, uint32_t groupnumber, uint32_t peer_limit,

 static void group_state_test(AutoTox *autotoxes)
 {
-#ifndef VANILLA_NACL
    ck_assert_msg(NUM_GROUP_TOXES >= 3, "NUM_GROUP_TOXES is too small: %d", NUM_GROUP_TOXES);

    for (size_t i = 0; i < NUM_GROUP_TOXES; ++i) {
@@ -318,8 +317,6 @@ static void group_state_test(AutoTox *autotoxes)
    }

    fprintf(stderr, "All tests passed!\n");
-
-#endif /* VANILLA_NACL */
 }

 int main(void)
--- a/external/toxcore/c-toxcore/auto_tests/group_sync_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/group_sync_test.c
@@ -330,7 +330,6 @@ static void topic_spam(const Random *rng, AutoTox *autotoxes, uint32_t num_peers

 static void group_sync_test(AutoTox *autotoxes)
 {
-#ifndef VANILLA_NACL
    ck_assert(NUM_GROUP_TOXES >= 5);
    const Random *rng = system_random();
    ck_assert(rng != nullptr);
@@ -443,8 +442,6 @@ static void group_sync_test(AutoTox *autotoxes)
    }

    fprintf(stderr, "All tests passed!\n");
-
-#endif  // VANILLA_NACL
 }

 int main(void)
--- a/external/toxcore/c-toxcore/auto_tests/group_tcp_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/group_tcp_test.c
@@ -8,8 +8,6 @@

 #include "auto_test_support.h"

-#ifdef USE_TEST_NETWORK
-
 #define NUM_GROUP_TOXES 2
 #define CODEWORD "RONALD MCDONALD"
 #define CODEWORD_LEN (sizeof(CODEWORD) - 1)
@@ -129,7 +127,6 @@ static bool all_peers_got_code(AutoTox *autotoxes)

 static void group_tcp_test(AutoTox *autotoxes)
 {
-#ifndef VANILLA_NACL
    ck_assert(NUM_GROUP_TOXES >= 2);

    State *state0 = (State *)autotoxes[0].state;
@@ -209,7 +206,7 @@ static void group_tcp_test(AutoTox *autotoxes)

    Tox_Err_Group_Send_Message merr;
    tox_group_send_message(autotoxes[0].tox, groupnumber, TOX_MESSAGE_TYPE_NORMAL,
-                           (const uint8_t *)CODEWORD, CODEWORD_LEN, nullptr, &merr);
+                           (const uint8_t *)CODEWORD, CODEWORD_LEN, &merr);
    ck_assert(merr == TOX_ERR_GROUP_SEND_MESSAGE_OK);

    while (!state1->got_second_code) {
@@ -222,34 +219,29 @@ static void group_tcp_test(AutoTox *autotoxes)
    }

    printf("Test passed!\n");
-
-#endif // VANILLA_NACL
 }
-#endif // USE_TEST_NETWORK

-int main(void)
+int main(int argc, char **argv)
 {
-#ifdef USE_TEST_NETWORK  // TODO(Jfreegman): Enable this test when the mainnet works with DHT groupchats
    setvbuf(stdout, nullptr, _IONBF, 0);

-    struct Tox_Options *options = (struct Tox_Options *)calloc(1, sizeof(struct Tox_Options));
+    struct Tox_Options *options = tox_options_new(nullptr);
    ck_assert(options != nullptr);

-    tox_options_default(options);
    tox_options_set_udp_enabled(options, false);

    Run_Auto_Options autotest_opts = default_run_auto_options();
    autotest_opts.graph = GRAPH_COMPLETE;

-    run_auto_test(options, NUM_GROUP_TOXES, group_tcp_test, sizeof(State), &autotest_opts);
+    // TODO(JFreegman): Fix this test and remove the "if".
+    if (argc > 2) {
+        run_auto_test(options, NUM_GROUP_TOXES, group_tcp_test, sizeof(State), &autotest_opts);
+    }

    tox_options_free(options);
-#endif
    return 0;
 }

-#ifdef USE_TEST_NETWORK
-#undef NUM_GROUP_TOXES
 #undef CODEWORD_LEN
 #undef CODEWORD
-#endif // USE_TEST_NETWORK
+#undef NUM_GROUP_TOXES
--- a/external/toxcore/c-toxcore/auto_tests/group_topic_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/group_topic_test.c
@@ -203,7 +203,6 @@ static uint32_t set_topic_all_peers(const Random *rng, AutoTox *autotoxes, size_

 static void group_topic_test(AutoTox *autotoxes)
 {
-#ifndef VANILLA_NACL
    ck_assert_msg(NUM_GROUP_TOXES >= 3, "NUM_GROUP_TOXES is too small: %d", NUM_GROUP_TOXES);

    const Random *rng = system_random();
@@ -318,8 +317,6 @@ static void group_topic_test(AutoTox *autotoxes)
    }

    fprintf(stderr, "All tests passed!\n");
-
-#endif /* VANILLA_NACL */
 }

 int main(void)
--- a/external/toxcore/c-toxcore/auto_tests/invalid_tcp_proxy_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/invalid_tcp_proxy_test.c
@@ -7,15 +7,8 @@
 #include "auto_test_support.h"
 #include "check_compat.h"

-static uint8_t const key[] = {
-    0x15, 0xE9, 0xC3, 0x09, 0xCF, 0xCB, 0x79, 0xFD,
-    0xDF, 0x0E, 0xBA, 0x05, 0x7D, 0xAB, 0xB4, 0x9F,
-    0xE1, 0x5F, 0x38, 0x03, 0xB1, 0xBF, 0xF0, 0x65,
-    0x36, 0xAE, 0x2E, 0x5B, 0xA5, 0xE4, 0x69, 0x0E,
-};
-
-// Try to bootstrap for 30 seconds.
-#define NUM_ITERATIONS (unsigned)(30.0 / (ITERATION_INTERVAL / 1000.0))
+// Try to bootstrap for 20 seconds.
+#define NUM_ITERATIONS (unsigned)(20.0 / (ITERATION_INTERVAL / 1000.0))

 int main(void)
 {
@@ -24,13 +17,12 @@ int main(void)
    struct Tox_Options *opts = tox_options_new(nullptr);
    tox_options_set_udp_enabled(opts, false);
    tox_options_set_proxy_type(opts, TOX_PROXY_TYPE_SOCKS5);
-    tox_options_set_proxy_host(opts, "localhost");
+    tox_options_set_proxy_host(opts, "127.0.0.1");
    tox_options_set_proxy_port(opts, 51724);
    Tox *tox = tox_new_log(opts, nullptr, nullptr);
    tox_options_free(opts);

-    tox_add_tcp_relay(tox, "tox.ngc.zone", 33445, key, nullptr);
-    tox_bootstrap(tox, "tox.ngc.zone", 33445, key, nullptr);
+    bootstrap_tox_live_network(tox, true);

    printf("Waiting for connection...\n");

--- a/external/toxcore/c-toxcore/auto_tests/invalid_udp_proxy_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/invalid_udp_proxy_test.c
@@ -7,15 +7,8 @@
 #include "auto_test_support.h"
 #include "check_compat.h"

-static uint8_t const key[] = {
-    0x15, 0xE9, 0xC3, 0x09, 0xCF, 0xCB, 0x79, 0xFD,
-    0xDF, 0x0E, 0xBA, 0x05, 0x7D, 0xAB, 0xB4, 0x9F,
-    0xE1, 0x5F, 0x38, 0x03, 0xB1, 0xBF, 0xF0, 0x65,
-    0x36, 0xAE, 0x2E, 0x5B, 0xA5, 0xE4, 0x69, 0x0E,
-};
-
-// Try to bootstrap for 30 seconds.
-#define NUM_ITERATIONS (unsigned)(30.0 / (ITERATION_INTERVAL / 1000.0))
+// Try to bootstrap for 20 seconds.
+#define NUM_ITERATIONS (unsigned)(20.0 / (ITERATION_INTERVAL / 1000.0))

 int main(void)
 {
@@ -24,13 +17,12 @@ int main(void)
    struct Tox_Options *opts = tox_options_new(nullptr);
    tox_options_set_udp_enabled(opts, true);
    tox_options_set_proxy_type(opts, TOX_PROXY_TYPE_SOCKS5);
-    tox_options_set_proxy_host(opts, "localhost");
+    tox_options_set_proxy_host(opts, "127.0.0.1");
    tox_options_set_proxy_port(opts, 51724);
    Tox *tox = tox_new_log(opts, nullptr, nullptr);
    tox_options_free(opts);

-    tox_add_tcp_relay(tox, "tox.ngc.zone", 33445, key, nullptr);
-    tox_bootstrap(tox, "tox.ngc.zone", 33445, key, nullptr);
+    bootstrap_tox_live_network(tox, true);

    printf("Waiting for connection...");

--- a/external/toxcore/c-toxcore/auto_tests/onion_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/onion_test.c
@@ -53,7 +53,7 @@ static int handle_test_1(void *object, const IP_Port *source, const uint8_t *pac
    res_packet[0] = NET_PACKET_ANNOUNCE_RESPONSE;
    memcpy(res_packet + 1, res_message, sizeof(res_message));

-    if (send_onion_response(onion->net, source, res_packet, sizeof(res_packet),
+    if (send_onion_response(onion->log, onion->net, source, res_packet, sizeof(res_packet),
                            packet + sizeof(res_packet)) == -1) {
        return 1;
    }
@@ -293,7 +293,7 @@ static void test_basic(void)
    uint64_t s;
    memcpy(&s, sb_data, sizeof(uint64_t));
    memcpy(test_3_pub_key, nodes[3].public_key, CRYPTO_PUBLIC_KEY_SIZE);
-    int ret = send_announce_request(onion1->net, rng, &path, &nodes[3],
+    int ret = send_announce_request(log1, onion1->net, rng, &path, &nodes[3],
                                    dht_get_self_public_key(onion1->dht),
                                    dht_get_self_secret_key(onion1->dht),
                                    zeroes,
@@ -315,7 +315,7 @@ static void test_basic(void)
    memcpy(onion_announce_entry_public_key(onion2_a, 1), dht_get_self_public_key(onion2->dht), CRYPTO_PUBLIC_KEY_SIZE);
    onion_announce_entry_set_time(onion2_a, 1, mono_time_get(mono_time2));
    networking_registerhandler(onion1->net, NET_PACKET_ONION_DATA_RESPONSE, &handle_test_4, onion1);
-    send_announce_request(onion1->net, rng, &path, &nodes[3],
+    send_announce_request(log1, onion1->net, rng, &path, &nodes[3],
                          dht_get_self_public_key(onion1->dht),
                          dht_get_self_secret_key(onion1->dht),
                          test_3_ping_id,
@@ -340,7 +340,7 @@ static void test_basic(void)
    ck_assert_msg((onion3 != nullptr), "Onion failed initializing.");

    random_nonce(rng, nonce);
-    ret = send_data_request(onion3->net, rng, &path, &nodes[3].ip_port,
+    ret = send_data_request(log3, onion3->net, rng, &path, &nodes[3].ip_port,
                            dht_get_self_public_key(onion1->dht),
                            dht_get_self_public_key(onion1->dht),
                            nonce, (const uint8_t *)"Install gentoo", sizeof("Install gentoo"));
--- a/external/toxcore/c-toxcore/auto_tests/send_message_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/send_message_test.c
@@ -42,6 +42,7 @@ static void send_message_test(AutoTox *autotoxes)

    const size_t msgs_len = tox_max_message_length() + 1;
    uint8_t *msgs = (uint8_t *)malloc(msgs_len);
+    ck_assert(msgs != nullptr);
    memset(msgs, MESSAGE_FILLER, msgs_len);

    Tox_Err_Friend_Send_Message errm;
--- a/external/toxcore/c-toxcore/auto_tests/tox_dispatch_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/tox_dispatch_test.c
@@ -10,6 +10,8 @@
 #include "../toxcore/tox.h"
 #include "../toxcore/tox_dispatch.h"
 #include "../toxcore/tox_events.h"
+#include "../toxcore/tox_private.h"
+#include "../toxcore/tox_unpack.h"
 #include "auto_test_support.h"
 #include "check_compat.h"

@@ -30,31 +32,36 @@ static void handle_events_friend_message(Tox *tox, const Tox_Event_Friend_Messag

 static void dump_events(const char *path, const Tox_Events *events)
 {
-    if (want_dump_events) {
-        FILE *fh = fopen(path, "w");
-        ck_assert(fh != nullptr);
-        const uint32_t len = tox_events_bytes_size(events);
-        uint8_t *buf = (uint8_t *)malloc(len);
-        ck_assert(buf != nullptr);
-        tox_events_get_bytes(events, buf);
-        fwrite(buf, 1, len, fh);
-        free(buf);
-        fclose(fh);
-    }
+    FILE *fh = fopen(path, "w");
+    ck_assert(fh != nullptr);
+    const uint32_t len = tox_events_bytes_size(events);
+    uint8_t *buf = (uint8_t *)malloc(len);
+    ck_assert(buf != nullptr);
+    ck_assert(tox_events_get_bytes(events, buf));
+    fwrite(buf, 1, len, fh);
+    free(buf);
+    fclose(fh);
 }

 static void print_events(const Tox_System *sys, Tox_Events *events)
 {
    const uint32_t size = tox_events_bytes_size(events);

-    uint8_t *bytes = (uint8_t *)malloc(size);
-    ck_assert(bytes != nullptr);
+    uint8_t *bytes1 = (uint8_t *)malloc(size);
+    uint8_t *bytes2 = (uint8_t *)malloc(size);
+    ck_assert(bytes1 != nullptr);
+    ck_assert(bytes2 != nullptr);

-    tox_events_get_bytes(events, bytes);
+    ck_assert(tox_events_get_bytes(events, bytes1));
+    ck_assert(tox_events_get_bytes(events, bytes2));

-    Tox_Events *events_copy = tox_events_load(sys, bytes, size);
+    // Make sure get_bytes is deterministic.
+    ck_assert(memcmp(bytes1, bytes2, size) == 0);
+
+    Tox_Events *events_copy = tox_events_load(sys, bytes1, size);
    ck_assert(events_copy != nullptr);
-    free(bytes);
+    free(bytes1);
+    free(bytes2);

    ck_assert(tox_events_equal(sys, events, events_copy));

@@ -72,7 +79,9 @@ static bool await_message(Tox **toxes, const Tox_Dispatch *dispatch)
        // Check if tox 2 got the message from tox 1.
        Tox_Events *events = tox_events_iterate(toxes[1], false, nullptr);

-        dump_events("/tmp/test.mp", events);
+        if (want_dump_events) {
+            dump_events("/tmp/test.mp", events);
+        }

        bool success = false;
        tox_dispatch_invoke(dispatch, events, toxes[1], &success);
@@ -160,9 +169,22 @@ static void test_tox_events(void)
    }
 }

+static void fake_test_unpack(void)
+{
+    // TODO(Green-Sky): add proper unpack tests and/or implement ngc events
+    (void)tox_group_privacy_state_unpack;
+    (void)tox_group_privacy_state_unpack;
+    (void)tox_group_voice_state_unpack;
+    (void)tox_group_topic_lock_unpack;
+    (void)tox_group_join_fail_unpack;
+    (void)tox_group_mod_event_unpack;
+    (void)tox_group_exit_type_unpack;
+}
+
 int main(void)
 {
    setvbuf(stdout, nullptr, _IONBF, 0);
    test_tox_events();
+    fake_test_unpack();
    return 0;
 }
--- a/external/toxcore/c-toxcore/auto_tests/tox_events_test.c
+++ b/external/toxcore/c-toxcore/auto_tests/tox_events_test.c
@@ -28,6 +28,15 @@ static bool await_message(Tox **toxes)
            const uint8_t *msg = tox_event_friend_message_get_message(msg_event);
            ck_assert_msg(memcmp(msg, "hello", sizeof("hello")) == 0,
                          "message was not expected 'hello' but '%s'", (const char *)msg);
+
+            const uint32_t event_count = tox_events_get_size(events);
+            for (uint32_t j = 0; j < event_count; ++j) {
+                const Tox_Event *event = tox_events_get(events, j);
+                if (tox_event_get_type(event) == TOX_EVENT_FRIEND_MESSAGE) {
+                    ck_assert(tox_event_get_friend_message(event) == msg_event);
+                }
+            }
+
            tox_events_free(events);
            return true;
        }
--- a/external/toxcore/c-toxcore/cmake/CompileGTest.cmake
+++ b/external/toxcore/c-toxcore/cmake/CompileGTest.cmake
@@ -1,62 +0,0 @@
-# Find and compile the GTest library.
-
-include(CheckCXXCompilerFlag)
-include(CheckIncludeFileCXX)
-
-message(STATUS "Checking for gtest")
-
-# Look for the sources.
-find_file(GTEST_ALL_CC gtest-all.cc PATHS
-  ${CMAKE_SOURCE_DIR}/third_party/googletest/googletest/src
-  /usr/src/gtest/src
-  NO_DEFAULT_PATH
-)
-
-if(GTEST_ALL_CC)
-  # ../.. from the source file is the source root.
-  get_filename_component(GTEST_SRC_DIR ${GTEST_ALL_CC} DIRECTORY)
-  get_filename_component(GTEST_SRC_ROOT ${GTEST_SRC_DIR} DIRECTORY)
-
-  # Look for the header file.
-  include(CheckIncludeFileCXX)
-  include_directories(SYSTEM ${GTEST_SRC_ROOT}/include)
-  check_include_file_cxx("gtest/gtest.h" HAVE_GTEST_GTEST_H)
-
-  if(HAVE_GTEST_GTEST_H)
-    message(STATUS "Found gtest: ${GTEST_SRC_ROOT}")
-
-    add_library(gtest
-      ${GTEST_SRC_DIR}/gtest-all.cc
-      ${GTEST_SRC_DIR}/gtest_main.cc)
-    target_include_directories(gtest PRIVATE ${GTEST_SRC_ROOT})
-
-    # Ignore all warnings for gtest. We don't care about their implementation.
-    check_cxx_compiler_flag("-w" HAVE_CXX_W QUIET)
-    if(HAVE_CXX_W)
-      set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
-    endif()
-
-    set(HAVE_GTEST TRUE)
-    set(TEST_CXX_FLAGS "")
-
-    check_cxx_compiler_flag("-Wno-global-constructors" HAVE_CXX_W_NO_GLOBAL_CONSTRUCTORS QUIET)
-    if(HAVE_CXX_W_NO_GLOBAL_CONSTRUCTORS)
-      set(TEST_CXX_FLAGS "${TEST_CXX_FLAGS} -Wno-global-constructors")
-    endif()
-
-    check_cxx_compiler_flag("-Wno-zero-as-null-pointer-constant" HAVE_CXX_W_NO_ZERO_AS_NULL_POINTER_CONSTANT QUIET)
-    if(HAVE_CXX_W_NO_ZERO_AS_NULL_POINTER_CONSTANT)
-      set(TEST_CXX_FLAGS "${TEST_CXX_FLAGS} -Wno-zero-as-null-pointer-constant")
-    endif()
-  endif()
-endif()
-
-function(unit_test subdir target)
-  if(HAVE_GTEST)
-    add_executable(unit_${target}_test ${subdir}/${target}_test.cc)
-    target_link_modules(unit_${target}_test toxcore gtest)
-    set_target_properties(unit_${target}_test PROPERTIES COMPILE_FLAGS "${TEST_CXX_FLAGS}")
-    add_test(NAME ${target} COMMAND ${CROSSCOMPILING_EMULATOR} unit_${target}_test)
-    set_property(TEST ${target} PROPERTY ENVIRONMENT "LLVM_PROFILE_FILE=${target}.profraw")
-  endif()
-endfunction()
--- a/external/toxcore/c-toxcore/cmake/Dependencies.cmake
+++ b/external/toxcore/c-toxcore/cmake/Dependencies.cmake
@@ -1,76 +1,36 @@
 ###############################################################################
 #
-# :: For UNIX-like systems that have pkg-config.
+# :: For systems that have pkg-config.
 #
 ###############################################################################

-include(ModulePackage)
+find_package(PkgConfig REQUIRED)

-find_package(Threads REQUIRED)
+find_library(NSL_LIBRARIES    nsl   )
+find_library(RT_LIBRARIES     rt    )
+find_library(SOCKET_LIBRARIES socket)

-find_library(NSL_LIBRARIES          nsl          )
-find_library(RT_LIBRARIES           rt           )
-find_library(SOCKET_LIBRARIES       socket       )
+find_package(pthreads QUIET)
+if(NOT TARGET PThreads4W::PThreads4W)
+  set(THREADS_PREFER_PTHREAD_FLAG ON)
+  find_package(Threads REQUIRED)
+endif()

 # For toxcore.
-pkg_use_module(LIBSODIUM            libsodium    )
+pkg_search_module(LIBSODIUM   libsodium IMPORTED_TARGET REQUIRED)
+if(MSVC)
+  find_package(unofficial-sodium REQUIRED)
+endif()

 # For toxav.
-pkg_use_module(OPUS                 "opus;Opus"  )
-pkg_use_module(VPX                  "vpx;libvpx" )
+pkg_search_module(OPUS        opus      IMPORTED_TARGET)
+if(NOT OPUS_FOUND)
+  pkg_search_module(OPUS      Opus      IMPORTED_TARGET)
+endif()
+pkg_search_module(VPX         vpx       IMPORTED_TARGET)
+if(NOT VPX_FOUND)
+  pkg_search_module(VPX       libvpx    IMPORTED_TARGET)
+endif()

 # For tox-bootstrapd.
-pkg_use_module(LIBCONFIG            libconfig    )
-
-###############################################################################
-#
-# :: For MSVC Windows builds.
-#
-# These require specific installation paths of dependencies:
-# - libsodium in third-party/libsodium/Win32/Release/v140/dynamic
-# - pthreads in third-party/pthreads-win32/Pre-built.2
-#
-###############################################################################
-
-if(MSVC)
-  # libsodium
-  # ---------
-  if(NOT LIBSODIUM_FOUND)
-    find_library(LIBSODIUM_LIBRARIES
-      NAMES sodium libsodium
-      PATHS
-        "third_party/libsodium/Win32/Release/v140/dynamic"
-        "third_party/libsodium/x64/Release/v140/dynamic"
-    )
-    if(LIBSODIUM_LIBRARIES)
-      include_directories("third_party/libsodium/include")
-      set(LIBSODIUM_FOUND TRUE)
-      message("libsodium: ${LIBSODIUM_LIBRARIES}")
-    else()
-      message(FATAL_ERROR "libsodium libraries not found")
-    endif()
-  endif()
-
-  # pthreads
-  # --------
-  if(CMAKE_USE_WIN32_THREADS_INIT)
-    find_library(CMAKE_THREAD_LIBS_INIT
-      NAMES pthreadVC2
-      PATHS
-        "third_party/pthreads-win32/Pre-built.2/lib/x86"
-        "third_party/pthreads-win32/Pre-built.2/lib/x64"
-    )
-    if(CMAKE_THREAD_LIBS_INIT)
-      include_directories("third_party/pthreads-win32/Pre-built.2/include")
-      add_definitions(-DHAVE_STRUCT_TIMESPEC)
-      message("libpthreads: ${CMAKE_THREAD_LIBS_INIT}")
-    else()
-      find_package(pthreads4w)
-      if(NOT pthreads4w_FOUND)
-        message(FATAL_ERROR "libpthreads libraries not found")
-      endif()
-      include_directories(${pthreads4w_INCLUDE_DIR})
-      link_libraries(${pthreads4w_LIBRARIES})
-    endif()
-  endif()
-endif()
+pkg_search_module(LIBCONFIG   libconfig IMPORTED_TARGET)
--- a/external/toxcore/c-toxcore/cmake/ModulePackage.cmake
+++ b/external/toxcore/c-toxcore/cmake/ModulePackage.cmake
@@ -19,58 +19,21 @@ if(FULLY_STATIC)
  set(ENABLE_STATIC ON)
 endif()

-find_package(PkgConfig)
-
-function(pkg_use_module mod pkgs)
-  foreach(pkg IN ITEMS ${pkgs})
-    if(PKG_CONFIG_FOUND)
-      pkg_search_module(${mod} ${pkg})
-    endif()
-    if(NOT ${mod}_FOUND)
-      find_package(${pkg} QUIET)
-      # This is very very ugly, but the variables are sometimes used in this scope
-      # and sometimes in the parent scope, so we have to set them to both places.
-      set(${mod}_FOUND ${${pkg}_FOUND})
-      set(${mod}_FOUND ${${pkg}_FOUND} PARENT_SCOPE)
-      set(${mod}_LIBRARIES ${${pkg}_LIBS})
-      set(${mod}_LIBRARIES ${${pkg}_LIBS} PARENT_SCOPE)
-      set(${mod}_LIBRARY_DIRS ${${pkg}_LIBRARY_DIRS})
-      set(${mod}_LIBRARY_DIRS ${${pkg}_LIBRARY_DIRS} PARENT_SCOPE)
-      set(${mod}_INCLUDE_DIRS ${${pkg}_INCLUDE_DIRS})
-      set(${mod}_INCLUDE_DIRS ${${pkg}_INCLUDE_DIRS} PARENT_SCOPE)
-    endif()
-    if(${mod}_FOUND)
-      link_directories(${${mod}_LIBRARY_DIRS})
-      include_directories(${${mod}_INCLUDE_DIRS})
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${mod}_CFLAGS_OTHER}" PARENT_SCOPE)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${mod}_CFLAGS_OTHER}" PARENT_SCOPE)
-
-      if(NOT MSVC)
-        foreach(dir ${${mod}_INCLUDE_DIRS})
-          set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isystem ${dir}" PARENT_SCOPE)
-          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${dir}" PARENT_SCOPE)
-        endforeach()
-      endif()
-      break()
-    endif()
-  endforeach()
-endfunction()
-
 function(add_module lib)
-  set(${lib}_SOURCES ${ARGN} PARENT_SCOPE)
-
  if(ENABLE_SHARED)
    add_library(${lib}_shared SHARED ${ARGN})
    set_target_properties(${lib}_shared PROPERTIES OUTPUT_NAME ${lib})
  endif()
  if(ENABLE_STATIC)
    add_library(${lib}_static STATIC ${ARGN})
-    set_target_properties(${lib}_static PROPERTIES OUTPUT_NAME ${lib})
+    if(NOT MSVC)
+      set_target_properties(${lib}_static PROPERTIES OUTPUT_NAME ${lib})
+    endif()
  endif()
 endfunction()

 function(install_module lib)
-  if(ENABLE_SHARED)
+  if(TARGET ${lib}_shared)
    set_target_properties(${lib}_shared PROPERTIES
      VERSION ${SOVERSION}
      SOVERSION ${SOVERSION_MAJOR}
@@ -80,7 +43,7 @@ function(install_module lib)
      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
  endif()
-  if(ENABLE_STATIC)
+  if(TARGET ${lib}_static)
    install(TARGETS ${lib}_static
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -113,59 +76,3 @@ function(install_module lib)
    install(FILES ${header} ${ARGN})
  endforeach()
 endfunction()
-
-function(target_link_modules target)
-  # If the target we're adding dependencies to is a shared library, add it to
-  # the set of targets.
-  if(TARGET ${target}_shared)
-    set(_targets ${_targets} ${target}_shared)
-    # Shared libraries should first try to link against other shared libraries.
-    set(${target}_shared_primary shared)
-    # If that fails (because the shared target doesn't exist), try linking
-    # against the static library. This requires the static library's objects to
-    # be PIC.
-    set(${target}_shared_secondary static)
-  endif()
-  # It can also be a static library at the same time.
-  if(TARGET ${target}_static)
-    set(_targets ${_targets} ${target}_static)
-    # Static libraries aren't actually linked, but their dependencies are
-    # recorded by "linking" them. If we link an executable to a static library,
-    # we want to also link statically against its transitive dependencies.
-    set(${target}_static_primary static)
-    # If a dependency doesn't exist as static library, we link against the
-    # shared one.
-    set(${target}_static_secondary shared)
-  endif()
-  # If it's neither, then it's an executable.
-  if(NOT _targets)
-    set(_targets ${_targets} ${target})
-    # Executables preferably link against static libraries, so they are
-    # standalone and can be shipped without any external dependencies. As a
-    # frame of reference: tests become roughly 600-800K binaries instead of
-    # 50-100K on x86_64 Linux.
-    set(${target}_primary static)
-    set(${target}_secondary shared)
-  endif()
-
-  foreach(dep ${ARGN})
-    foreach(_target ${_targets})
-      if(TARGET ${dep}_${${_target}_primary})
-        target_link_libraries(${_target} ${dep}_${${_target}_primary})
-      elseif(TARGET ${dep}_${${_target}_secondary})
-        target_link_libraries(${_target} ${dep}_${${_target}_secondary})
-      else()
-        # We record the modules linked to this target, so that we can collect
-        # them later when linking a composed module.
-        list(FIND LINK_MODULES ${dep} _index)
-        if(_index EQUAL -1)
-          set(LINK_MODULES ${LINK_MODULES} ${dep})
-        endif()
-
-        target_link_libraries(${_target} ${dep})
-      endif()
-    endforeach()
-  endforeach()
-
-  set(${target}_LINK_MODULES ${${target}_LINK_MODULES} ${LINK_MODULES} PARENT_SCOPE)
-endfunction()
--- a/external/toxcore/c-toxcore/configure.ac
+++ b/external/toxcore/c-toxcore/configure.ac
@@ -22,8 +22,6 @@ BUILD_AV="yes"
 BUILD_TESTING="yes"

 LIBCONFIG_FOUND="no"
-WANT_NACL="no"
-ADD_NACL_OBJECTS_TO_PKGCONFIG="yes"
 SET_SO_VERSION="yes"

 AC_ARG_ENABLE([soname-versions],
@@ -38,26 +36,11 @@ AC_ARG_ENABLE([soname-versions],
 )
 AM_CONDITIONAL(SET_SO_VERSION, test "x$SET_SO_VERSION" = "xyes")

-AC_ARG_ENABLE([nacl],
-    [AC_HELP_STRING([--enable-nacl], [use nacl instead of libsodium (default: disabled)]) ],
-    [
-        if test "x$enableval" = "xno"; then
-            WANT_NACL="no"
-        elif test "x$enableval" = "xyes"; then
-            WANT_NACL="yes"
-        fi
-    ]
-)
-
 AC_ARG_ENABLE([randombytes-stir],
    [AC_HELP_STRING([--enable-randombytes-stir], [use randombytes_stir() instead of sodium_init() for faster startup on android (default: disabled)]) ],
    [
        if test "x$enableval" = "xyes"; then
-            if test "x$WANT_NACL" = "xyes"; then
-                AC_MSG_WARN([randombytes_stir() is not available with NaCl library])
-            else
-                AC_DEFINE([USE_RANDOMBYTES_STIR], [1], [randombytes_stir() instead of sodium_init()])
-            fi
+            AC_DEFINE([USE_RANDOMBYTES_STIR], [1], [randombytes_stir() instead of sodium_init()])
        fi
    ]
 )
@@ -171,16 +154,6 @@ if test "$use_ipv6" != "yes"; then
  AC_DEFINE([USE_IPV6],[0],[define to 0 to force ipv4])
 fi

-AC_ARG_ENABLE([[test_network]],
-  [AS_HELP_STRING([[--enable-test-network[=ARG]]], [build tox for a test network incompatible with the main DHT [no]])],
-    [use_test_network=${enableval}],
-    [use_test_network='no']
-  )
-
-if test "$use_test_network" == "yes"; then
-  AC_DEFINE([USE_TEST_NETWORK],[1],[define to 1 to enable the test network])
-fi
-
 AX_HAVE_EPOLL
 if test "$enable_epoll" != "no"; then
  if test "${ax_cv_have_epoll}" = "yes"; then
@@ -197,8 +170,6 @@ fi
 DEPSEARCH=
 LIBSODIUM_SEARCH_HEADERS=
 LIBSODIUM_SEARCH_LIBS=
-NACL_SEARCH_HEADERS=
-NACL_SEARCH_LIBS=

 AC_ARG_WITH(dependency-search,
    AC_HELP_STRING([--with-dependency-search=DIR],
@@ -216,24 +187,6 @@ if test -n "$DEPSEARCH"; then
    export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$DEPSEARCH/lib/pkgconfig
 fi

-AC_ARG_WITH(nacl-headers,
-        AC_HELP_STRING([--with-nacl-headers=DIR],
-                       [search for nacl<F2> header files in DIR]),
-        [
-            NACL_SEARCH_HEADERS="$withval"
-            AC_MSG_NOTICE([will search for nacl header files in $withval])
-        ]
-)
-
-AC_ARG_WITH(nacl-libs,
-        AC_HELP_STRING([--with-nacl-libs=DIR],
-                       [search for nacl libraries in DIR]),
-        [
-            NACL_SEARCH_LIBS="$withval"
-            AC_MSG_NOTICE([will search for nacl libraries in $withval])
-        ]
-)
-
 AC_ARG_WITH(libsodium-headers,
        AC_HELP_STRING([--with-libsodium-headers=DIR],
                       [search for libsodium header files in DIR]),
@@ -252,11 +205,6 @@ AC_ARG_WITH(libsodium-libs,
        ]
 )

-if test "x$WANT_NACL" = "xyes"; then
-    enable_shared=no
-    enable_static=yes
-fi
-
 # Checks for programs.
 AC_PROG_CC_C99

@@ -287,7 +235,6 @@ case $host_os in
        LDFLAGS="$LDFLAGS -L/usr/local/lib"
        CFLAGS="$CFLAGS -I/usr/local/include"
        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-        ADD_NACL_OBJECTS_TO_PKGCONFIG="no"
    ;;
    darwin*)
        MACH=yes
@@ -312,50 +259,7 @@ PKG_CHECK_MODULES([LIBSODIUM], [libsodium],
        LIBSODIUM_FOUND="no"
    ])

-if test "x$WANT_NACL" = "xyes"; then
-    NACL_LIBS=
-    NACL_LDFLAGS=
-    NACL_OBJECTS=
-    NACL_OBJECTS_PKGCONFIG=
-    LDFLAGS_SAVE="$LDFLAGS"
-    if test -n "$NACL_SEARCH_LIBS"; then
-        LDFLAGS="-L$NACL_SEARCH_LIBS $LDFLAGS"
-        AC_CHECK_LIB(nacl, random,
-            [
-                NACL_LDFLAGS="-L$NACL_SEARCH_LIBS"
-                NACL_LIBS="-lnacl"
-            ],
-            [
-                AC_MSG_ERROR([library nacl was not found in requested location $NACL_SEARCH_LIBS])
-            ]
-        )
-    else
-        AC_CHECK_LIB(nacl, random,
-            [],
-            [
-                AC_MSG_ERROR([you enabled nacl support, but library nacl was not found on your system])
-            ]
-        )
-    fi
-
-    if (test -f "$NACL_SEARCH_LIBS/cpucycles.o") &&
-       (test -f "$NACL_SEARCH_LIBS/randombytes.o"); then
-        NACL_OBJECTS="$NACL_SEARCH_LIBS/cpucycles.o $NACL_SEARCH_LIBS/randombytes.o"
-        AC_MSG_NOTICE([found extra NaCl objects: $NACL_OBJECTS])
-        if test "x$ADD_NACL_OBJECTS_TO_PKGCONFIG" = "xyes"; then
-            AC_MSG_NOTICE([adding extra NaCl objects to pkg-config file])
-            NACL_OBJECTS_PKGCONFIG="$NACL_OBJECTS"
-        fi
-    else
-        AC_MSG_ERROR([required NaCl object files cpucycles.o randombytes.o not found, please specify their location using the --with-nacl-libs parameter])
-    fi
-
-    LDFLAGS="$LDFLAGS_SAVE"
-    AC_SUBST(NACL_LIBS)
-    AC_SUBST(NACL_LDFLAGS)
-    AC_SUBST(NACL_OBJECTS)
-    AC_SUBST(NACL_OBJECTS_PKGCONFIG)
-elif test "x$LIBSODIUM_FOUND" = "xno"; then
+if test "x$LIBSODIUM_FOUND" = "xno"; then
    LIBSODIUM_LIBS=
    LIBSODIUM_LDFLAGS=
    LDFLAGS_SAVE="$LDFLAGS"
@@ -388,34 +292,7 @@ fi
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])


-if test "x$WANT_NACL" = "xyes"; then
-    NACL_CFLAGS=
-    CFLAGS_SAVE="$CFLAGS"
-    CPPFLAGS_SAVE="$CPPFLAGS"
-    if test -n "$NACL_SEARCH_HEADERS"; then
-        CFLAGS="-I$NACL_SEARCH_HEADERS $CFLAGS"
-        CPPFLAGS="-I$NACL_SEARCH_HEADERS $CPPFLAGS"
-        AC_CHECK_HEADER(crypto_box.h,
-            [
-                NACL_CFLAGS="-I$NACL_SEARCH_HEADERS"
-            ],
-            [
-                AC_MSG_ERROR([header files for library nacl were not found in requested location $NACL_SEARCH_HEADERS])
-            ]
-        )
-    else
-        AC_CHECK_HEADER(crypto_box.h,
-            [],
-            [
-                AC_MSG_ERROR([you enabled nacl support, but nacl header files were not found on your system])
-            ]
-        )
-    fi
-    CFLAGS="$CFLAGS_SAVE"
-    CPPFLAGS="$CPPFLAGS_SAVE"
-    AC_SUBST(NACL_CFLAGS)
-    AC_DEFINE([VANILLA_NACL], [1], [use nacl instead of libsodium])
-elif test "x$LIBSODIUM_FOUND" = "xno"; then
+if test "x$LIBSODIUM_FOUND" = "xno"; then
    LIBSODIUM_CFLAGS=
    CFLAGS_SAVE="$CFLAGS"
    CPPFLAGS_SAVE="$CPPFLAGS"
@@ -555,7 +432,6 @@ AM_CONDITIONAL(BUILD_DHT_BOOTSTRAP, test "x$BUILD_DHT_BOOTSTRAP" = "xyes")
 AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
 AM_CONDITIONAL(BUILD_AV, test "x$BUILD_AV" = "xyes")
 AM_CONDITIONAL(BUILD_TESTING, test "x$BUILD_TESTING" = "xyes")
-AM_CONDITIONAL(WITH_NACL, test "x$WANT_NACL" = "xyes")
 AM_CONDITIONAL(WIN32, test "x$WIN32" = "xyes")

 AC_CONFIG_FILES([Makefile
--- a/external/toxcore/c-toxcore/docs/TCP_Network.txt
+++ b/external/toxcore/c-toxcore/docs/TCP_Network.txt
@@ -1,100 +1,100 @@
-It has come to our attention that to achieve decent market penetration Tox 
-must work behind ALL internet connections, may they be behind enterprise NATs 
-or any other bad network conditions. 
+It has come to our attention that to achieve decent market penetration Tox
+must work behind ALL internet connections, may they be behind enterprise NATs
+or any other bad network conditions.

-The people who have issues with the UDP direct connection approach seem to be a 
+The people who have issues with the UDP direct connection approach seem to be a
 small minority though it is hard to estimate how many.

-This means that routing their packets using good nodes on the network will 
+This means that routing their packets using good nodes on the network will
 probably not take a huge toll on the network and will assure that people
 can use Tox regardless of the quality of their internet connection.


 How it's going to work:
-1. Alice, a Tox client on a TCP only network generates a temporary public key 
+1. Alice, a Tox client on a TCP only network generates a temporary public key
 and connects to a bootstrap node.

-2. Using the bootstrap node she finds and connects to a couple (exact number 
+2. Using the bootstrap node she finds and connects to a couple (exact number
 to be determined later) number of random nodes that have TCP relay support.

-3. She uses the onion through the TCP relay connections to send friend requests 
-or tell online friends which TCP nodes she is connected to and her temporary 
+3. She uses the onion through the TCP relay connections to send friend requests
+or tell online friends which TCP nodes she is connected to and her temporary
 public key.

-4. Bob receives an onion packet from Alice telling him which nodes she is 
-connected to. Bob connects to these nodes and establishes a routed connection 
+4. Bob receives an onion packet from Alice telling him which nodes she is
+connected to. Bob connects to these nodes and establishes a routed connection
 with Alice using that temporary public key.

-5. That connection is used by both to transmit encrypted Messenger and A/V 
+5. That connection is used by both to transmit encrypted Messenger and A/V
 packets.

-6. If one of the nodes shuts down while it is currently routing traffic, Alice 
+6. If one of the nodes shuts down while it is currently routing traffic, Alice
 and bob just switch to one of the other nodes they are both connected to.


 Detailed implementation details:

-There are two distinct parts for TCP relays, the client part and the server 
+There are two distinct parts for TCP relays, the client part and the server
 part.

-The server acts as the actual relay. Servers must have fully forwarded TCP 
-ports (NAT-PMP and uPNP can help here). The first port the server will try 
-binding to is 443 followed by port 3389 and possibly some others. Onion packets 
+The server acts as the actual relay. Servers must have fully forwarded TCP
+ports (NAT-PMP and uPNP can help here). The first port the server will try
+binding to is 443 followed by port 3389 and possibly some others. Onion packets
 can be sent/received through the TCP servers.


 Server:

-The public/private key pair the TCP server uses is the same one he uses for the 
-DHT. 
+The public/private key pair the TCP server uses is the same one he uses for the
+DHT.

-all crypto for communication with the server uses the crypto_box() function of 
-NaCl.
+all crypto for communication with the server uses the crypto_box() function of
+libsodium.

-TCP doesn't have packets so what we will refer to as packets are sent this way: 
+TCP doesn't have packets so what we will refer to as packets are sent this way:
 [[uint16_t (length of data)][data]]

 So if you would inspect the TCP stream you would see:
-[[uint16_t (length of data)][data]][[uint16_t (length of 
+[[uint16_t (length of data)][data]][[uint16_t (length of
 data)][data]][[uint16_t (length of data)][data]]

-Note that both handshake packets don't have this format (the length for them is 
+Note that both handshake packets don't have this format (the length for them is
 always the same so we don't need to specify it.)

 When the client connects to the server, he sends this packet:
-[public key of client (32 bytes)][nonce for the encrypted data [24 
-bytes]][encrypted with the private key of the client and public key of the 
-server and the nonce:[public key (32 bytes) and][base nonce we want the server 
+[public key of client (32 bytes)][nonce for the encrypted data [24
+bytes]][encrypted with the private key of the client and public key of the
+server and the nonce:[public key (32 bytes) and][base nonce we want the server
 to use to encrypt the packets sent to us (24 bytes)]]

 The server responds with:
-[nonce for the encrypted data [24 bytes]][encrypted with the public key of the 
-client and private key of the server and the nonce:[public key (32 bytes) 
-and][base nonce we want the client to use to encrypt the packets sent to us (24 
+[nonce for the encrypted data [24 bytes]][encrypted with the public key of the
+client and private key of the server and the nonce:[public key (32 bytes)
+and][base nonce we want the client to use to encrypt the packets sent to us (24
 bytes)]]

-All packets to the server are end to end encrypted with the information 
-received 
+All packets to the server are end to end encrypted with the information
+received
 (and sent) in the handshake.

-(first packet is encrypted with the base nonce the private key for which the 
-client sent the server the public key and the public key we sent to the client, 
+(first packet is encrypted with the base nonce the private key for which the
+client sent the server the public key and the public key we sent to the client,
 the next with base nonce + 1...)

-The connection is set to an unconfirmed state until a packet is received and 
+The connection is set to an unconfirmed state until a packet is received and
 decrypted correctly using the information in the handshake.

-each packet sent to/from the server has an id (the first byte of the plain text 
+each packet sent to/from the server has an id (the first byte of the plain text
 data of the packet.)

-ids 0 to 15 are reserved for special packets, ids 16 to 255 are used to denote 
+ids 0 to 15 are reserved for special packets, ids 16 to 255 are used to denote
 who we want the data to be routed to/who the packet is from.

 special ids and packets:
 0 - Routing request.
 [uint8_t id (0)][public key (32 bytes)]
 1 - Routing request response.
-[uint8_t id (1)][uint8_t (rpid) 0 if refused, packet id if accepted][public key 
+[uint8_t id (1)][uint8_t (rpid) 0 if refused, packet id if accepted][public key
 (32 bytes)]
 2 - Connect notification:
 [uint8_t id (2)][uint8_t (packet id of connection that got connected)]
@@ -108,44 +108,44 @@ special ids and packets:
 [uint8_t id (6)][destination public key (32 bytes)][data]
 7 - OOB recv
 [uint8_t id (7)][senders public key (32 bytes)][data]
-8 - onion packet (same format as initial onion packet (See: Prevent 
+8 - onion packet (same format as initial onion packet (See: Prevent
 tracking.txt) but packet id is 8 instead of 128)
-9 - onion packet response (same format as onion packet with id 142 but id is 9 
+9 - onion packet response (same format as onion packet with id 142 but id is 9
 instead.)

 The rest of the special ids are reserved for possible future usage.

-If the server receives a routing request he stores server side that the client 
-wants to connect to the person with that public key and sends back a Routing 
+If the server receives a routing request he stores server side that the client
+wants to connect to the person with that public key and sends back a Routing
 request response with the rpid along with the public key sent in the request.

-If for some reason the server must refuse the routing request (too many) he 
+If for some reason the server must refuse the routing request (too many) he
 sends the response with a rpid of 0.

-If the person who the client wants to connect to is also online and wants to 
-connect to the client a connect notification is sent to both with the 
+If the person who the client wants to connect to is also online and wants to
+connect to the client a connect notification is sent to both with the
 appropriate packet id.

-If either one disconnects, a disconnect notification is sent to the other with 
+If either one disconnects, a disconnect notification is sent to the other with
 appropriate packet id.

-If a client sends a disconnect notification, the entry on the server for that 
-routed connection is cleared and a disconnect notification is sent to the peer 
+If a client sends a disconnect notification, the entry on the server for that
+routed connection is cleared and a disconnect notification is sent to the peer
 (if he was online)

-If the server receives an onion packet he handles it the same as he would if it 
-was one received normally via UDP, he must also assure himself that any 
+If the server receives an onion packet he handles it the same as he would if it
+was one received normally via UDP, he must also assure himself that any
 responses must be sent to the proper client.

 Ping responses must have the same ping_id as the request.

 If the server receives a ping packet he must respond with a ping response.

-The server will send a ping packet to clients every 30 seconds, they have 30 
+The server will send a ping packet to clients every 30 seconds, they have 30
 seconds to respond, if they don't the connection is deleted.

-OOB send packets will be sent to the peer connected to the TCP server with the 
-destination public key as a OOB recv packet. The client sending this packet has 
+OOB send packets will be sent to the peer connected to the TCP server with the
+destination public key as a OOB recv packet. The client sending this packet has
 no way of knowing if the packet reached its destination.


--- a/external/toxcore/c-toxcore/docs/updates/Crypto.md
+++ b/external/toxcore/c-toxcore/docs/updates/Crypto.md
@@ -1,7 +1,7 @@
-Encryption library used: http://nacl.cr.yp.to/
+Encryption library used: https://doc.libsodium.org/


-When running the program for the first time the crypto_box_keypair() function is used to 
+When running the program for the first time the crypto_box_keypair() function is used to
 generate the users public-private key pair. (32 bytes each)

 The generated public key is set as the client_id of the peer.
@@ -9,13 +9,13 @@ The generated public key is set as the client_id of the peer.
 Adding a friend
 ---------------

-Alice adds Bob to her friend list by adding his 32 byte public key (client_id) to her friend list.  
-2 cases:  
-case 1: Alice adds the public key of Bob, then Bob waits for Alice to attempt to connect to him.  
-case 2: Bob and Alice add their respective public keys to their friend lists at the same time.  
-    
-case 1:  
-Alice sends an onion data (see: Prevent_tracking.txt) packet to Bob with the encrypted part containing the friend request like so:  
+Alice adds Bob to her friend list by adding his 32 byte public key (client_id) to her friend list.
+2 cases:
+case 1: Alice adds the public key of Bob, then Bob waits for Alice to attempt to connect to him.
+case 2: Bob and Alice add their respective public keys to their friend lists at the same time.
+
+case 1:
+Alice sends an onion data (see: Prevent_tracking.txt) packet to Bob with the encrypted part containing the friend request like so:
 ```
 [char with a value of 32][nospam number (4 bytes)][Message]
 ```
@@ -23,15 +23,15 @@ Alice sends an onion data (see: Prevent_tracking.txt) packet to Bob with the enc
 Ex message: hello Bob it's me Alice -_- add me pl0x.

 For more info on the nospam see: Spam_Prevention.txt
-        
-Bob receives the request and decrypts the message using the function crypto_box_open()
-        
-If the message decrypts successfully:   
-If Alice is already in Bob's friend list: case 2  
-If Alice is not in Bob's friend list and the nospam is good: Bob is prompt to add Alice and is shown the message from her.  
-If Bob accepts Alice friend request he adds her public key to his friend list.  

-case 2:  
+Bob receives the request and decrypts the message using the function crypto_box_open()
+
+If the message decrypts successfully:
+If Alice is already in Bob's friend list: case 2
+If Alice is not in Bob's friend list and the nospam is good: Bob is prompt to add Alice and is shown the message from her.
+If Bob accepts Alice friend request he adds her public key to his friend list.
+
+case 2:
 Bob and Alice both have the others public key in their friend list, they are ready for the next step:   Connecting to an already added friend

 In the next step only crypto_box() is used for encryption and only crypto_box_open() for decryption (just like in the last step.)
--- a/external/toxcore/c-toxcore/libtoxcore.pc.in
+++ b/external/toxcore/c-toxcore/libtoxcore.pc.in
@@ -7,5 +7,5 @@ Name: libtoxcore
 Description: Tox protocol library
 Requires:
 Version: @PACKAGE_VERSION@
-Libs: @NACL_OBJECTS_PKGCONFIG@ -L${libdir} -ltoxcore @NACL_LDFLAGS@ -ltoxencryptsave @NACL_LIBS@ @LIBS@ @MATH_LDFLAGS@ @PTHREAD_LDFLAGS@
+Libs: -L${libdir} -ltoxcore -ltoxencryptsave @LIBS@ @MATH_LDFLAGS@ @PTHREAD_LDFLAGS@
 Cflags: -I${includedir}
--- a/external/toxcore/c-toxcore/other/BUILD.bazel
+++ b/external/toxcore/c-toxcore/other/BUILD.bazel
@@ -21,13 +21,11 @@ cc_binary(
        "//c-toxcore/toxcore:Messenger",
        "//c-toxcore/toxcore:TCP_server",
        "//c-toxcore/toxcore:ccompat",
-        "//c-toxcore/toxcore:friend_requests",
        "//c-toxcore/toxcore:group_onion_announce",
        "//c-toxcore/toxcore:logger",
        "//c-toxcore/toxcore:mono_time",
        "//c-toxcore/toxcore:network",
        "//c-toxcore/toxcore:onion_announce",
        "//c-toxcore/toxcore:tox",
-        "//c-toxcore/toxcore:util",
    ],
 )
--- a/external/toxcore/c-toxcore/other/DHT_bootstrap.c
+++ b/external/toxcore/c-toxcore/other/DHT_bootstrap.c
@@ -16,12 +16,17 @@
 #include "../toxcore/DHT.h"
 #include "../toxcore/LAN_discovery.h"
 #include "../toxcore/ccompat.h"
-#include "../toxcore/friend_requests.h"
+#include "../toxcore/crypto_core.h"
+#include "../toxcore/forwarding.h"
+#include "../toxcore/group_announce.h"
 #include "../toxcore/group_onion_announce.h"
 #include "../toxcore/logger.h"
+#include "../toxcore/mem.h"
 #include "../toxcore/mono_time.h"
+#include "../toxcore/network.h"
+#include "../toxcore/onion.h"
+#include "../toxcore/onion_announce.h"
 #include "../toxcore/tox.h"
-#include "../toxcore/util.h"

 #define TCP_RELAY_ENABLED

@@ -46,7 +51,7 @@ static const char *motd_str = ""; //Change this to anything within 256 bytes(but
 #define PORT 33445


-static void manage_keys(DHT *dht)
+static bool manage_keys(DHT *dht)
 {
    enum { KEYS_SIZE = CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_SECRET_KEY_SIZE };
    uint8_t keys[KEYS_SIZE];
@@ -60,7 +65,8 @@ static void manage_keys(DHT *dht)

        if (read_size != KEYS_SIZE) {
            printf("Error while reading the key file\nExiting.\n");
-            exit(1);
+            fclose(keys_file);
+            return false;
        }

        dht_set_self_public_key(dht, keys);
@@ -73,18 +79,20 @@ static void manage_keys(DHT *dht)

        if (keys_file == nullptr) {
            printf("Error opening key file in write mode.\nKeys will not be saved.\n");
-            return;
+            return false;
        }

        if (fwrite(keys, sizeof(uint8_t), KEYS_SIZE, keys_file) != KEYS_SIZE) {
            printf("Error while writing the key file.\nExiting.\n");
-            exit(1);
+            fclose(keys_file);
+            return false;
        }

        printf("Keys saved successfully.\n");
    }

    fclose(keys_file);
+    return true;
 }

 static const char *strlevel(Logger_Level level)
@@ -121,7 +129,7 @@ int main(int argc, char *argv[])
    if (argc == 2 && !tox_strncasecmp(argv[1], "-h", 3)) {
        printf("Usage (connected)  : %s [--ipv4|--ipv6] IP PORT KEY\n", argv[0]);
        printf("Usage (unconnected): %s [--ipv4|--ipv6]\n", argv[0]);
-        exit(0);
+        return 0;
    }

    /* let user override default by cmdline */
@@ -129,7 +137,7 @@ int main(int argc, char *argv[])
    int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled);

    if (argvoffset < 0) {
-        exit(1);
+        return 1;
    }

    /* Initialize networking -
@@ -162,14 +170,16 @@ int main(int argc, char *argv[])

    if (!(onion && forwarding && onion_a)) {
        printf("Something failed to initialize.\n");
-        exit(1);
+        return 1;
    }

    gca_onion_init(gc_announces_list, onion_a);

    perror("Initialization");

-    manage_keys(dht);
+    if (!manage_keys(dht)) {
+        return 1;
+    }
    printf("Public key: ");

 #ifdef TCP_RELAY_ENABLED
@@ -179,7 +189,7 @@ int main(int argc, char *argv[])

    if (tcp_s == nullptr) {
        printf("TCP server failed to initialize.\n");
-        exit(1);
+        return 1;
    }

 #endif
@@ -189,7 +199,7 @@ int main(int argc, char *argv[])

    if (file == nullptr) {
        printf("Could not open file \"%s\" for writing. Exiting...\n", public_id_filename);
-        exit(1);
+        return 1;
    }

    for (uint32_t i = 0; i < 32; ++i) {
@@ -210,7 +220,7 @@ int main(int argc, char *argv[])

        if (port_conv <= 0 || port_conv > UINT16_MAX) {
            printf("Failed to convert \"%s\" into a valid port. Exiting...\n", argv[argvoffset + 2]);
-            exit(1);
+            return 1;
        }

        const uint16_t port = net_htons((uint16_t)port_conv);
@@ -222,7 +232,7 @@ int main(int argc, char *argv[])

        if (!res) {
            printf("Failed to convert \"%s\" into an IP address. Exiting...\n", argv[argvoffset + 1]);
-            exit(1);
+            return 1;
        }
    }

--- a/external/toxcore/c-toxcore/other/Makefile.inc
+++ b/external/toxcore/c-toxcore/other/Makefile.inc
@@ -9,16 +9,12 @@ DHT_bootstrap_SOURCES = ../other/DHT_bootstrap.c \
                        ../other/bootstrap_node_packets.c

 DHT_bootstrap_CFLAGS = -I$(top_srcdir)/other \
-                        $(LIBSODIUM_CFLAGS) \
-                        $(NACL_CFLAGS)
+                        $(LIBSODIUM_CFLAGS)

 DHT_bootstrap_LDADD =   $(LIBSODIUM_LDFLAGS) \
-                        $(NACL_LDFLAGS) \
                        libmisc_tools.la \
                        libtoxcore.la \
                        $(LIBSODIUM_LIBS) \
-                        $(NACL_OBJECTS) \
-                        $(NACL_LIBS) \
                        $(WINSOCK2_LIBS)

 endif
--- a/external/toxcore/c-toxcore/other/analysis/run-clang-tidy
+++ b/external/toxcore/c-toxcore/other/analysis/run-clang-tidy
@@ -1,6 +1,64 @@
-#!/bin/bash
+#!/usr/bin/env bash

 CHECKS="*"
+ERRORS="*"
+
+# Need to investigate or disable and document these.
+# =========================================================
+
+# TODO(iphydf): Fix these.
+ERRORS="$ERRORS,-cert-err34-c"
+ERRORS="$ERRORS,-readability-suspicious-call-argument"
+
+# TODO(iphydf): Fix once cimple 0.0.19 is released.
+CHECKS="$CHECKS,-google-readability-casting"
+
+# TODO(iphydf): Fix these.
+CHECKS="$CHECKS,-bugprone-switch-missing-default-case"
+
+# TODO(iphydf): We might want some of these. For the ones we don't want, add a
+# comment explaining why not.
+CHECKS="$CHECKS,-clang-analyzer-optin.performance.Padding"
+CHECKS="$CHECKS,-hicpp-signed-bitwise"
+
+# TODO(iphydf): Maybe fix these?
+CHECKS="$CHECKS,-bugprone-implicit-widening-of-multiplication-result"
+CHECKS="$CHECKS,-bugprone-integer-division"
+CHECKS="$CHECKS,-misc-no-recursion"
+
+# TODO(iphydf): Only happens in bootstrap_daemon. Fix it.
+CHECKS="$CHECKS,-cppcoreguidelines-avoid-non-const-global-variables"
+
+# TODO(iphydf): Probably fix these.
+CHECKS="$CHECKS,-cert-err33-c"
+CHECKS="$CHECKS,-cppcoreguidelines-avoid-magic-numbers"
+CHECKS="$CHECKS,-readability-magic-numbers"
+
+# TODO(iphydf): We're using a lot of macros for constants. Should we convert
+# all of them to enum?
+CHECKS="$CHECKS,-modernize-macro-to-enum"
+
+# Documented disabled checks. We don't want these for sure.
+# =========================================================
+
+# https://stackoverflow.com/questions/58672959/why-does-clang-tidy-say-vsnprintf-has-an-uninitialized-va-list-argument
+CHECKS="$CHECKS,-clang-analyzer-valist.Uninitialized"
+
+# We pass a lot of ints around, so many function parameters are some kind of
+# int type that can be converted from another int type. We won't be getting
+# away from that anytime soon.
+CHECKS="$CHECKS,-bugprone-easily-swappable-parameters"
+
+# Callback handlers often don't use all their parameters. There's
+# IgnoreVirtual, but that doesn't work for C-style callbacks.
+CHECKS="$CHECKS,-misc-unused-parameters"
+
+# We sometimes use #if 0.
+CHECKS="$CHECKS,-readability-avoid-unconditional-preprocessor-if"
+
+# We have better macro hygiene checks with tokstyle. We can never pass macro
+# arguments that require parentheses inside the macro.
+CHECKS="$CHECKS,-bugprone-macro-parentheses"

 # We don't use memcpy_s.
 CHECKS="$CHECKS,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling"
@@ -81,62 +139,48 @@ CHECKS="$CHECKS,-cert-dcl03-c"
 CHECKS="$CHECKS,-hicpp-static-assert"
 CHECKS="$CHECKS,-misc-static-assert"

-# TODO(iphydf): We might want some of these. For the ones we don't want, add a
-# comment explaining why not.
-CHECKS="$CHECKS,-clang-analyzer-optin.performance.Padding"
-CHECKS="$CHECKS,-hicpp-signed-bitwise"
-CHECKS="$CHECKS,-misc-unused-parameters"
-CHECKS="$CHECKS,-readability-function-cognitive-complexity"
-
-# TODO(iphydf): Maybe fix these?
-CHECKS="$CHECKS,-bugprone-easily-swappable-parameters"
-CHECKS="$CHECKS,-bugprone-implicit-widening-of-multiplication-result"
-CHECKS="$CHECKS,-bugprone-integer-division"
-CHECKS="$CHECKS,-clang-analyzer-core.NullDereference"
-CHECKS="$CHECKS,-clang-analyzer-valist.Uninitialized"
-CHECKS="$CHECKS,-concurrency-mt-unsafe"
-CHECKS="$CHECKS,-cppcoreguidelines-avoid-non-const-global-variables"
-CHECKS="$CHECKS,-misc-no-recursion"
-
-# TODO(iphydf): Probably fix these.
-CHECKS="$CHECKS,-cert-err33-c"
-CHECKS="$CHECKS,-cppcoreguidelines-avoid-magic-numbers"
-CHECKS="$CHECKS,-google-readability-casting"
-CHECKS="$CHECKS,-modernize-macro-to-enum"
-CHECKS="$CHECKS,-readability-magic-numbers"
-
-# TODO(iphydf): These two trip on list.c. Investigate why.
-CHECKS="$CHECKS,-clang-analyzer-core.NonNullParamChecker"
-CHECKS="$CHECKS,-clang-analyzer-unix.Malloc"
-
-ERRORS="*"
-
-# TODO(iphydf): Fix these.
-ERRORS="$ERRORS,-bugprone-macro-parentheses"
-ERRORS="$ERRORS,-cert-err34-c"
-ERRORS="$ERRORS,-cert-str34-c"
-ERRORS="$ERRORS,-readability-suspicious-call-argument"
-
 set -eux

+# TODO(iphydf): Add toxav.
+DIRS=(
+  other/bootstrap_daemon/src
+  other
+  toxcore
+  toxcore/events
+  toxencryptsave
+)
+
+copy_files() {
+  find "${DIRS[@]}" \
+    -maxdepth 1 -type d -exec mkdir -p "$1/{}" \;
+  find "${DIRS[@]}" \
+    -maxdepth 1 -name "*.c" -exec cp "{}" "$1/{}" \;
+}
+
 run() {
  echo "Running clang-tidy in variant '$*'"
  EXTRA_ARGS=("$@")
  for i in "${!EXTRA_ARGS[@]}"; do
    EXTRA_ARGS[$i]="--extra-arg=${EXTRA_ARGS[$i]}"
  done
-  clang-tidy-14 \
-    -p=_build \
-    --extra-arg=-DMIN_LOGGER_LEVEL=LOGGER_LEVEL_TRACE \
-    "${EXTRA_ARGS[@]}" \
-    --checks="$CHECKS" \
-    --warnings-as-errors="$ERRORS" \
-    --use-color \
-    other/bootstrap_daemon/src/*.c \
-    other/*.c \
-    toxav/*.c \
-    toxcore/*.c \
-    toxencryptsave/*.c
+  ls .clang-tidy
+  copy_files a
+  if ! find "${DIRS[@]}" \
+    -maxdepth 1 -name "*.c" -print0 \
+    | xargs -0 -n15 -P"$(nproc)" clang-tidy \
+      -p="$PWD/_build" \
+      --extra-arg=-DMIN_LOGGER_LEVEL=LOGGER_LEVEL_TRACE \
+      "${EXTRA_ARGS[@]}" \
+      --fix \
+      --checks="$CHECKS" \
+      --warnings-as-errors="$ERRORS" \
+      --use-color; then
+    copy_files b
+    colordiff -ru a b
+    rm -rf a b
+    false
+  fi
+  rm -rf a
 }

 cmake . -B_build -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
--- a/external/toxcore/c-toxcore/other/analysis/run-cppcheck
+++ b/external/toxcore/c-toxcore/other/analysis/run-cppcheck
@@ -8,9 +8,12 @@ set -e

 CPPCHECK=("--enable=all")
 CPPCHECK+=("--inconclusive")
+CPPCHECK+=("--check-level=exhaustive")
+CPPCHECK+=("--inline-suppr")
+CPPCHECK+=("--library=other/docker/cppcheck/toxcore.cfg")
 CPPCHECK+=("--error-exitcode=1")
-# Used for VLA.
-CPPCHECK+=("--suppress=allocaCalled")
+# We don't cast function pointers, which cppcheck suggests here.
+CPPCHECK+=("--suppress=constParameterCallback")
 # False positives in switch statements.
 CPPCHECK+=("--suppress=knownConditionTrueFalse")
 # Cppcheck does not need standard library headers to get proper results.
@@ -19,27 +22,22 @@ CPPCHECK+=("--suppress=missingIncludeSystem")
 CPPCHECK+=("--suppress=signConversion")
 # TODO(iphydf): Fixed in the toxav refactor PR.
 CPPCHECK+=("--suppress=redundantAssignment")
-# We have some redundant nullptr checks in assertions
-CPPCHECK+=("--suppress=nullPointerRedundantCheck")
-# Triggers a false warning in group.c
-CPPCHECK+=("--suppress=AssignmentAddressToInteger")
-# TODO(sudden6): This triggers a false positive, check again later to enable it
-CPPCHECK+=("--suppress=arrayIndexOutOfBoundsCond")
-
-# We're a library. This only works on whole programs.
-CPPCHECK_C=("--suppress=unusedFunction")

+# We use this for VLAs.
+CPPCHECK_CXX+=("--suppress=allocaCalled")
 # False positive in auto_tests.
-CPPCHECK_CXX+=("--suppress=shadowArgument")
 CPPCHECK_CXX+=("--suppress=shadowFunction")
-# False positive for callback functions
-CPPCHECK_CXX+=("--suppress=constParameter")
+# False positive in group.c.
+# Using cppcheck-suppress claims the suppression is unused.
+CPPCHECK_CXX+=("--suppress=AssignmentAddressToInteger")
+# We use C style casts because we write C code.
+CPPCHECK_CXX+=("--suppress=cstyleCast")
 # Used in Messenger.c for a static_assert(...)
 CPPCHECK_CXX+=("--suppress=sizeofFunctionCall")

 run() {
  echo "Running cppcheck in variant '$*'"
-  cppcheck "${CPPCHECK[@]}" "${CPPCHECK_C[@]}" tox*/*.[ch] tox*/*/*.[ch] "${CPPFLAGS[@]}" "$@"
+  cppcheck -j8 "${CPPCHECK[@]}" "${CPPCHECK_C[@]}" tox*/*.[ch] tox*/*/*.[ch] "${CPPFLAGS[@]}" "$@"
  cppcheck "${CPPCHECK[@]}" "${CPPCHECK_CXX[@]}" amalgamation.cc "${CPPFLAGS[@]}" "$@"
 }

--- a/external/toxcore/c-toxcore/other/astyle/astylerc
+++ b/external/toxcore/c-toxcore/other/astyle/astylerc
@@ -16,7 +16,6 @@
 --align-reference=name

 # Formatting Options
--add-brackets
 --convert-tabs
 --max-code-length=120

--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/BUILD.bazel
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/BUILD.bazel
@@ -18,7 +18,6 @@ cc_binary(
        "//c-toxcore/toxcore:mono_time",
        "//c-toxcore/toxcore:onion_announce",
        "//c-toxcore/toxcore:tox",
-        "//c-toxcore/toxcore:util",
        "@libconfig",
    ],
 )
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/CMakeLists.txt
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/CMakeLists.txt
@@ -19,6 +19,14 @@ add_executable(tox-bootstrapd
  src/tox-bootstrapd.c
  ../bootstrap_node_packets.c
  ../bootstrap_node_packets.h)
-target_link_modules(tox-bootstrapd toxcore ${LIBCONFIG_LIBRARIES})
+target_link_libraries(tox-bootstrapd PRIVATE ${LIBCONFIG_LIBRARIES})
+target_link_directories(tox-bootstrapd PRIVATE ${LIBCONFIG_LIBRARY_DIRS})
+target_include_directories(tox-bootstrapd SYSTEM PRIVATE ${LIBCONFIG_INCLUDE_DIRS})
+target_compile_options(tox-bootstrapd PRIVATE ${LIBCONFIG_CFLAGS_OTHER})
+if(TARGET toxcore_static)
+  target_link_libraries(tox-bootstrapd PRIVATE toxcore_static)
+else()
+  target_link_libraries(tox-bootstrapd PRIVATE toxcore_shared)
+endif()
 install(TARGETS tox-bootstrapd RUNTIME DESTINATION bin)
 install(FILES bash-completion/completions/tox-bootstrapd DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/bash-completion/completions")
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/README.md
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/README.md
@@ -259,7 +259,7 @@ docker run -d --name tox-bootstrapd --restart always \
  toxchat/bootstrap-node
 ```

-We create a new user and protect its home directory in order to mount it in the Docker image, so that the kyepair the daemon uses would be stored on the host system, which makes it less likely that you would loose the keypair while playing with or updating the Docker container.
+We create a new user and protect its home directory in order to mount it in the Docker image, so that the keypair the daemon uses would be stored on the host system, which makes it less likely that you would loose the keypair while playing with or updating the Docker container.

 You can check logs for your public key or any errors:
 ```sh
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/docker/Dockerfile
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/docker/Dockerfile
@@ -1,18 +1,18 @@
 ###########################################################
 # Builder image: we compile the code here (static build)
-FROM alpine:3.18.5 AS build
+FROM alpine:3.19.0 AS build

 RUN ["apk", "--no-cache", "add",\
- "build-base",\
+ "clang",\
 "cmake",\
 "linux-headers",\
 "libconfig-dev",\
 "libconfig-static",\
 "libsodium-dev",\
 "libsodium-static",\
+ "musl-dev",\
 "ninja",\
- "python3"\
-]
+ "python3"]

 WORKDIR /src/c-toxcore

@@ -34,9 +34,9 @@ COPY CMakeLists.txt so.version ./
 COPY other/bootstrap_daemon/CMakeLists.txt other/bootstrap_daemon/CMakeLists.txt
 COPY testing/CMakeLists.txt testing/CMakeLists.txt

-RUN cmake -B_build -H. \
+RUN CC=clang cmake -B_build -H. \
      -GNinja \
-      -DCMAKE_C_FLAGS="-DTCP_SERVER_USE_EPOLL -fstack-protector-all -fisolate-erroneous-paths-attribute" \
+      -DCMAKE_C_FLAGS="-DTCP_SERVER_USE_EPOLL -fsanitize=alignment,return,returns-nonnull-attribute,vla-bound,unreachable,float-cast-overflow,null -fsanitize-trap=all -fstack-protector-all" \
      -DCMAKE_UNITY_BUILD=ON \
      -DCMAKE_BUILD_TYPE=Release \
      -DFULLY_STATIC=ON \
@@ -48,8 +48,10 @@ RUN cmake -B_build -H. \
 # Verify checksum from dev-built binary, so we can be sure Docker Hub doesn't
 # mess with your binaries.
 COPY other/bootstrap_daemon/docker/tox-bootstrapd.sha256 other/bootstrap_daemon/docker/
-RUN sha256sum /usr/local/bin/tox-bootstrapd && \
-    sha256sum -c other/bootstrap_daemon/docker/tox-bootstrapd.sha256
+RUN SHA256="$(sha256sum /usr/local/bin/tox-bootstrapd)" && \
+    (sha256sum -c other/bootstrap_daemon/docker/tox-bootstrapd.sha256 || \
+    (echo "::error file=other/bootstrap_daemon/docker/tox-bootstrapd.sha256,line=1::$SHA256" && \
+     false))

 # Remove all the example bootstrap nodes from the config file.
 COPY other/bootstrap_daemon/tox-bootstrapd.conf other/bootstrap_daemon/
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/docker/fetch-sha256
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/docker/fetch-sha256
@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+import json
+import os
+import pprint
+import subprocess
+import sys
+import urllib.request
+from typing import Any
+
+SHA256_FILE = "other/bootstrap_daemon/docker/tox-bootstrapd.sha256"
+
+with open(f"{os.environ['HOME']}/.github-token") as fh:
+    token = fh.read().strip()
+
+head_sha = (subprocess.run(["git", "rev-parse", "HEAD"],
+                           capture_output=True,
+                           check=True).stdout.decode("utf-8").strip())
+
+
+def request(url: str) -> Any:
+    return json.loads(
+        urllib.request.urlopen(
+            urllib.request.Request(
+                url,
+                headers={
+                    "Accept": "application/vnd.github+json",
+                    "Authorization": "Bearer " + token,
+                    "X-GitHub-Api-Version": "2022-11-28",
+                },
+            )).read())
+
+
+pp = pprint.PrettyPrinter(indent=2, compact=True)
+annots = [
+    a for r in request(
+        f"https://api.github.com/repos/TokTok/c-toxcore/commits/{head_sha}/check-runs?per_page=100"
+    )["check_runs"] if r["name"] == "docker-bootstrap-node"
+    for a in request(r["output"]["annotations_url"])
+    if a["path"] == SHA256_FILE
+]
+if not annots:
+    print("could not find sha256sum output")
+    sys.exit(1)
+with open(SHA256_FILE, "w") as fh:
+    fh.write(annots[0]["message"] + "\n")
+    print(f"updated {SHA256_FILE}")
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
@@ -1 +1 @@
-5aac1df4d6c1de289e8e9f646d06099c84fd4d9b80d19f45e3254eec3ece2bff  /usr/local/bin/tox-bootstrapd
+8fadc6fd894bb8f60fd53d51dcd51ff24e62b41ae404d3921e0247b9337c9a30  /usr/local/bin/tox-bootstrapd
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/src/Makefile.inc
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/src/Makefile.inc
@@ -24,17 +24,13 @@ tox_bootstrapd_SOURCES = \
 tox_bootstrapd_CFLAGS = \
                        -I$(top_srcdir)/other/bootstrap_daemon \
                        $(LIBSODIUM_CFLAGS) \
-                        $(NACL_CFLAGS) \
                        $(LIBCONFIG_CFLAGS)

 tox_bootstrapd_LDADD = \
                        $(LIBSODIUM_LDFLAGS) \
-                        $(NACL_LDFLAGS) \
                        libtoxcore.la \
                        $(LIBCONFIG_LIBS) \
-                        $(LIBSODIUM_LIBS) \
-                        $(NACL_OBJECTS) \
-                        $(NACL_LIBS)
+                        $(LIBSODIUM_LIBS)

 bashcompdir = $(datarootdir)/bash-completion/completions
 dist_bashcomp_DATA = $(top_builddir)/other/bootstrap_daemon/bash-completion/completions/tox-bootstrapd
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/src/command_line_arguments.c
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/src/command_line_arguments.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2016-2018 The TokTok team.
+ * Copyright © 2016-2024 The TokTok team.
 * Copyright © 2015-2016 Tox project.
 */

@@ -10,12 +10,12 @@
 #include "command_line_arguments.h"

 #include "global.h"
+#include "log.h"

 #include "../../../toxcore/ccompat.h"

 #include <getopt.h>

-#include <stdlib.h>
 #include <string.h>


@@ -24,9 +24,9 @@
 */
 static void print_help(void)
 {
-    // 2 space ident
-    // make sure all lines fit into 80 columns
-    // make sure options are listed in alphabetical order
+    // 2 space indent
+    // Make sure all lines fit into 80 columns
+    // Make sure options are listed in alphabetical order
    log_write(LOG_LEVEL_INFO,
              "Usage: tox-bootstrapd [OPTION]... --config=FILE_PATH\n"
              "\n"
@@ -39,7 +39,7 @@ static void print_help(void)
              "                         (detach from the terminal) and won't use the PID file.\n"
              "  --help                 Print this help message.\n"
              "  --log-backend=BACKEND  Specify which logging backend to use.\n"
-              "                         Valid BACKEND values (case sensetive):\n"
+              "                         Valid BACKEND values (case sensitive):\n"
              "                           syslog Writes log messages to syslog.\n"
              "                                  Default option when no --log-backend is\n"
              "                                  specified.\n"
@@ -47,13 +47,14 @@ static void print_help(void)
              "  --version              Print version information.\n");
 }

-void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path, LOG_BACKEND *log_backend,
-                                   bool *run_in_foreground)
+Cli_Status handle_command_line_arguments(
+        int argc, char *argv[], char **cfg_file_path, LOG_BACKEND *log_backend,
+        bool *run_in_foreground)
 {
    if (argc < 2) {
        log_write(LOG_LEVEL_ERROR, "Error: No arguments provided.\n\n");
        print_help();
-        exit(1);
+        return CLI_STATUS_ERROR;
    }

    opterr = 0;
@@ -89,7 +90,7 @@ void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path,

            case 'h':
                print_help();
-                exit(0);
+                return CLI_STATUS_DONE;

            case 'l':
                if (strcmp(optarg, "syslog") == 0) {
@@ -101,24 +102,24 @@ void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path,
                } else {
                    log_write(LOG_LEVEL_ERROR, "Error: Invalid BACKEND value for --log-backend option passed: %s\n\n", optarg);
                    print_help();
-                    exit(1);
+                    return CLI_STATUS_ERROR;
                }

                break;

            case 'v':
                log_write(LOG_LEVEL_INFO, "Version: %lu\n", DAEMON_VERSION_NUMBER);
-                exit(0);
+                return CLI_STATUS_DONE;

            case '?':
                log_write(LOG_LEVEL_ERROR, "Error: Unrecognized option %s\n\n", argv[optind - 1]);
                print_help();
-                exit(1);
+                return CLI_STATUS_ERROR;

            case ':':
                log_write(LOG_LEVEL_ERROR, "Error: No argument provided for option %s\n\n", argv[optind - 1]);
                print_help();
-                exit(1);
+                return CLI_STATUS_ERROR;
        }
    }

@@ -129,6 +130,8 @@ void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path,
    if (!cfg_file_path_set) {
        log_write(LOG_LEVEL_ERROR, "Error: The required --config option wasn't specified\n\n");
        print_help();
-        exit(1);
+        return CLI_STATUS_ERROR;
    }
+
+    return CLI_STATUS_OK;
 }
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/src/command_line_arguments.h
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/src/command_line_arguments.h
@@ -12,6 +12,15 @@

 #include "log.h"

+typedef enum Cli_Status {
+    /** Continue the program. Command line processing completed. */
+    CLI_STATUS_OK,
+    /** Stop the program with success status. */
+    CLI_STATUS_DONE,
+    /** Stop the program with error status. */
+    CLI_STATUS_ERROR,
+} Cli_Status;
+
 /**
 * Handles command line arguments, setting cfg_file_path and log_backend.
 * Terminates the application if incorrect arguments are specified.
@@ -22,7 +31,8 @@
 * @param log_backend Sets to the provided by the user log backend option.
 * @param run_in_foreground Sets to the provided by the user foreground option.
 */
-void handle_command_line_arguments(int argc, char *argv[], char **cfg_file_path, LOG_BACKEND *log_backend,
-                                   bool *run_in_foreground);
+Cli_Status handle_command_line_arguments(
+        int argc, char *argv[], char **cfg_file_path, LOG_BACKEND *log_backend,
+        bool *run_in_foreground);

 #endif // C_TOXCORE_OTHER_BOOTSTRAP_DAEMON_SRC_COMMAND_LINE_ARGUMENTS_H
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/src/config.c
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/src/config.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2016-2023 The TokTok team.
+ * Copyright © 2016-2024 The TokTok team.
 * Copyright © 2014-2016 Tox project.
 */

@@ -10,6 +10,7 @@
 #include "config.h"

 #include "config_defaults.h"
+#include "global.h"
 #include "log.h"

 #include <stdio.h>
@@ -18,6 +19,10 @@

 #include <libconfig.h>

+#include "../../../toxcore/DHT.h"
+#include "../../../toxcore/ccompat.h"
+#include "../../../toxcore/crypto_core.h"
+#include "../../../toxcore/network.h"
 #include "../../bootstrap_node_packets.h"

 /**
@@ -51,7 +56,7 @@ static void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_por
            log_write(LOG_LEVEL_INFO, "Port #%zu: %u\n", i, default_ports[i]);
        }

-        // similar procedure to the one of reading config file below
+        // Similar procedure to the one of reading config file below
        *tcp_relay_ports = (uint16_t *)malloc(default_ports_count * sizeof(uint16_t));

        for (size_t i = 0; i < default_ports_count; ++i) {
@@ -68,7 +73,7 @@ static void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_por
            ++*tcp_relay_port_count;
        }

-        // the loop above skips invalid ports, so we adjust the allocated memory size
+        // The loop above skips invalid ports, so we adjust the allocated memory size
        if ((*tcp_relay_port_count) > 0) {
            *tcp_relay_ports = (uint16_t *)realloc(*tcp_relay_ports, (*tcp_relay_port_count) * sizeof(uint16_t));
        } else {
@@ -98,7 +103,7 @@ static void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_por
        config_setting_t *elem = config_setting_get_elem(ports_array, i);

        if (elem == nullptr) {
-            // it's NULL if `ports_array` is not an array (we have that check earlier) or if `i` is out of range, which should not be
+            // It's NULL if `ports_array` is not an array (we have that check earlier) or if `i` is out of range, which should not be
            log_write(LOG_LEVEL_WARNING, "Port #%d: Something went wrong while parsing the port. Stopping reading ports.\n", i);
            break;
        }
@@ -120,7 +125,7 @@ static void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_por
        ++*tcp_relay_port_count;
    }

-    // the loop above skips invalid ports, so we adjust the allocated memory size
+    // The loop above skips invalid ports, so we adjust the allocated memory size
    if ((*tcp_relay_port_count) > 0) {
        *tcp_relay_ports = (uint16_t *)realloc(*tcp_relay_ports, (*tcp_relay_port_count) * sizeof(uint16_t));
    } else {
@@ -260,7 +265,7 @@ int get_general_config(const char *cfg_file_path, char **pid_file_path, char **k

    log_write(LOG_LEVEL_INFO, "'%s': %s\n", NAME_ENABLE_TCP_RELAY,     *enable_tcp_relay     ? "true" : "false");

-    // show info about tcp ports only if tcp relay is enabled
+    // Show info about tcp ports only if tcp relay is enabled
    if (*enable_tcp_relay) {
        if (*tcp_relay_port_count == 0) {
            log_write(LOG_LEVEL_ERROR, "No TCP ports could be read.\n");
@@ -407,7 +412,7 @@ int bootstrap_from_config(const char *cfg_file_path, DHT *dht, int enable_ipv6)
        log_write(LOG_LEVEL_INFO, "Successfully added bootstrap node #%d: %s:%d %s\n", i, bs_address, bs_port, bs_public_key);

 next:
-        // config_setting_lookup_string() allocates string inside and doesn't allow us to free it direcly
+        // config_setting_lookup_string() allocates string inside and doesn't allow us to free it directly
        // though it's freed when the element is removed, so we free it right away in order to keep memory
        // consumption minimal
        config_setting_remove_elem(node_list, 0);
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/src/config.h
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/src/config.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2016-2018 The TokTok team.
+ * Copyright © 2016-2024 The TokTok team.
 * Copyright © 2014-2016 Tox project.
 */

@@ -30,7 +30,7 @@ int get_general_config(const char *cfg_file_path, char **pid_file_path, char **k
 * Bootstraps off nodes listed in the config file.
 *
 * @return 1 on success, some or no bootstrap nodes were added
- *         0 on failure, a error accured while parsing config file.
+ *         0 on failure, an error occurred while parsing the config file.
 */
 int bootstrap_from_config(const char *cfg_file_path, DHT *dht, int enable_ipv6);

--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/src/log.c
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/src/log.c
@@ -3,6 +3,8 @@
 * Copyright © 2015-2016 Tox project.
 */

+#include <stdarg.h>
+
 /*
 * Tox DHT bootstrap daemon.
 * Logging utility with support of multiple logging backends.
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/src/log_backend_stdout.c
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/src/log_backend_stdout.c
@@ -9,8 +9,11 @@
 */
 #include "log_backend_stdout.h"

+#include <stdarg.h>
 #include <stdio.h>

+#include "log.h"
+
 static FILE *log_backend_stdout_level(LOG_LEVEL level)
 {
    switch (level) {
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/src/log_backend_syslog.c
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/src/log_backend_syslog.c
@@ -10,10 +10,12 @@
 #include "log_backend_syslog.h"

 #include "global.h"
+#include "log.h"

 #include "../../../toxcore/ccompat.h"

 #include <assert.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <syslog.h>
--- a/external/toxcore/c-toxcore/other/bootstrap_daemon/src/tox-bootstrapd.c
+++ b/external/toxcore/c-toxcore/other/bootstrap_daemon/src/tox-bootstrapd.c
@@ -23,17 +23,24 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>

 // toxcore
-#include "../../../toxcore/tox.h"
+#include "../../../toxcore/DHT.h"
 #include "../../../toxcore/LAN_discovery.h"
 #include "../../../toxcore/TCP_server.h"
 #include "../../../toxcore/announce.h"
+#include "../../../toxcore/ccompat.h"
+#include "../../../toxcore/crypto_core.h"
+#include "../../../toxcore/forwarding.h"
+#include "../../../toxcore/group_announce.h"
 #include "../../../toxcore/group_onion_announce.h"
 #include "../../../toxcore/logger.h"
+#include "../../../toxcore/mem.h"
 #include "../../../toxcore/mono_time.h"
+#include "../../../toxcore/network.h"
+#include "../../../toxcore/onion.h"
 #include "../../../toxcore/onion_announce.h"
-#include "../../../toxcore/util.h"

 // misc
 #include "../../bootstrap_node_packets.h"
@@ -57,7 +64,7 @@ static void sleep_milliseconds(uint32_t ms)
 // returns 1 on success
 //         0 on failure - no keys were read or stored

-static int manage_keys(DHT *dht, char *keys_file_path)
+static int manage_keys(DHT *dht, const char *keys_file_path)
 {
    enum { KEYS_SIZE = CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_SECRET_KEY_SIZE };
    uint8_t keys[KEYS_SIZE];
@@ -116,7 +123,7 @@ static void print_public_key(const uint8_t *public_key)
 // Demonizes the process, appending PID to the PID file and closing file descriptors based on log backend
 // Terminates the application if the daemonization fails.

-static void daemonize(LOG_BACKEND log_backend, char *pid_file_path)
+static Cli_Status daemonize(LOG_BACKEND log_backend, char *pid_file_path)
 {
    // Check if the PID file exists
    FILE *pid_file = fopen(pid_file_path, "r");
@@ -131,7 +138,7 @@ static void daemonize(LOG_BACKEND log_backend, char *pid_file_path)

    if (pid_file == nullptr) {
        log_write(LOG_LEVEL_ERROR, "Couldn't open the PID file for writing: %s. Exiting.\n", pid_file_path);
-        exit(1);
+        return CLI_STATUS_ERROR;
    }

    // Fork off from the parent process
@@ -141,27 +148,27 @@ static void daemonize(LOG_BACKEND log_backend, char *pid_file_path)
        fprintf(pid_file, "%d", pid);
        fclose(pid_file);
        log_write(LOG_LEVEL_INFO, "Forked successfully: PID: %d.\n", pid);
-        exit(0);
+        return CLI_STATUS_DONE;
    } else {
        fclose(pid_file);
    }

    if (pid < 0) {
        log_write(LOG_LEVEL_ERROR, "Forking failed. Exiting.\n");
-        exit(1);
+        return CLI_STATUS_ERROR;
    }

    // Create a new SID for the child process
    if (setsid() < 0) {
        log_write(LOG_LEVEL_ERROR, "SID creation failure. Exiting.\n");
-        exit(1);
+        return CLI_STATUS_ERROR;
    }


    // Change the current working directory
    if ((chdir("/")) < 0) {
        log_write(LOG_LEVEL_ERROR, "Couldn't change working directory to '/'. Exiting.\n");
-        exit(1);
+        return CLI_STATUS_ERROR;
    }

    // Go quiet
@@ -170,6 +177,8 @@ static void daemonize(LOG_BACKEND log_backend, char *pid_file_path)
        close(STDIN_FILENO);
        close(STDERR_FILENO);
    }
+
+    return CLI_STATUS_OK;
 }

 // Logs toxcore logger message using our logger facility
@@ -212,11 +221,18 @@ int main(int argc, char *argv[])
    char *cfg_file_path = nullptr;
    bool run_in_foreground = false;

-    // choose backend for printing command line argument parsing output based on whether the daemon is being run from a terminal
+    // Choose backend for printing command line argument parsing output based on whether the daemon is being run from a terminal
    LOG_BACKEND log_backend = isatty(STDOUT_FILENO) ? LOG_BACKEND_STDOUT : LOG_BACKEND_SYSLOG;

    log_open(log_backend);
-    handle_command_line_arguments(argc, argv, &cfg_file_path, &log_backend, &run_in_foreground);
+    switch (handle_command_line_arguments(argc, argv, &cfg_file_path, &log_backend, &run_in_foreground)) {
+        case CLI_STATUS_OK:
+            break;
+        case CLI_STATUS_DONE:
+            return 0;
+        case CLI_STATUS_ERROR:
+            return 1;
+    }
    log_close();

    log_open(log_backend);
@@ -254,7 +270,14 @@ int main(int argc, char *argv[])
    }

    if (!run_in_foreground) {
-        daemonize(log_backend, pid_file_path);
+        switch (daemonize(log_backend, pid_file_path)) {
+            case CLI_STATUS_OK:
+                break;
+            case CLI_STATUS_DONE:
+                return 0;
+            case CLI_STATUS_ERROR:
+                return 1;
+        }
    }

    free(pid_file_path);
--- a/external/toxcore/c-toxcore/other/bootstrap_node_packets.c
+++ b/external/toxcore/c-toxcore/other/bootstrap_node_packets.c
@@ -12,6 +12,8 @@

 #include <string.h>

+#include "../toxcore/network.h"
+
 #define INFO_REQUEST_PACKET_LENGTH 78

 static uint32_t bootstrap_version;
--- a/external/toxcore/c-toxcore/other/docker/autotools/Dockerfile
+++ b/external/toxcore/c-toxcore/other/docker/autotools/Dockerfile
@@ -1,6 +1,28 @@
 ################################################
 # autotools-linux
-FROM toxchat/nacl:latest
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+ DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
+ autoconf \
+ automake \
+ ca-certificates \
+ curl \
+ libconfig-dev \
+ libopus-dev \
+ libsodium-dev \
+ libtool \
+ libvpx-dev \
+ make \
+ pkg-config \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN groupadd -r -g 1000 builder \
+ && useradd -m --no-log-init -r -g builder -u 1000 builder
+USER builder
+
+WORKDIR /home/builder

 # Copy the sources and run the build.
 COPY --chown=builder:builder . /home/builder/c-toxcore/
--- a/external/toxcore/c-toxcore/other/docker/clang-tidy/Dockerfile
+++ b/external/toxcore/c-toxcore/other/docker/clang-tidy/Dockerfile
@@ -0,0 +1,21 @@
+FROM alpine:3.19.0
+
+RUN ["apk", "add", "--no-cache", \
+ "bash", \
+ "clang", \
+ "clang-extra-tools", \
+ "cmake", \
+ "colordiff", \
+ "libconfig-dev", \
+ "libsodium-dev", \
+ "libvpx-dev", \
+ "linux-headers", \
+ "opus-dev", \
+ "pkgconfig", \
+ "samurai"]
+
+ENV CC=clang CXX=clang++
+
+COPY . /c-toxcore/
+WORKDIR /c-toxcore
+RUN other/analysis/run-clang-tidy
--- a/external/toxcore/c-toxcore/other/docker/clang-tidy/run
+++ b/external/toxcore/c-toxcore/other/docker/clang-tidy/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -eux
+BUILD=clang-tidy
+docker build -t "toxchat/c-toxcore:$BUILD" -f "other/docker/$BUILD/Dockerfile" .
--- a/external/toxcore/c-toxcore/other/docker/coverage/Dockerfile
+++ b/external/toxcore/c-toxcore/other/docker/coverage/Dockerfile
@@ -1,13 +1,15 @@
 FROM toxchat/c-toxcore:sources AS src
-FROM ubuntu:22.04 AS build
+FROM ubuntu:20.04 AS build

 RUN apt-get update && \
 DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
+ ca-certificates \
 clang \
 cmake \
+ curl \
 gcc \
 git \
- golang \
+ golang-1.18 \
 libconfig-dev \
 libgtest-dev \
 libopus-dev \
@@ -17,15 +19,24 @@ RUN apt-get update && \
 make \
 ninja-build \
 pkg-config \
+ python3-lxml \
 python3-pip \
 python3-pygments \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* \
 && pip3 install --no-cache-dir gcovr
+# strip gtest so it doesn't end up in stack traces. This speeds up the
+# mallocfail run below by a lot.
+RUN ["strip", "-g",\
+ "/usr/lib/x86_64-linux-gnu/libgtest.a",\
+ "/usr/lib/x86_64-linux-gnu/libgtest_main.a"]
+RUN ["curl", "-s", "https://codecov.io/bash", "-o", "/usr/local/bin/codecov"]
+RUN ["chmod", "+x", "/usr/local/bin/codecov"]

 ENV CC=clang \
    CXX=clang++ \
-    PYTHONUNBUFFERED=1
+    PYTHONUNBUFFERED=1 \
+    PATH=$PATH:/usr/lib/go-1.18/bin
 SHELL ["/bin/bash", "-c"]

 WORKDIR /work
@@ -41,26 +52,27 @@ RUN source .github/scripts/flags-coverage.sh \
 -DENABLE_SHARED=OFF \
 -DMIN_LOGGER_LEVEL=TRACE \
 -DMUST_BUILD_TOXAV=ON \
- -DNON_HERMETIC_TESTS=ON \
+ -DNON_HERMETIC_TESTS=OFF \
 -DSTRICT_ABI=ON \
 -DAUTOTEST=ON \
 -DPROXY_TEST=ON \
 -DUSE_IPV6=OFF \
- -DTEST_TIMEOUT_SECONDS=30 \
+ -DTEST_TIMEOUT_SECONDS=40 \
 && cmake --build _build --parallel 8 --target install

 WORKDIR /work/_build
-RUN /work/proxy_server \
- & ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:6
+RUN /work/other/proxy/proxy_server \
+ & (ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:6 || \
+    ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:6)

 WORKDIR /work/mallocfail
 RUN ["git", "clone", "--depth=1", "https://github.com/ralight/mallocfail", "/work/mallocfail"]
-COPY run_mallocfail /usr/local/bin/
-COPY syscall_funcs.c src/
+COPY other/docker/coverage/syscall_funcs.c src/
 RUN gcc -fPIC -shared -O2 -g3 -Wall -Ideps/uthash -Ideps/sha3 deps/*/*.c src/*.c -o mallocfail.so -ldl -lbacktrace \
 && install mallocfail.so /usr/local/lib/mallocfail.so

 WORKDIR /work/_build
+COPY other/docker/coverage/run_mallocfail /usr/local/bin/
 RUN ["run_mallocfail", "--ctest=2", "--jobs=8"]
 RUN ["gcovr", \
 "--sort-percentage", \
@@ -74,6 +86,4 @@ RUN ["gcovr", \
 "--exclude=(.+/)?other/", \
 "--exclude=(.+/)?testing/"]

-FROM nginx:alpine
-COPY --from=build /work/_build/html/coverage_details.html /usr/share/nginx/html/index.html
-COPY --from=build /work/_build/html/ /usr/share/nginx/html/
+WORKDIR /work
--- a/external/toxcore/c-toxcore/other/docker/coverage/Dockerfile.nginx
+++ b/external/toxcore/c-toxcore/other/docker/coverage/Dockerfile.nginx
@@ -0,0 +1,5 @@
+# vim:ft=dockerfile
+FROM toxchat/c-toxcore:coverage AS build
+FROM nginx:alpine
+COPY --from=build /work/_build/html/coverage_details.html /usr/share/nginx/html/index.html
+COPY --from=build /work/_build/html/ /usr/share/nginx/html/
--- a/external/toxcore/c-toxcore/other/docker/coverage/run
+++ b/external/toxcore/c-toxcore/other/docker/coverage/run
@@ -1,7 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env bash

 set -eux

+read -a ci_env <<<"$(bash <(curl -s https://codecov.io/env))"
+
 docker build -t toxchat/c-toxcore:sources -f other/docker/sources/Dockerfile .
-docker build -t toxchat/c-toxcore:coverage other/docker/coverage
-docker run --name toxcore-coverage --rm -it -p "28192:80" toxchat/c-toxcore:coverage
+docker build -t toxchat/c-toxcore:coverage -f other/docker/coverage/Dockerfile .
+docker run "${ci_env[@]}" -e CI=true --name toxcore-coverage --rm -t toxchat/c-toxcore:coverage /usr/local/bin/codecov -x "llvm-cov gcov"
--- a/external/toxcore/c-toxcore/other/docker/coverage/run_mallocfail
+++ b/external/toxcore/c-toxcore/other/docker/coverage/run_mallocfail
@@ -39,8 +39,8 @@ _ENV = {
 }


-def run_mallocfail(tmpdir: str, timeout: float, exe: str,
-                   iteration: int) -> bool:
+def run_mallocfail(tmpdir: str, timeout: float, exe: str, iteration: int,
+                   keep_going: bool) -> bool:
    """Run a program with mallocfail."""
    print(f"\x1b[1;33mmallocfail '{exe}' run #{iteration}\x1b[0m")
    hashes = os.path.join(tmpdir, _HASHES)
@@ -73,7 +73,8 @@ def run_mallocfail(tmpdir: str, timeout: float, exe: str,
        print(
            f"\x1b[1;32mProgram '{exe}' failed to handle OOM situation cleanly\x1b[0m"
        )
-        raise Exception("Aborting test")
+        if not keep_going:
+            raise Exception("Aborting test")

    return True

@@ -95,7 +96,8 @@ def find_prog(name: str) -> Tuple[Optional[str], ...]:
            return path
        return None

-    return (attempt(f"./unit_{name}_test"), attempt(f"./auto_{name}_test"))
+    return (attempt(f"./unit_{name}_test"),
+            attempt(f"auto_tests/auto_{name}_test"))


 def parse_flags(args: List[str]) -> Tuple[Dict[str, str], List[str]]:
@@ -110,15 +112,19 @@ def parse_flags(args: List[str]) -> Tuple[Dict[str, str], List[str]]:
    return flags, exes


-def loop_mallocfail(tmpdir: str, timeout: float, exe: str) -> None:
+def loop_mallocfail(tmpdir: str,
+                    timeout: float,
+                    exe: str,
+                    keep_going: bool = False) -> None:
    i = 1
-    while run_mallocfail(tmpdir, timeout, exe, i):
+    while run_mallocfail(tmpdir, timeout, exe, i, keep_going):
        i += 1


 def isolated_mallocfail(timeout: int, exe: str) -> None:
    with tempfile.TemporaryDirectory(prefix="mallocfail") as tmpdir:
        print(f"\x1b[1;33mRunning for {exe} in isolated path {tmpdir}\x1b[0m")
+        os.mkdir(os.path.join(tmpdir, "auto_tests"))
        shutil.copy(exe, os.path.join(tmpdir, exe))
        shutil.copy(_HASHES, os.path.join(tmpdir, _HASHES))
        loop_mallocfail(tmpdir, timeout, exe)
@@ -149,7 +155,7 @@ def main(args: List[str]) -> None:
    # such as llvm_gcov_init fail.
    if os.path.exists(_PRIMER):
        print(f"\x1b[1;33mPriming hashes with unit_util_test\x1b[0m")
-        loop_mallocfail(".", timeout, _PRIMER)
+        loop_mallocfail(".", timeout, _PRIMER, keep_going=True)

    print(f"\x1b[1;33m--------------------------------\x1b[0m")
    print(f"\x1b[1;33mStarting mallocfail for {len(exes)} programs:\x1b[0m")
--- a/external/toxcore/c-toxcore/other/docker/coverage/serve
+++ b/external/toxcore/c-toxcore/other/docker/coverage/serve
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -eux
+
+docker build -t toxchat/c-toxcore:sources -f other/docker/sources/Dockerfile .
+docker build -t toxchat/c-toxcore:coverage -f other/docker/coverage/Dockerfile .
+docker build -t toxchat/c-toxcore:coverage-nginx -f other/docker/coverage/Dockerfile.nginx other/docker/coverage
+docker run --name toxcore-coverage --rm -it -p "28192:80" toxchat/c-toxcore:coverage-nginx
--- a/external/toxcore/c-toxcore/other/docker/cppcheck/Dockerfile
+++ b/external/toxcore/c-toxcore/other/docker/cppcheck/Dockerfile
@@ -0,0 +1,30 @@
+FROM alpine:3.19.0
+
+RUN ["apk", "add", "--no-cache", \
+ "bash", \
+ "cppcheck", \
+ "findutils", \
+ "libconfig-dev", \
+ "libsodium-dev", \
+ "libvpx-dev", \
+ "linux-headers", \
+ "make", \
+ "opus-dev"]
+
+COPY other/bootstrap_daemon/ /src/workspace/c-toxcore/other/bootstrap_daemon/
+COPY other/bootstrap_node_packets.* /src/workspace/c-toxcore/other/
+COPY other/fun/ /src/workspace/c-toxcore/other/fun/
+COPY auto_tests/check_compat.h /src/workspace/c-toxcore/auto_tests/
+COPY testing/ /src/workspace/c-toxcore/testing/
+COPY toxav/ /src/workspace/c-toxcore/toxav/
+COPY toxcore/ /src/workspace/c-toxcore/toxcore/
+COPY toxencryptsave/ /src/workspace/c-toxcore/toxencryptsave/
+COPY third_party/cmp/cmp.h /src/workspace/c-toxcore/third_party/cmp/
+COPY other/analysis/run-cppcheck \
+     other/analysis/gen-file.sh \
+     other/analysis/variants.sh \
+     /src/workspace/c-toxcore/other/analysis/
+COPY other/docker/cppcheck/toxcore.cfg \
+     /src/workspace/c-toxcore/other/docker/cppcheck/
+WORKDIR /src/workspace/c-toxcore
+RUN ["other/analysis/run-cppcheck"]
--- a/external/toxcore/c-toxcore/other/docker/cppcheck/run
+++ b/external/toxcore/c-toxcore/other/docker/cppcheck/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -eux
+BUILD=cppcheck
+docker build -t "toxchat/c-toxcore:$BUILD" -f "other/docker/$BUILD/Dockerfile" .
--- a/external/toxcore/c-toxcore/other/docker/cppcheck/toxcore.cfg
+++ b/external/toxcore/c-toxcore/other/docker/cppcheck/toxcore.cfg
@@ -0,0 +1,121 @@
+<?xml version="1.0"?>
+<def format="2">
+  <memory>
+    <alloc init="false" buffer-size="malloc:2">mem_balloc</alloc>
+    <alloc init="true" buffer-size="malloc:2">mem_alloc</alloc>
+    <alloc init="true" buffer-size="calloc:2,3">mem_valloc</alloc>
+    <realloc init="false" buffer-size="calloc:3,4">mem_vrealloc</realloc>
+    <dealloc arg="2">mem_delete</dealloc>
+  </memory>
+  <resource>
+    <alloc init="true">bin_pack_new</alloc>
+    <dealloc arg="1">bin_pack_free</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">bin_unpack_new</alloc>
+    <dealloc arg="1">bin_unpack_free</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">friendreq_new</alloc>
+    <dealloc arg="1">friendreq_kill</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">logger_new</alloc>
+    <dealloc arg="1">logger_kill</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">mono_time_new</alloc>
+    <dealloc arg="1">mono_time_free</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">ping_array_new</alloc>
+    <dealloc arg="1">ping_array_kill</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">ping_new</alloc>
+    <dealloc arg="1">ping_kill</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">shared_key_cache_new</alloc>
+    <dealloc arg="1">shared_key_cache_free</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">tox_dispatch_new</alloc>
+    <dealloc arg="1">tox_dispatch_free</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">tox_new</alloc>
+    <dealloc arg="1">tox_kill</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">tox_options_new</alloc>
+    <dealloc arg="1">tox_options_free</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_announcements</alloc>
+    <dealloc arg="1">kill_announcements</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_dht</alloc>
+    <dealloc arg="1">kill_dht</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_dht_groupchats</alloc>
+    <dealloc arg="1">kill_dht_groupchats</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_forwarding</alloc>
+    <dealloc arg="1">kill_forwarding</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_friend_connections</alloc>
+    <dealloc arg="1">kill_friend_connections</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_gca_list</alloc>
+    <dealloc arg="1">kill_gca_list</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_groupchats</alloc>
+    <dealloc arg="1">kill_groupchats</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_messenger</alloc>
+    <dealloc arg="1">kill_messenger</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_net_crypto</alloc>
+    <dealloc arg="1">kill_net_crypto</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_networking_ex</alloc>
+    <alloc init="true">new_networking_no_udp</alloc>
+    <dealloc arg="1">kill_networking</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">net_new_strerror</alloc>
+    <dealloc arg="1">net_kill_strerror</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_onion</alloc>
+    <dealloc arg="1">kill_onion</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_onion_announce</alloc>
+    <dealloc arg="1">kill_onion_announce</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_onion_client</alloc>
+    <dealloc arg="1">kill_onion_client</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_tcp_connections</alloc>
+    <dealloc arg="1">kill_tcp_connections</dealloc>
+  </resource>
+  <resource>
+    <alloc init="true">new_tcp_server</alloc>
+    <dealloc arg="1">kill_tcp_server</dealloc>
+  </resource>
+</def>
+<!-- vim:ft=xml
+ -->
--- a/external/toxcore/c-toxcore/other/docker/esp32/BUILD.bazel
+++ b/external/toxcore/c-toxcore/other/docker/esp32/BUILD.bazel
@@ -0,0 +1,15 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary")
+
+cc_binary(
+    name = "host_main",
+    testonly = 1,
+    srcs = [
+        "host_main.cc",
+        "main/tox_main.cc",
+        "main/tox_main.h",
+    ],
+    deps = [
+        "//c-toxcore/toxcore:tox",
+        "//c-toxcore/toxcore:tox_events",
+    ],
+)
--- a/external/toxcore/c-toxcore/other/docker/esp32/Dockerfile
+++ b/external/toxcore/c-toxcore/other/docker/esp32/Dockerfile
@@ -1,48 +1,32 @@
-FROM toxchat/c-toxcore:sources AS src
-FROM ubuntu:18.04
+FROM mluis/qemu-esp32:latest
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+ENV IDF_TARGET=esp32

-RUN apt-get update && \
- DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
- bison \
- ccache \
- cmake \
- flex \
- git \
- gperf \
- libncurses-dev \
- ninja-build \
- python \
- python-cryptography \
- python-future \
- python-pip \
- python-pyparsing \
- python-serial \
- python-setuptools \
- wget \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
+WORKDIR /root/toxcore

-ENV ESP32_TARBALL=xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0 \
-    IDF_PATH="/root/esp/esp-idf" \
-    PATH="/root/esp/esp-idf/tools:/root/esp/xtensa-esp32-elf/bin:$PATH"
-WORKDIR /root/esp
-RUN wget -q https://dl.espressif.com/dl/$ESP32_TARBALL.tar.gz \
- && tar zxf $ESP32_TARBALL.tar.gz \
- && rm -f $ESP32_TARBALL.tar.gz \
- && git clone -b v3.3 --recursive --depth=1 --shallow-submodules https://github.com/espressif/esp-idf
+# Build an initial bootstrap hello world just to compile libsodium and other
+# system level dependencies.
+COPY other/docker/esp32/sdkconfig \
+     other/docker/esp32/CMakeLists.txt \
+     /root/toxcore/
+COPY other/docker/esp32/bootstrap/ \
+     /root/toxcore/main/
+RUN . /root/esp/esp-idf/export.sh && idf.py build

-# Build a hello world first, so the OS and libsodium etc. are compiled.
-WORKDIR /root/esp/toxcore
-COPY other/docker/esp32/CMakeLists.txt /root/esp/toxcore/
-COPY other/docker/esp32/hello/ /root/esp/toxcore/main/
-RUN idf.py build
-
-# Then copy over the actual toxcore sources and build those.
-COPY --from=src /src/third_party/cmp/ /root/esp/toxcore/main/third_party/cmp/
-COPY --from=src /src/toxencryptsave/defines.h /root/esp/toxcore/main/toxencryptsave/
-COPY --from=src /src/toxcore/ /root/esp/toxcore/main/toxcore/
-COPY other/docker/esp32/toxcore/CMakeLists.txt /root/esp/toxcore/main/
-COPY other/docker/esp32/toxcore/toxcore_main.cc /root/esp/toxcore/main/other/docker/esp32/main/
-RUN idf.py build
+# Copy over toxcore sources and build those.
+COPY third_party/cmp/ /root/toxcore/main/third_party/cmp/
+COPY toxencryptsave/defines.h /root/toxcore/main/toxencryptsave/
+COPY toxcore/ /root/toxcore/main/toxcore/
+COPY other/docker/esp32/main/CMakeLists.txt \
+     /root/toxcore/main/
+COPY other/docker/esp32/main/*.cc \
+     other/docker/esp32/main/*.h \
+     /root/toxcore/main/other/docker/esp32/main/
+RUN touch /root/toxcore/main/CMakeLists.txt \
+ && . /root/esp/esp-idf/export.sh && idf.py build
 RUN ls -lh build/toxcore.bin \
- && shasum build/toxcore.bin
+ && sha512sum build/toxcore.bin
+RUN /root/flash.sh build/toxcore.bin
+
+COPY other/docker/esp32/qemu-test /root/toxcore/
+RUN ["/root/toxcore/qemu-test"]
--- a/external/toxcore/c-toxcore/other/docker/esp32/bootstrap/CMakeLists.txt
+++ b/external/toxcore/c-toxcore/other/docker/esp32/bootstrap/CMakeLists.txt
@@ -0,0 +1,4 @@
+idf_component_register(
+  SRCS hello_main.cc
+  INCLUDE_DIRS "."
+  REQUIRES esp_netif lwip)
--- a/external/toxcore/c-toxcore/other/docker/esp32/bootstrap/hello_main.cc
+++ b/external/toxcore/c-toxcore/other/docker/esp32/bootstrap/hello_main.cc
@@ -0,0 +1,4 @@
+#include <stdio.h>
+
+// Bootstrap main. Only writes hello world. See ../main/ for the real thing.
+extern "C" void app_main(void) { printf("Hello world!\n"); }
--- a/external/toxcore/c-toxcore/other/docker/esp32/bootstrap/idf_component.yml
+++ b/external/toxcore/c-toxcore/other/docker/esp32/bootstrap/idf_component.yml
@@ -0,0 +1,2 @@
+dependencies:
+  espressif/libsodium: "==1.0.20"
--- a/external/toxcore/c-toxcore/other/docker/esp32/hello/CMakeLists.txt
+++ b/external/toxcore/c-toxcore/other/docker/esp32/hello/CMakeLists.txt
@@ -1,4 +0,0 @@
-set(COMPONENT_SRCS "hello_main.c")
-set(COMPONENT_ADD_INCLUDEDIRS "")
-
-register_component()
--- a/external/toxcore/c-toxcore/other/docker/esp32/hello/hello_main.c
+++ b/external/toxcore/c-toxcore/other/docker/esp32/hello/hello_main.c
@@ -1,6 +0,0 @@
-#include <stdio.h>
-
-void app_main(void)
-{
-    printf("Hello world!\n");
-}
--- a/external/toxcore/c-toxcore/other/docker/esp32/host_main.cc
+++ b/external/toxcore/c-toxcore/other/docker/esp32/host_main.cc
@@ -0,0 +1,3 @@
+#include "main/tox_main.h"
+
+int main() { tox_main(); }
--- a/external/toxcore/c-toxcore/other/docker/esp32/main/CMakeLists.txt
+++ b/external/toxcore/c-toxcore/other/docker/esp32/main/CMakeLists.txt
@@ -0,0 +1,16 @@
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-field-initializers -Wno-format -DMIN_LOGGER_LEVEL=LOGGER_LEVEL_TRACE")
+
+file(GLOB toxcore_SRCS "toxcore/*.[ch]" "toxcore/*/*.[ch]")
+set(COMPONENT_SRCS
+  ${toxcore_SRCS}
+  other/docker/esp32/main/app_main.cc
+  other/docker/esp32/main/tox_main.cc
+  other/docker/esp32/main/tox_main.h
+  third_party/cmp/cmp.c
+  third_party/cmp/cmp.h
+  toxencryptsave/defines.h)
+
+idf_component_register(
+  SRCS ${COMPONENT_SRCS}
+  INCLUDE_DIRS "."
+  REQUIRES esp_eth esp_netif lwip)
--- a/external/toxcore/c-toxcore/other/docker/esp32/main/app_main.cc
+++ b/external/toxcore/c-toxcore/other/docker/esp32/main/app_main.cc
@@ -0,0 +1,73 @@
+#include <esp_eth.h>
+#include <esp_event.h>
+#include <esp_log.h>
+#include <esp_netif.h>
+#include <esp_netif_sntp.h>
+#include <stdio.h>
+#include <time.h>
+
+#include "tox_main.h"
+
+static const char *MAIN_TAG = "app_main";
+static constexpr int NTP_TIMEOUT = 60;  // 1 minute
+
+static esp_eth_handle_t eth_handle = nullptr;
+static esp_netif_t *eth_netif = nullptr;
+
+static void event_handler(
+    void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data)
+{
+    if (event_base == ETH_EVENT) {
+        if (event_id == ETHERNET_EVENT_START) {
+            return;
+        }
+        if (event_id == ETHERNET_EVENT_STOP) {
+            return;
+        }
+    }
+    if (event_base == IP_EVENT) {
+        if (event_id == IP_EVENT_ETH_GOT_IP) {
+            return;
+        }
+    }
+}
+
+static void register_ethernet(void)
+{
+    ESP_ERROR_CHECK(esp_netif_init());
+    ESP_ERROR_CHECK(esp_event_loop_create_default());
+    esp_netif_config_t cfg = ESP_NETIF_DEFAULT_ETH();
+    eth_netif = esp_netif_new(&cfg);
+
+    eth_mac_config_t mac_config = ETH_MAC_DEFAULT_CONFIG();
+    eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG();
+    esp_eth_mac_t *mac = esp_eth_mac_new_openeth(&mac_config);
+
+    esp_eth_phy_t *phy = esp_eth_phy_new_dp83848(&phy_config);
+
+    esp_eth_config_t config = ETH_DEFAULT_CONFIG(mac, phy);
+    ESP_ERROR_CHECK(esp_eth_driver_install(&config, &eth_handle));
+    ESP_ERROR_CHECK(esp_netif_attach(eth_netif, esp_eth_new_netif_glue(eth_handle)));
+    ESP_ERROR_CHECK(esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL));
+    ESP_ERROR_CHECK(
+        esp_event_handler_register(IP_EVENT, IP_EVENT_ETH_GOT_IP, &event_handler, NULL));
+    ESP_ERROR_CHECK(esp_eth_start(eth_handle));
+}
+
+// Does all the esp32-specific init before running generic tox code.
+extern "C" void app_main(void)
+{
+    register_ethernet();
+
+    esp_sntp_config_t config = ESP_NETIF_SNTP_DEFAULT_CONFIG("pool.ntp.org");
+    ESP_ERROR_CHECK(esp_netif_sntp_init(&config));
+
+    if (esp_netif_sntp_sync_wait(pdMS_TO_TICKS(NTP_TIMEOUT * 1000)) != ESP_OK) {
+        ESP_LOGE(MAIN_TAG, "failed to update system time within %ds timeout", NTP_TIMEOUT);
+        return;
+    }
+
+    ESP_LOGI(MAIN_TAG, "time is updated: %lld", time(nullptr));
+
+    tox_main();
+}
--- a/external/toxcore/c-toxcore/other/docker/esp32/main/tox_main.cc
+++ b/external/toxcore/c-toxcore/other/docker/esp32/main/tox_main.cc
@@ -0,0 +1,98 @@
+#include "../main/tox_main.h"
+
+#include <assert.h>
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
+
+#include <memory>
+
+#include "../../../../toxcore/ccompat.h"
+#include "../../../../toxcore/tox.h"
+#include "../../../../toxcore/tox_events.h"
+
+static const char *color(int index)
+{
+    switch (index) {
+    case 0:
+        return "\033"
+               "[35m";
+    case 1:
+        return "\033"
+               "[36m";
+    }
+
+    return "\033"
+           "[0m";
+}
+
+static tox_log_cb log_handler;
+static void log_handler(Tox *tox, Tox_Log_Level level, const char *file, uint32_t line,
+    const char *func, const char *msg, void *user_data)
+{
+    const int *index = static_cast<const int *>(user_data);
+    const uint16_t udp_port = tox_self_get_udp_port(tox, nullptr);
+    printf("%s#%d (:%d) [%c] %s:%u(%s): %s\n", color(*index), *index, udp_port,
+        tox_log_level_to_string(level)[0], file, static_cast<unsigned int>(line), func, msg);
+}
+
+using Tox_Options_Ptr = std::unique_ptr<Tox_Options, void (*)(Tox_Options *)>;
+using Tox_Ptr = std::unique_ptr<Tox, void (*)(Tox *)>;
+
+void tox_main()
+{
+    printf("Hello Tox!\n");
+
+    Tox_Options_Ptr opts(tox_options_new(nullptr), tox_options_free);
+    assert(opts != nullptr);
+
+    tox_options_set_ipv6_enabled(opts.get(), false);
+    tox_options_set_local_discovery_enabled(opts.get(), false);
+
+    tox_options_set_log_callback(opts.get(), log_handler);
+
+    Tox_Err_New err;
+
+    int index[] = {0, 1};
+
+    tox_options_set_log_user_data(opts.get(), &index[0]);
+    Tox_Ptr tox0(tox_new(opts.get(), &err), tox_kill);
+    printf("tox_new(#0): %p\n", static_cast<void *>(tox0.get()));
+
+    if (err != TOX_ERR_NEW_OK) {
+        printf("tox_new(#0): %s\n", tox_err_new_to_string(err));
+        return;
+    }
+
+    tox_options_set_log_user_data(opts.get(), &index[1]);
+    Tox_Ptr tox1(tox_new(opts.get(), &err), tox_kill);
+    printf("tox_new(#1): %p\n", static_cast<void *>(tox0.get()));
+
+    if (err != TOX_ERR_NEW_OK) {
+        printf("tox_new(#1): %s\n", tox_err_new_to_string(err));
+        return;
+    }
+
+    uint8_t pk[TOX_PUBLIC_KEY_SIZE];
+    tox_self_get_dht_id(tox0.get(), pk);
+    tox_bootstrap(tox1.get(), "localhost", tox_self_get_udp_port(tox0.get(), nullptr), pk, nullptr);
+
+#if 0
+    tox_self_get_public_key(tox0.get(), pk);
+    tox_friend_add_norequest(tox1.get(), pk, nullptr);
+
+    tox_self_get_public_key(tox1.get(), pk);
+    tox_friend_add_norequest(tox0.get(), pk, nullptr);
+#endif
+
+    printf("bootstrapping and connecting 2 toxes\n");
+
+    while (tox_self_get_connection_status(tox1.get()) == TOX_CONNECTION_NONE
+        || tox_self_get_connection_status(tox0.get()) == TOX_CONNECTION_NONE) {
+        tox_events_free(tox_events_iterate(tox0.get(), true, nullptr));
+        tox_events_free(tox_events_iterate(tox1.get(), true, nullptr));
+
+        usleep(tox_iteration_interval(tox0.get()) * 1000);
+        usleep(250);  // a bit less noise in the log
+    }
+}
--- a/external/toxcore/c-toxcore/other/docker/esp32/main/tox_main.h
+++ b/external/toxcore/c-toxcore/other/docker/esp32/main/tox_main.h
@@ -0,0 +1,6 @@
+#ifndef TOX_MAIN_H
+#define TOX_MAIN_H
+
+void tox_main();
+
+#endif // TOX_MAIN_H
--- a/external/toxcore/c-toxcore/other/docker/esp32/qemu-test
+++ b/external/toxcore/c-toxcore/other/docker/esp32/qemu-test
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -eu
+
+qemu-system-xtensa \
+  -nographic \
+  -M esp32 \
+  -m 4 \
+  -drive file=flash.bin,if=mtd,format=raw \
+  -nic user,model=open_eth,hostfwd=tcp::80-:80 \
+  -s |
+  tee qemu.log &
+
+echo "Waiting for program to complete"
+while ! grep 'Returned from app_main' qemu.log >/dev/null; do
+  sleep 1
+done
--- a/external/toxcore/c-toxcore/other/docker/esp32/run
+++ b/external/toxcore/c-toxcore/other/docker/esp32/run
@@ -1,4 +1,3 @@
 #!/bin/sh

-docker build -t toxchat/c-toxcore:sources -f other/docker/sources/Dockerfile .
 docker build -t toxchat/c-toxcore:esp32 -f other/docker/esp32/Dockerfile .
--- a/external/toxcore/c-toxcore/other/docker/esp32/run-host
+++ b/external/toxcore/c-toxcore/other/docker/esp32/run-host
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -eux
+
+bazel run //c-toxcore/other/docker/esp32:host_main
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Green Sky	3d2f5b644b	make toxcore work	2024-01-09 20:36:06 +01:00
Green Sky	6104d3b6d1	Merge commit '9ace11a0e2843cbde4af2b6ff7b49bcc6d429f78'	2024-01-09 16:39:05 +01:00
Green Sky	9ace11a0e2	Squashed 'external/toxcore/c-toxcore/' changes from f1df709b87..8f0d505f9a 8f0d505f9a feat: add ngc events 9b8216e70c refactor: Make event dispatch ordered by receive time. 814c12a6f4 cleanup: Add dynamically derived array sizes to the API. 226b23be12 cleanup: Add explicit array sizes to toxencryptsave. ef33cb4de0 cleanup: Add Toxav alias for ToxAV. 1da723b34d cleanup: Make Tox_Options a typedef. b148a2afff chore: Simplify msvc build using vcpkg. 5cac6d7eb1 cleanup: Move `tox_get_system` out of the public API. c9ca4007e3 refactor: Align group message sending with other send functions. 6c6c0b1b1b cleanup: Make setters take non-const `Tox `. a76f758d70 cleanup: Mark arrays in the tox API as `[]` instead of ``. baf6d1f6cf cleanup: Make array params in toxav `[]` instead of `*`. 79f55bd06a cleanup: Put the size of fixed arrays into the API types. 1e73698db2 cleanup: Add typedefs for public API int identifiers. cac074c57f chore: Add fetch-sha256 script to update bootstrap node hash. 32576656bb Make the comment capitalization uniform aff4dda17c Spellcheck tox-bootstrapd 40b5fbbe9d chore: Remove settings.yml in favour of hs-github-tools. ebafd51be7 chore: Use GPL license with https. 0e42752f0f cleanup: Move all vptr-to-ptr casts to the beginning of a function. 5407384211 cleanup: Use github actions matrix to simplify CI. 82d8265688 fix: Use QueryPerformanceCounter on windows for monotonic time. 1224e656e3 chore: Add `net_(new\|kill)_strerror` to cppcheck's allocators. 6a90ddfe4e cleanup: Run clang-tidy on headers, as well. bd930cc80a cleanup: Make TCP connection failures a warning instead of error. fad6e4e173 cleanup: Make all .c files include the headers they need. ef4897a898 cleanup: Upgrade to clang-tidy-17 and fix some warnings. REVERT: f1df709b87 feat: add ngc events REVERT: 1b6c907235 refactor: Make event dispatch ordered by receive time. git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 8f0d505f9a598cc41c682178e1589bcc01efe9cb	2024-01-09 16:39:05 +01:00
Green Sky	f637c7c942	make fade respect fps	2024-01-09 16:30:27 +01:00
Green Sky	afb886ea7c	default to reduced fps	2024-01-09 15:57:20 +01:00
Green Sky	74129cabef	fix url open with unsanitized strings	2024-01-09 02:26:50 +01:00
Green Sky	be8ceb861c	1 sec cooldown for reduced fps mode	2024-01-07 22:20:40 +01:00
Green Sky	da0f59a3f5	try fix plugin rendering	2024-01-07 19:37:05 +01:00
Green Sky	000254320e	add ubuntu linux to cd	2024-01-07 18:54:18 +01:00
Green Sky	2fac7206d2	pull windows fixes	2024-01-07 18:05:36 +01:00
Green Sky	e8234f2a4a	properly seperate tick and render	2024-01-07 16:33:08 +01:00
Green Sky	a0ba0b39d8	add fps reduced mode	2024-01-06 18:23:06 +01:00
Green Sky	845967cf12	more main loop fiddling	2024-01-06 16:45:08 +01:00
Green Sky	92b58cbfa9	faster wakeup	2024-01-06 15:13:45 +01:00
Green Sky	5a0651eaf0	wip low fps mode for hidden states and powersave modes. dont use yet, as all compute is still done in the render method	2024-01-06 14:38:21 +01:00
Green Sky	14fcaf1d7e	why is windows so bad	2024-01-05 16:32:37 +01:00
Green Sky	5a0252d8d0	start screen refactor	2024-01-05 14:47:08 +01:00
Green Sky	9c0ffd38ce	last update fixes	2023-12-27 12:49:52 +01:00
Green Sky	b2ae9530a4	Squashed 'external/toxcore/c-toxcore/' changes from e29e185c03..f1df709b87 f1df709b87 feat: add ngc events 1b6c907235 refactor: Make event dispatch ordered by receive time. b7f9367f6f test: Upgrade cppcheck, fix some warnings. 766e62bc89 chore: Use `pkg_search_module` directly in cmake. 00ff078f91 cleanup: Use target_link_libraries directly in cmake. c58928cc89 chore: Add `IMPORTED_TARGET` to pkg-config packages. 895a6af122 cleanup: Remove NaCl support. 41dfb1c1c0 fix: unpack enum function names in event impl generator 447666d1a1 chore: Disable targets for cross-compilation. 572924e924 chore: Build a docker image with coverage info in it. 415cb78f5e cleanup: Some portability/warning fixes for Windows builds. 425216d9ec fix: Correct a use-after-free and fix some memory leaks. 4b1cfa3e08 refactor: Change all enum-like `#define` sequences into enums. d3c2704fa9 chore: Fix make_single_file to support core-only. 0ce46b644e refactor: Change the `TCP_PACKET_*` defines into an enum. 22cd38ad50 adopt event impl generation tool to #2392 f31ea1088a add the event impl generation tool 4e603bb613 refactor: Use `enum-from-int` rule from tokstyle. 19d8f180d6 chore: Update github actions `uses`. 6a895be0c7 test: Make esp32 build actually try to instantiate tox. 65d09c9bfb cleanup: Remove test net support. REVERT: e29e185c03 feat: add ngc events git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: f1df709b8792da4c0e946d826b11df77d565064d	2023-12-27 12:37:22 +01:00
Green Sky	ae1fb0fde3	Merge commit 'b2ae9530a405e02a50476c04fc7196c5e9863ad6'	2023-12-27 12:37:22 +01:00
Green Sky	35ebbbef93	prep for new toxcore events	2023-12-27 12:36:38 +01:00
Green Sky	83e200df43	Squashed 'external/toxcore/c-toxcore/' changes from adbd5b32d8..e29e185c03 e29e185c03 feat: add ngc events 2b0dc0f46b add ngc related unpack functions b2315c50e0 Add groupchat API function that returns an IP address string for a peer 5f863a5492 feat: Add `to_string` functions for all public enums. 0c998a7598 add real timeout test 68c827609a chore: Move s390x build to post-merge. 028b017d79 perf: Slightly reduce bandwidth usage when there are few nodes. 90f7496819 feat: Enable ubsan on bootstrap nodes. 89b6450d66 test: Add check-c run to bazel build. REVERT: adbd5b32d8 feat: add ngc events git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: e29e185c03fea7337036e5ef4d1d9080a6cee721	2023-12-24 12:21:34 +01:00
Green Sky	260d3b7818	Merge commit '83e200df43eb790719c40103099c8d70e37c0477'	2023-12-24 12:21:34 +01:00
Green Sky	4ebffd8c63	switch to cerr in test to restore log order	2023-12-22 12:07:43 +01:00
Green Sky	8923e09b36	add asan option and enable for msvc ci/cd	2023-12-22 11:44:59 +01:00
Green Sky	ec4195f18a	add linux to test	2023-12-19 01:56:35 +01:00
Green Sky	062ad7ae80	fix mac	2023-12-19 01:47:50 +01:00
Green Sky	aad07611c7	ci/cd blancing	2023-12-19 01:26:56 +01:00
Green Sky	0dcb66f143	add temp test	2023-12-19 00:29:27 +01:00
Green Sky	331c25b0e6	switch to debug	2023-12-19 00:22:23 +01:00
Green Sky	e50844be06	switch to release with debug info	2023-12-19 00:07:47 +01:00
Green Sky	4dd7c98c1a	change to 2019	2023-12-18 23:58:15 +01:00
Green Sky	63bad2e99a	add deterrent	2023-12-18 22:58:23 +01:00