tmp patch to enlargen the ngc lossy custom pkg size

.github/workflows/cd.yml

@@ -10,40 +10,10 @@ 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-2019
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v3
@@ -64,50 +34,10 @@ 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/
-

.github/workflows/ci.yml

@@ -29,9 +29,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
-
   macos:
     timeout-minutes: 10
 
@@ -75,6 +72,3 @@ 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
-

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14...3.24 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
 
 # cmake setup begin
 project(tomato)
@@ -18,26 +18,6 @@ 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 :(
 
@@ -53,8 +33,13 @@ 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 (MSVC)
+	if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
 		string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 	else()
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")

external/toxcore/CMakeLists.txt

@@ -127,8 +127,6 @@ 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
@@ -205,10 +203,6 @@ 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)

external/toxcore/c-toxcore/.circleci/cmake-ubsan

@@ -6,7 +6,6 @@ CACHEDIR="$HOME/cache"
 
 . ".github/scripts/flags-$CC.sh"
 add_flag -Werror
-add_flag -D_DEBUG
 add_flag -fdiagnostics-color=always
 add_flag -fno-omit-frame-pointer
 add_flag -fno-sanitize-recover=all

external/toxcore/c-toxcore/.circleci/config.yml

@@ -134,6 +134,7 @@ jobs:
       - run:
           apt-get install -y --no-install-recommends
             ca-certificates
+            cppcheck
             g++
             llvm-dev
       - checkout
@@ -141,6 +142,7 @@ 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:

external/toxcore/c-toxcore/.cirrus.yml

@@ -9,6 +9,7 @@ bazel-opt_task:
     - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
     - cd /src/workspace && bazel test -k
+        --config=ci
         --build_tag_filters=-haskell
         --test_tag_filters=-haskell
         --
@@ -25,6 +26,7 @@ bazel-dbg_task:
     - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
     - cd /src/workspace && bazel test -k
+        --config=ci
         --build_tag_filters=-haskell
         --test_tag_filters=-haskell
         --
@@ -41,19 +43,8 @@ cimple_task:
     - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
     - cd /src/workspace && bazel test -k
+        --config=ci
         --build_tag_filters=haskell
         --test_tag_filters=haskell
         --
         //c-toxcore/...
-
-freebsd_task:
-  container:
-    image: toxchat/freebsd:latest
-    cpu: 2
-    memory: 4G
-    kvm: true
-  configure_script:
-    - git submodule update --init --recursive
-    - cd .. && mv cirrus-ci-build /work/c-toxcore && mkdir cirrus-ci-build
-  test_all_script:
-    - cd /work/c-toxcore && .github/scripts/cmake-freebsd

external/toxcore/c-toxcore/.dockerignore

@@ -1,2 +0,0 @@
-/_build
-/_install

external/toxcore/c-toxcore/.github/scripts/autotools-linux

@@ -11,7 +11,10 @@ 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
 

external/toxcore/c-toxcore/.github/scripts/cmake-alpine-s390x

@@ -1,55 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2018-2023 nurupo
-
-# Toxcore building
-
-set -eux
-
-cd .. # /work
-. cmake-alpine-run.sh
-
-# === Get VM ready to build the code ===
-
-start_vm
-
-RUN apk add cmake g++ ninja
-
-mv c-toxcore /
-
-# Copy over toxcore code from host to qemu
-scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -P "$SSH_PORT" -r /c-toxcore root@localhost:~
-
-cd /c-toxcore
-. ".github/scripts/flags-gcc.sh"
-
-# Make compilation error on a warning
-add_flag -Werror
-
-# - disabling toxav because vpx doesn't work on s390x.
-# - disabling bootstrap daemons because we don't need them for testing (saving time).
-# - disabling shared libraries because it saves a lot of time on building PIC objects.
-# - enable unity build because it saves a lot of time as well (fewer objects to build).
-RUN "cmake -B_build -Hc-toxcore -GNinja \
-  -DCMAKE_C_FLAGS='$C_FLAGS' \
-  -DCMAKE_CXX_FLAGS='$CXX_FLAGS' \
-  -DCMAKE_EXE_LINKER_FLAGS='$LD_FLAGS' \
-  -DCMAKE_SHARED_LINKER_FLAGS='$LD_FLAGS' \
-  -DCMAKE_INSTALL_PREFIX:PATH='_install' \
-  -DCMAKE_UNITY_BUILD=ON \
-  -DMIN_LOGGER_LEVEL=TRACE \
-  -DNON_HERMETIC_TESTS=ON \
-  -DENABLE_SHARED=OFF \
-  -DBUILD_TOXAV=OFF \
-  -DDHT_BOOTSTRAP=OFF \
-  -DBOOTSTRAP_DAEMON=OFF \
-  -DSTRICT_ABI=ON \
-  -DTEST_TIMEOUT_SECONDS=90 \
-  -DUSE_IPV6=OFF \
-  -DAUTOTEST=ON"
-
-RUN 'cmake --build _build --parallel 2 --target install -- -k 0'
-RUN 'cd _build && ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:1 --timeout 90 || true' &
-
-# Give the tests 5 minutes to run. Sometimes, the per-test timeout doesn't
-# work, so we put a global timeout here for everything.
-sleep 300

external/toxcore/c-toxcore/.github/scripts/cmake-freebsd

@@ -1,58 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2018-2023 nurupo
-
-# Toxcore building
-
-set -eux
-
-cd .. # /work
-. cmake-freebsd-run.sh
-
-# === Get VM ready to build the code ===
-
-# Unpack image only if it's compressed.
-if [ -f "$IMAGE_NAME.gz" ]; then
-  gunzip "$IMAGE_NAME.gz"
-fi
-
-mv c-toxcore /
-
-start_vm
-
-# Copy over toxcore code from host to qemu
-scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -P "$SSH_PORT" -r /c-toxcore root@localhost:~
-
-RUN ls -lh
-
-cd /c-toxcore
-. '.github/scripts/flags-clang.sh'
-
-add_ld_flag -Wl,-z,defs
-
-# Make compilation error on a warning.
-add_flag -Werror
-
-# This triggers on FreeBSD's clang.
-add_flag -Wno-format
-add_flag -Wno-unsafe-buffer-usage
-
-RUN "cmake -B_build -Hc-toxcore \
-  -DCMAKE_C_FLAGS='$C_FLAGS' \
-  -DCMAKE_CXX_FLAGS='$CXX_FLAGS' \
-  -DCMAKE_EXE_LINKER_FLAGS='$LD_FLAGS' \
-  -DCMAKE_SHARED_LINKER_FLAGS='$LD_FLAGS' \
-  -DCMAKE_INSTALL_PREFIX:PATH='_install' \
-  -DMIN_LOGGER_LEVEL=TRACE \
-  -DMUST_BUILD_TOXAV=ON \
-  -DNON_HERMETIC_TESTS=ON \
-  -DSTRICT_ABI=ON \
-  -DTEST_TIMEOUT_SECONDS=120 \
-  -DUSE_IPV6=OFF \
-  -DAUTOTEST=ON"
-
-# We created the VM with the same number of cores as the host, so the host-ran `nproc` here is fine.
-RUN 'cmake --build _build --parallel "$NPROC" --target install -- -k'
-RUN 'cd _build && ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:2 --timeout 120 || true'
-
-# Gracefully shut down the VM.
-stop_vm

external/toxcore/c-toxcore/.github/scripts/cmake-freebsd-stage2

@@ -0,0 +1,52 @@
+#!/bin/bash
+# Copyright (C) 2018-2021 nurupo
+
+# Toxcore building
+
+set -eux
+
+if [ "$PWD" != "/work" ]; then
+  cd ..
+  mv c-toxcore /
+  mkdir c-toxcore
+  cd /work
+fi
+
+. cmake-freebsd-run.sh
+
+# === Get VM ready to build the code ===
+
+gunzip "$IMAGE_NAME.gz"
+
+start_vm
+
+# Copy over toxcore code from host to qemu
+scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -P "$SSH_PORT" -r /c-toxcore root@localhost:~
+
+RUN ls -lh
+
+cd /c-toxcore
+. ".github/scripts/flags-clang.sh"
+
+add_ld_flag -Wl,-z,defs
+
+# Make compilation error on a warning
+add_flag -Werror
+
+RUN 'cmake -B_build -Hc-toxcore \
+  -DCMAKE_C_FLAGS="$C_FLAGS" \
+  -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \
+  -DCMAKE_EXE_LINKER_FLAGS="$LD_FLAGS" \
+  -DCMAKE_SHARED_LINKER_FLAGS="$LD_FLAGS" \
+  -DCMAKE_INSTALL_PREFIX:PATH="_install" \
+  -DMIN_LOGGER_LEVEL=TRACE \
+  -DMUST_BUILD_TOXAV=ON \
+  -DNON_HERMETIC_TESTS=ON \
+  -DSTRICT_ABI=ON \
+  -DTEST_TIMEOUT_SECONDS=90 \
+  -DUSE_IPV6=OFF \
+  -DAUTOTEST=ON'
+
+# We created the VM with the same number of cores as the host, so the host-ran `nproc` here is fine
+RUN 'gmake "-j$NPROC" -k install -C_build'
+RUN 'gmake "-j$NPROC" test ARGS="-j50" -C_build || true'

external/toxcore/c-toxcore/.github/scripts/flags-clang.sh

@@ -65,8 +65,6 @@ 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

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 -D_DEBUG
+add_flag -fsanitize=undefined -fno-sanitize-recover=all
 
 # 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,

external/toxcore/c-toxcore/.github/scripts/flags.sh

@@ -28,6 +28,8 @@ add_flag -O3 -march=native
 
 # Warn on non-ISO C.
 add_c_flag -pedantic
+add_c_flag -std=c99
+add_cxx_flag -std=c++11
 
 add_flag -g3
 add_flag -ftrapv

external/toxcore/c-toxcore/.github/settings.yml

@@ -12,52 +12,36 @@ branches:
     protection:
       required_status_checks:
         contexts:
+          - "bazel-asan"
           - "bazel-dbg"
           - "bazel-opt"
-          - "build-alpine-s390x"
+          - "bazel-tsan"
-          - "build-android"
-          - "build-autotools"
           - "build-compcert"
           - "build-macos"
+          - "build-nacl"
           - "build-tcc"
           - "build-win32"
           - "build-win64"
+          - "CodeFactor"
+          - "common / buildifier"
+          - "coverage-linux"
           - "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: msan"
           - "ci/circleci: static-analysis"
           - "ci/circleci: tsan"
           - "ci/circleci: ubsan"
           - "cimple"
-          - "cimplefmt"
-          - "CodeFactor"
           - "code-review/reviewable"
-          - "common / buildifier"
+          - "continuous-integration/appveyor/pr"
-          - "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:

external/toxcore/c-toxcore/.github/workflows/ci.yml

@@ -13,20 +13,10 @@ jobs:
   common:
     uses: TokTok/ci-tools/.github/workflows/common-ci.yml@master
 
-  cppcheck:
-    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/cppcheck/Dockerfile
-
   mypy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           submodules: recursive
       - name: Set up Python 3.9
@@ -44,9 +34,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
       - name: Docker Build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           file: other/docker/doxygen/Dockerfile
 
@@ -54,9 +44,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
       - name: Docker Build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           file: other/docker/tokstyle/Dockerfile
 
@@ -64,66 +54,35 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
       - name: Docker Build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           file: other/docker/misra/Dockerfile
 
-  build-autotools:
-    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/autotools/Dockerfile
-
-  build-tcc:
-    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/tcc/Dockerfile
-
-  build-compcert:
-    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/compcert/Dockerfile
-
-  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
+      - uses: actions/checkout@v2
         with:
           submodules: recursive
       - name: Run cimplefmt
         run: other/docker/cimplefmt/run -u $(find tox* -name "*.[ch]")
 
+  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-win32:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           submodules: recursive
       - name: Cross compilation
@@ -132,16 +91,26 @@ jobs:
   build-win64:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           submodules: recursive
       - name: Cross compilation
         run: .github/scripts/cmake-win64 script
 
+  build-freebsd:
+    runs-on: ubuntu-latest
+    container: toxchat/freebsd
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Build on FreeBSD
+        run: .github/scripts/cmake-freebsd-stage2
+
   build-macos:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           submodules: recursive
       - name: Build and test
@@ -150,16 +119,91 @@ jobs:
   coverage-linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           submodules: recursive
       - name: Build, test, and upload coverage
-        run: other/docker/coverage/run
+        run: .github/scripts/coverage-linux
+
+  build-tcc:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Install dependencies
+        run:
+          sudo apt-get install -y --no-install-recommends
+            tcc
+            libconfig-dev
+            libopus-dev
+            libsodium-dev
+            libvpx-dev
+      - name: Build with TCC
+        run:
+          tcc
+            -Dinline=static
+            -o send_message_test
+            -Wall -Werror
+            -bench -g
+            auto_tests/auto_test_support.c
+            auto_tests/send_message_test.c
+            testing/misc_tools.c
+            toxav/*.c
+            toxcore/*.c
+            toxcore/*/*.c
+            toxencryptsave/*.c
+            third_party/cmp/*.c
+            $(pkg-config --cflags --libs libsodium opus vpx)
+      - name: Run the test
+        run: "./send_message_test | grep 'tox clients connected'"
+      - name: Build amalgamation file with TCC
+        run:
+          other/make_single_file
+            auto_tests/auto_test_support.c
+            auto_tests/send_message_test.c
+            testing/misc_tools.c |
+          tcc -
+            -o send_message_test
+            -Wall -Werror
+            -bench -g
+            $(pkg-config --cflags --libs libsodium opus vpx)
+      - name: Run the test again
+        run: "./send_message_test | grep 'tox clients connected'"
+
+  build-compcert:
+    runs-on: ubuntu-latest
+    container: toxchat/compcert
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Build with CompCert
+        run:
+          ccomp
+            -o send_message_test
+            -Wall -Werror
+            -Wno-c11-extensions
+            -Wno-unknown-pragmas
+            -Wno-unused-variable
+            -fstruct-passing -fno-unprototyped -g
+            auto_tests/auto_test_support.c
+            auto_tests/send_message_test.c
+            testing/misc_tools.c
+            toxav/*.c
+            toxcore/*.c
+            toxcore/*/*.c
+            toxencryptsave/*.c
+            third_party/cmp/*.c
+            -D__COMPCERT__ -DDISABLE_VLA -Dinline=
+            -lpthread $(pkg-config --cflags --libs libsodium opus vpx)
+      - name: Run the test
+        run: "./send_message_test | grep 'tox clients connected'"
 
   build-android:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           submodules: recursive
       - run: .github/scripts/cmake-android armeabi-v7a

external/toxcore/c-toxcore/.github/workflows/docker.yml

@@ -6,22 +6,17 @@ on:
   pull_request:
     branches: [master]
 
-# Cancel old PR builds when pushing new commits.
-concurrency:
-  group: docker-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   docker-bootstrap-node:
     runs-on: ubuntu-latest
     steps:
       - name: Login to DockerHub
         if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
         with:
           submodules: recursive
       - name: Docker Build
@@ -38,15 +33,15 @@ jobs:
     needs: [docker-bootstrap-node]
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
         if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           context: "{{defaultContext}}:other/bootstrap_daemon/websocket"
           push: ${{ github.event_name == 'push' }}
@@ -57,17 +52,17 @@ jobs:
   docker-clusterfuzz:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
         if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           context: "."
           file: .clusterfuzzlite/Dockerfile
@@ -80,15 +75,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
         if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           file: testing/Dockerfile
           push: ${{ github.event_name == 'push' }}
@@ -100,15 +95,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
         if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           file: other/emscripten/Dockerfile
           push: ${{ github.event_name == 'push' }}
@@ -120,22 +115,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
         with:
           driver: docker
       - name: Login to DockerHub
         if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build toxchat/c-toxcore:sources
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           file: other/docker/sources/Dockerfile
           tags: toxchat/c-toxcore:sources
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           file: other/docker/esp32/Dockerfile
           push: ${{ github.event_name == 'push' }}
@@ -147,15 +142,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
         if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           context: "{{defaultContext}}:other/docker/windows"
           push: ${{ github.event_name == 'push' }}
@@ -171,15 +166,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
         if: ${{ github.event_name == 'push' }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v2
         with:
           context: "{{defaultContext}}:other/docker/windows"
           push: ${{ github.event_name == 'push' }}

external/toxcore/c-toxcore/.github/workflows/post-submit.yml

@@ -1,43 +0,0 @@
-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

external/toxcore/c-toxcore/.github/workflows/sonar-scan.yml

@@ -6,28 +6,22 @@ on:
   pull_request:
     branches: [master]
 
-# Cancel old PR builds when pushing new commits.
-concurrency:
-  group: scan-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   sonar-scan:
     runs-on: ubuntu-latest
     env:
-      SONAR_SCANNER_VERSION: 5.0.1.3006
+      SONAR_SCANNER_VERSION: 4.4.0.2170
       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@v4
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
           submodules: recursive
-      - name: Set up JDK 17
+      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v1
         with:
-          distribution: "zulu"
+          java-version: 11
-          java-version: 17
       - name: Download and set up sonar-scanner
         env:
           SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip

external/toxcore/c-toxcore/BUILD.bazel

@@ -1,6 +1,8 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//tools/project:build_defs.bzl", "project")
 
+package(features = ["layering_check"])
+
 project()
 
 genrule(
@@ -8,19 +10,16 @@ genrule(
     srcs = [
         "//c-toxcore/toxav:toxav.h",
         "//c-toxcore/toxcore:tox.h",
-        "//c-toxcore/toxcore:tox_private.h",
         "//c-toxcore/toxencryptsave:toxencryptsave.h",
     ],
     outs = [
         "tox/toxav.h",
         "tox/tox.h",
-        "tox/tox_private.h",
         "tox/toxencryptsave.h",
     ],
     cmd = """
         cp $(location //c-toxcore/toxav:toxav.h) $(GENDIR)/c-toxcore/tox/toxav.h
         cp $(location //c-toxcore/toxcore:tox.h) $(GENDIR)/c-toxcore/tox/tox.h
-        cp $(location //c-toxcore/toxcore:tox_private.h) $(GENDIR)/c-toxcore/tox/tox_private.h
         cp $(location //c-toxcore/toxencryptsave:toxencryptsave.h) $(GENDIR)/c-toxcore/tox/toxencryptsave.h
     """,
     visibility = ["//visibility:public"],

external/toxcore/c-toxcore/CMakeLists.txt

@@ -14,8 +14,8 @@
 #
 ################################################################################
 
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 2.8.12)
-cmake_policy(VERSION 3.16)
+cmake_policy(VERSION 2.8.12)
 project(toxcore)
 
 list(APPEND CMAKE_MODULE_PATH ${toxcore_SOURCE_DIR}/cmake)
@@ -76,23 +76,24 @@ if(APPLE)
 endif()
 
 enable_testing()
-find_package(GTest)
 
 set(CMAKE_MACOSX_RPATH ON)
 
-# Set standard version for compiler.
+if(${CMAKE_VERSION} VERSION_LESS "3.1.0")
-if(MSVC)
+  if(NOT MSVC)
-  # https://developercommunity.visualstudio.com/t/older-winsdk-headers-are-incompatible-with-zcprepr/1593479
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-  set(CMAKE_C_STANDARD 99)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-else()
-  set(CMAKE_C_STANDARD 11)
   endif()
+else()
+  # Set standard version for compiler.
+  set(CMAKE_C_STANDARD 99)
   set(CMAKE_CXX_STANDARD 17)
   set(CMAKE_C_EXTENSIONS OFF)
   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}")
+endif()
 
 set(MIN_LOGGER_LEVEL "" CACHE STRING "Logging level to use (TRACE, DEBUG, INFO, WARNING, ERROR)")
 if(MIN_LOGGER_LEVEL)
@@ -112,6 +113,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)
 
@@ -316,8 +322,6 @@ 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
@@ -327,16 +331,12 @@ set(toxcore_SOURCES
   toxcore/tox_unpack.h
   toxcore/util.c
   toxcore/util.h)
-set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${LIBSODIUM_LIBRARIES})
+set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${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})
 set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} libsodium)
 set(toxcore_API_HEADERS
   ${toxcore_SOURCE_DIR}/toxcore/tox.h^tox
   ${toxcore_SOURCE_DIR}/toxcore/tox_events.h^tox
-  ${toxcore_SOURCE_DIR}/toxcore/tox_dispatch.h^tox
+  ${toxcore_SOURCE_DIR}/toxcore/tox_dispatch.h^tox)
-  ${toxcore_SOURCE_DIR}/toxcore/tox_private.h^tox)
 
 ################################################################################
 #
@@ -366,10 +366,7 @@ if(BUILD_TOXAV)
   set(toxcore_API_HEADERS ${toxcore_API_HEADERS}
     ${toxcore_SOURCE_DIR}/toxav/toxav.h^toxav)
 
-  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${OPUS_LIBRARIES} ${VPX_LIBRARIES})
+  set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${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})
   set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} opus vpx)
 endif()
 
@@ -396,28 +393,28 @@ 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_LIBRARIES ${toxcore_LINK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+  set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${CMAKE_THREAD_LIBS_INIT})
   set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
 
 if(NSL_LIBRARIES)
-  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${NSL_LIBRARIES})
+  set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${NSL_LIBRARIES})
   set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lnsl)
 endif()
 
 if(RT_LIBRARIES)
-  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${RT_LIBRARIES})
+  set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${RT_LIBRARIES})
   set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lrt)
 endif()
 
 if(SOCKET_LIBRARIES)
-  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ${SOCKET_LIBRARIES})
+  set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${SOCKET_LIBRARIES})
   set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lsocket)
 endif()
 
 if(WIN32)
-  set(toxcore_LINK_LIBRARIES ${toxcore_LINK_LIBRARIES} ws2_32 iphlpapi)
+  set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ws2_32 iphlpapi)
   set(toxcore_PKGCONFIG_LIBS ${toxcore_PKGCONFIG_LIBS} -lws2_32 -liphlpapi)
 endif()
 
@@ -431,18 +428,7 @@ endif()
 add_module(toxcore ${toxcore_SOURCES})
 
 # Link it to all dependencies.
-if(TARGET toxcore_static)
+target_link_modules(toxcore ${toxcore_LINK_MODULES})
-  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})
@@ -457,22 +443,10 @@ install_module(toxcore DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tox)
 #
 ################################################################################
 
-function(unit_test subdir target)
+include(CompileGTest)
-  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.
 #
-if(GTEST_FOUND)
 unit_test(toxav ring_buffer)
 unit_test(toxav rtp)
 unit_test(toxcore DHT)
@@ -480,13 +454,11 @@ if(GTEST_FOUND)
 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)
 
@@ -510,12 +482,7 @@ if(DHT_BOOTSTRAP)
   add_executable(DHT_bootstrap
     other/DHT_bootstrap.c
     other/bootstrap_node_packets.c)
-  if(TARGET toxcore_static)
+  target_link_modules(DHT_bootstrap toxcore misc_tools)
-    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)
   install(TARGETS DHT_bootstrap RUNTIME DESTINATION bin)
 endif()
 

external/toxcore/c-toxcore/INSTALL.md

@@ -33,10 +33,10 @@ 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    | libsodium, libm, libpthread, librt | Cross-platform | The main Tox library that provides the messenger functionality.            |
+| `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, libsodium              | Cross-platform | Provides encryption of Tox profiles (savedata), as well as arbitrary data. |
+| `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) |

external/toxcore/c-toxcore/README.md

@@ -4,12 +4,13 @@
 
 [**Website**](https://tox.chat) **|** [**Wiki**](https://wiki.tox.chat/) **|** [**Blog**](https://blog.tox.chat/) **|** [**FAQ**](https://wiki.tox.chat/doku.php?id=users:faq) **|** [**Binaries/Downloads**](https://tox.chat/download.html) **|** [**Clients**](https://wiki.tox.chat/doku.php?id=clients) **|** [**Compiling**](/INSTALL.md)
 
+**IRC Channels:** Users: [#tox@libera.chat](https://web.libera.chat/#tox), Developers: [#toktok@libera.chat](https://web.libera.chat/#toktok)
+
 ## What is Tox
 
 Tox is a peer to peer (serverless) instant messenger aimed at making security
 and privacy easy to obtain for regular users. It uses
-[libsodium](https://doc.libsodium.org/) (based on
+[NaCl](https://nacl.cr.yp.to/) for its encryption and authentication.
-[NaCl](https://nacl.cr.yp.to/)) for its encryption and authentication.
 
 ## IMPORTANT!
 
@@ -19,12 +20,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 [libsodium](https://doc.libsodium.org/) provides
+The underlying crypto library [NaCl](https://nacl.cr.yp.to/install.html)
-reliable encryption, but the security model has not yet been fully specified.
+provides reliable encryption, but the security model has not yet been fully
-See [issue 210](https://github.com/TokTok/c-toxcore/issues/210) for a
+specified. See [issue 210](https://github.com/TokTok/c-toxcore/issues/210) for
-discussion on developing a threat model. See other issues for known weaknesses
+a discussion on developing a threat model. See other issues for known
-(e.g. [issue 426](https://github.com/TokTok/c-toxcore/issues/426) describes
+weaknesses (e.g. [issue 426](https://github.com/TokTok/c-toxcore/issues/426)
-what can happen if your secret key is stolen).
+describes what can happen if your secret key is stolen).
 
 ## Toxcore Development Roadmap
 

external/toxcore/c-toxcore/auto_tests/BUILD.bazel

@@ -1,5 +1,7 @@
 load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
 
+package(features = ["layering_check"])
+
 cc_library(
     name = "check_compat",
     testonly = True,

external/toxcore/c-toxcore/auto_tests/CMakeLists.txt

@@ -3,27 +3,19 @@ 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_libraries(auto_test_support PRIVATE misc_tools)
+target_link_modules(auto_test_support toxcore 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()
 
 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_libraries(auto_${target}_test PRIVATE misc_tools auto_test_support)
+    target_link_modules(auto_${target}_test toxcore 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(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()
+  endif()
 endfunction()
 
 auto_test(TCP)
@@ -77,29 +69,18 @@ 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)
+  auto_test(conference_av MSVC_DONT_BUILD)
   auto_test(toxav_basic)
   auto_test(toxav_many)
-
-  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()
 
+
 if(PROXY_TEST)
   auto_test(proxy)
 endif()

external/toxcore/c-toxcore/auto_tests/Makefile.inc

@@ -13,8 +13,6 @@ TESTS = \
 	conference_test \
 	conference_two_test \
 	crypto_test \
-	encryptsave_test \
-	file_saving_test \
 	file_transfer_test \
 	forwarding_test \
 	friend_connection_test \
@@ -36,24 +34,34 @@ TESTS = \
 	set_name_test \
 	set_status_message_test \
 	TCP_test \
-	tox_dispatch_test \
 	tox_events_test \
+	tox_dispatch_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)
+	$(LIBSODIUM_CFLAGS) \
+	$(NACL_CFLAGS)
 
 AUTOTEST_LDADD = \
 	$(LIBSODIUM_LDFLAGS) \
+	$(NACL_LDFLAGS) \
 	libmisc_tools.la \
 	libauto_test_support.la \
 	libtoxcore.la \
 	libtoxencryptsave.la \
-	$(LIBSODIUM_LIBS)
+	$(LIBSODIUM_LIBS) \
+	$(NACL_OBJECTS) \
+	$(NACL_LIBS)
 
 
 if BUILD_AV

external/toxcore/c-toxcore/auto_tests/announce_test.c

@@ -61,13 +61,9 @@ 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);
 

external/toxcore/c-toxcore/auto_tests/auto_test_support.c

@@ -28,6 +28,7 @@ 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,
@@ -56,6 +57,22 @@ 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 },
 };
 
@@ -315,7 +332,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_msg(err == TOX_ERR_BOOTSTRAP_OK, "bootstrap error for port %d: %d", dht_port, err);
+        ck_assert(err == TOX_ERR_BOOTSTRAP_OK);
     }
 
     if (!udp_enabled) {

external/toxcore/c-toxcore/auto_tests/crypto_test.c

@@ -269,30 +269,6 @@ static void test_large_data_symmetric(void)
     free(m1);
 }
 
-static void test_very_large_data(void)
-{
-    const Random *rng = system_random();
-    ck_assert(rng != nullptr);
-
-    uint8_t nonce[CRYPTO_NONCE_SIZE] = {0};
-    uint8_t pk[CRYPTO_PUBLIC_KEY_SIZE];
-    uint8_t sk[CRYPTO_SECRET_KEY_SIZE];
-    crypto_new_keypair(rng, pk, sk);
-
-    // 100 MiB of data (all zeroes, doesn't matter what's inside).
-    const uint32_t plain_size = 100 * 1024 * 1024;
-    uint8_t *plain = (uint8_t *)malloc(plain_size);
-    uint8_t *encrypted = (uint8_t *)malloc(plain_size + CRYPTO_MAC_SIZE);
-
-    ck_assert(plain != nullptr);
-    ck_assert(encrypted != nullptr);
-
-    encrypt_data(pk, sk, nonce, plain, plain_size, encrypted);
-
-    free(encrypted);
-    free(plain);
-}
-
 static void increment_nonce_number_cmp(uint8_t *nonce, uint32_t num)
 {
     uint32_t num1 = 0;
@@ -364,7 +340,6 @@ int main(void)
     test_endtoend(); /* waiting up to 15 seconds */
     test_large_data();
     test_large_data_symmetric();
-    test_very_large_data();
     test_increment_nonce();
     test_memzero();
 

external/toxcore/c-toxcore/auto_tests/dht_getnodes_api_test.c

@@ -123,7 +123,7 @@ static void test_dht_getnodes(AutoTox *autotoxes)
         tox_self_get_dht_id(autotoxes[i].tox, public_key_list[i]);
         tox_callback_dht_get_nodes_response(autotoxes[i].tox, getnodes_response_cb);
 
-        printf("Peer %zu dht closenode count total/announce-capable: %d/%d\n",
+        printf("Peer %zu dht closenode count total/annouce-capable: %d/%d\n",
             i,
             tox_dht_get_num_closelist(autotoxes[i].tox),
             tox_dht_get_num_closelist_announce_capable(autotoxes[i].tox)

external/toxcore/c-toxcore/auto_tests/encryptsave_test.c

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <sys/types.h>
 
+#ifndef VANILLA_NACL
 #include <sodium.h>
 
 #include "../testing/misc_tools.h"
@@ -231,3 +232,9 @@ int main(void)
 
     return 0;
 }
+#else  // VANILLA_NACL
+int main(void)
+{
+    return 0;
+}
+#endif

external/toxcore/c-toxcore/auto_tests/group_general_test.c

@@ -9,7 +9,6 @@
 #include <string.h>
 
 #include "auto_test_support.h"
-#include "../toxcore/tox_private.h"
 
 typedef struct State {
     size_t   peer_joined_count;
@@ -43,22 +42,6 @@ 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) {
@@ -136,9 +119,6 @@ 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;
 }
@@ -198,11 +178,6 @@ 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;
 }
 
@@ -259,6 +234,7 @@ 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;
@@ -365,7 +341,6 @@ 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);
@@ -435,6 +410,7 @@ 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)

external/toxcore/c-toxcore/auto_tests/group_invite_test.c

@@ -102,6 +102,7 @@ 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) {
@@ -259,6 +260,8 @@ static void group_invite_test(AutoTox *autotoxes)
     }
 
     printf("All tests passed!\n");
+
+#endif // VANILLA_NACL
 }
 
 int main(void)

external/toxcore/c-toxcore/auto_tests/group_message_test.c

@@ -44,10 +44,6 @@ typedef struct State {
 #define TEST_CUSTOM_PACKET "Why'd ya spill yer beans?"
 #define TEST_CUSTOM_PACKET_LEN (sizeof(TEST_CUSTOM_PACKET) - 1)
 
-#define TEST_CUSTOM_PACKET_LARGE "Where is it I've read that someone condemned to death says or thinks, an hour before his death, that if he had to live on some high rock, on such a narrow ledge that he'd only room to stand, and the ocean, everlasting darkness, everlasting solitude, everlasting tempest around him, if he had to remain standing on a square yard of space all his life, a thousand years, eternity, it were better to live so than to die at once. Only to live, to live and live! Life, whatever it may be! ...............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................0123456789"
-#define TEST_CUSTOM_PACKET_LARGE_LEN (sizeof(TEST_CUSTOM_PACKET_LARGE) - 1)
-static_assert(TEST_CUSTOM_PACKET_LARGE_LEN == TOX_GROUP_MAX_CUSTOM_LOSSY_PACKET_LENGTH, "Should be max");
-
 #define TEST_CUSTOM_PRIVATE_PACKET "This is a custom private packet. Enjoy."
 #define TEST_CUSTOM_PRIVATE_PACKET_LEN (sizeof(TEST_CUSTOM_PRIVATE_PACKET) - 1)
 
@@ -191,21 +187,6 @@ static void group_custom_packet_handler(Tox *tox, uint32_t groupnumber, uint32_t
     ++state->custom_packets_received;
 }
 
-static void group_custom_packet_large_handler(Tox *tox, uint32_t groupnumber, uint32_t peer_id, const uint8_t *data,
-                                        size_t length, void *user_data)
-{
-    ck_assert_msg(length == TEST_CUSTOM_PACKET_LARGE_LEN, "Failed to receive large custom packet. Invalid length: %zu\n", length);
-
-    ck_assert(memcmp(data, TEST_CUSTOM_PACKET_LARGE, length) == 0);
-
-    AutoTox *autotox = (AutoTox *)user_data;
-    ck_assert(autotox != nullptr);
-
-    State *state = (State *)autotox->state;
-
-    ++state->custom_packets_received;
-}
-
 static void group_message_handler(Tox *tox, uint32_t groupnumber, uint32_t peer_id, TOX_MESSAGE_TYPE type,
                                   const uint8_t *message, size_t length, uint32_t pseudo_msg_id, void *user_data)
 {
@@ -350,6 +331,7 @@ 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();
@@ -468,19 +450,6 @@ static void group_message_test(AutoTox *autotoxes)
         iterate_all_wait(autotoxes, NUM_GROUP_TOXES, ITERATION_INTERVAL);
     }
 
-    // tox0 sends a large max sized lossy custom packet
-
-    // overwrite callback for larger packet
-    tox_callback_group_custom_packet(tox0, group_custom_packet_large_handler);
-
-    tox_group_send_custom_packet(tox1, group_number, false, (const uint8_t *)TEST_CUSTOM_PACKET_LARGE, TEST_CUSTOM_PACKET_LARGE_LEN,
-                                 &c_err);
-    ck_assert_msg(c_err == TOX_ERR_GROUP_SEND_CUSTOM_PACKET_OK, "%d", c_err);
-
-    while (state0->custom_packets_received < 3) {
-        iterate_all_wait(autotoxes, NUM_GROUP_TOXES, ITERATION_INTERVAL);
-    }
-
     uint8_t m[TOX_GROUP_MAX_MESSAGE_LENGTH] = {0};
 
     fprintf(stderr, "Doing lossless packet test...\n");
@@ -543,6 +512,7 @@ static void group_message_test(AutoTox *autotoxes)
     }
 
     fprintf(stderr, "All tests passed!\n");
+#endif  // VANILLA_NACL
 }
 
 int main(void)
@@ -568,8 +538,6 @@ int main(void)
 #undef TEST_PRIVATE_MESSAGE_LEN
 #undef TEST_CUSTOM_PACKET
 #undef TEST_CUSTOM_PACKET_LEN
-#undef TEST_CUSTOM_PACKET_LARGE
-#undef TEST_CUSTOM_PACKET_LARGE_LEN
 #undef TEST_CUSTOM_PRIVATE_PACKET
 #undef TEST_CUSTOM_PRIVATE_PACKET_LEN
 #undef IGNORE_MESSAGE

external/toxcore/c-toxcore/auto_tests/group_moderation_test.c

@@ -432,6 +432,7 @@ 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);
 
@@ -633,6 +634,7 @@ static void group_moderation_test(AutoTox *autotoxes)
     }
 
     fprintf(stderr, "All tests passed!\n");
+#endif  // VANILLA_NACL
 }
 
 int main(void)

external/toxcore/c-toxcore/auto_tests/group_save_test.c

@@ -148,6 +148,7 @@ 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) {
@@ -269,6 +270,8 @@ static void group_save_test(AutoTox *autotoxes)
     tox_kill(new_tox);
 
     printf("All tests passed!\n");
+
+#endif  // VANILLA_NACL
 }
 
 int main(void)

external/toxcore/c-toxcore/auto_tests/group_state_test.c

@@ -238,6 +238,7 @@ 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) {
@@ -317,6 +318,8 @@ static void group_state_test(AutoTox *autotoxes)
     }
 
     fprintf(stderr, "All tests passed!\n");
+
+#endif /* VANILLA_NACL */
 }
 
 int main(void)

external/toxcore/c-toxcore/auto_tests/group_sync_test.c

@@ -330,6 +330,7 @@ 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);
@@ -442,6 +443,8 @@ static void group_sync_test(AutoTox *autotoxes)
     }
 
     fprintf(stderr, "All tests passed!\n");
+
+#endif  // VANILLA_NACL
 }
 
 int main(void)

external/toxcore/c-toxcore/auto_tests/group_tcp_test.c

@@ -8,6 +8,8 @@
 
 #include "auto_test_support.h"
 
+#ifdef USE_TEST_NETWORK
+
 #define NUM_GROUP_TOXES 2
 #define CODEWORD "RONALD MCDONALD"
 #define CODEWORD_LEN (sizeof(CODEWORD) - 1)
@@ -127,6 +129,7 @@ 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;
@@ -219,29 +222,34 @@ static void group_tcp_test(AutoTox *autotoxes)
     }
 
     printf("Test passed!\n");
-}
 
-int main(int argc, char **argv)
+#endif // VANILLA_NACL
+}
+#endif // USE_TEST_NETWORK
+
+int main(void)
 {
+#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 = tox_options_new(nullptr);
+    struct Tox_Options *options = (struct Tox_Options *)calloc(1, sizeof(struct Tox_Options));
     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;
 
-    // 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
-#undef NUM_GROUP_TOXES
+#endif // USE_TEST_NETWORK

external/toxcore/c-toxcore/auto_tests/group_topic_test.c

@@ -203,6 +203,7 @@ 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();
@@ -317,6 +318,8 @@ static void group_topic_test(AutoTox *autotoxes)
     }
 
     fprintf(stderr, "All tests passed!\n");
+
+#endif /* VANILLA_NACL */
 }
 
 int main(void)

external/toxcore/c-toxcore/auto_tests/invalid_tcp_proxy_test.c

@@ -7,8 +7,15 @@
 #include "auto_test_support.h"
 #include "check_compat.h"
 
-// Try to bootstrap for 20 seconds.
+static uint8_t const key[] = {
-#define NUM_ITERATIONS (unsigned)(20.0 / (ITERATION_INTERVAL / 1000.0))
+    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))
 
 int main(void)
 {
@@ -17,12 +24,13 @@ 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, "127.0.0.1");
+    tox_options_set_proxy_host(opts, "localhost");
     tox_options_set_proxy_port(opts, 51724);
     Tox *tox = tox_new_log(opts, nullptr, nullptr);
     tox_options_free(opts);
 
-    bootstrap_tox_live_network(tox, true);
+    tox_add_tcp_relay(tox, "tox.ngc.zone", 33445, key, nullptr);
+    tox_bootstrap(tox, "tox.ngc.zone", 33445, key, nullptr);
 
     printf("Waiting for connection...\n");
 

external/toxcore/c-toxcore/auto_tests/invalid_udp_proxy_test.c

@@ -7,8 +7,15 @@
 #include "auto_test_support.h"
 #include "check_compat.h"
 
-// Try to bootstrap for 20 seconds.
+static uint8_t const key[] = {
-#define NUM_ITERATIONS (unsigned)(20.0 / (ITERATION_INTERVAL / 1000.0))
+    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))
 
 int main(void)
 {
@@ -17,12 +24,13 @@ 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, "127.0.0.1");
+    tox_options_set_proxy_host(opts, "localhost");
     tox_options_set_proxy_port(opts, 51724);
     Tox *tox = tox_new_log(opts, nullptr, nullptr);
     tox_options_free(opts);
 
-    bootstrap_tox_live_network(tox, true);
+    tox_add_tcp_relay(tox, "tox.ngc.zone", 33445, key, nullptr);
+    tox_bootstrap(tox, "tox.ngc.zone", 33445, key, nullptr);
 
     printf("Waiting for connection...");
 

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->log, onion->net, source, res_packet, sizeof(res_packet),
+    if (send_onion_response(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(log1, onion1->net, rng, &path, &nodes[3],
+    int ret = send_announce_request(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(log1, onion1->net, rng, &path, &nodes[3],
+    send_announce_request(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(log3, onion3->net, rng, &path, &nodes[3].ip_port,
+    ret = send_data_request(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"));

external/toxcore/c-toxcore/auto_tests/send_message_test.c

@@ -42,7 +42,6 @@ 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;

external/toxcore/c-toxcore/auto_tests/tox_dispatch_test.c

@@ -10,7 +10,6 @@
 #include "../toxcore/tox.h"
 #include "../toxcore/tox_dispatch.h"
 #include "../toxcore/tox_events.h"
-#include "../toxcore/tox_unpack.h"
 #include "auto_test_support.h"
 #include "check_compat.h"
 
@@ -31,36 +30,31 @@ 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);
-    ck_assert(tox_events_get_bytes(events, buf));
+        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 *bytes1 = (uint8_t *)malloc(size);
+    uint8_t *bytes = (uint8_t *)malloc(size);
-    uint8_t *bytes2 = (uint8_t *)malloc(size);
+    ck_assert(bytes != nullptr);
-    ck_assert(bytes1 != nullptr);
-    ck_assert(bytes2 != nullptr);
 
-    ck_assert(tox_events_get_bytes(events, bytes1));
+    tox_events_get_bytes(events, bytes);
-    ck_assert(tox_events_get_bytes(events, bytes2));
 
-    // Make sure get_bytes is deterministic.
+    Tox_Events *events_copy = tox_events_load(sys, bytes, size);
-    ck_assert(memcmp(bytes1, bytes2, size) == 0);
-
-    Tox_Events *events_copy = tox_events_load(sys, bytes1, size);
     ck_assert(events_copy != nullptr);
-    free(bytes1);
+    free(bytes);
-    free(bytes2);
 
     ck_assert(tox_events_equal(sys, events, events_copy));
 
@@ -78,9 +72,7 @@ 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);
 
-        if (want_dump_events) {
         dump_events("/tmp/test.mp", events);
-        }
 
         bool success = false;
         tox_dispatch_invoke(dispatch, events, toxes[1], &success);
@@ -168,22 +160,9 @@ 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;
 }

external/toxcore/c-toxcore/auto_tests/tox_events_test.c

@@ -28,15 +28,6 @@ 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;
         }

external/toxcore/c-toxcore/azure-pipelines.yml

@@ -12,4 +12,4 @@ jobs:
       - bash: python -m pip install conan==1.59.0
       - bash: git submodule update --init --recursive
       - bash: conan install -if _build -o with_tests=True -o shared=$(conan.shared) .
-      - bash: CONAN_CPU_COUNT=50 CTEST_OUTPUT_ON_FAILURE=1 conan build -bf _build -if _build . || true
+      - bash: CONAN_CPU_COUNT=50 CTEST_OUTPUT_ON_FAILURE=1 conan build -bf _build -if _build .

external/toxcore/c-toxcore/cmake/CompileGTest.cmake

@@ -0,0 +1,62 @@
+# 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()

external/toxcore/c-toxcore/cmake/Dependencies.cmake

@@ -13,20 +13,14 @@ find_library(RT_LIBRARIES     rt    )
 find_library(SOCKET_LIBRARIES       socket       )
 
 # For toxcore.
-pkg_search_module(LIBSODIUM   libsodium IMPORTED_TARGET)
+pkg_use_module(LIBSODIUM            libsodium    )
 
 # For toxav.
-pkg_search_module(OPUS        opus      IMPORTED_TARGET)
+pkg_use_module(OPUS                 "opus;Opus"  )
-if(NOT OPUS_FOUND)
+pkg_use_module(VPX                  "vpx;libvpx" )
-  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_search_module(LIBCONFIG   libconfig IMPORTED_TARGET)
+pkg_use_module(LIBCONFIG            libconfig    )
 
 ###############################################################################
 #

external/toxcore/c-toxcore/cmake/ModulePackage.cmake

@@ -21,6 +21,41 @@ 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)
 
@@ -35,7 +70,7 @@ function(add_module lib)
 endfunction()
 
 function(install_module lib)
-  if(TARGET ${lib}_shared)
+  if(ENABLE_SHARED)
     set_target_properties(${lib}_shared PROPERTIES
       VERSION ${SOVERSION}
       SOVERSION ${SOVERSION_MAJOR}
@@ -45,7 +80,7 @@ function(install_module lib)
       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
   endif()
-  if(TARGET ${lib}_static)
+  if(ENABLE_STATIC)
     install(TARGETS ${lib}_static
       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -78,3 +113,59 @@ 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()

external/toxcore/c-toxcore/cmake/StrictAbi.cmake

@@ -29,7 +29,7 @@ function(_make_version_script target)
     list(GET sublib 1 ns)
 
     execute_process(
-      COMMAND ${SHELL} -c "egrep '^\\w' ${header} | grep '${ns}_[a-z0-9_]*(' | grep -v '^typedef' | grep -o '${ns}_[a-z0-9_]*(' | egrep -o '[a-z0-9_]+' | sort -u"
+      COMMAND ${SHELL} -c "egrep '^\\w' ${header} | grep '${ns}_[a-z0-9_]*(' | grep -v '^typedef' | grep -o '${ns}_[a-z0-9_]*(' | egrep -o '\\w+' | sort -u"
       OUTPUT_VARIABLE sublib_SYMS
       OUTPUT_STRIP_TRAILING_WHITESPACE)
     string(REPLACE "\n" ";" sublib_SYMS ${sublib_SYMS})

external/toxcore/c-toxcore/configure.ac

@@ -22,6 +22,8 @@ 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],
@@ -36,12 +38,27 @@ 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
+        fi
     ]
 )
 
@@ -154,6 +171,16 @@ 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
@@ -170,6 +197,8 @@ 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],
@@ -187,6 +216,24 @@ 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]),
@@ -205,6 +252,11 @@ 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
 
@@ -235,6 +287,7 @@ 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
@@ -259,7 +312,50 @@ PKG_CHECK_MODULES([LIBSODIUM], [libsodium],
         LIBSODIUM_FOUND="no"
     ])
 
-if test "x$LIBSODIUM_FOUND" = "xno"; then
+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
     LIBSODIUM_LIBS=
     LIBSODIUM_LDFLAGS=
     LDFLAGS_SAVE="$LDFLAGS"
@@ -292,7 +388,34 @@ 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$LIBSODIUM_FOUND" = "xno"; then
+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
     LIBSODIUM_CFLAGS=
     CFLAGS_SAVE="$CFLAGS"
     CPPFLAGS_SAVE="$CPPFLAGS"
@@ -432,6 +555,7 @@ 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

external/toxcore/c-toxcore/docs/TCP_Network.txt

@@ -49,7 +49,7 @@ 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 
-libsodium.
+NaCl.
 
 TCP doesn't have packets so what we will refer to as packets are sent this way: 
 [[uint16_t (length of data)][data]]

external/toxcore/c-toxcore/docs/updates/Crypto.md

@@ -1,4 +1,4 @@
-Encryption library used: https://doc.libsodium.org/
+Encryption library used: http://nacl.cr.yp.to/
 
 
 When running the program for the first time the crypto_box_keypair() function is used to 

external/toxcore/c-toxcore/libtoxcore.pc.in

@@ -7,5 +7,5 @@ Name: libtoxcore
 Description: Tox protocol library
 Requires:
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -ltoxcore -ltoxencryptsave @LIBS@ @MATH_LDFLAGS@ @PTHREAD_LDFLAGS@
+Libs: @NACL_OBJECTS_PKGCONFIG@ -L${libdir} -ltoxcore @NACL_LDFLAGS@ -ltoxencryptsave @NACL_LIBS@ @LIBS@ @MATH_LDFLAGS@ @PTHREAD_LDFLAGS@
 Cflags: -I${includedir}

external/toxcore/c-toxcore/other/BUILD.bazel

@@ -1,6 +1,8 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary")
 load("//tools:no_undefined.bzl", "cc_library")
 
+package(features = ["layering_check"])
+
 cc_library(
     name = "bootstrap_node_packets",
     srcs = ["bootstrap_node_packets.c"],

external/toxcore/c-toxcore/other/Makefile.inc

@@ -9,12 +9,16 @@ DHT_bootstrap_SOURCES = ../other/DHT_bootstrap.c \
                         ../other/bootstrap_node_packets.c
 
 DHT_bootstrap_CFLAGS = -I$(top_srcdir)/other \
-                        $(LIBSODIUM_CFLAGS)
+                        $(LIBSODIUM_CFLAGS) \
+                        $(NACL_CFLAGS)
 
 DHT_bootstrap_LDADD =   $(LIBSODIUM_LDFLAGS) \
+                        $(NACL_LDFLAGS) \
                         libmisc_tools.la \
                         libtoxcore.la \
                         $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
+                        $(NACL_LIBS) \
                         $(WINSOCK2_LIBS)
 
 endif

external/toxcore/c-toxcore/other/analysis/run-clang-tidy

@@ -2,9 +2,6 @@
 
 CHECKS="*"
 
-# We don't use memcpy_s.
-CHECKS="$CHECKS,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling"
-
 # __attribute__((nonnull)) causes this warning on defensive null checks.
 CHECKS="$CHECKS,-clang-diagnostic-pointer-bool-conversion"
 CHECKS="$CHECKS,-clang-diagnostic-tautological-pointer-compare"
@@ -60,27 +57,6 @@ CHECKS="$CHECKS,-readability-redundant-control-flow"
 CHECKS="$CHECKS,-bugprone-narrowing-conversions"
 CHECKS="$CHECKS,-cppcoreguidelines-narrowing-conversions"
 
-# Mistakenly thinks that
-#   const int a = 0, b = 1;
-#   assert(a < b);
-# is a constant expression in C (it is in C++ though, which is probably why it's
-# mistaken), suggesting to replace 'assert()' with 'static_assert()' in cases
-# where that won't work.
-#
-# There are ways to make 'static_assert()' work, but they are rather annoying --
-# they are somewhat ugly, hurting the readability, and some are error-prone:
-#
-# - Turning 'a' and 'b' into enum constants would make it work, but this falls
-#   apart if the enum types are compared against non-enums down the line
-#     error: enumerated and non-enumerated type in conditional expression [-Werror=extra]
-#
-# - Turning 'a' and 'b' into pre-processor macros is the only option left, but
-#   #defines and #undefs in the middle of a function hurt the readability and
-#   are less idiomatic than simply using 'const int'.
-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"

external/toxcore/c-toxcore/other/analysis/run-cppcheck

@@ -8,12 +8,9 @@ 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")
-# We don't cast function pointers, which cppcheck suggests here.
+# Used for VLA.
-CPPCHECK+=("--suppress=constParameterCallback")
+CPPCHECK+=("--suppress=allocaCalled")
 # False positives in switch statements.
 CPPCHECK+=("--suppress=knownConditionTrueFalse")
 # Cppcheck does not need standard library headers to get proper results.
@@ -22,22 +19,27 @@ 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 in group.c.
+# False positive for callback functions
-# Using cppcheck-suppress claims the suppression is unused.
+CPPCHECK_CXX+=("--suppress=constParameter")
-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 -j8 "${CPPCHECK[@]}" "${CPPCHECK_C[@]}" tox*/*.[ch] tox*/*/*.[ch] "${CPPFLAGS[@]}" "$@"
+  cppcheck "${CPPCHECK[@]}" "${CPPCHECK_C[@]}" tox*/*.[ch] tox*/*/*.[ch] "${CPPFLAGS[@]}" "$@"
   cppcheck "${CPPCHECK[@]}" "${CPPCHECK_CXX[@]}" amalgamation.cc "${CPPFLAGS[@]}" "$@"
 }
 

external/toxcore/c-toxcore/other/bootstrap_daemon/BUILD.bazel

@@ -1,5 +1,7 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary")
 
+package(features = ["layering_check"])
+
 cc_binary(
     name = "bootstrap_daemon",
     srcs = glob([

external/toxcore/c-toxcore/other/bootstrap_daemon/CMakeLists.txt

@@ -19,14 +19,6 @@ add_executable(tox-bootstrapd
   src/tox-bootstrapd.c
   ../bootstrap_node_packets.c
   ../bootstrap_node_packets.h)
-target_link_libraries(tox-bootstrapd PRIVATE ${LIBCONFIG_LIBRARIES})
+target_link_modules(tox-bootstrapd toxcore ${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")

external/toxcore/c-toxcore/other/bootstrap_daemon/docker/Dockerfile

@@ -1,16 +1,15 @@
 ###########################################################
 # Builder image: we compile the code here (static build)
-FROM alpine:3.19.0 AS build
+FROM alpine:3.15.0 AS build
 
 RUN ["apk", "--no-cache", "add",\
- "clang",\
+ "build-base",\
  "cmake",\
  "linux-headers",\
  "libconfig-dev",\
  "libconfig-static",\
  "libsodium-dev",\
  "libsodium-static",\
- "musl-dev",\
  "ninja",\
  "python3"\
 ]
@@ -35,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 CC=clang cmake -B_build -H. \
+RUN cmake -B_build -H. \
       -GNinja \
-      -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_C_FLAGS="-DTCP_SERVER_USE_EPOLL -fstack-protector-all -fisolate-erroneous-paths-attribute" \
       -DCMAKE_UNITY_BUILD=ON \
       -DCMAKE_BUILD_TYPE=Release \
       -DFULLY_STATIC=ON \
@@ -63,7 +62,7 @@ RUN ["other/bootstrap_daemon/docker/get-nodes.py", "other/bootstrap_daemon/tox-b
 
 ###########################################################
 # Final image build: this is what runs the bootstrap node
-FROM debian:bookworm-slim
+FROM debian:bullseye-slim
 
 COPY --from=build /usr/local/bin/tox-bootstrapd /usr/local/bin/
 COPY --from=build /src/c-toxcore/other/bootstrap_daemon/tox-bootstrapd.conf /etc/tox-bootstrapd.conf

external/toxcore/c-toxcore/other/bootstrap_daemon/docker/tox-bootstrapd.sha256

@@ -1 +1 @@
-b0bd5099f2f77fbd540a5a929a23cece39ff95e3a66702a5381342d01775cbd3  /usr/local/bin/tox-bootstrapd
+b2996d73cab7c7453dc10ccf7ad733622558de3b1ad0db824a379cf96f500379  /usr/local/bin/tox-bootstrapd

external/toxcore/c-toxcore/other/bootstrap_daemon/docker/update-sha256

@@ -3,7 +3,7 @@
 set -eux
 
 docker_build() {
-  DOCKER_BUILDKIT=1 docker build --progress=plain -f other/bootstrap_daemon/docker/Dockerfile -t toxchat/bootstrap-node .
+  docker build -f other/bootstrap_daemon/docker/Dockerfile -t toxchat/bootstrap-node .
 }
 
 # Run Docker build once. If it succeeds, we're good.
@@ -12,11 +12,12 @@ if docker_build; then
 fi
 
 # We're not good. Run it again, but now capture the output.
-OUTPUT=$(docker_build 2>&1 || true)
+OUTPUT=$(docker_build || true 2>&1)
 
 if echo "$OUTPUT" | grep '/usr/local/bin/tox-bootstrapd: FAILED'; then
   # This is a checksum warning, so we need to update it.
-  echo "$OUTPUT" | grep -Eo '[0-9a-f]{64}  /usr/local/bin/tox-bootstrapd' | tail -n1 >other/bootstrap_daemon/docker/tox-bootstrapd.sha256
+  IMAGE=$(echo "$OUTPUT" | grep '^ ---> [0-9a-f]*$' | grep -o '[0-9a-f]*$' | tail -n1)
+  docker run --rm "$IMAGE" sha256sum /usr/local/bin/tox-bootstrapd >other/bootstrap_daemon/docker/tox-bootstrapd.sha256
 fi
 
 # Run once last time to complete the build.

external/toxcore/c-toxcore/other/bootstrap_daemon/src/Makefile.inc

@@ -24,13 +24,17 @@ 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)
+                        $(LIBSODIUM_LIBS) \
+                        $(NACL_OBJECTS) \
+                        $(NACL_LIBS)
 
 bashcompdir = $(datarootdir)/bash-completion/completions
 dist_bashcomp_DATA = $(top_builddir)/other/bootstrap_daemon/bash-completion/completions/tox-bootstrapd

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-2018 The TokTok team.
  * Copyright © 2014-2016 Tox project.
  */
 
@@ -39,28 +39,22 @@ static void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_por
         log_write(LOG_LEVEL_WARNING, "No '%s' setting in the configuration file.\n", NAME_TCP_RELAY_PORTS);
         log_write(LOG_LEVEL_WARNING, "Using default '%s':\n", NAME_TCP_RELAY_PORTS);
 
-        uint16_t default_ports[] = {DEFAULT_TCP_RELAY_PORTS};
+        uint16_t default_ports[DEFAULT_TCP_RELAY_PORTS_COUNT] = {DEFAULT_TCP_RELAY_PORTS};
 
-        // Check to avoid calling malloc(0) later on
+        for (int i = 0; i < DEFAULT_TCP_RELAY_PORTS_COUNT; ++i) {
-        // NOLINTNEXTLINE, clang-tidy: error: suspicious comparison of 'sizeof(expr)' to a constant [bugprone-sizeof-expression,-warnings-as-errors]
+            log_write(LOG_LEVEL_INFO, "Port #%d: %u\n", i, default_ports[i]);
-        static_assert(sizeof(default_ports) > 0, "At least one default TCP relay port should be provided");
-
-        const size_t default_ports_count = sizeof(default_ports)/sizeof(*default_ports);
-
-        for (size_t i = 0; i < default_ports_count; ++i) {
-            log_write(LOG_LEVEL_INFO, "Port #%zu: %u\n", i, default_ports[i]);
         }
 
         // similar procedure to the one of reading config file below
-        *tcp_relay_ports = (uint16_t *)malloc(default_ports_count * sizeof(uint16_t));
+        *tcp_relay_ports = (uint16_t *)malloc(DEFAULT_TCP_RELAY_PORTS_COUNT * sizeof(uint16_t));
 
-        for (size_t i = 0; i < default_ports_count; ++i) {
+        for (int i = 0; i < DEFAULT_TCP_RELAY_PORTS_COUNT; ++i) {
 
             (*tcp_relay_ports)[*tcp_relay_port_count] = default_ports[i];
 
             if ((*tcp_relay_ports)[*tcp_relay_port_count] < MIN_ALLOWED_PORT
                     || (*tcp_relay_ports)[*tcp_relay_port_count] > MAX_ALLOWED_PORT) {
-                log_write(LOG_LEVEL_WARNING, "Port #%zu: Invalid port: %u, should be in [%d, %d]. Skipping.\n", i,
+                log_write(LOG_LEVEL_WARNING, "Port #%d: Invalid port: %u, should be in [%d, %d]. Skipping.\n", i,
                           (*tcp_relay_ports)[*tcp_relay_port_count], MIN_ALLOWED_PORT, MAX_ALLOWED_PORT);
                 continue;
             }

external/toxcore/c-toxcore/other/bootstrap_daemon/src/config_defaults.h

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2016-2023 The TokTok team.
+ * Copyright © 2016-2018 The TokTok team.
  * Copyright © 2014-2016 Tox project.
  */
 
@@ -19,7 +19,8 @@
 #define DEFAULT_ENABLE_IPV4_FALLBACK  1 // 1 - true, 0 - false
 #define DEFAULT_ENABLE_LAN_DISCOVERY  1 // 1 - true, 0 - false
 #define DEFAULT_ENABLE_TCP_RELAY      1 // 1 - true, 0 - false
-#define DEFAULT_TCP_RELAY_PORTS       443, 3389, 33445 // comma-separated list of ports
+#define DEFAULT_TCP_RELAY_PORTS       443, 3389, 33445 // comma-separated list of ports. make sure to adjust DEFAULT_TCP_RELAY_PORTS_COUNT accordingly
+#define DEFAULT_TCP_RELAY_PORTS_COUNT 3
 #define DEFAULT_ENABLE_MOTD           1 // 1 - true, 0 - false
 #define DEFAULT_MOTD                  DAEMON_NAME
 

external/toxcore/c-toxcore/other/bootstrap_daemon/src/tox-bootstrapd.c

@@ -57,7 +57,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, const char *keys_file_path)
+static int manage_keys(DHT *dht, char *keys_file_path)
 {
     enum { KEYS_SIZE = CRYPTO_PUBLIC_KEY_SIZE + CRYPTO_SECRET_KEY_SIZE };
     uint8_t keys[KEYS_SIZE];
@@ -375,7 +375,6 @@ int main(int argc, char *argv[])
 
     if (!onion) {
         log_write(LOG_LEVEL_ERROR, "Couldn't initialize Tox Onion. Exiting.\n");
-        kill_gca(group_announce);
         kill_announcements(announce);
         kill_forwarding(forwarding);
         kill_dht(dht);

external/toxcore/c-toxcore/other/bootstrap_daemon/websocket/websockify/BUILD.bazel

@@ -1,5 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
+package(features = ["-layering_check"])
+
 go_library(
     name = "go_default_library",
     srcs = ["websockify.go"],

external/toxcore/c-toxcore/other/docker/alpine-s390x/Dockerfile

@@ -1,6 +0,0 @@
-FROM toxchat/alpine-s390x:latest
-
-WORKDIR /work/c-toxcore
-COPY . /work/c-toxcore/
-
-RUN [".github/scripts/cmake-alpine-s390x"]

external/toxcore/c-toxcore/other/docker/alpine-s390x/run

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -eux
-BUILD=alpine-s390x
-docker build -t "toxchat/c-toxcore:$BUILD" -f "other/docker/$BUILD/Dockerfile" .

external/toxcore/c-toxcore/other/docker/autotools/Dockerfile

@@ -1,27 +1,6 @@
 ################################################
 # autotools-linux
-FROM ubuntu:22.04
+FROM toxchat/nacl:latest
-
-RUN apt-get update && apt-get install --no-install-recommends -y \
- 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/

external/toxcore/c-toxcore/other/docker/autotools/run

@@ -1,5 +1,3 @@
 #!/bin/sh
 
-set -eux
+docker build -t toxchat/c-toxcore:autotools -f other/docker/autotools/Dockerfile .
-BUILD=autotools
-docker build -t "toxchat/c-toxcore:$BUILD" -f "other/docker/$BUILD/Dockerfile" .

external/toxcore/c-toxcore/other/docker/cimplefmt/run

@@ -5,4 +5,4 @@ if [ "$1" = "-u" ]; then
   docker pull toxchat/haskell:hs-cimple
   docker build -t toxchat/cimplefmt -f other/docker/cimplefmt/Dockerfile .
 fi
-docker run --name toxcore-cimplefmt --rm -v "$PWD:/work" toxchat/cimplefmt "$@"
+docker run --rm -v "$PWD:/work" toxchat/cimplefmt "$@"

external/toxcore/c-toxcore/other/docker/circleci/run

@@ -3,4 +3,4 @@
 SANITIZER="${1:-asan}"
 
 docker build -t toxchat/c-toxcore:circleci other/docker/circleci
-docker run --name toxcore-circleci --rm -it -v "$PWD:/c-toxcore" toxchat/c-toxcore:circleci "$SANITIZER"
+docker run --rm -it -v "$PWD:/c-toxcore" toxchat/c-toxcore:circleci "$SANITIZER"

external/toxcore/c-toxcore/other/docker/compcert/Dockerfile

@@ -1,30 +0,0 @@
-FROM toxchat/compcert:latest
-
-WORKDIR /work
-COPY auto_tests/ /work/auto_tests/
-COPY testing/ /work/testing/
-COPY toxav/ /work/toxav/
-COPY toxcore/ /work/toxcore/
-COPY toxencryptsave/ /work/toxencryptsave/
-COPY third_party/ /work/third_party/
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-RUN ccomp \
- -o send_message_test \
- -Wall -Werror \
- -Wno-c11-extensions \
- -Wno-unknown-pragmas \
- -Wno-unused-variable \
- -fstruct-passing -fno-unprototyped -g \
- auto_tests/auto_test_support.c \
- auto_tests/send_message_test.c \
- testing/misc_tools.c \
- toxav/*.c \
- toxcore/*.c \
- toxcore/*/*.c \
- toxencryptsave/*.c \
- third_party/cmp/*.c \
- -D__COMPCERT__ -DDISABLE_VLA -Dinline= \
- -lpthread $(pkg-config --cflags --libs libsodium opus vpx) \
- && ./send_message_test | grep 'tox clients connected'

external/toxcore/c-toxcore/other/docker/compcert/run

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -eux
-BUILD=compcert
-docker build -t "toxchat/c-toxcore:$BUILD" -f "other/docker/$BUILD/Dockerfile" .

external/toxcore/c-toxcore/other/docker/coverage/Dockerfile

@@ -1,15 +1,13 @@
 FROM toxchat/c-toxcore:sources AS src
-FROM ubuntu:20.04 AS build
+FROM ubuntu:22.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-1.18 \
+ golang \
  libconfig-dev \
  libgtest-dev \
  libopus-dev \
@@ -24,16 +22,10 @@ RUN apt-get update && \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/* \
  && pip3 install --no-cache-dir gcovr
-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
@@ -49,27 +41,26 @@ RUN source .github/scripts/flags-coverage.sh \
  -DENABLE_SHARED=OFF \
  -DMIN_LOGGER_LEVEL=TRACE \
  -DMUST_BUILD_TOXAV=ON \
- -DNON_HERMETIC_TESTS=OFF \
+ -DNON_HERMETIC_TESTS=ON \
  -DSTRICT_ABI=ON \
  -DAUTOTEST=ON \
  -DPROXY_TEST=ON \
  -DUSE_IPV6=OFF \
- -DTEST_TIMEOUT_SECONDS=40 \
+ -DTEST_TIMEOUT_SECONDS=30 \
  && cmake --build _build --parallel 8 --target install
 
 WORKDIR /work/_build
-RUN /work/other/proxy/proxy_server \
+RUN /work/proxy_server \
- & (ctest -j50 --output-on-failure --rerun-failed --repeat until-pass:6 || \
+ & 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 other/docker/coverage/syscall_funcs.c src/
+COPY run_mallocfail /usr/local/bin/
+COPY 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", \
@@ -83,4 +74,6 @@ RUN ["gcovr", \
  "--exclude=(.+/)?other/", \
  "--exclude=(.+/)?testing/"]
 
-WORKDIR /work
+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/

external/toxcore/c-toxcore/other/docker/coverage/Dockerfile.nginx

@@ -1,5 +0,0 @@
-# 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/

external/toxcore/c-toxcore/other/docker/coverage/run

@@ -1,9 +1,7 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 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 -f other/docker/coverage/Dockerfile .
+docker build -t toxchat/c-toxcore:coverage other/docker/coverage
-docker run "${ci_env[@]}" -e CI=true --name toxcore-coverage --rm -t toxchat/c-toxcore:coverage /usr/local/bin/codecov -x "llvm-cov gcov"
+docker run --rm -it -p "28192:80" toxchat/c-toxcore:coverage

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,
+def run_mallocfail(tmpdir: str, timeout: float, exe: str,
-                   keep_going: bool) -> bool:
+                   iteration: int) -> 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,6 @@ def run_mallocfail(tmpdir: str, timeout: float, exe: str, iteration: int,
         print(
             f"\x1b[1;32mProgram '{exe}' failed to handle OOM situation cleanly\x1b[0m"
         )
-        if not keep_going:
         raise Exception("Aborting test")
 
     return True
@@ -96,8 +95,7 @@ def find_prog(name: str) -> Tuple[Optional[str], ...]:
             return path
         return None
 
-    return (attempt(f"./unit_{name}_test"),
+    return (attempt(f"./unit_{name}_test"), attempt(f"./auto_{name}_test"))
-            attempt(f"auto_tests/auto_{name}_test"))
 
 
 def parse_flags(args: List[str]) -> Tuple[Dict[str, str], List[str]]:
@@ -112,19 +110,15 @@ def parse_flags(args: List[str]) -> Tuple[Dict[str, str], List[str]]:
     return flags, exes
 
 
-def loop_mallocfail(tmpdir: str,
+def loop_mallocfail(tmpdir: str, timeout: float, exe: str) -> None:
-                    timeout: float,
-                    exe: str,
-                    keep_going: bool = False) -> None:
     i = 1
-    while run_mallocfail(tmpdir, timeout, exe, i, keep_going):
+    while run_mallocfail(tmpdir, timeout, exe, i):
         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)
@@ -155,7 +149,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, keep_going=True)
+        loop_mallocfail(".", timeout, _PRIMER)
 
     print(f"\x1b[1;33m--------------------------------\x1b[0m")
     print(f"\x1b[1;33mStarting mallocfail for {len(exes)} programs:\x1b[0m")

external/toxcore/c-toxcore/other/docker/coverage/serve

@@ -1,8 +0,0 @@
-#!/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

external/toxcore/c-toxcore/other/docker/cppcheck/Dockerfile

@@ -1,30 +0,0 @@
-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"]

external/toxcore/c-toxcore/other/docker/cppcheck/run

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -eux
-BUILD=cppcheck
-docker build -t "toxchat/c-toxcore:$BUILD" -f "other/docker/$BUILD/Dockerfile" .

external/toxcore/c-toxcore/other/docker/cppcheck/toxcore.cfg

@@ -1,117 +0,0 @@
-<?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">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
- -->

external/toxcore/c-toxcore/other/docker/doxygen/run

@@ -3,4 +3,4 @@
 set -eux
 
 docker build -t toxchat/c-toxcore:docs -f other/docker/doxygen/Dockerfile .
-docker run --name toxcore-docs --rm -it -p "28192:80" toxchat/c-toxcore:docs
+docker run --rm -it -p "28192:80" toxchat/c-toxcore:docs

external/toxcore/c-toxcore/other/docker/esp32/BUILD.bazel

@@ -1,15 +0,0 @@
-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",
-    ],
-)

external/toxcore/c-toxcore/other/docker/esp32/Dockerfile

@@ -1,32 +1,48 @@
-FROM mluis/qemu-esp32:latest
+FROM toxchat/c-toxcore:sources AS src
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+FROM ubuntu:18.04
-ENV IDF_TARGET=esp32
 
-WORKDIR /root/toxcore
+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/*
 
-# Build an initial bootstrap hello world just to compile libsodium and other
+ENV ESP32_TARBALL=xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0 \
-# system level dependencies.
+    IDF_PATH="/root/esp/esp-idf" \
-COPY other/docker/esp32/sdkconfig \
+    PATH="/root/esp/esp-idf/tools:/root/esp/xtensa-esp32-elf/bin:$PATH"
-     other/docker/esp32/CMakeLists.txt \
+WORKDIR /root/esp
-     /root/toxcore/
+RUN wget -q https://dl.espressif.com/dl/$ESP32_TARBALL.tar.gz \
-COPY other/docker/esp32/bootstrap/ \
+ && tar zxf $ESP32_TARBALL.tar.gz \
-     /root/toxcore/main/
+ && rm -f $ESP32_TARBALL.tar.gz \
-RUN . /root/esp/esp-idf/export.sh && idf.py build
+ && git clone -b v3.3 --recursive --depth=1 --shallow-submodules https://github.com/espressif/esp-idf
 
-# Copy over toxcore sources and build those.
+# Build a hello world first, so the OS and libsodium etc. are compiled.
-COPY third_party/cmp/ /root/toxcore/main/third_party/cmp/
+WORKDIR /root/esp/toxcore
-COPY toxencryptsave/defines.h /root/toxcore/main/toxencryptsave/
+COPY other/docker/esp32/CMakeLists.txt /root/esp/toxcore/
-COPY toxcore/ /root/toxcore/main/toxcore/
+COPY other/docker/esp32/hello/ /root/esp/toxcore/main/
-COPY other/docker/esp32/main/CMakeLists.txt \
+RUN idf.py build
-     /root/toxcore/main/
+
-COPY other/docker/esp32/main/*.cc \
+# Then copy over the actual toxcore sources and build those.
-     other/docker/esp32/main/*.h \
+COPY --from=src /src/third_party/cmp/ /root/esp/toxcore/main/third_party/cmp/
-     /root/toxcore/main/other/docker/esp32/main/
+COPY --from=src /src/toxencryptsave/defines.h /root/esp/toxcore/main/toxencryptsave/
-RUN touch /root/toxcore/main/CMakeLists.txt \
+COPY --from=src /src/toxcore/ /root/esp/toxcore/main/toxcore/
- && . /root/esp/esp-idf/export.sh && idf.py build
+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
 RUN ls -lh build/toxcore.bin \
- && sha512sum build/toxcore.bin
+ && shasum build/toxcore.bin
-RUN /root/flash.sh build/toxcore.bin
-
-COPY other/docker/esp32/qemu-test /root/toxcore/
-RUN ["/root/toxcore/qemu-test"]

external/toxcore/c-toxcore/other/docker/esp32/bootstrap/CMakeLists.txt

@@ -1,4 +0,0 @@
-idf_component_register(
-  SRCS hello_main.cc
-  INCLUDE_DIRS "."
-  REQUIRES esp_netif lwip)

external/toxcore/c-toxcore/other/docker/esp32/bootstrap/hello_main.cc

@@ -1,4 +0,0 @@
-#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"); }

external/toxcore/c-toxcore/other/docker/esp32/bootstrap/idf_component.yml

@@ -1,2 +0,0 @@
-dependencies:
-  espressif/libsodium: "==1.0.20"

external/toxcore/c-toxcore/other/docker/esp32/hello/CMakeLists.txt

@@ -0,0 +1,4 @@
+set(COMPONENT_SRCS "hello_main.c")
+set(COMPONENT_ADD_INCLUDEDIRS "")
+
+register_component()

external/toxcore/c-toxcore/other/docker/esp32/hello/hello_main.c

@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+void app_main(void)
+{
+    printf("Hello world!\n");
+}

external/toxcore/c-toxcore/other/docker/esp32/host_main.cc

@@ -1,3 +0,0 @@
-#include "main/tox_main.h"
-
-int main() { tox_main(); }

external/toxcore/c-toxcore/other/docker/esp32/main/CMakeLists.txt

@@ -1,16 +0,0 @@
-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)

external/toxcore/c-toxcore/other/docker/esp32/main/app_main.cc

@@ -1,73 +0,0 @@
-#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();
-}