thread pool: add ExecutionContext

.devcontainer/devcontainer.json

@@ -1,12 +0,0 @@
-{
-	"name": "C++",
-	"build": {
-		"dockerfile": "../docker/DockerfileDepsLlvm",
-	},
-	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
-	"settings": {},
-	"extensions": [
-		"ms-vscode.cpptools"
-	],
-	"forwardPorts": [4222],
-}

.github/workflows/ccpp.yml

@@ -1,92 +1,34 @@
 name: C/C++ CI
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
-  build-ubuntu:
-    name: Ubuntu/GCC Autotools build
+  build:
+
     runs-on: ubuntu-latest
+    
     steps:
-    - uses: actions/checkout@v3
-    - name: Dependencies
+    - uses: actions/checkout@v1
+    - name: deps
       run: |
-        sudo apt install libncurses5-dev libreadline-dev nettle-dev libasio-dev \
+        sudo apt install libncurses5-dev libreadline-dev nettle-dev \
         libgnutls28-dev libuv1-dev cython3 python3-dev python3-setuptools libcppunit-dev libjsoncpp-dev \
-        autotools-dev autoconf libfmt-dev libhttp-parser-dev libmsgpack-dev libargon2-0-dev
-    - name: Configure
+        autotools-dev autoconf libfmt-dev libhttp-parser-dev libmsgpack-dev
+    - name: autogen
+      run: ./autogen.sh
+    - name: argon2
       run: |
-        ./autogen.sh
-        ./configure
-    - name: Build
+        cd argon2 && make && sudo make install && cd ..
+    - name: asio
+      run: |
+        wget https://github.com/aberaud/asio/archive/b2b7a1c166390459e1c169c8ae9ef3234b361e3f.tar.gz \
+        && tar -xvf b2b7a1c166390459e1c169c8ae9ef3234b361e3f.tar.gz && cd asio-b2b7a1c166390459e1c169c8ae9ef3234b361e3f/asio \
+        && ./autogen.sh && ./configure --prefix=/usr --without-boost --disable-examples --disable-tests  \
+        && sudo make install \
+        && cd ../../ && rm -rf asio*
+    - name: configure
+      run: ./configure
+    - name: make
       run: make
-
-  build-ubuntu-meson:
-    name: Ubuntu/GCC Meson build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Dependencies
-      run: |
-        sudo apt install meson ninja-build libncurses5-dev libreadline-dev nettle-dev libasio-dev \
-        libgnutls28-dev libuv1-dev cython3 python3-dev python3-setuptools libcppunit-dev libjsoncpp-dev \
-        libfmt-dev libhttp-parser-dev libmsgpack-dev libargon2-0-dev
-    - name: Configure
-      run: meson setup build .
-    - name: Build
-      run: cd build && ninja
-
-  build-ubuntu-minimal:
-    name: Ubuntu/GCC minimal build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Dependencies
-      run: |
-        sudo apt install libncurses5-dev libreadline-dev nettle-dev libfmt-dev \
-        libgnutls28-dev libcppunit-dev libmsgpack-dev libargon2-0-dev
-    - name: Configure
-      run: |
-        mkdir build && cd build
-        cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Debug \
-                 -DOPENDHT_C=Off -DOPENDHT_TESTS=On -DOPENDHT_PEER_DISCOVERY=Off -DOPENDHT_PYTHON=Off \
-                 -DOPENDHT_TOOLS=On -DOPENDHT_PROXY_SERVER=Off -DOPENDHT_PROXY_CLIENT=Off
-    - name: Build
-      run: cd build && make
-    - name: Unit tests
-      run: cd build && ./opendht_unit_tests
-
-  build-macos:
-    name: macOS/Clang build
-    runs-on: macos-12
-    steps:
-    - uses: actions/checkout@v3
-    - name: Dependencies
-      run: |
-        brew install msgpack-cxx asio gnutls nettle readline fmt jsoncpp argon2 openssl http-parser cppunit
-
-    - name: restinio
-      run: |
-        mkdir restinio && cd restinio
-        wget https://github.com/aberaud/restinio/archive/6fd08b65f6f15899dd0de3c801f6a5462b811c64.tar.gz
-        ls -l && tar -xzf 6fd08b65f6f15899dd0de3c801f6a5462b811c64.tar.gz
-        cd restinio-6fd08b65f6f15899dd0de3c801f6a5462b811c64/dev
-        cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
-                -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
-                -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none .
-        make -j8 && sudo make install
-        cd ../../.. && rm -rf restinio
-
-    - name: Configure
-      run: |
-        mkdir build && cd build
-        export PATH="/opt/homebrew/opt/openssl@3/bin:$PATH"
-        export LDFLAGS="-L/usr/local/opt/openssl@3/lib"
-        export CPPFLAGS="-I/usr/local/opt/openssl@3/include"
-        export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig"
-        cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Debug \
-                 -DOPENDHT_C=On -DOPENDHT_TESTS=On -DOPENDHT_PEER_DISCOVERY=On -DOPENDHT_PYTHON=Off \
-                 -DOPENDHT_TOOLS=On -DOPENDHT_PROXY_SERVER=On -DOPENDHT_PROXY_CLIENT=On -DOPENDHT_PUSH_NOTIFICATIONS=On
-
-    - name: Build
-      run: cd build && make
-
+    - name: make check
+      run: make check

.github/workflows/clang-analyzer.yml

@@ -1,35 +0,0 @@
-name: Clang Static Analysis
-on: [push, pull_request]
-
-jobs:
-  clang-analyzer:
-    name: Clang Static Analysis
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: deps
-        run: |
-          sudo apt install libncurses5-dev libreadline-dev nettle-dev \
-          libgnutls28-dev libuv1-dev cython3 python3-dev python3-setuptools libcppunit-dev libjsoncpp-dev \
-          autotools-dev autoconf libfmt-dev libhttp-parser-dev libmsgpack-dev libargon2-0-dev libasio-dev \
-          llvm llvm-dev clang clang-tools && \
-          sudo apt remove gcc g++
-
-      - name: restinio
-        run: |
-          mkdir restinio && cd restinio \
-          && wget https://github.com/aberaud/restinio/archive/6fd08b65f6f15899dd0de3c801f6a5462b811c64.tar.gz \
-          && ls -l && tar -xzf 6fd08b65f6f15899dd0de3c801f6a5462b811c64.tar.gz \
-          && cd restinio-6fd08b65f6f15899dd0de3c801f6a5462b811c64/dev \
-          && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
-                  -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
-                  -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
-          && make -j8 && sudo make install \
-          && cd ../../.. && rm -rf restinio
-
-      - name: cmake
-        run: |
-          mkdir build && cd build && \
-          cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug -DOPENDHT_C=On -DOPENDHT_PEER_DISCOVERY=On -DOPENDHT_PYTHON=Off -DOPENDHT_TOOLS=On -DOPENDHT_PROXY_SERVER=On -DOPENDHT_PROXY_CLIENT=On -DOPENDHT_PUSH_NOTIFICATIONS=On
-      - name: scan-build
-        run: cd build && scan-build --status-bugs make

.github/workflows/codeql-analysis.yml

@@ -1,53 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "master" ]
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/savoirfairelinux/opendht/opendht-deps:latest
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'cpp' ]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-    # - run: |
-    #   echo "Run, Build Application using script"
-    #   ./location_of_script_within_repo/buildscript.sh
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2

.github/workflows/release-package.yml

@@ -1,293 +0,0 @@
-name: Release actions
-
-on:
-  push:
-    tags:
-    - 'v*'
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME_DEPS: ${{ github.repository }}/opendht-deps
-  IMAGE_NAME: ${{ github.repository }}/opendht
-  IMAGE_NAME_DEPS_LLVM: ${{ github.repository }}/opendht-deps-llvm
-  IMAGE_NAME_LLVM: ${{ github.repository }}/opendht-llvm
-  IMAGE_NAME_DHTNODE: ${{ github.repository }}/dhtnode
-  IMAGE_NAME_ALPINE: ${{ github.repository }}/opendht-alpine
-  IMAGE_NAME_ALPINE_DEPS: ${{ github.repository }}/opendht-deps-alpine
-
-jobs:
-  build-and-push-deps-image:
-    name: Dependency Docker image
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_DEPS }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/DockerfileDeps
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-and-push-image:
-    name: OpenDHT Docker image
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-and-push-deps-image-llvm:
-    name: Dependency Docker image (LLVM)
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_DEPS_LLVM }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/DockerfileDepsLlvm
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-and-push-image-llvm:
-    name: OpenDHT Docker image (LLVM)
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LLVM }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/DockerfileLlvm
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-and-push-image-dhtnode:
-    name: dhtnode Docker image
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_DHTNODE }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/DockerfileDhtnode
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-and-push-image-alpine-deps:
-    name: Alpine Deps Docker image
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_ALPINE_DEPS }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/DockerfileDepsAlpine
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-and-push-image-alpine:
-    name: Alpine Docker image
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_ALPINE }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/DockerfileAlpine
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build-python-wheel:
-    name: Release and build Python Wheel package
-    runs-on: ubuntu-latest
-    container: ghcr.io/savoirfairelinux/opendht/opendht-deps:latest
-
-    permissions:
-      contents: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: cmake
-        run: |
-          mkdir build && cd build && \
-          cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-                   -DCMAKE_BUILD_TYPE=Release \
-                   -DOPENDHT_STATIC=Off \
-                   -DOPENDHT_PYTHON=On \
-                   -DOPENDHT_C=Off \
-                   -DOPENDHT_PEER_DISCOVERY=On \
-                   -DOPENDHT_TOOLS=Off \
-                   -DOPENDHT_PROXY_SERVER=On \
-                   -DOPENDHT_PROXY_CLIENT=On
-
-      - name: build
-        run: cd build && make dist
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: opendht-wheels-linux
-          path: build/python/dist/*.whl
-
-      - name: Create Release
-        id: create_release
-        uses: softprops/action-gh-release@v1
-        with:
-          draft: true
-          files: build/python/dist/*.whl

.gitignore

@@ -19,9 +19,6 @@
 *.exe
 *.out
 *.app
-**/dhtnode
-**/dhtchat
-**/dhtscanner
 
 # Autotools
 /ac
@@ -76,5 +73,3 @@ doc/Doxyfile
 
 # build dir
 build
-build_dev
-.DS_Store

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "argon2"]
+	path = argon2
+	url = https://github.com/P-H-C/phc-winner-argon2
+	ignore = dirty

.travis.yml

@@ -0,0 +1,67 @@
+dist: xenial
+sudo: required
+
+services:
+  - docker
+
+language: cpp
+
+env:
+  matrix:
+    - OPENDHT_TEST_JOB="opendht.classic"
+    - OPENDHT_TEST_JOB="opendht.llvm"
+    - OPENDHT_TEST_JOB="opendht.proxyserver"
+    - OPENDHT_TEST_JOB="opendht.proxyclient"
+    - OPENDHT_TEST_JOB="opendht.push"
+
+before_install:
+  - |
+    if [[ "$OPENDHT_TEST_JOB" == *"opendht.classic"* ]]; then
+      docker pull aberaud/opendht-deps-bionic;
+    fi
+    if [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyclient"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyserver"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.push"* ]]; then
+      docker pull aberaud/opendht-deps;
+    fi
+    if [[ "$OPENDHT_TEST_JOB" == *"opendht.llvm"* ]]; then
+      docker pull aberaud/opendht-deps-llvm
+    fi
+
+script:
+  - |
+    # classic build
+    if [[ "$OPENDHT_TEST_JOB" == *"opendht.classic"* ]]; then
+      docker build -t opendht -f docker/DockerfileTravis .;
+    fi
+
+  - |
+    # proxy builds
+    if [[ "$OPENDHT_TEST_JOB" != *"opendht.llvm"* ]] && [[ "$OPENDHT_TEST_JOB" != *"opendht.classic"* ]]; then
+      docker build -t opendht-proxy -f docker/DockerfileTravisProxy .;
+      options='-DOPENDHT_SANITIZE=On ';
+      if [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyserver"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.push"* ]]; then
+        options+='-DOPENDHT_PROXY_SERVER=ON ';
+      else
+        options+='-DOPENDHT_PROXY_SERVER=OFF ';
+      fi
+      if [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyclient"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.push"* ]]; then
+        options+='-DOPENDHT_PROXY_CLIENT=ON ';
+      else
+        options+='-DOPENDHT_PROXY_CLIENT=OFF ';
+      fi
+      if [[ "$OPENDHT_TEST_JOB" == *"opendht.push"* ]]; then
+        options+='-DOPENDHT_PUSH_NOTIFICATIONS=ON ';
+      else
+        options+='-DOPENDHT_PUSH_NOTIFICATIONS=OFF ';
+      fi
+      docker run opendht-proxy /bin/sh -c "cd /root/opendht && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=ON -DOPENDHT_LTO=ON -DOPENDHT_TESTS=ON $options .. && make -j8 && ./opendht_unit_tests && make install";
+    fi
+
+  - |
+    # llvm build
+    if [[ "$OPENDHT_TEST_JOB" == *"opendht.llvm"* ]]; then
+      docker build -f docker/DockerfileTravisLlvm .
+    fi
+
+notifications:
+  email:
+      - adrien.beraud@savoirfairelinux.com

.vscode/launch.json

@@ -1,54 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "dhtnode",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/build_dev/tools/dhtnode",
-            "args": ["-v", "-p", "4222"],
-            "cwd": "${workspaceFolder}/build_dev",
-            "environment": [],
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ],
-            "preLaunchTask": "build",
-            "linux": {
-                "MIMode": "gdb",
-                "externalConsole": false,
-              },
-              "osx": {
-                "MIMode": "lldb",
-                "externalConsole": true,
-              },
-        },
-        {
-            "name": "tests",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/build_dev/opendht_unit_tests",
-            "cwd": "${workspaceFolder}/build_dev",
-            "environment": [],
-            "setupCommands": [
-                {
-                    "description": "Enable pretty-printing for gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ],
-            "preLaunchTask": "build",
-            "linux": {
-                "MIMode": "gdb",
-                "externalConsole": false,
-            },
-            "osx": {
-                "MIMode": "lldb",
-                "externalConsole": true,
-            },
-        }
-    ]
-}

.vscode/tasks.json

@@ -1,46 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build",
-            "type": "shell",
-            "options": {
-                "cwd": "${workspaceRoot}/build_dev"
-            },
-            "command": "make",
-            "args": ["-j4"],
-            "dependsOn": "cmake"
-        },
-        {
-            "label": "cmake",
-            "type": "shell",
-            "options": {
-                "cwd": "${workspaceRoot}/build_dev"
-            },
-            "command": "cmake",
-            "args": [
-                "${workspaceRoot}",
-                "-DCMAKE_EXPORT_COMPILE_COMMANDS=On",
-                "-DCMAKE_BUILD_TYPE=Debug",
-                "-DOPENDHT_SANITIZE=On",
-                "-DOPENDHT_PROXY_CLIENT=On",
-                "-DOPENDHT_PROXY_SERVER=On",
-                "-DOPENDHT_TESTS=On",
-                "-DOPENDHT_C=On"
-            ],
-            "dependsOn": "builddir"
-        },
-        {
-            "label": "builddir",
-            "type": "shell",
-            "options": {
-                "cwd": "${workspaceRoot}"
-            },
-            "command": "mkdir",
-            "args": [
-                "-p",
-                "${workspaceRoot}/build_dev"
-            ]
-        },
-    ]
-}

CMakeLists.txt

@@ -1,84 +1,70 @@
-cmake_minimum_required (VERSION 3.10..3.20)
-if(POLICY CMP0073)
-  cmake_policy(SET CMP0073 NEW)
-endif()
-if(POLICY CMP0074)
-  cmake_policy(SET CMP0074 NEW)
-endif()
+cmake_minimum_required (VERSION 3.1)
 project (opendht)
 
 include(CMakePackageConfigHelpers)
 include(CMakeDependentOption)
-include(CheckIncludeFileCXX)
 include(FindPkgConfig)
 include(cmake/CheckAtomic.cmake)
-include(CTest)
 
-set (opendht_VERSION_MAJOR 3)
-set (opendht_VERSION_MINOR 1.4)
+set (opendht_VERSION_MAJOR 2)
+set (opendht_VERSION_MINOR 2.0)
 set (opendht_VERSION ${opendht_VERSION_MAJOR}.${opendht_VERSION_MINOR})
 set (PACKAGE_VERSION ${opendht_VERSION})
 set (VERSION "${opendht_VERSION}")
 
 # Options
-option (BUILD_SHARED_LIBS "Build shared library" ON)
-CMAKE_DEPENDENT_OPTION (OPENDHT_STATIC "Build static library" OFF BUILD_SHARED_LIBS ON)
+option (OPENDHT_STATIC "Build static library" ON)
+option (OPENDHT_SHARED "Build shared library" ON)
+option (OPENDHT_LOG "Build with logs" ON)
 option (OPENDHT_PYTHON "Build Python bindings" OFF)
 option (OPENDHT_TOOLS "Build DHT tools" ON)
 option (OPENDHT_SYSTEMD "Install systemd module" OFF)
 option (OPENDHT_SYSTEMD_UNIT_FILE_LOCATION "Where to install systemd unit file")
+option (OPENDHT_ARGON2 "Use included argon2 sources" OFF)
+option (OPENDHT_LTO "Build with LTO" OFF)
 option (OPENDHT_SANITIZE "Build with address sanitizer and stack protector" OFF)
 option (OPENDHT_PROXY_SERVER "Enable DHT proxy server, use Restinio and jsoncpp" OFF)
 option (OPENDHT_PUSH_NOTIFICATIONS "Enable push notifications support" OFF)
 option (OPENDHT_PROXY_SERVER_IDENTITY "Allow clients to use the node identity" OFF)
 option (OPENDHT_PROXY_CLIENT "Enable DHT proxy client, use Restinio and jsoncpp" OFF)
 option (OPENDHT_PROXY_OPENSSL "Build DHT proxy with OpenSSL" ON)
+option (OPENDHT_PROXY_HTTP_PARSER_FORK "Build DHT proxy with custom http_parser to support old API" OFF)
 CMAKE_DEPENDENT_OPTION(OPENDHT_HTTP "Build embedded http(s) client" OFF "NOT OPENDHT_PROXY_SERVER;NOT OPENDHT_PROXY_CLIENT" ON)
 option (OPENDHT_PEER_DISCOVERY "Enable multicast peer discovery" ON)
 option (OPENDHT_INDEX "Build DHT indexation feature" OFF)
+option (OPENDHT_TESTS "Add unit tests executable" OFF)
 option (OPENDHT_TESTS_NETWORK "Enable unit tests that require network access" ON)
 option (OPENDHT_C "Build C bindings" OFF)
 
 find_package(Doxygen)
 option (OPENDHT_DOCUMENTATION "Create and install the HTML based API documentation (requires Doxygen)" ${DOXYGEN_FOUND})
 
-# Build flags
-set (CMAKE_CXX_STANDARD 17)
-set (CMAKE_CXX_STANDARD_REQUIRED on)
-
 # Dependencies
-if (NOT HAVE_CXX_ATOMICS_WITHOUT_LIB
-        # For ARM EABI (armel), little-endian MIPS (mipsel), etc.
-        OR NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-    link_libraries (atomic)
-endif ()
-
 list (APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 if (NOT MSVC)
     set (THREADS_PREFER_PTHREAD_FLAG TRUE)
     find_package (Threads)
     find_package (PkgConfig REQUIRED)
-    pkg_search_module (GnuTLS REQUIRED IMPORTED_TARGET gnutls)
-    pkg_search_module (Nettle REQUIRED IMPORTED_TARGET nettle)
-    check_include_file_cxx(msgpack.hpp HAVE_MSGPACKCXX)
-    if (NOT HAVE_MSGPACKCXX)
-        find_package(msgpack QUIET CONFIG NAMES msgpack msgpackc-cxx)
-        if (NOT msgpack_FOUND)
-            find_package(msgpack REQUIRED CONFIG NAMES msgpack-cxx)
-            set(MSGPACK_TARGET "msgpack-cxx")
-        else()
-            set(MSGPACK_TARGET "msgpackc-cxx")
-        endif()
-    endif()
+    find_package (GnuTLS 3.3 REQUIRED)
+    pkg_search_module (Nettle nettle)
+    find_package (Msgpack 1.2 REQUIRED)
     if (OPENDHT_TOOLS)
         find_package (Readline 6 REQUIRED)
     endif ()
-    pkg_search_module(argon2 REQUIRED IMPORTED_TARGET libargon2)
-    set(argon2_lib ", libargon2")
-    pkg_search_module(Jsoncpp IMPORTED_TARGET jsoncpp)
+    if (NOT OPENDHT_ARGON2)
+        pkg_search_module(argon2 libargon2)
+        if (argon2_FOUND)
+            message("-- Found Argon2: " ${argon2_LIBRARY_DIRS} " (found version \"" ${argon2_VERSION} "\")")
+            link_directories (${argon2_LIBRARY_DIRS})
+        else ()
+            message("Argon2 not found, using included version.")
+            set(OPENDHT_ARGON2 ON)
+        endif()
+    endif ()
+
+    pkg_search_module(Jsoncpp jsoncpp)
     if (Jsoncpp_FOUND)
         add_definitions(-DOPENDHT_JSONCPP)
-        set(jsoncpp_lib ", jsoncpp")
         list (APPEND opendht_SOURCES
           src/base64.h
           src/base64.cpp
@@ -89,26 +75,29 @@ if (NOT MSVC)
         find_path(ASIO_INCLUDE_DIR asio.hpp REQUIRED)
     endif ()
 
-    find_package(fmt)
-
     if (OPENDHT_HTTP)
         find_package(Restinio REQUIRED)
+        find_library(FMT_LIBRARY fmt)
+        add_library(fmt SHARED IMPORTED)
         find_library(HTTP_PARSER_LIBRARY http_parser)
         add_library(http_parser SHARED IMPORTED)
-        set(http_parser_lib "-lhttp_parser")
         if (NOT Jsoncpp_FOUND)
             message(SEND_ERROR "Jsoncpp is required for DHT proxy support")
         endif()
         if (OPENDHT_PROXY_OPENSSL)
             # https://cmake.org/cmake/help/latest/module/FindOpenSSL.html
-            pkg_search_module(OPENSSL REQUIRED IMPORTED_TARGET openssl)
+            pkg_search_module(OPENSSL REQUIRED openssl)
             if (OPENSSL_FOUND)
                 message(STATUS "Found OpenSSL ${OPENSSL_VERSION} ${OPENSSL_INCLUDE_DIRS}")
-                set(openssl_lib ", openssl")
+                include_directories(SYSTEM ${OPENSSL_INCLUDE_DIRS})
+                link_directories (${OPENSSL_LIBRARY_DIRS})
             else ()
                 message(SEND_ERROR "OpenSSL is required for DHT proxy as specified")
             endif()
         endif()
+        if (OPENDHT_PROXY_HTTP_PARSER_FORK)
+            add_definitions(-DOPENDHT_PROXY_HTTP_PARSER_FORK)
+        endif()
     else ()
         set(OPENDHT_PROXY_OPENSSL OFF)
     endif ()
@@ -138,11 +127,14 @@ if (OPENDHT_HTTP OR OPENDHT_PEER_DISCOVERY)
     add_definitions(-DASIO_STANDALONE)
 endif()
 
+# Build flags
+set (CMAKE_CXX_STANDARD 14)
+set (CMAKE_CXX_STANDARD_REQUIRED on)
+
 if (NOT MSVC)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type -Wno-deprecated -Wall -Wextra -Wnon-virtual-dtor -pedantic-errors -fvisibility=hidden")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -pedantic-errors -fvisibility=hidden")
     if (OPENDHT_SANITIZE)
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fstack-protector-strong")
-        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fstack-protector-strong")
     endif ()
 else ()
     add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS
@@ -154,16 +146,47 @@ else ()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DISABLE_MSC_WARNINGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 endif ()
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMSGPACK_NO_BOOST -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT")
 
+if (NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif ()
 add_definitions(-DPACKAGE_VERSION="${opendht_VERSION}")
+if (OPENDHT_LOG)
+    add_definitions(-DOPENDHT_LOG=true)
+else ()
+    add_definitions(-DOPENDHT_LOG=false)
+endif()
+if (OPENDHT_LTO AND NOT MSVC)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
+    if (CMAKE_COMPILER_IS_GNUCC)
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-linker-plugin")
+        set (CMAKE_AR        "gcc-ar")
+        set (CMAKE_NM        "gcc-nm")
+        set (CMAKE_RANLIB    "gcc-ranlib")
+    endif ()
+endif ()
 
+if (MSGPACK_INCLUDE_DIRS)
+    include_directories (SYSTEM "${MSGPACK_INCLUDE_DIRS}")
+endif ()
+if (GNUTLS_INCLUDE_DIRS)
+    include_directories (SYSTEM "${GNUTLS_INCLUDE_DIRS}")
+endif ()
+if (Nettle_INCLUDE_DIRS)
+    include_directories (SYSTEM "${Nettle_INCLUDE_DIRS}")
+endif ()
 if (ASIO_INCLUDE_DIR)
     include_directories (SYSTEM "${ASIO_INCLUDE_DIR}")
 endif ()
 if (Restinio_INCLUDE_DIR)
     include_directories (SYSTEM "${Restinio_INCLUDE_DIR}")
 endif ()
+if (Jsoncpp_INCLUDE_DIRS)
+    include_directories (SYSTEM "${Jsoncpp_INCLUDE_DIRS}")
+endif ()
+link_directories (${Nettle_LIBRARY_DIRS})
+link_directories (${Jsoncpp_LIBRARY_DIRS})
 include_directories (
     ./
     include/
@@ -175,8 +198,8 @@ include_directories (
 include (GNUInstallDirs)
 set (prefix ${CMAKE_INSTALL_PREFIX})
 set (exec_prefix "\${prefix}")
-set (libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
-set (includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+set (libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
+set (includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
 set (bindir "${CMAKE_INSTALL_FULL_BINDIR}")
 set (sysconfdir "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
 set (top_srcdir "${CMAKE_CURRENT_SOURCE_DIR}")
@@ -184,6 +207,7 @@ set (top_srcdir "${CMAKE_CURRENT_SOURCE_DIR}")
 # Sources
 list (APPEND opendht_SOURCES
     src/utils.cpp
+    src/infohash.cpp
     src/crypto.cpp
     src/default_types.cpp
     src/node.cpp
@@ -229,7 +253,7 @@ list (APPEND opendht_HEADERS
     include/opendht/rate_limiter.h
     include/opendht/securedht.h
     include/opendht/log.h
-    include/opendht/logger.h
+    include/opendht/log_enable.h
     include/opendht/thread_pool.h
     include/opendht/network_utils.h
     include/opendht.h
@@ -290,13 +314,46 @@ if (OPENDHT_HTTP)
   )
 endif ()
 
+if(OPENDHT_ARGON2)
+    # make sure argon2 submodule is up to date and initialized
+    message("Initializing Argon2 submodule")
+    execute_process(COMMAND git submodule update --init)
+
+    # add local argon2 files to build
+    list (APPEND opendht_SOURCES
+        argon2/src/argon2.c
+        argon2/src/core.c
+        argon2/src/blake2/blake2b.c
+        argon2/src/thread.c
+        argon2/src/ref.c
+        argon2/src/encoding.c
+    )
+    include_directories(argon2/include/)
+endif()
+
 if (MSVC)
     list (APPEND opendht_HEADERS src/compat/msvc/unistd.h)
 endif ()
 
 # Targets
-if (MSVC)
-    if (OPENDHT_STATIC)
+if (OPENDHT_STATIC)
+    if (NOT MSVC)
+        add_library (opendht-static STATIC
+            ${opendht_SOURCES}
+            ${opendht_HEADERS}
+        )
+        set_target_properties (opendht-static PROPERTIES OUTPUT_NAME "opendht")
+        if (OPENDHT_ARGON2)
+            target_include_directories(opendht-static SYSTEM PRIVATE argon2)
+        else ()
+            target_include_directories(opendht-static SYSTEM PRIVATE ${argon2_INCLUDE_DIRS})
+        endif ()
+        target_link_libraries(opendht-static
+            PRIVATE  ${argon2_LIBRARIES}
+            PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_STATIC_LIBRARIES}
+                   ${Jsoncpp_STATIC_LIBRARIES} ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY}
+                   ${OPENSSL_STATIC_LIBRARIES})
+    else ()
         if (OPENDHT_TOOLS)
             function (add_obj_lib name libfile)
                 add_library(${name} OBJECT IMPORTED)
@@ -335,63 +392,61 @@ if (MSVC)
                 ${PROJECT_SOURCE_DIR}/../openssl/libcrypto.lib
             )
         endif ()
+        add_library (opendht-static STATIC
+            ${opendht_SOURCES}
+            ${opendht_HEADERS}
+            ${obj_libs}
+        )
+        target_link_libraries(opendht-static PUBLIC ${Win32_STATIC_LIBRARIES} ${Win32_IMPORT_LIBRARIES})
         set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4006")
+        set_target_properties (opendht-static PROPERTIES OUTPUT_NAME "libopendht")
     endif()
+    install (TARGETS opendht-static DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
 endif ()
 
-add_library (opendht
-    ${opendht_SOURCES}
-    ${opendht_HEADERS}
-    ${obj_libs}
-)
-set_target_properties (opendht PROPERTIES OUTPUT_NAME "opendht")
-
-if (NOT HAVE_MSGPACKCXX)
-    target_link_libraries(opendht PUBLIC ${MSGPACK_TARGET})
-endif()
-if (APPLE)
-    target_link_libraries(opendht PRIVATE "-framework CoreFoundation" "-framework Security")
-endif()
-if (MSVC)
-    if (OPENDHT_STATIC)
-        target_link_libraries(opendht PUBLIC ${Win32_STATIC_LIBRARIES} ${Win32_IMPORT_LIBRARIES})
-        set_target_properties (opendht PROPERTIES OUTPUT_NAME "libopendht")
-    endif()
-else()
-    target_link_libraries(opendht
-        PRIVATE
-            PkgConfig::argon2
-            PkgConfig::Nettle
-            ${HTTP_PARSER_LIBRARY}
-        PUBLIC
-            ${CMAKE_THREAD_LIBS_INIT}
-            PkgConfig::GnuTLS
-            fmt::fmt
+if (OPENDHT_SHARED)
+    add_library (opendht SHARED
+        ${opendht_SOURCES}
+        ${opendht_HEADERS}
     )
-    if (Jsoncpp_FOUND)
-        target_link_libraries(opendht PUBLIC PkgConfig::Jsoncpp)
-    endif()
-    if (OPENDHT_PROXY_OPENSSL)
-        target_link_libraries(opendht PUBLIC PkgConfig::OPENSSL)
-    endif()
-endif()
-
-if (BUILD_SHARED_LIBS)
     set_target_properties (opendht PROPERTIES IMPORT_SUFFIX "_import.lib")
     set_target_properties (opendht PROPERTIES SOVERSION ${opendht_VERSION_MAJOR} VERSION ${opendht_VERSION})
     target_compile_definitions(opendht PRIVATE OPENDHT_BUILD)
+    if (OPENDHT_ARGON2)
+        target_include_directories(opendht SYSTEM PRIVATE argon2)
+    else ()
+        target_link_libraries(opendht PRIVATE ${argon2_LIBRARIES})
+        target_include_directories(opendht SYSTEM PRIVATE ${argon2_INCLUDE_DIRS})
+    endif ()
+    if (APPLE)
+        target_link_libraries(opendht
+            PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES}
+            PRIVATE ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES}
+                    ${Jsoncpp_LIBRARIES}
+                    ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY}
+            SYSTEM "-framework CoreFoundation" "-framework Security")
+    else ()
+        target_link_libraries(opendht
+            PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES}
+            PRIVATE ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES}
+                    ${Jsoncpp_LIBRARIES}
+                    ${FMT_LIBRARY} ${HTTP_PARSER_LIBRARY})
+    endif ()
+
+    install (TARGETS opendht DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
 endif ()
-install (TARGETS opendht DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
 
 if (OPENDHT_C)
-    add_library (opendht-c
+    add_library (opendht-c SHARED
         c/opendht.cpp
         c/opendht_c.h
     )
     target_compile_definitions(opendht-c PRIVATE OPENDHT_C_BUILD)
-    target_link_libraries(opendht-c PRIVATE opendht)
-    set_target_properties (opendht-c PROPERTIES SOVERSION ${opendht_VERSION_MAJOR} VERSION ${opendht_VERSION})
-    install (TARGETS opendht-c DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht-c)
+    if (OPENDHT_SHARED)
+        target_link_libraries(opendht-c opendht)
+    else ()
+        target_link_libraries(opendht-c opendht-static)
+    endif ()
 
     # PkgConfig module
     configure_file (
@@ -399,8 +454,8 @@ if (OPENDHT_C)
         opendht-c.pc
         @ONLY
     )
+    install (TARGETS opendht-c DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht-c)
     install (FILES ${CMAKE_CURRENT_BINARY_DIR}/opendht-c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-    install (FILES c/opendht_c.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/opendht)
 endif ()
 
 if (OPENDHT_TOOLS)
@@ -431,8 +486,8 @@ install (EXPORT opendht DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/opendht FILE o
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/opendhtConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/opendht)
 
 # Unit tests
-if (BUILD_TESTING AND NOT MSVC)
-    pkg_search_module(Cppunit REQUIRED IMPORTED_TARGET cppunit)
+if (OPENDHT_TESTS)
+    pkg_search_module(Cppunit REQUIRED cppunit)
     # unit testing
     list (APPEND test_FILES
         tests/infohashtester.h
@@ -466,10 +521,22 @@ if (BUILD_TESTING AND NOT MSVC)
         tests/tests_runner.cpp
         ${test_FILES}
     )
-    target_link_libraries(opendht_unit_tests PRIVATE
-       opendht
+    target_include_directories(opendht_unit_tests SYSTEM PRIVATE ${Cppunit_INCLUDE_DIR})
+    target_link_directories(opendht_unit_tests PRIVATE ${Cppunit_LIBRARY_DIRS})
+    if (OPENDHT_SHARED)
+        target_link_libraries(opendht_unit_tests opendht)
+    else ()
+        target_link_libraries(opendht_unit_tests opendht-static)
+    endif ()
+    target_link_libraries(opendht_unit_tests
        ${CMAKE_THREAD_LIBS_INIT}
-       PkgConfig::Cppunit
+       ${Cppunit_LIBRARIES}
+       ${GNUTLS_LIBRARIES}
+       ${Jsoncpp_LIBRARIES}
     )
+    if (OPENDHT_PROXY_OPENSSL)
+        target_link_libraries(opendht_unit_tests ${OPENSSL_LIBRARIES})
+    endif()
+    enable_testing()
     add_test(TEST opendht_unit_tests)
 endif()

Makefile.am

@@ -4,10 +4,6 @@ SUBDIRS =
 
 SUBDIRS += src
 
-if ENABLE_C
-SUBDIRS += c
-endif
-
 if ENABLE_TOOLS
 SUBDIRS += tools
 endif

README.md

@@ -4,7 +4,7 @@
     <a id="user-content-opendht-" class="anchor" href="/savoirfairelinux/opendht/blob/master/README.md#opendht-" aria-hidden="true"></a>OpenDHT
 </h1>
 
-A lightweight C++17 Distributed Hash Table implementation.
+A lightweight C++14 Distributed Hash Table implementation.
 
 OpenDHT provides an easy to use distributed in-memory data store.
 Every node in the network can read and write values to the store.
@@ -14,22 +14,22 @@ Values are distributed over the network, with redundancy.
  * High resilience to network disruption
  * Public key cryptography layer providing optional data signature and encryption (using GnuTLS)
  * IPv4 and IPv6 support
- * Clean and powerful **C++17** map API
+ * Clean and powerful **C++14** map API
  * Bindings for **C, Rust & Python 3**
  * REST API with optional HTTP client+server with push notification support
 
 ## Documentation
 See the wiki: <https://github.com/savoirfairelinux/opendht/wiki>
 
-#### How to run a node
-
-You can help contributing to the public network by running a stable node with a public IP address.
-https://github.com/savoirfairelinux/opendht/wiki/Running-a-node-with-dhtnode
-
 #### How-to build and install
 
 Build instructions: <https://github.com/savoirfairelinux/opendht/wiki/Build-the-library>
 
+#### How-to build a simple client app
+```bash
+g++ main.cpp -std=c++14 -lopendht
+```
+
 ## Examples
 ### C++ example
 The `tools` directory includes simple example programs :
@@ -96,18 +96,17 @@ for r in results:
 - msgpack-c 1.2+, used for data serialization.
 - GnuTLS 3.3+, used for cryptographic operations.
 - Nettle 2.4+, a GnuTLS dependency for crypto.
-- {fmt} 9.0+, for log formatting.
 - (optional) restinio used for the REST API.
 - (optional) jsoncpp 1.7.4-3+, used for the REST API.
-- Build tested with GCC 7+ (GNU/Linux, Windows with MinGW), Clang/LLVM (GNU/Linux, Android, macOS, iOS).
-- Build tested with Microsoft Visual Studio 2019, 2022
+- Build tested with GCC 5.2+ (GNU/Linux, Windows with MinGW), Clang/LLVM (GNU/Linux, Android, macOS, iOS).
+- Build tested with Microsoft Visual Studio 2015, 2017, 2019
 
 ## Contact
 
-IRC: join us on Libera.chat at [`#opendht`](https://web.libera.chat/#opendht).
+IRC: join us on Freenode at [`#opendht`](https://webchat.freenode.net/?channels=%23opendht).
 
 ## License
-Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+Copyright (C) 2014-2020 Savoir-faire Linux Inc.
 
 OpenDHT is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
 
@@ -118,3 +117,6 @@ See COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html for the full GPLv3 l
 ## Acknowledgements
 This project was originally based on https://github.com/jech/dht by Juliusz Chroboczek.
 It is independent from another project called OpenDHT (Sean Rhea. Ph.D. Thesis, 2005), now extinct.
+
+## Donations
+We gratefully accept Bitcoin donations to support OpenDHT development at: `bitcoin:3EykSd1An888efq4Bq3KaV3hJ3JQ4FPnwm`.

autogen.sh

@@ -1 +1,2 @@
+git submodule update --init
 autoreconf --install --verbose -Wall

c/Makefile.am

@@ -1,15 +0,0 @@
-lib_LTLIBRARIES = libopendht-c.la
-noinst_HEADERS = opendht_c.h
-
-AM_CPPFLAGS = -DOPENDHT_C_BUILD -isystem @top_srcdir@/include @JsonCpp_CFLAGS@ @MsgPack_CFLAGS@
-if OPENDHT_SHARED
-AM_CPPFLAGS += -Dopendht_c_EXPORTS
-endif
-
-libopendht_c_la_LIBADD = $(LIBOBJS) ../src/.libs/libopendht.la
-
-libopendht_c_la_SOURCES  = \
-        opendht.cpp
-
-nobase_include_HEADERS = \
-        opendht_c.h

c/opendht.cpp

@@ -1,25 +1,5 @@
-/*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
- *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
 #include "opendht_c.h"
-
-#include <opendht.h>
-#include <opendht/log.h>
+#include "opendht.h"
 
 using ValueSp = std::shared_ptr<dht::Value>;
 using PrivkeySp = std::shared_ptr<dht::crypto::PrivateKey>;
@@ -30,13 +10,6 @@ using CertSp = std::shared_ptr<dht::crypto::Certificate>;
 extern "C" {
 #endif
 
-#include <errno.h>
-
-const char* dht_version()
-{
-    return dht::version();
-}
-
 // dht::InfoHash
 
 inline dht_infohash dht_infohash_to_c(const dht::InfoHash& h) {
@@ -76,11 +49,7 @@ bool dht_infohash_is_zero(const dht_infohash* h) {
 }
 
 void dht_infohash_from_hex(dht_infohash* h, const char* dat) {
-    *h = dht_infohash_to_c(dht::InfoHash(std::string_view(dat, HASH_LEN*2)));
-}
-
-void dht_infohash_from_hex_null(dht_infohash* h, const char* dat) {
-    *h = dht_infohash_to_c(dht::InfoHash(std::string_view(dat)));
+    *h = dht_infohash_to_c(dht::InfoHash(std::string(dat, HASH_LEN*2)));
 }
 
 const char* dht_pkid_print(const dht_pkid* h) {
@@ -128,20 +97,10 @@ const char* dht_value_get_user_type(const dht_value* data) {
     return vsp->user_type.c_str();
 }
 
-void dht_value_set_user_type(dht_value* data, const char* user_type) {
-    (*reinterpret_cast<ValueSp*>(data))->user_type = user_type;
-}
-
 dht_value* dht_value_new(const uint8_t* data, size_t size) {
     return reinterpret_cast<dht_value*>(new ValueSp(std::make_shared<dht::Value>(data, size)));
 }
 
-dht_value* dht_value_new_from_string(const char* str) {
-    ValueSp value = std::make_shared<dht::Value>((const uint8_t*)str, strlen(str));
-    value->user_type = "text/plain";
-    return reinterpret_cast<dht_value*>(new ValueSp(std::move(value)));
-}
-
 dht_value* dht_value_ref(const dht_value* v) {
     return reinterpret_cast<dht_value*>(new ValueSp(*reinterpret_cast<const ValueSp*>(v)));
 }
@@ -185,13 +144,9 @@ bool dht_publickey_check_signature(const dht_publickey* pk, const char* data, si
 
 dht_blob* dht_publickey_encrypt(const dht_publickey* pk, const char* data, size_t data_size) {
     const auto& pkey = *reinterpret_cast<const PubkeySp*>(pk);
-    try {
-        auto rdata = std::make_unique<dht::Blob>();
-        *rdata = pkey->encrypt((const uint8_t*)data, data_size);
-        return (dht_blob*)rdata.release();
-    } catch (...) {
-        return nullptr;
-    }
+    auto rdata = new dht::Blob;
+    *rdata = pkey->encrypt((const uint8_t*)data, data_size);
+    return (dht_blob*)rdata;
 }
 
 // dht::crypto::PrivateKey
@@ -218,18 +173,7 @@ int dht_privatekey_export(const dht_privatekey* k, char* out, size_t* out_size,
 
 dht_publickey* dht_privatekey_get_publickey(const dht_privatekey* k) {
     const auto& key = *reinterpret_cast<const PrivkeySp*>(k);
-    return reinterpret_cast<dht_publickey*>(new PubkeySp(key->getSharedPublicKey()));
-}
-
-dht_blob* dht_privatekey_decrypt(const dht_privatekey* k, const char* data, size_t data_size) {
-    const auto& key = *reinterpret_cast<const PrivkeySp*>(k);
-    try {
-        auto rdata = std::make_unique<dht::Blob>();
-        *rdata = key->decrypt((const uint8_t*)data, data_size);
-        return (dht_blob*)rdata.release();
-    } catch (...) {
-        return nullptr;
-    }
+    return reinterpret_cast<dht_publickey*>(new PubkeySp(std::make_shared<dht::crypto::PublicKey>(key->getPublicKey())));
 }
 
 void dht_privatekey_delete(dht_privatekey* pk) {
@@ -261,7 +205,7 @@ dht_pkid dht_certificate_get_long_id(const dht_certificate* c) {
 
 dht_publickey* dht_certificate_get_publickey(const dht_certificate* c) {
     const auto& cert = *reinterpret_cast<const CertSp*>(c);
-    return reinterpret_cast<dht_publickey*>(new PubkeySp(cert->getSharedPublicKey()));
+    return reinterpret_cast<dht_publickey*>(new PubkeySp(std::make_shared<dht::crypto::PublicKey>(cert->getPublicKey())));
 }
 
 // dht::crypto::Identity
@@ -303,7 +247,7 @@ void dht_runner_config_default(dht_runner_config* config) {
 }
 
 // dht::DhtRunner
-dht_runner* dht_runner_new(void) {
+dht_runner* dht_runner_new() {
     return reinterpret_cast<dht_runner*>(new dht::DhtRunner);
 }
 
@@ -311,62 +255,39 @@ void dht_runner_delete(dht_runner* runner) {
     delete reinterpret_cast<dht::DhtRunner*>(runner);
 }
 
-int dht_runner_run(dht_runner* r, in_port_t port) {
+void dht_runner_run(dht_runner* r, in_port_t port) {
     auto runner = reinterpret_cast<dht::DhtRunner*>(r);
-    try {
-        runner->run(port, {}, true);
-    } catch(...) {
-        return ENOTCONN;
-    }
-    return 0;
+    runner->run(port, {}, true);
 }
 
-int dht_runner_run_config(dht_runner* r, in_port_t port, const dht_runner_config* conf) {
+void dht_runner_run_config(dht_runner* r, in_port_t port, const dht_runner_config* conf) {
     auto runner = reinterpret_cast<dht::DhtRunner*>(r);
-    try {
-        dht::DhtRunner::Config config;
-        config.dht_config.node_config.is_bootstrap = conf->dht_config.node_config.is_bootstrap;
-        config.dht_config.node_config.maintain_storage = conf->dht_config.node_config.maintain_storage;
-        config.dht_config.node_config.node_id = *reinterpret_cast<const dht::InfoHash*>(&conf->dht_config.node_config.node_id);
-        config.dht_config.node_config.network = conf->dht_config.node_config.network;
-        config.dht_config.node_config.persist_path = conf->dht_config.node_config.persist_path
-            ? std::string(conf->dht_config.node_config.persist_path) : std::string{};
+    dht::DhtRunner::Config config;
+    config.dht_config.node_config.is_bootstrap = conf->dht_config.node_config.is_bootstrap;
+    config.dht_config.node_config.maintain_storage = conf->dht_config.node_config.maintain_storage;
+    config.dht_config.node_config.node_id = *reinterpret_cast<const dht::InfoHash*>(&conf->dht_config.node_config.node_id);
+    config.dht_config.node_config.network = conf->dht_config.node_config.network;
+    config.dht_config.node_config.persist_path = conf->dht_config.node_config.persist_path
+        ? std::string(conf->dht_config.node_config.persist_path) : std::string{};
 
-        if (conf->dht_config.id.privatekey)
-            config.dht_config.id.first = *reinterpret_cast<const PrivkeySp*>(conf->dht_config.id.privatekey);
+    if (conf->dht_config.id.privatekey)
+        config.dht_config.id.first = *reinterpret_cast<const PrivkeySp*>(conf->dht_config.id.privatekey);
 
-        if (conf->dht_config.id.certificate)
-            config.dht_config.id.second = *reinterpret_cast<const CertSp*>(conf->dht_config.id.certificate);
+    if (conf->dht_config.id.certificate)
+        config.dht_config.id.second = *reinterpret_cast<const CertSp*>(conf->dht_config.id.certificate);
 
-        config.threaded = conf->threaded;
-        config.proxy_server = conf->proxy_server ? std::string(conf->proxy_server) : std::string{};
-        config.push_node_id = conf->push_node_id ? std::string(conf->push_node_id) : std::string{};
-        config.push_token = conf->push_token ? std::string(conf->push_token) : std::string{};
-        config.push_topic = conf->push_topic ? std::string(conf->push_topic) : std::string{};
-        config.push_platform = conf->push_platform ? std::string(conf->push_platform) : std::string{};
-        config.peer_discovery = conf->peer_discovery;
-        config.peer_publish = conf->peer_publish;
-
-        dht::DhtRunner::Context context;
-        if (conf->log) {
-            context.logger = dht::log::getStdLogger();
-        }
-        runner->run(port, config, std::move(context));
-    } catch(...) {
-        return ENOTCONN;
-    }
-    return 0;
+    config.threaded = conf->threaded;
+    config.proxy_server = conf->proxy_server ? std::string(conf->proxy_server) : std::string{};
+    config.push_node_id = conf->push_node_id ? std::string(conf->push_node_id) : std::string{};
+    config.push_token = conf->push_token ? std::string(conf->push_token) : std::string{};
+    config.peer_discovery = conf->peer_discovery;
+    config.peer_publish = conf->peer_publish;
+    runner->run(port, config);
 }
 
-void dht_runner_ping(dht_runner* r, struct sockaddr* addr, socklen_t addr_len, dht_done_cb done_cb, void* cb_user_data) {
+void dht_runner_ping(dht_runner* r, struct sockaddr* addr, socklen_t addr_len) {
     auto runner = reinterpret_cast<dht::DhtRunner*>(r);
-    if (done_cb) {
-        runner->bootstrap(dht::SockAddr(addr, addr_len), [done_cb, cb_user_data](bool ok){
-            done_cb(ok, cb_user_data);
-        });
-    } else {
-        runner->bootstrap(dht::SockAddr(addr, addr_len));
-    }
+    runner->bootstrap(dht::SockAddr(addr, addr_len));
 }
 
 void dht_runner_bootstrap(dht_runner* r, const char* host, const char* service) {
@@ -405,11 +326,8 @@ dht_op_token* dht_runner_listen(dht_runner* r, const dht_infohash* h, dht_value_
     auto runner = reinterpret_cast<dht::DhtRunner*>(r);
     auto hash = reinterpret_cast<const dht::InfoHash*>(h);
     auto fret = new std::future<size_t>;
-    *fret = runner->listen(*hash, [
-        cb,
-        cb_user_data,
-        guard = done_cb ? std::make_shared<ScopeGuardCb>(done_cb, cb_user_data) : std::shared_ptr<ScopeGuardCb>{}
-    ](const std::vector<std::shared_ptr<dht::Value>>& values, bool expired) {
+    auto guard = done_cb ? std::make_shared<ScopeGuardCb>(done_cb, cb_user_data) : std::shared_ptr<ScopeGuardCb>{};
+    *fret = runner->listen(*hash, [cb,cb_user_data, guard](const std::vector<std::shared_ptr<dht::Value>>& values, bool expired) {
         for (const auto& value : values) {
             if (not cb(reinterpret_cast<const dht_value*>(&value), expired, cb_user_data))
                 return false;
@@ -475,17 +393,6 @@ void dht_runner_shutdown(dht_runner* r, dht_shutdown_cb done_cb, void* cb_user_d
     });
 }
 
-bool dht_runner_is_running(const dht_runner* r) {
-    if (not r) return false;
-    auto runner = reinterpret_cast<const dht::DhtRunner*>(r);
-    return runner->isRunning();
-}
-
-in_port_t dht_runner_get_bound_port(const dht_runner* r, sa_family_t af) {
-    auto runner = reinterpret_cast<const dht::DhtRunner*>(r);
-    return runner->getBoundPort(af);
-}
-
 dht_infohash dht_runner_get_node_id(const dht_runner* r) {
     auto runner = reinterpret_cast<const dht::DhtRunner*>(r);
     dht_infohash ret;
@@ -506,8 +413,14 @@ struct sockaddr** dht_runner_get_public_address(const dht_runner* r) {
     if (addrs.empty())
         return nullptr;
     auto ret = (struct sockaddr**)malloc(sizeof(struct sockaddr*) * (addrs.size() + 1));
-    for (size_t i=0; i<addrs.size(); i++)
-        ret[i] = addrs[i].release();
+    for (size_t i=0; i<addrs.size(); i++) {
+        if (auto len = addrs[i].getLength()) {
+            ret[i] = (struct sockaddr*)malloc(len);
+            memcpy((struct sockaddr*)ret[i], addrs[i].get(), len);
+        } else {
+            ret[i] = nullptr;
+        }
+    }
     ret[addrs.size()] = nullptr;
     return ret;
 }

c/opendht_c.h

@@ -1,28 +1,10 @@
-/*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
- *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
 #pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <opendht/def.h>
+#include "def.h"
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <stdbool.h>
@@ -36,8 +18,6 @@ struct OPENDHT_C_PUBLIC dht_data_view {
 };
 typedef struct dht_data_view dht_data_view;
 
-OPENDHT_C_PUBLIC const char* dht_version(void);
-
 // dht::Blob
 struct OPENDHT_C_PUBLIC dht_blob;
 typedef struct dht_blob dht_blob;
@@ -50,7 +30,6 @@ typedef struct dht_infohash dht_infohash;
 OPENDHT_C_PUBLIC void dht_infohash_zero(dht_infohash* h);
 OPENDHT_C_PUBLIC void dht_infohash_random(dht_infohash* h);
 OPENDHT_C_PUBLIC void dht_infohash_from_hex(dht_infohash* h, const char* dat);
-OPENDHT_C_PUBLIC void dht_infohash_from_hex_null(dht_infohash* h, const char* dat);
 OPENDHT_C_PUBLIC void dht_infohash_get(dht_infohash* h, const uint8_t* dat, size_t dat_size);
 OPENDHT_C_PUBLIC void dht_infohash_get_from_string(dht_infohash* h, const char* str);
 OPENDHT_C_PUBLIC const char* dht_infohash_print(const dht_infohash* h);
@@ -79,7 +58,6 @@ OPENDHT_C_PUBLIC dht_privatekey* dht_privatekey_generate(unsigned key_length_bit
 OPENDHT_C_PUBLIC dht_privatekey* dht_privatekey_import(const uint8_t* dat, size_t dat_size, const char* password);
 OPENDHT_C_PUBLIC int dht_privatekey_export(const dht_privatekey*, char* out, size_t* out_size, const char* password);
 OPENDHT_C_PUBLIC dht_publickey* dht_privatekey_get_publickey(const dht_privatekey*);
-OPENDHT_C_PUBLIC dht_blob* dht_privatekey_decrypt(const dht_privatekey*, const char* data, size_t data_size);
 OPENDHT_C_PUBLIC void dht_privatekey_delete(dht_privatekey*);
 
 // dht::crypto::Certificate
@@ -104,7 +82,6 @@ struct OPENDHT_C_PUBLIC dht_value;
 typedef struct dht_value dht_value;
 typedef uint64_t dht_value_id;
 OPENDHT_C_PUBLIC dht_value* dht_value_new(const uint8_t* data, size_t size);
-OPENDHT_C_PUBLIC dht_value* dht_value_new_from_string(const char* str);
 OPENDHT_C_PUBLIC dht_value* dht_value_ref(const dht_value*);
 OPENDHT_C_PUBLIC void dht_value_unref(dht_value*);
 OPENDHT_C_PUBLIC dht_data_view dht_value_get_data(const dht_value* data);
@@ -112,7 +89,6 @@ OPENDHT_C_PUBLIC dht_value_id dht_value_get_id(const dht_value* data);
 OPENDHT_C_PUBLIC dht_publickey* dht_value_get_owner(const dht_value* data);
 OPENDHT_C_PUBLIC dht_infohash dht_value_get_recipient(const dht_value* data);
 OPENDHT_C_PUBLIC const char* dht_value_get_user_type(const dht_value* data);
-OPENDHT_C_PUBLIC void dht_value_set_user_type(dht_value* data, const char* user_type);
 
 // callbacks
 typedef bool (*dht_get_cb)(const dht_value* value, void* user_data);
@@ -146,13 +122,10 @@ struct OPENDHT_PUBLIC dht_runner_config {
     const char* proxy_server;
     const char* push_node_id;
     const char* push_token;
-    const char* push_topic;
-    const char* push_platform;
     bool peer_discovery;
     bool peer_publish;
     dht_certificate* server_ca;
     dht_identity client_identity;
-    bool log;
 };
 typedef struct dht_runner_config dht_runner_config;
 OPENDHT_C_PUBLIC void dht_runner_config_default(dht_runner_config* config);
@@ -160,13 +133,11 @@ OPENDHT_C_PUBLIC void dht_runner_config_default(dht_runner_config* config);
 // dht::DhtRunner
 struct OPENDHT_C_PUBLIC dht_runner;
 typedef struct dht_runner dht_runner;
-OPENDHT_C_PUBLIC dht_runner* dht_runner_new(void);
+OPENDHT_C_PUBLIC dht_runner* dht_runner_new();
 OPENDHT_C_PUBLIC void dht_runner_delete(dht_runner* runner);
-/* Returns 0 on success, standard error code on failure */
-OPENDHT_C_PUBLIC int dht_runner_run(dht_runner* runner, in_port_t port);
-/* Returns 0 on success, standard error code on failure */
-OPENDHT_C_PUBLIC int dht_runner_run_config(dht_runner* runner, in_port_t port, const dht_runner_config* config);
-OPENDHT_C_PUBLIC void dht_runner_ping(dht_runner* runner, struct sockaddr* addr, socklen_t addr_len, dht_done_cb done_cb, void* cb_user_data);
+OPENDHT_C_PUBLIC void dht_runner_run(dht_runner* runner, in_port_t port);
+OPENDHT_C_PUBLIC void dht_runner_run_config(dht_runner* runner, in_port_t port, const dht_runner_config* config);
+OPENDHT_C_PUBLIC void dht_runner_ping(dht_runner* runner, struct sockaddr* addr, socklen_t addr_len);
 OPENDHT_C_PUBLIC void dht_runner_bootstrap(dht_runner* runner, const char* host, const char* service);
 OPENDHT_C_PUBLIC void dht_runner_get(dht_runner* runner, const dht_infohash* hash, dht_get_cb cb, dht_done_cb done_cb, void* cb_user_data);
 OPENDHT_C_PUBLIC dht_op_token* dht_runner_listen(dht_runner* runner, const dht_infohash* hash, dht_value_cb cb, dht_shutdown_cb done_cb, void* cb_user_data);
@@ -178,9 +149,6 @@ OPENDHT_C_PUBLIC void dht_runner_cancel_put(dht_runner* runner, const dht_infoha
 OPENDHT_C_PUBLIC void dht_runner_shutdown(dht_runner* runner, dht_shutdown_cb done_cb, void* cb_user_data);
 OPENDHT_C_PUBLIC dht_infohash dht_runner_get_node_id(const dht_runner* runner);
 OPENDHT_C_PUBLIC dht_infohash dht_runner_get_id(const dht_runner* runner);
-OPENDHT_C_PUBLIC bool dht_runner_is_running(const dht_runner* runner);
-OPENDHT_C_PUBLIC in_port_t dht_runner_get_bound_port(const dht_runner* runner, sa_family_t af);
-/** Returns null-terminated array that must be freed after use as well as each element */
 OPENDHT_C_PUBLIC struct sockaddr** dht_runner_get_public_address(const dht_runner* runner);
 
 #ifdef __cplusplus

cmake/CheckAtomic.cmake

@@ -1,103 +1,95 @@
-# atomic builtins are required for threading support.
+# University of Illinois/NCSA
+# Open Source License
+#
+# Copyright (c) 2003-2017 University of Illinois at Urbana-Champaign.
+# All rights reserved.
+#
+# Developed by:
+#
+#     LLVM Team
+#
+#     University of Illinois at Urbana-Champaign
+#
+#     http://llvm.org
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal with
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is furnished to do
+# so, subject to the following conditions:
+#
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimers.
+#
+#     * Redistributions in binary form must reproduce the above copyright notice,
+#       this list of conditions and the following disclaimers in the
+#       documentation and/or other materials provided with the distribution.
+#
+#     * Neither the names of the LLVM Team, University of Illinois at
+#       Urbana-Champaign, nor the names of its contributors may be used to
+#       endorse or promote products derived from this Software without specific
+#       prior written permission.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+# SOFTWARE.
 
-INCLUDE(CheckCXXSourceCompiles)
-INCLUDE(CheckLibraryExists)
-INCLUDE("${CMAKE_CURRENT_LIST_DIR}/DetermineGCCCompatible.cmake")
+include(CheckCXXSourceCompiles)
+include(CheckLibraryExists)
 
 # Sometimes linking against libatomic is required for atomic ops, if
 # the platform doesn't support lock-free atomics.
 
 function(check_working_cxx_atomics varname)
   set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11")
-  CHECK_CXX_SOURCE_COMPILES("
-#include <atomic>
-std::atomic<int> x;
-std::atomic<short> y;
-std::atomic<char> z;
-int main() {
-  ++z;
-  ++y;
-  return ++x;
-}
-" ${varname})
-  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-endfunction(check_working_cxx_atomics)
-
-function(check_working_cxx_atomics64 varname)
-  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS "-std=c++11 ${CMAKE_REQUIRED_FLAGS}")
+  get_directory_property(compile_options COMPILE_OPTIONS)
+  set(CMAKE_REQUIRED_FLAGS ${compile_options})
   CHECK_CXX_SOURCE_COMPILES("
 #include <atomic>
 #include <cstdint>
-std::atomic<uint64_t> x (0);
-int main() {
-  uint64_t i = x.load(std::memory_order_relaxed);
-  (void)i;
-  return 0;
-}
-" ${varname})
+std::atomic<int64_t> v1;
+std::atomic<int64_t> v2;
+int main(int, char**) {
+  return v1 + v2;
+}" ${varname})
   set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-endfunction(check_working_cxx_atomics64)
+endfunction(check_working_cxx_atomics)
 
 
-# Check for (non-64-bit) atomic operations.
-if(MSVC)
-  set(HAVE_CXX_ATOMICS_WITHOUT_LIB True)
-elseif(LLVM_COMPILER_IS_GCC_COMPATIBLE OR CMAKE_CXX_COMPILER_ID MATCHES "XL")
+if(NOT DEFINED PROXYGEN_COMPILER_IS_GCC_COMPATIBLE)
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    set(PROXYGEN_COMPILER_IS_GCC_COMPATIBLE ON)
+  elseif(MSVC)
+    set(PROXYGEN_COMPILER_IS_GCC_COMPATIBLE OFF)
+  elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    set(PROXYGEN_COMPILER_IS_GCC_COMPATIBLE ON)
+  elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel")
+    set(PROXYGEN_COMPILER_IS_GCC_COMPATIBLE ON)
+  endif()
+endif()
+
+# This isn't necessary on MSVC, so avoid command-line switch annoyance
+# by only running on GCC-like hosts.
+if(PROXYGEN_COMPILER_IS_GCC_COMPATIBLE)
   # First check if atomics work without the library.
   check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB)
   # If not, check if the library exists, and atomics work with it.
   if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
-    list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-    check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB)
-    if (NOT HAVE_CXX_ATOMICS_WITH_LIB)
-      message(FATAL_ERROR "Host compiler must support std::atomic!")
+    check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC)
+    if(HAVE_LIBATOMIC)
+      list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
+      check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB)
+      if (NOT HAVE_CXX_ATOMICS_WITH_LIB)
+	message(FATAL_ERROR "Host compiler must support std::atomic!")
+      endif()
+      list(APPEND CMAKE_CXX_STANDARD_LIBRARIES -latomic)
+    else()
+      message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
     endif()
   endif()
 endif()
-
-# Check for 64 bit atomic operations.
-if(MSVC)
-  set(HAVE_CXX_ATOMICS64_WITHOUT_LIB True)
-elseif(LLVM_COMPILER_IS_GCC_COMPATIBLE OR CMAKE_CXX_COMPILER_ID MATCHES "XL")
-  # First check if atomics work without the library.
-  check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-  # If not, check if the library exists, and atomics work with it.
-  if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-    list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-    check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
-    if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
-      message(FATAL_ERROR "Host compiler must support 64-bit std::atomic!")
-    endif()
-  endif()
-endif()
-
-## TODO: This define is only used for the legacy atomic operations in
-## llvm's Atomic.h, which should be replaced.  Other code simply
-## assumes C++11 <atomic> works.
-CHECK_CXX_SOURCE_COMPILES("
-#ifdef _MSC_VER
-#include <windows.h>
-#endif
-int main() {
-#ifdef _MSC_VER
-        volatile LONG val = 1;
-        MemoryBarrier();
-        InterlockedCompareExchange(&val, 0, 1);
-        InterlockedIncrement(&val);
-        InterlockedDecrement(&val);
-#else
-        volatile unsigned long val = 1;
-        __sync_synchronize();
-        __sync_val_compare_and_swap(&val, 1, 0);
-        __sync_add_and_fetch(&val, 1);
-        __sync_sub_and_fetch(&val, 1);
-#endif
-        return 0;
-      }
-" LLVM_HAS_ATOMICS)
-
-if( NOT LLVM_HAS_ATOMICS )
-  message(STATUS "Warning: LLVM will be built thread-unsafe because atomic builtins are missing")
-endif()

cmake/DetermineGCCCompatible.cmake

@@ -1,13 +0,0 @@
-# Determine if the compiler has GCC-compatible command-line syntax.
-
-if(NOT DEFINED LLVM_COMPILER_IS_GCC_COMPATIBLE)
-  if(CMAKE_COMPILER_IS_GNUCXX)
-    set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON)
-  elseif( MSVC )
-    set(LLVM_COMPILER_IS_GCC_COMPATIBLE OFF)
-  elseif( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
-    set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON)
-  elseif( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel" )
-    set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON)
-  endif()
-endif()

cmake/FindMsgpack.cmake

@@ -0,0 +1,64 @@
+# - Try to find msgpack
+# Once done this will define
+#  MSGPACK_FOUND - System has msgpack
+#  MSGPACK_INCLUDE_DIRS - The msgpack include directories
+#  MSGPACK_LIBRARIES - The libraries needed to use msgpack
+
+if(NOT MSGPACK_USE_BUNDLED)
+  find_package(PkgConfig)
+  if (PKG_CONFIG_FOUND)
+    pkg_search_module(PC_MSGPACK QUIET
+      msgpackc>=${Msgpack_FIND_VERSION}
+      msgpack>=${Msgpack_FIND_VERSION})
+  endif()
+else()
+  set(PC_MSGPACK_INCLUDEDIR)
+  set(PC_MSGPACK_INCLUDE_DIRS)
+  set(PC_MSGPACK_LIBDIR)
+  set(PC_MSGPACK_LIBRARY_DIRS)
+  set(LIMIT_SEARCH NO_DEFAULT_PATH)
+endif()
+
+set(MSGPACK_DEFINITIONS ${PC_MSGPACK_CFLAGS_OTHER})
+
+find_path(MSGPACK_INCLUDE_DIR msgpack/version_master.h
+  HINTS ${PC_MSGPACK_INCLUDEDIR} ${PC_MSGPACK_INCLUDE_DIRS}
+  ${LIMIT_SEARCH})
+
+if(MSGPACK_INCLUDE_DIR)
+  file(READ ${MSGPACK_INCLUDE_DIR}/msgpack/version_master.h msgpack_version_h)
+  string(REGEX REPLACE ".*MSGPACK_VERSION_MAJOR +([0-9]+).*" "\\1" MSGPACK_VERSION_MAJOR "${msgpack_version_h}")
+  string(REGEX REPLACE ".*MSGPACK_VERSION_MINOR +([0-9]+).*" "\\1" MSGPACK_VERSION_MINOR "${msgpack_version_h}")
+  string(REGEX REPLACE ".*MSGPACK_VERSION_REVISION +([0-9]+).*" "\\1" MSGPACK_VERSION_REVISION "${msgpack_version_h}")
+  set(MSGPACK_VERSION_STRING "${MSGPACK_VERSION_MAJOR}.${MSGPACK_VERSION_MINOR}.${MSGPACK_VERSION_REVISION}")
+else()
+  set(MSGPACK_VERSION_STRING)
+endif()
+
+# If we're asked to use static linkage, add libmsgpack{,c}.a as a preferred library name.
+if(MSGPACK_USE_STATIC)
+  list(APPEND MSGPACK_NAMES
+    "${CMAKE_STATIC_LIBRARY_PREFIX}msgpackc${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    "${CMAKE_STATIC_LIBRARY_PREFIX}msgpack${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endif()
+
+list(APPEND MSGPACK_NAMES msgpackc msgpack)
+
+find_library(MSGPACK_LIBRARY NAMES ${MSGPACK_NAMES}
+  # Check each directory for all names to avoid using headers/libraries from
+  # different places.
+  NAMES_PER_DIR
+  HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS}
+  ${LIMIT_SEARCH})
+
+mark_as_advanced(MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY)
+
+set(MSGPACK_LIBRARIES ${MSGPACK_LIBRARY})
+set(MSGPACK_INCLUDE_DIRS ${MSGPACK_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set MSGPACK_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(Msgpack
+  REQUIRED_VARS MSGPACK_LIBRARY MSGPACK_INCLUDE_DIR
+  VERSION_VAR MSGPACK_VERSION_STRING)

configure.ac

@@ -1,7 +1,7 @@
 dnl define macros
-m4_define([opendht_major_version], 3)
-m4_define([opendht_minor_version], 1)
-m4_define([opendht_patch_version], 4)
+m4_define([opendht_major_version], 2)
+m4_define([opendht_minor_version], 2)
+m4_define([opendht_patch_version], 0)
 m4_define([opendht_version],
 		  [opendht_major_version.opendht_minor_version.opendht_patch_version])
 
@@ -18,27 +18,18 @@ AC_SUBST(OPENDHT_PATCH_VERSION, opendht_patch_version)
 
 AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Build in debug mode, adds stricter warnings, disables optimization]))
 AS_IF([test "x$enable_debug" = "xyes"],
-      [CXXFLAGS="${CXXFLAGS} -g -Og -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -Wno-deprecated -pedantic-errors"],
-      [CXXFLAGS="${CXXFLAGS} -O3 -Wno-deprecated -pedantic-errors -fvisibility=hidden"])
+      [CXXFLAGS="${CXXFLAGS} -g -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -O0 -pedantic-errors"],
+      [CXXFLAGS="${CXXFLAGS} -O3 -pedantic-errors"])
 
-CPPFLAGS+=" -DOPENDHT_BUILD"
-AM_CONDITIONAL([OPENDHT_SHARED], [test "x$enable_shared" != xno])
-AM_COND_IF(OPENDHT_SHARED, [
-  CPPFLAGS+=" -Dopendht_EXPORTS"
-])
-
-AM_PROG_AR
-LT_INIT()
-LT_LANG(C++)
-AC_LANG(C++)
 AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX(17,[noext],[mandatory])
+AM_PROG_AR
 
-dnl Check for C binding
-AC_ARG_ENABLE([c], [AS_HELP_STRING([--disable-c], [Disable DHT C binding])])
-AM_CONDITIONAL(ENABLE_C, test x$enable_c != "xno")
-AM_COND_IF(ENABLE_C, [
-	AC_DEFINE([OPENDHT_C], [], [Define if DHT C biding is enabled])
+dnl Check for logs
+AC_ARG_ENABLE([logs], [AS_HELP_STRING([--disable-logs], [Disable DHT logs])])
+AS_IF([test "x$enable_logs" != "xno"], [
+	AC_DEFINE([OPENDHT_LOG], [true], [Define if DHT logs are enabled])
+], [
+	AC_DEFINE([OPENDHT_LOG], [false], [Define if DHT logs are enabled])
 ])
 
 dnl Check for indexation
@@ -108,6 +99,11 @@ AM_CONDITIONAL(WIN32, [test "x$SYS" = "xmingw32"])
 AS_IF([test "x$SYS" = "xandroid"],
       [], [LDFLAGS="${LDFLAGS} -lpthread"])
 
+LT_INIT()
+LT_LANG(C++)
+
+AX_CXX_COMPILE_STDCXX(14,[noext],[mandatory])
+
 PKG_PROG_PKG_CONFIG()
 
 AC_ARG_ENABLE([proxy_server], AS_HELP_STRING([--enable-proxy-server], [Enable proxy server ability]), proxy_server=yes, proxy_server=no)
@@ -126,8 +122,8 @@ AC_ARG_ENABLE([proxy_client], AS_HELP_STRING([--enable-proxy-client], [Enable pr
 AM_CONDITIONAL(ENABLE_PROXY_CLIENT, test x$proxy_client == xyes)
 
 AC_ARG_ENABLE([tests], AS_HELP_STRING([--enable-tests], [Enable tests]), build_tests=yes, build_tests=no)
-AM_CONDITIONAL(ENABLE_TESTS, test "x$build_tests" == xyes)
-AS_IF([test "x$build_tests" == xyes], [
+AM_CONDITIONAL(ENABLE_TESTS, test x$build_tests == xyes)
+AM_COND_IF([ENABLE_TESTS], [
 	PKG_CHECK_MODULES([CppUnit], [cppunit >= 1.12])
 ])
 
@@ -135,11 +131,7 @@ AM_CONDITIONAL(PROXY_CLIENT_OR_SERVER, test x$proxy_client == xyes || test x$pro
 
 PKG_CHECK_MODULES([Nettle], [nettle >= 2.4])
 PKG_CHECK_MODULES([GnuTLS], [gnutls >= 3.3])
-AC_CHECK_HEADERS([msgpack.hpp], [], [
-  PKG_CHECK_MODULES([MsgPack], [msgpack >= 1.2])
-])
-PKG_CHECK_MODULES([Argon2], [libargon2])
-AC_SUBST(argon2_lib, [", libargon2"])
+PKG_CHECK_MODULES([MsgPack], [msgpack >= 1.2])
 
 AC_ARG_WITH([jsoncpp], AS_HELP_STRING([--without-jsoncpp], [Build without JsonCpp support]))
 AS_IF([test "x$with_jsoncpp" != "xno"],
@@ -165,16 +157,23 @@ AS_IF([test "x$have_openssl" = "xyes"], [
     AC_MSG_NOTICE([Not using OpenSSL])
 ])
 
-PKG_CHECK_MODULES([Fmt], [fmt >= 5.3.0], [have_fmt=yes], [have_fmt=no])
-AS_IF([test "x$have_fmt" = "xyes"], [
-    AC_MSG_NOTICE([Using libfmt])
+AC_ARG_WITH([http_parser_fork], AS_HELP_STRING([--with-http-parser-fork], [Build with http_parser fork to support old API]))
+AS_IF([test "x$with_http_parser_fork" = "xyes"],[
+    AC_MSG_NOTICE([Using http_parser fork])
+    AC_DEFINE([OPENDHT_PROXY_HTTP_PARSER_FORK], [], [Define if using http parser fork])
 ], [
-    AC_MSG_NOTICE([Missing libfmt files])
+    AC_MSG_NOTICE([Not using http_parser fork])
 ])
 
 AM_COND_IF([PROXY_CLIENT_OR_SERVER], [
-    AC_CHECK_HEADERS([asio.hpp],, AC_MSG_ERROR([Missing Asio headers files]))
+    AC_CHECK_HEADERS([asio.hpp], exit,, AC_MSG_ERROR([Missing Asio headers files]))
     CXXFLAGS="${CXXFLAGS} -DASIO_STANDALONE"
+    PKG_CHECK_MODULES([Fmt], [fmt >= 5.3.0], [have_fmt=yes], [have_fmt=no])
+    AS_IF([test "x$have_fmt" = "xyes"], [
+        AC_MSG_NOTICE([Using libfmt])
+    ], [
+        AC_MSG_NOTICE([Missing libfmt files])
+    ])
     # http_parser has no pkgconfig, instead we check with:
     AC_CHECK_LIB(http_parser, exit,, AC_MSG_ERROR([Missing HttpParser library files]))
     AC_CHECK_HEADERS([http_parser.h], [http_parser_headers=yes; break;])
@@ -182,7 +181,28 @@ AM_COND_IF([PROXY_CLIENT_OR_SERVER], [
     AS_IF([test "x$http_parser_headers" != "xyes"], AC_MSG_ERROR([Missing HttpParser headers files]))
 ])
 
-CXXFLAGS="${CXXFLAGS} -DMSGPACK_NO_BOOST -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT"
+CXXFLAGS="${CXXFLAGS} -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT"
+
+dnl Check for Argon2
+AC_ARG_WITH([argon2], AS_HELP_STRING([--without-argon2], [Use included Argon2]))
+AS_IF([test "x$with_argon2" != "xno"],
+			[PKG_CHECK_MODULES([Argon2], [libargon2], [have_argon2=yes], [have_argon2=no])],
+			[have_argon2=no])
+AS_IF([test "x$have_argon2" = "xyes"], [
+  AC_MSG_NOTICE([Using system Argon2])
+  AC_SUBST(argon2_lib, [", libargon2"])
+], [
+		AS_IF([test "x$with_argon2" = "xyes"], [
+				AC_MSG_ERROR([Argon2 requested but not found])
+		],[
+				AC_MSG_NOTICE([Using included Argon2])
+				AC_SUBST(Argon2_CFLAGS, "-I\${top_srcdir}/argon2/src -I\${top_srcdir}/argon2/include")
+				AC_SUBST(Argon2_LIBS, "libargon2.la")
+				AC_SUBST(Argon2_LDFLAGS, "-L\${abs_top_srcdir}/argon2/src/.libs")
+		])
+])
+
+AM_CONDITIONAL([WITH_INCLUDED_ARGON2], [test "x$have_argon2" = "xno"])
 
 AC_ARG_ENABLE([tools], AS_HELP_STRING([--disable-tools],[Disable tools (CLI DHT node)]),,build_tools=yes)
 AM_CONDITIONAL(ENABLE_TOOLS, test x$build_tools == xyes)
@@ -205,7 +225,6 @@ AC_SUBST(PROJECT_BINARY_DIR, "../src/.libs")
 
 AC_CONFIG_FILES([Makefile
                  src/Makefile
-                 c/Makefile
                  tools/Makefile
                  python/Makefile
                  python/setup.py

doc/dhtnode.1

@@ -19,7 +19,7 @@
 .SH DESCRIPTION
 Runs an OpenDHT node, with a CLI (default) or as a daemon (with \fB'-d'\fP or \fB'-s'\fP).
 Commands available in the interactive shell are:
-.EX
+.EE
     h, help    Print this help message.
     q, quit    Quit the program.
     log        Start/stop printing DHT logs.
@@ -39,7 +39,6 @@ Commands available in the interactive shell are:
                           private key.
     e [key] [dest] [str]  Put string value at [key], encrypted for [dest] with
                           its public key (if found).
-.EE
 .SH OPTIONS
 .TP
 \fB\-h\fP

docker/Dockerfile

@@ -1,18 +1,6 @@
-FROM ghcr.io/savoirfairelinux/opendht/opendht-deps:latest
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
-
-COPY . opendht
-
-RUN cd opendht && mkdir build && cd build \
-	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-				-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \
-				-DOPENDHT_C=On \
-				-DOPENDHT_PEER_DISCOVERY=On \
-				-DOPENDHT_PYTHON=On \
-				-DOPENDHT_TOOLS=On \
-				-DOPENDHT_PROXY_SERVER=On \
-				-DOPENDHT_PROXY_CLIENT=On \
-				-DOPENDHT_SYSTEMD=On \
-	&& make -j8 && make install \
+FROM aberaud/opendht-deps
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+RUN git clone https://github.com/savoirfairelinux/opendht.git \
+	&& cd opendht && mkdir build && cd build \
+	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_LTO=On -DOPENDHT_PROXY_SERVER=On -DOPENDHT_PROXY_CLIENT=On && make -j8 && make install \
 	&& cd ../.. && rm -rf opendht

docker/DockerfileAlpine

@@ -1,37 +0,0 @@
-FROM ghcr.io/savoirfairelinux/opendht/opendht-deps-alpine:latest AS build
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
-
-COPY . opendht
-
-RUN mkdir /install
-ENV DESTDIR /install
-
-RUN cd opendht && mkdir build && cd build \
-	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-				-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \
-				-DOPENDHT_C=On \
-				-DOPENDHT_PEER_DISCOVERY=On \
-				-DOPENDHT_PYTHON=On \
-				-DOPENDHT_TOOLS=On \
-				-DOPENDHT_PROXY_SERVER=On \
-				-DOPENDHT_PROXY_CLIENT=On \
-				-DOPENDHT_SYSTEMD=On \
-	&& make -j8 && make install
-
-FROM alpine:3.18 AS install
-COPY --from=build /install /
-RUN apk add --no-cache \
-        libstdc++ \
-        gnutls \
-        nettle \
-        openssl \
-        argon2-dev \
-        jsoncpp \
-        fmt \
-        http-parser \
-        readline \
-        ncurses
-CMD ["dhtnode", "-b", "bootstrap.jami.net", "-p", "4222", "--proxyserver", "8080"]
-EXPOSE 4222/udp
-EXPOSE 8080/tcp

docker/DockerfileBionic

@@ -1,17 +1,13 @@
-FROM ghcr.io/savoirfairelinux/opendht/opendht-deps-bionic:latest
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
+FROM docker.pkg.github.com/savoirfairelinux/opendht/opendht-deps-bionic:2.1.3
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 
-COPY . opendht
-
-RUN cd opendht && mkdir build && cd build \
+RUN git clone https://github.com/savoirfairelinux/opendht.git \
+	&& cd opendht && mkdir build && cd build \
 	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-				-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \
-				-DOPENDHT_C=On \
-				-DOPENDHT_PEER_DISCOVERY=On \
-				-DOPENDHT_PYTHON=On \
-				-DOPENDHT_TOOLS=On \
-				-DOPENDHT_PROXY_SERVER=On \
-				-DOPENDHT_PROXY_CLIENT=On \
-	&& make -j8 && make install \
+		-DOPENDHT_PROXY_CLIENT=On \
+		-DOPENDHT_PROXY_SERVER=On \
+		-DOPENDHT_C=On \
+		-DOPENDHT_PYTHON=On \
+		-DOPENDHT_LTO=On \
+		&& make -j8 && make install \
 	&& cd ../.. && rm -rf opendht

docker/DockerfileDeps

@@ -1,6 +1,5 @@
-FROM ubuntu:22.04
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
+FROM ubuntu:20.04
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 
 RUN apt-get update && apt-get install -y \
         dialog apt-utils \
@@ -9,18 +8,18 @@ RUN apt-get update && apt-get install -y \
 
 RUN apt-get update && apt-get install -y \
         build-essential pkg-config cmake git wget \
-        libtool autotools-dev autoconf \
-        cython3 python3-dev python3-setuptools python3-build python3-virtualenv \
+        autotools-dev autoconf \
+        cython3 python3-dev python3-setuptools \
         libncurses5-dev libreadline-dev nettle-dev libcppunit-dev \
         libgnutls28-dev libuv1-dev libjsoncpp-dev libargon2-dev \
         libssl-dev libfmt-dev libhttp-parser-dev libasio-dev libmsgpack-dev \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+    && apt-get clean
 
 RUN echo "*** Downloading RESTinio ***" \
     && mkdir restinio && cd restinio \
-    && wget https://github.com/aberaud/restinio/archive/6fd08b65f6f15899dd0de3c801f6a5462b811c64.tar.gz \
-    && ls -l && tar -xzf 6fd08b65f6f15899dd0de3c801f6a5462b811c64.tar.gz \
-    && cd restinio-6fd08b65f6f15899dd0de3c801f6a5462b811c64/dev \
+    && wget https://github.com/aberaud/restinio/archive/2224ffedef52cb2b74645d63d871d61dbd0f165e.tar.gz \
+    && ls -l && tar -xzf 2224ffedef52cb2b74645d63d871d61dbd0f165e.tar.gz \
+    && cd restinio-2224ffedef52cb2b74645d63d871d61dbd0f165e/dev \
     && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
              -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
              -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \

docker/DockerfileDepsAlpine

@@ -1,23 +0,0 @@
-FROM alpine:3.18
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
-
-RUN apk add --no-cache \
-        build-base cmake ninja git wget \
-        cython python3-dev py3-setuptools \
-        ncurses-dev readline-dev nettle-dev \
-        cppunit-dev gnutls-dev jsoncpp-dev \
-        argon2-dev openssl-dev fmt-dev \
-        http-parser-dev asio-dev msgpack-cxx-dev \
-    && rm -rf /var/cache/apk/*
-
-RUN echo "*** Downloading RESTinio ***" \
-    && mkdir restinio && cd restinio \
-    && wget https://github.com/aberaud/restinio/archive/6fd08b65f6f15899dd0de3c801f6a5462b811c64.tar.gz \
-    && tar -xzf 6fd08b65f6f15899dd0de3c801f6a5462b811c64.tar.gz \
-    && cd restinio-6fd08b65f6f15899dd0de3c801f6a5462b811c64/dev \
-    && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
-             -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
-             -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
-    && make -j8 && make install \
-    && cd ../../.. && rm -rf restinio

docker/DockerfileDepsBionic

@@ -1,16 +1,14 @@
 FROM ubuntu:18.04
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 
 RUN echo "APT::Acquire::Retries \"3\";" > /etc/apt/apt.conf.d/80-retries
 RUN apt-get update && apt-get install -y \
         apt-transport-https build-essential pkg-config git wget libncurses5-dev libreadline-dev nettle-dev \
         libgnutls28-dev libuv1-dev cython3 python3-dev python3-setuptools libcppunit-dev libjsoncpp-dev \
-        libargon2-0-dev \
-        autotools-dev autoconf libfmt-dev libhttp-parser-dev libmsgpack-dev libssl-dev python3-pip \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+        autotools-dev autoconf libfmt-dev libhttp-parser-dev libmsgpack-dev libssl-dev \
+    && apt-get clean
 
-RUN pip3 install --upgrade cmake
+RUN apt-get update && apt-get install -y python3-pip && pip3 install --upgrade cmake
 
 # libasio-dev (1.10) is too old
 RUN echo "** Building a recent version of asio ***" \

docker/DockerfileDepsFocal

@@ -1,28 +0,0 @@
-FROM ubuntu:20.04
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
-
-RUN apt-get update && apt-get install -y \
-        dialog apt-utils \
-    && apt-get clean \
-    && echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-
-RUN apt-get update && apt-get install -y \
-        build-essential pkg-config cmake git wget \
-        libtool autotools-dev autoconf \
-        cython3 python3-dev python3-setuptools \
-        libncurses5-dev libreadline-dev nettle-dev libcppunit-dev \
-        libgnutls28-dev libuv1-dev libjsoncpp-dev libargon2-dev \
-        libssl-dev libfmt-dev libhttp-parser-dev libasio-dev libmsgpack-dev \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-RUN echo "*** Downloading RESTinio ***" \
-    && mkdir restinio && cd restinio \
-    && wget https://github.com/aberaud/restinio/archive/e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
-    && ls -l && tar -xzf e0a261dd8488246a3cb8bbb3ea781ea5139c3c94.tar.gz \
-    && cd restinio-e0a261dd8488246a3cb8bbb3ea781ea5139c3c94/dev \
-    && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
-             -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
-             -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
-    && make -j8 && make install \
-    && cd ../../.. && rm -rf restinio

docker/DockerfileDepsLlvm

@@ -1,30 +1,26 @@
-FROM ubuntu:22.04
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
-
+FROM ubuntu:20.04
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 RUN apt-get update && apt-get install -y \
         dialog apt-utils \
     && apt-get clean \
     && echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
 RUN apt-get update \
-    && apt-get install -y llvm llvm-dev lldb clang gdb make cmake pkg-config \
-       libtool git wget libncurses5-dev libreadline-dev \
+    && apt-get install -y llvm llvm-dev clang make cmake pkg-config git wget libncurses5-dev libreadline-dev \
        nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libjsoncpp-dev cython3 python3-dev \
-       python3-setuptools libcppunit-dev python3-pip python3-build python3-virtualenv \
+       python3-setuptools libcppunit-dev python3-pip \
        autotools-dev autoconf libssl-dev libargon2-dev \
        libfmt-dev libhttp-parser-dev libasio-dev \
-    && apt-get remove -y gcc g++ && apt-get autoremove -y \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+    && apt-get remove -y gcc g++ && apt-get autoremove -y && apt-get clean
 
 ENV CC cc
 ENV CXX c++
 
 RUN echo "*** Downloading RESTinio ***" \
     && mkdir restinio && cd restinio \
-    && wget https://github.com/aberaud/restinio/archive/6fd08b65f6f15899dd0de3c801f6a5462b811c64.tar.gz \
-    && ls -l && tar -xzf 6fd08b65f6f15899dd0de3c801f6a5462b811c64.tar.gz \
-    && cd restinio-6fd08b65f6f15899dd0de3c801f6a5462b811c64/dev \
+    && wget https://github.com/aberaud/restinio/archive/2224ffedef52cb2b74645d63d871d61dbd0f165e.tar.gz \
+    && ls -l && tar -xzf 2224ffedef52cb2b74645d63d871d61dbd0f165e.tar.gz \
+    && cd restinio-2224ffedef52cb2b74645d63d871d61dbd0f165e/dev \
     && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
              -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
              -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \

docker/DockerfileDhtnode

@@ -1,4 +0,0 @@
-FROM ghcr.io/savoirfairelinux/opendht/opendht:latest
-CMD ["dhtnode", "-b", "bootstrap.jami.net", "-p", "4222", "--proxyserver", "8080"]
-EXPOSE 4222/udp
-EXPOSE 8080/tcp

docker/DockerfileFocal

@@ -1,17 +0,0 @@
-FROM ghcr.io/savoirfairelinux/opendht/opendht-deps-bionic:latest
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
-
-COPY . opendht
-
-RUN cd opendht && mkdir build && cd build \
-	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-				-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \
-				-DOPENDHT_C=On \
-				-DOPENDHT_PEER_DISCOVERY=On \
-				-DOPENDHT_PYTHON=On \
-				-DOPENDHT_TOOLS=On \
-				-DOPENDHT_PROXY_SERVER=On \
-				-DOPENDHT_PROXY_CLIENT=On \
-	&& make -j8 && make install \
-	&& cd ../.. && rm -rf opendht

docker/DockerfileLlvm

@@ -1,18 +1,6 @@
-FROM ghcr.io/savoirfairelinux/opendht/opendht-deps-llvm:latest
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
-
-COPY . opendht
-
-RUN cd opendht && mkdir build && cd build \
-	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-				-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \
-				-DOPENDHT_C=On \
-				-DOPENDHT_PEER_DISCOVERY=On \
-				-DOPENDHT_PYTHON=On \
-				-DOPENDHT_TOOLS=On \
-				-DOPENDHT_PROXY_SERVER=On \
-				-DOPENDHT_PROXY_CLIENT=On \
-				-DOPENDHT_SYSTEMD=On \
-	&& make -j8 && make install \
+FROM aberaud/opendht-deps-llvm
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+RUN git clone https://github.com/savoirfairelinux/opendht.git \
+	&& cd opendht && mkdir build && cd build \
+	&& cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_LTO=On -DOPENDHT_PROXY_SERVER=On -DOPENDHT_PROXY_CLIENT=On && make -j8 && make install \
 	&& cd ../.. && rm -rf opendht

docker/DockerfileTravis

@@ -0,0 +1,9 @@
+FROM aberaud/opendht-deps-bionic
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+
+RUN apt-get update && apt-get install -y python3-pip && pip3 install --upgrade cmake
+
+COPY . /root/opendht
+RUN cd /root/opendht && mkdir build && cd build \
+	&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_C=On -DOPENDHT_LTO=On -DOPENDHT_TESTS=ON ..  \
+	&& make -j8 && ./opendht_unit_tests && make install

docker/DockerfileTravisLlvm

@@ -0,0 +1,7 @@
+FROM aberaud/opendht-deps-llvm
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+
+COPY . /root/opendht
+RUN cd /root/opendht && mkdir build && cd build \
+	&& cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_C=On -DOPENDHT_TESTS=ON .. \
+	&& make -j8 && ./opendht_unit_tests && make install

docker/DockerfileTravisProxy

@@ -0,0 +1,4 @@
+FROM aberaud/opendht-deps
+MAINTAINER Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+
+COPY . /root/opendht

include/opendht.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

include/opendht/callbacks.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -82,8 +82,6 @@ struct OPENDHT_PUBLIC NodeInfo {
     NodeStats ipv4 {};
     NodeStats ipv6 {};
     size_t ongoing_ops {0};
-    size_t storage_values {0};
-    size_t storage_size {0};
     in_port_t bound4 {0};
     in_port_t bound6 {0};
 
@@ -134,9 +132,6 @@ struct OPENDHT_PUBLIC Config {
     /* If non-0, overrides the default maximum store size. -1 means no limit.  */
     ssize_t max_store_size {0};
 
-    /* If non-0, overrides the default maximum store key count. -1 means no limit.  */
-    ssize_t max_store_keys {0};
-
     /**
      * Use appropriate bahavior for a public IP, stable node:
      *   - No connectivity change triggered when a search fails
@@ -170,19 +165,19 @@ using ValueCallback = std::function<bool(const std::vector<std::shared_ptr<Value
 using GetCallbackSimple = std::function<bool(std::shared_ptr<Value> value)>;
 using ShutdownCallback = std::function<void()>;
 using IdentityAnnouncedCb = std::function<void(bool)>;
-using PublicAddressChangedCb = std::function<void(std::vector<SockAddr>)>;
 
 using CertificateStoreQuery = std::function<std::vector<std::shared_ptr<crypto::Certificate>>(const InfoHash& pk_id)>;
-using DoneCallback = std::function<void(bool success, const std::vector<std::shared_ptr<Node>>& nodes)>;
-using DoneCallbackSimple = std::function<void(bool success)>;
 
 typedef bool (*GetCallbackRaw)(std::shared_ptr<Value>, void *user_data);
 typedef bool (*ValueCallbackRaw)(std::shared_ptr<Value>, bool expired, void *user_data);
+
+using DoneCallback = std::function<void(bool success, const std::vector<std::shared_ptr<Node>>& nodes)>;
 typedef void (*DoneCallbackRaw)(bool, std::vector<std::shared_ptr<Node>>*, void *user_data);
 typedef void (*ShutdownCallbackRaw)(void *user_data);
 typedef void (*DoneCallbackSimpleRaw)(bool, void *user_data);
 typedef bool (*FilterRaw)(const Value&, void *user_data);
 
+using DoneCallbackSimple = std::function<void(bool success)>;
 
 OPENDHT_PUBLIC GetCallbackSimple bindGetCb(GetCallbackRaw raw_cb, void* user_data);
 OPENDHT_PUBLIC GetCallback bindGetCb(GetCallbackSimple cb);

include/opendht/crypto.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *           Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
  *
@@ -32,9 +32,6 @@ extern "C" {
 
 #include <vector>
 #include <memory>
-#include <atomic>
-#include <mutex>
-#include <string_view>
 
 #ifdef _WIN32
 #include <iso646.h>
@@ -87,13 +84,12 @@ struct OPENDHT_PUBLIC PublicKey
     /** Import public key from serialized data */
     PublicKey(const uint8_t* dat, size_t dat_size);
     PublicKey(const Blob& pk) : PublicKey(pk.data(), pk.size()) {}
-    PublicKey(std::string_view pk) : PublicKey((const uint8_t*)pk.data(), pk.size()) {}
-    PublicKey(PublicKey&& o) noexcept : pk(o.pk) { o.pk = nullptr; }
+    PublicKey(PublicKey&& o) noexcept : pk(o.pk) { o.pk = nullptr; };
 
     ~PublicKey();
     explicit operator bool() const { return pk; }
     bool operator ==(const PublicKey& o) const {
-        return pk == o.pk || getLongId() == o.getLongId();
+        return pk == o.pk || getId() == o.getId();
     }
     bool operator !=(const PublicKey& o) const {
         return !(*this == o);
@@ -104,12 +100,12 @@ struct OPENDHT_PUBLIC PublicKey
     /**
      * Get public key fingerprint
      */
-   const InfoHash& getId() const;
+    InfoHash getId() const;
 
     /**
      * Get public key long fingerprint
      */
-    const PkId& getLongId() const;
+    PkId getLongId() const;
 
     bool checkSignature(const uint8_t* data, size_t data_len, const uint8_t* signature, size_t signature_len) const;
     inline bool checkSignature(const Blob& data, const Blob& signature) const {
@@ -120,9 +116,7 @@ struct OPENDHT_PUBLIC PublicKey
     inline Blob encrypt(const Blob& data) const {
         return encrypt(data.data(), data.size());
     }
-    inline Blob encrypt(std::string_view data) const {
-        return encrypt((const uint8_t*)data.data(), data.size());
-    }
+
     void pack(Blob& b) const;
     int pack(uint8_t* out, size_t* out_len) const;
     void unpack(const uint8_t* dat, size_t dat_size);
@@ -144,11 +138,6 @@ struct OPENDHT_PUBLIC PublicKey
 
     gnutls_pubkey_t pk {nullptr};
 private:
-    mutable InfoHash cachedId_ {};
-    mutable PkId cachedLongId_ {};
-    mutable std::atomic_bool idCached_ {false};
-    mutable std::atomic_bool longIdCached_ {false};
-
     PublicKey(const PublicKey&) = delete;
     PublicKey& operator=(const PublicKey&) = delete;
     void encryptBloc(const uint8_t* src, size_t src_size, uint8_t* dst, size_t dst_size) const;
@@ -171,15 +160,11 @@ struct OPENDHT_PUBLIC PrivateKey
     PrivateKey& operator=(PrivateKey&& o) noexcept;
 
     PrivateKey(const uint8_t* src, size_t src_size, const char* password = nullptr);
-    PrivateKey(const Blob& src, const std::string& password = {}) : PrivateKey(src.data(), src.size(), password.c_str()) {}
-    PrivateKey(std::string_view src, const std::string& password = {}) : PrivateKey((const uint8_t*)src.data(), src.size(), password.c_str()) {}
-
+    PrivateKey(const Blob& src, const std::string& password = {}) : PrivateKey(src.data(), src.size(), password.data()) {}
     ~PrivateKey();
     explicit operator bool() const { return key; }
 
-    const PublicKey& getPublicKey() const;
-    const std::shared_ptr<PublicKey>& getSharedPublicKey() const;
-
+    PublicKey getPublicKey() const;
     int serialize(uint8_t* out, size_t* out_len, const std::string& password = {}) const;
     Blob serialize(const std::string& password = {}) const;
 
@@ -188,7 +173,6 @@ struct OPENDHT_PUBLIC PrivateKey
      * @returns the signature data.
      */
     Blob sign(const uint8_t* data, size_t data_len) const;
-    inline Blob sign(std::string_view dat) const { return sign((const uint8_t*)dat.data(), dat.size()); }
     inline Blob sign(const Blob& dat) const { return sign(dat.data(), dat.size()); }
 
     /**
@@ -215,8 +199,7 @@ private:
     PrivateKey& operator=(const PrivateKey&) = delete;
     Blob decryptBloc(const uint8_t* src, size_t src_size) const;
 
-    mutable std::mutex publicKeyMutex_ {};
-    mutable std::shared_ptr<PublicKey> publicKey_ {};
+    //friend dht::crypto::Identity dht::crypto::generateIdentity(const std::string&, dht::crypto::Identity, unsigned key_length);
 };
 
 class OPENDHT_PUBLIC RevocationList
@@ -301,7 +284,6 @@ class OPENDHT_PUBLIC CertificateRequest {
 public:
     CertificateRequest();
     CertificateRequest(const uint8_t* data, size_t size);
-    CertificateRequest(std::string_view src) : CertificateRequest((const uint8_t*)src.data(), src.size()) {}
     CertificateRequest(const Blob& data) : CertificateRequest(data.data(), data.size()) {}
 
     CertificateRequest(CertificateRequest&& o) noexcept : request(std::move(o.request)) {
@@ -335,9 +317,8 @@ private:
 class OPENDHT_PUBLIC OcspRequest
 {
 public:
-    OcspRequest(gnutls_ocsp_req_t r) : request(r) {}
+    OcspRequest(gnutls_ocsp_req_t r) : request(r) {};
     OcspRequest(const uint8_t* dat_ptr, size_t dat_size);
-    OcspRequest(std::string_view dat): OcspRequest((const uint8_t*)dat.data(), dat.size()) {}
     ~OcspRequest();
 
     /*
@@ -355,7 +336,7 @@ class OPENDHT_PUBLIC OcspResponse
 {
 public:
     OcspResponse(const uint8_t* dat_ptr, size_t dat_size);
-    OcspResponse(std::string_view response) : OcspResponse((const uint8_t*)response.data(), response.size()) {}
+    OcspResponse(const std::string& response) : OcspResponse((const uint8_t*)response.data(), response.size()) {};
     ~OcspResponse();
 
     Blob pack() const;
@@ -390,21 +371,19 @@ struct OPENDHT_PUBLIC Certificate {
      */
     Certificate(gnutls_x509_crt_t crt) noexcept : cert(crt) {}
 
-    Certificate(Certificate&& o) noexcept
-        : cert(o.cert)
-        , issuer(std::move(o.issuer))
-        , publicKey_(std::move(o.publicKey_))
-        { o.cert = nullptr; };
+    Certificate(Certificate&& o) noexcept : cert(o.cert), issuer(std::move(o.issuer)) { o.cert = nullptr; };
 
     /**
      * Import certificate (PEM or DER) or certificate chain (PEM),
      * ordered from subject to issuer
      */
     Certificate(const Blob& crt);
+    Certificate(const std::string& pem) : cert(nullptr) {
+        unpack((const uint8_t*)pem.data(), pem.size());
+    }
     Certificate(const uint8_t* dat, size_t dat_size) : cert(nullptr) {
         unpack(dat, dat_size);
     }
-    Certificate(std::string_view pem) : Certificate((const uint8_t*)pem.data(), pem.size()) {}
 
     /**
      * Import certificate chain (PEM or DER),
@@ -502,13 +481,12 @@ struct OPENDHT_PUBLIC Certificate {
     void msgpack_unpack(const msgpack::object& o);
 
     explicit operator bool() const { return cert; }
-    const PublicKey& getPublicKey() const;
-    const std::shared_ptr<PublicKey>& getSharedPublicKey() const;
+    PublicKey getPublicKey() const;
 
     /** Same as getPublicKey().getId() */
-    const InfoHash& getId() const;
+    InfoHash getId() const;
     /** Same as getPublicKey().getLongId() */
-    const PkId& getLongId() const;
+    PkId getLongId() const;
 
     Blob getSerialNumber() const;
 
@@ -561,8 +539,8 @@ struct OPENDHT_PUBLIC Certificate {
     void addRevocationList(RevocationList&&);
     void addRevocationList(std::shared_ptr<RevocationList>);
 
-    static Certificate generate(const PrivateKey& key, const std::string& name = "dhtnode", const Identity& ca = {}, bool is_ca = false, int64_t validity = 0);
-    static Certificate generate(const CertificateRequest& request, const Identity& ca, int64_t validity = 0);
+    static Certificate generate(const PrivateKey& key, const std::string& name = "dhtnode", const Identity& ca = {}, bool is_ca = false);
+    static Certificate generate(const CertificateRequest& request, const Identity& ca);
 
     gnutls_x509_crt_t getCopy() const {
         if (not cert)
@@ -612,22 +590,12 @@ struct OPENDHT_PUBLIC Certificate {
      */
     std::pair<std::string, Blob> generateOcspRequest(gnutls_x509_crt_t& issuer);
 
-    /**
-     * Change certificate's expiration
-     */
-    void setValidity(const Identity& ca, int64_t validity);
-    void setValidity(const PrivateKey& key, int64_t validity);
-
     gnutls_x509_crt_t cert {nullptr};
     std::shared_ptr<Certificate> issuer {};
     std::shared_ptr<OcspResponse> ocspResponse;
 private:
     Certificate(const Certificate&) = delete;
     Certificate& operator=(const Certificate&) = delete;
-    mutable InfoHash cachedId_ {};
-    mutable PkId cachedLongId_ {};
-    mutable std::atomic_bool idCached_ {false};
-    mutable std::atomic_bool longIdCached_ {false};
 
     struct crlNumberCmp {
         bool operator() (const std::shared_ptr<RevocationList>& lhs, const std::shared_ptr<RevocationList>& rhs) const {
@@ -636,9 +604,6 @@ private:
     };
 
     std::set<std::shared_ptr<RevocationList>, crlNumberCmp> revocation_lists;
-
-    mutable std::mutex publicKeyMutex_ {};
-    mutable std::shared_ptr<PublicKey> publicKey_ {};
 };
 
 struct OPENDHT_PUBLIC TrustList
@@ -772,7 +737,6 @@ OPENDHT_PUBLIC Identity generateEcIdentity(const std::string& name, const Identi
 OPENDHT_PUBLIC Identity generateEcIdentity(const std::string& name = "dhtnode", const Identity& ca = {});
 
 OPENDHT_PUBLIC void saveIdentity(const Identity& id, const std::string& path, const std::string& privkey_password = {});
-OPENDHT_PUBLIC Identity loadIdentity(const std::string &path,const std::string &privkey_password = {});
 
 /**
  * Performs SHA512, SHA256 or SHA1, depending on hash_length.
@@ -793,7 +757,7 @@ OPENDHT_PUBLIC void hash(const uint8_t* data, size_t data_length, uint8_t* hash,
  * that can be transmitted in clear, and will be generated if
  * not provided (32 bytes).
  */
-OPENDHT_PUBLIC Blob stretchKey(std::string_view password, Blob& salt, size_t key_length = 512/8);
+OPENDHT_PUBLIC Blob stretchKey(const std::string& password, Blob& salt, size_t key_length = 512/8);
 
 /**
  * AES-GCM encryption. Key must be 128, 192 or 256 bits long (16, 24 or 32 bytes).
@@ -802,55 +766,15 @@ OPENDHT_PUBLIC Blob aesEncrypt(const uint8_t* data, size_t data_length, const Bl
 OPENDHT_PUBLIC inline Blob aesEncrypt(const Blob& data, const Blob& key) {
     return aesEncrypt(data.data(), data.size(), key);
 }
-/**
- * AES-GCM encryption with argon2 key derivation.
- * This function uses `stretchKey` to generate an AES key from the password and a random salt.
- * The result is a bundle including the salt that can be decrypted with `aesDecrypt(data, password)`.
- * If needed, the salt or encrypted data can be individually extracted from the bundle with `aesGetSalt` and `aesGetEncrypted`.
- */
-OPENDHT_PUBLIC Blob aesEncrypt(const Blob& data, std::string_view password);
+OPENDHT_PUBLIC Blob aesEncrypt(const Blob& data, const std::string& password);
 
 /**
  * AES-GCM decryption.
  */
 OPENDHT_PUBLIC Blob aesDecrypt(const uint8_t* data, size_t data_length, const Blob& key);
 OPENDHT_PUBLIC inline Blob aesDecrypt(const Blob& data, const Blob& key) { return aesDecrypt(data.data(), data.size(), key); }
-OPENDHT_PUBLIC inline Blob aesDecrypt(std::string_view data, const Blob& key) { return aesDecrypt((uint8_t*)data.data(), data.size(), key); }
-
-OPENDHT_PUBLIC Blob aesDecrypt(const uint8_t* data, size_t data_length, std::string_view password);
-OPENDHT_PUBLIC inline Blob aesDecrypt(const Blob& data, std::string_view password) { return aesDecrypt(data.data(), data.size(), password); }
-OPENDHT_PUBLIC inline Blob aesDecrypt(std::string_view data, std::string_view password) { return aesDecrypt((uint8_t*)data.data(), data.size(), password); }
-
-/**
- * Get raw AES key from password and salt stored with the encrypted data.
- */
-OPENDHT_PUBLIC Blob aesGetKey(const uint8_t* data, size_t data_length, std::string_view password);
-OPENDHT_PUBLIC Blob inline aesGetKey(const Blob& data, std::string_view password) {
-    return aesGetKey(data.data(), data.size(), password);
-}
-/** Get the salt part of data password-encrypted with `aesEncrypt(data, password)` */
-OPENDHT_PUBLIC Blob aesGetSalt(const uint8_t* data, size_t data_length);
-OPENDHT_PUBLIC Blob inline aesGetSalt(const Blob& data) {
-    return aesGetSalt(data.data(), data.size());
-}
-/** Get the encrypted data part of data password-encrypted with `aesEncrypt(data, password)` */
-OPENDHT_PUBLIC std::string_view aesGetEncrypted(const uint8_t* data, size_t data_length);
-OPENDHT_PUBLIC std::string_view inline aesGetEncrypted(const Blob& data) {
-    return aesGetEncrypted(data.data(), data.size());
-}
-
-/** Build an encrypted bundle that can be decrypted with aesDecrypt(data, password).
- *  @param encryptedData: result of `aesEncrypt(data, key)` or `aesGetEncrypted`
- *  @param salt: should match the encryption key and password so that `stretchKey(password, salk) == key`.
- *  Can be obtained from an existing bundle with `aesGetSalt`.
- **/
-OPENDHT_PUBLIC Blob aesBuildEncrypted(const uint8_t* encryptedData, size_t data_length, const Blob& salt);
-OPENDHT_PUBLIC Blob inline aesBuildEncrypted(const Blob& encryptedData, const Blob& salt) {
-    return aesBuildEncrypted(encryptedData.data(), encryptedData.size(), salt);
-}
-OPENDHT_PUBLIC Blob inline aesBuildEncrypted(std::string_view encryptedData, const Blob& salt) {
-    return aesBuildEncrypted((const uint8_t*)encryptedData.data(), encryptedData.size(), salt);
-}
+OPENDHT_PUBLIC Blob aesDecrypt(const uint8_t* data, size_t data_length, const std::string& password);
+OPENDHT_PUBLIC inline Blob aesDecrypt(const Blob& data, const std::string& password) { return aesDecrypt(data.data(), data.size(), password); }
 
 }
 }

include/opendht/default_types.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -66,10 +66,8 @@ private:
 
 public:
     virtual void unpackValue(const Value& v) override {
-        if (v.owner) {
-            owner = v.owner;
+        if (v.owner)
             from = v.owner->getId();
-        }
         BaseClass::unpackValue(v);
     }
 
@@ -77,7 +75,6 @@ public:
         return [](const Value& v){ return v.isSigned(); };
     }
 
-    Sp<crypto::PublicKey> owner;
     dht::InfoHash from;
 };
 

include/opendht/dht.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -67,15 +67,15 @@ public:
      */
     Dht(std::unique_ptr<net::DatagramSocket>&& sock, const Config& config, const Sp<Logger>& l = {});
 
+    Dht(std::unique_ptr<net::DatagramSocket>&& sock, const Config& config, const Logger& l = {})
+        : Dht(std::move(sock), config, std::make_shared<Logger>(l)) {}
+
     virtual ~Dht();
 
     /**
      * Get the ID of the node.
      */
     inline const InfoHash& getNodeId() const override { return myid; }
-    void setOnPublicAddressChanged(PublicAddressChangedCb cb) override {
-        publicAddressChangedCb_ = std::move(cb);
-    }
 
     NodeStatus updateStatus(sa_family_t af) override;
 
@@ -114,7 +114,7 @@ public:
 
     void addBootstrap(const std::string& host, const std::string& service) override {
         bootstrap_nodes.emplace_back(host, service);
-        startBootstrap();
+        onDisconnected();
     }
 
     void clearBootstrap() override {
@@ -128,7 +128,7 @@ public:
      */
     void insertNode(const InfoHash& id, const SockAddr&) override;
     void insertNode(const NodeExport& n) override {
-        insertNode(n.id, n.addr);
+        insertNode(n.id, SockAddr(n.ss, n.sslen));
     }
 
     void pingNode(SockAddr, DoneCallbackSimple&& cb={}) override;
@@ -265,6 +265,7 @@ public:
      */
     void connectivityChanged(sa_family_t) override;
     void connectivityChanged() override {
+        reported_addr.clear();
         connectivityChanged(AF_INET);
         connectivityChanged(AF_INET6);
     }
@@ -301,9 +302,6 @@ public:
     void setStorageLimit(size_t limit = DEFAULT_STORAGE_LIMIT) override {
         max_store_size = limit;
     }
-    size_t getStorageLimit() const override {
-        return max_store_size;
-    }
 
     /**
      * Returns the total memory usage of stored values and the number
@@ -342,7 +340,7 @@ private:
     static constexpr unsigned LISTEN_NODES {4};
 
     /* The maximum number of hashes we're willing to track. */
-    static constexpr unsigned MAX_HASHES {1024 * 1024 * 1024};
+    static constexpr unsigned MAX_HASHES {1024 * 1024};
 
     /* The maximum number of searches we keep data about. */
     static constexpr unsigned MAX_SEARCHES {1024 * 1024};
@@ -358,8 +356,6 @@ private:
 
     static constexpr duration REANNOUNCE_MARGIN {std::chrono::seconds(10)};
 
-    static constexpr std::chrono::seconds BOOTSTRAP_PERIOD {10};
-
     static constexpr size_t TOKEN_SIZE {32};
 
     // internal structures
@@ -383,14 +379,11 @@ private:
     TypeStore types;
 
     using SearchMap = std::map<InfoHash, Sp<Search>>;
-    using ReportedAddr = std::pair<unsigned, SockAddr>;
-
     struct Kad {
         RoutingTable buckets {};
         SearchMap searches {};
         unsigned pending_pings {0};
         NodeStatus status;
-        std::vector<ReportedAddr> reported_addr;
 
         NodeStatus getStatus(time_point now) const;
         NodeStats getNodesStats(time_point now, const InfoHash& myid) const;
@@ -398,10 +391,9 @@ private:
 
     Kad dht4 {};
     Kad dht6 {};
-    PublicAddressChangedCb publicAddressChangedCb_ {};
 
     std::vector<std::pair<std::string,std::string>> bootstrap_nodes {};
-    std::chrono::steady_clock::duration bootstrap_period {BOOTSTRAP_PERIOD};
+    std::chrono::steady_clock::duration bootstrap_period {std::chrono::seconds(10)};
     Sp<Scheduler::Job> bootstrapJob {};
 
     std::map<InfoHash, Storage> store;
@@ -426,6 +418,8 @@ private:
     Sp<Scheduler::Job> nextStorageMaintenance {};
 
     net::NetworkEngine network_engine;
+    using ReportedAddr = std::pair<unsigned, SockAddr>;
+    std::vector<ReportedAddr> reported_addr;
 
     std::string persistPath;
 
@@ -451,13 +445,13 @@ private:
     // Storage
     void storageAddListener(const InfoHash& id, const Sp<Node>& node, size_t tid, Query&& = {}, int version = 0);
     bool storageStore(const InfoHash& id, const Sp<Value>& value, time_point created, const SockAddr& sa = {}, bool permanent = false);
+    bool storageErase(const InfoHash& id, Value::Id vid);
     bool storageRefresh(const InfoHash& id, Value::Id vid);
     void expireStore();
     void expireStorage(InfoHash h);
     void expireStore(decltype(store)::iterator);
 
-    void storageRemoved(const InfoHash& id, Storage& st, const std::vector<Sp<Value>>& values, size_t totalSize);
-    void storageChanged(const InfoHash& id, Storage& st, const Sp<Value>&, bool newValue);
+    void storageChanged(const InfoHash& id, Storage& st, ValueStorage&, bool newValue);
     std::string printStorageLog(const decltype(store)::value_type&) const;
 
     /**
@@ -486,9 +480,6 @@ private:
     void sendCachedPing(Bucket& b);
     bool bucketMaintenance(RoutingTable&);
     void dumpBucket(const Bucket& b, std::ostream& out) const;
-    void bootstrap();
-    void startBootstrap();
-    void stopBootstrap();
 
     // Nodes
     void onNewNode(const Sp<Node>& node, int confirm);
@@ -496,6 +487,7 @@ private:
     bool trySearchInsert(const Sp<Node>& node);
 
     // Searches
+
     inline SearchMap& searches(sa_family_t af) { return dht(af).searches; }
     inline const SearchMap& searches(sa_family_t af) const { return dht(af).searches; }
 
@@ -568,7 +560,7 @@ private:
      * @param sr  The search for which we want to announce a value.
      * @param announce  The 'announce' structure.
      */
-    void searchSendAnnounceValue(const Sp<Search>& sr, unsigned syncLevel = TARGET_NODES);
+    void searchSendAnnounceValue(const Sp<Search>& sr);
 
     /**
      * Main process of a Search's operations. This function will demand the
@@ -577,8 +569,7 @@ private:
      *
      * @param sr  The search to execute its operations.
      */
-    void searchStep(std::weak_ptr<Search> ws);
-
+    void searchStep(Sp<Search>);
     void searchSynchedNodeListen(const Sp<Search>&, SearchNode&);
 
     void dumpSearch(const Search& sr, std::ostream& out) const;

include/opendht/dht_interface.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,8 +19,7 @@
 #pragma once
 
 #include "infohash.h"
-#include "logger.h"
-#include "node_export.h"
+#include "log_enable.h"
 
 #include <queue>
 
@@ -33,8 +32,8 @@ namespace net {
 class OPENDHT_PUBLIC DhtInterface {
 public:
     DhtInterface() = default;
-    DhtInterface(const Logger& l) : logger_(std::make_shared<Logger>(l)) {}
-    DhtInterface(const std::shared_ptr<Logger>& l) : logger_(l) {}
+    DhtInterface(const Logger& l) : logger_(std::make_shared<Logger>(l)) {};
+    DhtInterface(const std::shared_ptr<Logger>& l) : logger_(l) {};
     virtual ~DhtInterface() = default;
 
     // [[deprecated]]
@@ -45,16 +44,15 @@ public:
     /**
      * Get the current status of the node for the given family.
      */
-    virtual NodeStatus updateStatus(sa_family_t af) { return getStatus(af); }
+    virtual NodeStatus updateStatus(sa_family_t af) { return getStatus(af); };
     virtual NodeStatus getStatus(sa_family_t af) const = 0;
     virtual NodeStatus getStatus() const = 0;
 
     void addOnConnectedCallback(std::function<void()> cb) {
         onConnectCallbacks_.emplace(std::move(cb));
     }
-    virtual void setOnPublicAddressChanged(PublicAddressChangedCb) {}
 
-    virtual net::DatagramSocket* getSocket() const { return {}; }
+    virtual net::DatagramSocket* getSocket() const { return {}; };
 
     /**
      * Get the ID of the DHT node.
@@ -223,7 +221,6 @@ public:
      * Set the in-memory storage limit in bytes
      */
     virtual void setStorageLimit(size_t limit = DEFAULT_STORAGE_LIMIT) = 0;
-    virtual size_t getStorageLimit() const = 0;
 
     /**
      * Returns the total memory usage of stored values and the number
@@ -233,6 +230,18 @@ public:
 
     virtual std::vector<SockAddr> getPublicAddress(sa_family_t family = 0) = 0;
 
+    /**
+     * Enable or disable logging of DHT internal messages
+     */
+    virtual void setLoggers(LogMethod error = {}, LogMethod warn = {}, LogMethod debug = {}) {
+        if (logger_) {
+            logger_->DBG = std::move(debug);
+            logger_->WARN = std::move(warn);
+            logger_->ERR = std::move(error);
+        } else
+            logger_= std::make_shared<Logger>(std::move(error), std::move(warn), std::move(debug));
+    }
+
     virtual void setLogger(const Logger& l) {
         if (logger_)
             *logger_ = l;
@@ -255,9 +264,6 @@ public:
 
     virtual void setPushNotificationToken(const std::string&) {};
 
-    virtual void setPushNotificationTopic(const std::string&) {};
-    virtual void setPushNotificationPlatform(const std::string&) {};
-
     /**
      * Call linked callback with a push notification
      * @param notification to process

include/opendht/dht_proxy_client.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *          Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *          Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
@@ -67,31 +67,12 @@ public:
 #endif
     }
 
-    virtual void setPushNotificationTopic(const std::string& topic) override {
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
-        notificationTopic_ = topic;
-#else
-        (void) topic;
-#endif
-    }
-
-    virtual void setPushNotificationPlatform(const std::string& platform) override {
-#ifdef OPENDHT_PUSH_NOTIFICATIONS
-        platform_ = platform;
-#else
-        (void) platform;
-#endif
-    }
-
     virtual ~DhtProxyClient();
 
     /**
      * Get the ID of the node.
      */
     inline const InfoHash& getNodeId() const override { return myid; }
-    void setOnPublicAddressChanged(PublicAddressChangedCb cb) override {
-        publicAddressChangedCb_ = std::move(cb);
-    }
 
     /**
      * Get the current status of the node for the given family.
@@ -282,7 +263,6 @@ public:
     void dumpTables() const override {}
     std::vector<unsigned> getNodeMessageStats(bool) override { return {}; }
     void setStorageLimit(size_t) override {}
-    virtual size_t getStorageLimit() const override { return 0; }
     void connectivityChanged(sa_family_t) override {
         getProxyInfos();
     }
@@ -355,12 +335,8 @@ private:
     NodeStatus statusIpv6_ {NodeStatus::Disconnected};
     NodeStats stats4_ {};
     NodeStats stats6_ {};
-    SockAddr localAddrv4_;
-    SockAddr localAddrv6_;
     SockAddr publicAddressV4_;
     SockAddr publicAddressV6_;
-    std::atomic_bool launchConnectedCbs_ {false};
-    PublicAddressChangedCb publicAddressChangedCb_ {};
 
     InfoHash myid {};
 
@@ -372,7 +348,6 @@ private:
      * Note: Each context is used in one thread only
      */
     asio::io_context httpContext_;
-    mutable std::mutex resolverLock_;
     std::shared_ptr<http::Resolver> resolver_;
 
     mutable std::mutex requestLock_;
@@ -423,25 +398,6 @@ private:
      */
     std::string deviceKey_ {};
 
-    /**
-     * Notification topic for ios notifications.
-     */
-    std::string notificationTopic_ {};
-
-    /**
-     * Platform for push notifications (supported android, ios, unifiedpush)
-     */
-    std::string platform_
-#ifdef __ANDROID__
-    {"android"};
-#else
-#ifdef __APPLE__
-    {"ios"};
-#else
-    {};
-#endif
-#endif
-
     const std::function<void()> loopSignal_;
 
 #ifdef OPENDHT_PUSH_NOTIFICATIONS

include/opendht/dht_proxy_server.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *          Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *          Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
@@ -40,8 +40,7 @@ namespace dht {
 enum class PushType {
     None = 0,
     Android,
-    iOS,
-    UnifiedPush
+    iOS
 };
 }
 MSGPACK_ADD_ENUM(dht::PushType)
@@ -62,13 +61,11 @@ class DhtRunner;
 using RestRouter = restinio::router::express_router_t<>;
 using RequestStatus = restinio::request_handling_status_t;
 
-struct OPENDHT_PUBLIC ProxyServerConfig {
-    std::string address {};
+struct ProxyServerConfig {
     in_port_t port {8000};
     std::string pushServer {};
     std::string persistStatePath {};
     dht::crypto::Identity identity {};
-    std::string bundleId {};
 };
 
 /**
@@ -87,7 +84,7 @@ public:
      */
     DhtProxyServer(const std::shared_ptr<DhtRunner>& dht,
         const ProxyServerConfig& config = {},
-        const std::shared_ptr<log::Logger>& logger = {});
+        const std::shared_ptr<dht::Logger>& logger = {});
 
     virtual ~DhtProxyServer();
 
@@ -276,11 +273,6 @@ private:
                            restinio::router::route_params_t params);
 
 #ifdef OPENDHT_PUSH_NOTIFICATIONS
-    PushType getTypeFromString(const std::string& type);
-    std::string getDefaultTopic(PushType type);
-
-    RequestStatus pingPush(restinio::request_handle_t request,
-                         restinio::router::route_params_t /*params*/);
     /**
      * Subscribe to push notifications for an iOS or Android device.
      * Method: SUBSCRIBE "/{InfoHash: .*}"
@@ -308,7 +300,7 @@ private:
      * @param key of the device
      * @param json, the content to send
      */
-    void sendPushNotification(const std::string& key, Json::Value&& json, PushType type, bool highPriority, const std::string& topic);
+    void sendPushNotification(const std::string& key, Json::Value&& json, PushType type, bool highPriority);
 
     /**
      * Send push notification with an expire timeout.
@@ -316,10 +308,9 @@ private:
      * @param pushToken
      * @param json
      * @param type
-     * @param topic
      */
     void handleNotifyPushListenExpire(const asio::error_code &ec, const std::string pushToken,
-                                      std::function<Json::Value()> json, PushType type, const std::string& topic);
+                                      std::function<Json::Value()> json, PushType type);
 
     /**
      * Remove a push listener between a client and a hash
@@ -364,7 +355,7 @@ private:
     mutable std::mutex requestLock_;
     std::map<unsigned int /*id*/, std::shared_ptr<http::Request>> requests_;
 
-    std::shared_ptr<log::Logger> logger_;
+    std::shared_ptr<dht::Logger> logger_;
 
     std::shared_ptr<ServerStats> stats_;
     std::shared_ptr<NodeInfo> nodeInfo_ {};
@@ -391,12 +382,11 @@ private:
         std::unique_ptr<asio::steady_timer> expireNotifyTimer;
         Sp<Value> value;
         PushType type;
-        std::string topic;
 
         template <typename Packer>
         void msgpack_pack(Packer& p) const
         {
-            p.pack_map(2 + (sessionCtx ? 1 : 0) + (clientId.empty() ? 0 : 1) + (type == PushType::None ? 0 : 2) + (topic.empty() ? 0 : 1));
+            p.pack_map(2 + (sessionCtx ? 1 : 0) + (clientId.empty() ? 0 : 1) + (type == PushType::None ? 0 : 2));
             p.pack("value"); p.pack(value);
             p.pack("exp"); p.pack(to_time_t(expiration));
             if (not clientId.empty()) {
@@ -410,9 +400,6 @@ private:
                 p.pack("t"); p.pack(type);
                 p.pack("token"); p.pack(pushToken);
             }
-            if (not topic.empty()) {
-                p.pack("top"); p.pack(topic);
-            }
         }
 
         void msgpack_unpack(const msgpack::object& o);
@@ -428,7 +415,6 @@ private:
     mutable std::atomic<time_point> lastStatsReset_ {time_point::min()};
 
     std::string pushServer_;
-    std::string bundleId_;
 
 #ifdef OPENDHT_PUSH_NOTIFICATIONS
     struct Listener {
@@ -439,12 +425,11 @@ private:
         std::unique_ptr<asio::steady_timer> expireTimer;
         std::unique_ptr<asio::steady_timer> expireNotifyTimer;
         PushType type;
-        std::string topic;
 
         template <typename Packer>
         void msgpack_pack(Packer& p) const
         {
-            p.pack_map(3 + (sessionCtx ? 1 : 0) + (topic.empty() ? 0 : 1));
+            p.pack_map(sessionCtx ? 4 : 3);
             p.pack("cid"); p.pack(clientId);
             p.pack("exp"); p.pack(to_time_t(expiration));
             if (sessionCtx) {
@@ -452,9 +437,6 @@ private:
                 p.pack("sid"); p.pack(sessionCtx->sessionId);
             }
             p.pack("t"); p.pack(type);
-            if (!topic.empty()) {
-                p.pack("top"); p.pack(topic);
-            }
         }
 
         void msgpack_unpack(const msgpack::object& o);
@@ -464,6 +446,7 @@ private:
         MSGPACK_DEFINE_ARRAY(listeners)
     };
     std::map<std::string, PushListener> pushListeners_;
+    proxy::ListenToken tokenPushNotif_ {0};
 #endif //OPENDHT_PUSH_NOTIFICATIONS
 };
 

include/opendht/dhtrunner.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -25,9 +25,8 @@
 #include "value.h"
 #include "callbacks.h"
 #include "sockaddr.h"
-#include "logger.h"
+#include "log_enable.h"
 #include "network_utils.h"
-#include "node_export.h"
 
 #include <thread>
 #include <mutex>
@@ -62,8 +61,6 @@ public:
         std::string proxy_server {};
         std::string push_node_id {};
         std::string push_token {};
-        std::string push_topic {};
-        std::string push_platform {};
         bool peer_discovery {false};
         bool peer_publish {false};
         std::shared_ptr<dht::crypto::Certificate> server_ca;
@@ -78,7 +75,6 @@ public:
         StatusCallback statusChangedCallback {};
         CertificateStoreQuery certificateStore {};
         IdentityAnnouncedCb identityAnnouncedCb {};
-        PublicAddressChangedCb publicAddressChangedCb {};
         Context() {}
     };
 
@@ -261,29 +257,18 @@ public:
     }
     void putEncrypted(const std::string& key, InfoHash to, Value&& value, DoneCallback cb={}, bool permanent = false);
 
-    void putEncrypted(InfoHash hash, const std::shared_ptr<crypto::PublicKey>& to, std::shared_ptr<Value> value, DoneCallback cb={}, bool permanent = false);
-    void putEncrypted(InfoHash hash, const std::shared_ptr<crypto::PublicKey>& to, std::shared_ptr<Value> value, DoneCallbackSimple cb, bool permanent = false) {
-        putEncrypted(hash, to, value, bindDoneCb(cb), permanent);
-    }
-
-    void putEncrypted(InfoHash hash, const std::shared_ptr<crypto::PublicKey>& to, Value&& value, DoneCallback cb={}, bool permanent = false);
-    void putEncrypted(InfoHash hash, const std::shared_ptr<crypto::PublicKey>& to, Value&& value, DoneCallbackSimple cb, bool permanent = false) {
-        putEncrypted(hash, to, std::forward<Value>(value), bindDoneCb(cb), permanent);
-    }
-
+    /**
+     * Insert known nodes to the routing table, without necessarly ping them.
+     * Usefull to restart a node and get things running fast without putting load on the network.
+     */
+    void bootstrap(std::vector<SockAddr> nodes, DoneCallbackSimple&& cb={});
+    void bootstrap(const SockAddr& addr, DoneCallbackSimple&& cb={});
 
     /**
      * Insert known nodes to the routing table, without necessarly ping them.
      * Usefull to restart a node and get things running fast without putting load on the network.
      */
-    void bootstrap(std::vector<SockAddr> nodes, DoneCallbackSimple cb={});
-    void bootstrap(SockAddr addr, DoneCallbackSimple cb={});
-
-    /**
-     * Insert known nodes to the routing table, without necessarly ping them.
-     * Usefull to restart a node and get things running fast without putting load on the network.
-     */
-    void bootstrap(std::vector<NodeExport> nodes);
+    void bootstrap(const std::vector<NodeExport>& nodes);
 
     /**
      * Add host:service to bootstrap nodes, and ping this node.
@@ -318,7 +303,6 @@ public:
      * Get the public key fingerprint if an identity is used with this node, 0 otherwise.
      */
     InfoHash getId() const;
-    std::shared_ptr<crypto::PublicKey> getPublicKey() const;
 
     /**
      * Get the ID of the DHT node.
@@ -339,7 +323,6 @@ public:
 
     std::pair<size_t, size_t> getStoreSize() const;
 
-    void getStorageLimit() const;
     void setStorageLimit(size_t limit = DEFAULT_STORAGE_LIMIT);
 
     std::vector<NodeExport> exportNodes() const;
@@ -350,6 +333,7 @@ public:
     void setLogger(const Logger& logger) {
         setLogger(std::make_shared<Logger>(logger));
     }
+    void setLoggers(LogMethod err = {}, LogMethod warn = {}, LogMethod debug = {});
 
     /**
      * Only print logs related to the given InfoHash (if given), or disable filter (if zeroes).
@@ -375,8 +359,8 @@ public:
     std::string getRoutingTablesLog(sa_family_t af) const;
     std::string getSearchesLog(sa_family_t af = AF_UNSPEC) const;
     std::string getSearchLog(const InfoHash&, sa_family_t af = AF_UNSPEC) const;
-    std::vector<SockAddr> getPublicAddress(sa_family_t af = AF_UNSPEC) const;
-    std::vector<std::string> getPublicAddressStr(sa_family_t af = AF_UNSPEC) const;
+    std::vector<SockAddr> getPublicAddress(sa_family_t af = AF_UNSPEC);
+    std::vector<std::string> getPublicAddressStr(sa_family_t af = AF_UNSPEC);
     void getPublicAddress(std::function<void(std::vector<SockAddr>&&)>, sa_family_t af = AF_UNSPEC);
 
     // securedht methods
@@ -440,6 +424,7 @@ public:
     /**
      * Start or stop the proxy
      * @param proxify if we want to use the proxy
+     * @param deviceKey non empty to enable push notifications
      */
     void enableProxy(bool proxify);
 
@@ -450,16 +435,6 @@ public:
      */
     void setPushNotificationToken(const std::string& token);
 
-     /**
-     * Sets the push notification topic
-     */
-    void setPushNotificationTopic(const std::string& topic);
-
-     /**
-     * Sets the push notification platform
-     */
-    void setPushNotificationPlatform(const std::string& platform);
-
     /**
      * Insert a push notification to process for OpenDHT
      */
@@ -469,6 +444,8 @@ public:
     void forwardAllMessages(bool forward);
 
 private:
+    static constexpr std::chrono::seconds BOOTSTRAP_PERIOD {10};
+
     enum class State {
         Idle,
         Running,
@@ -486,9 +463,12 @@ private:
     DoneCallback bindOpDoneCallback(DoneCallback&& cb);
     DoneCallbackSimple bindOpDoneCallback(DoneCallbackSimple&& cb);
 
-    /** DHT instance */
+    /** Local DHT instance */
     std::unique_ptr<SecureDht> dht_;
 
+    /** Proxy client instance */
+    std::unique_ptr<SecureDht> dht_via_proxy_;
+
     /** true if we are currently using a proxy */
     std::atomic_bool use_proxy {false};
 
@@ -500,6 +480,17 @@ private:
      * reset dht clients
      */
     void resetDht();
+    /**
+     * @return the current active DHT
+     */
+    SecureDht* activeDht() const;
+
+    /**
+     * Store current listeners and translates global tokens for each client.
+     */
+    struct Listener;
+    std::map<size_t, Listener> listeners_;
+    size_t listener_token_ {1};
 
     mutable std::mutex dht_mtx {};
     std::thread dht_thread {};

include/opendht/http.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -53,9 +53,7 @@ class tls_socket_t;
 }
 
 namespace dht {
-namespace log {
 struct Logger;
-}
 
 namespace crypto {
 struct Certificate;
@@ -90,9 +88,9 @@ public:
 class OPENDHT_PUBLIC Connection : public std::enable_shared_from_this<Connection>
 {
 public:
-    Connection(asio::io_context& ctx, const bool ssl = true, std::shared_ptr<log::Logger> l = {});
+    Connection(asio::io_context& ctx, const bool ssl = true, std::shared_ptr<dht::Logger> l = {});
     Connection(asio::io_context& ctx, std::shared_ptr<dht::crypto::Certificate> server_ca,
-               const dht::crypto::Identity& identity, std::shared_ptr<log::Logger> l = {});
+               const dht::crypto::Identity& identity, std::shared_ptr<dht::Logger> l = {});
     ~Connection();
 
     inline unsigned int id() const { return  id_; };
@@ -116,16 +114,13 @@ public:
     void async_read(size_t bytes, BytesHandlerCb cb);
     void async_read_some(size_t bytes, BytesHandlerCb cb);
 
-    const asio::ip::address& local_address() const;
-
-    void timeout(const std::chrono::seconds& timeout, HandlerCb cb = {});
-
+    void timeout(const std::chrono::seconds timeout, HandlerCb cb = {});
     void close();
 
 private:
 
     template<typename T>
-    T wrapCallback(T cb) const {
+    T wrapCallabck(T cb) const {
         return [t=shared_from_this(),cb=std::move(cb)](auto ...params) {
             cb(params...);
         };
@@ -147,10 +142,8 @@ private:
     asio::streambuf read_buf_;
     std::istream istream_;
 
-    asio::ip::address local_address_;
-
     std::unique_ptr<asio::steady_timer> timeout_timer_;
-    std::shared_ptr<log::Logger> logger_;
+    std::shared_ptr<dht::Logger> logger_;
     bool checkOcsp_ {false};
 };
 
@@ -174,15 +167,15 @@ public:
     using ResolverCb = std::function<void(const asio::error_code& ec,
                                           const std::vector<asio::ip::tcp::endpoint>& endpoints)>;
 
-    Resolver(asio::io_context& ctx, const std::string& url, std::shared_ptr<log::Logger> logger = {});
+    Resolver(asio::io_context& ctx, const std::string& url, std::shared_ptr<dht::Logger> logger = {});
     Resolver(asio::io_context& ctx, const std::string& host, const std::string& service,
-             const bool ssl = false, std::shared_ptr<log::Logger> logger = {});
+             const bool ssl = false, std::shared_ptr<dht::Logger> logger = {});
 
     // use already resolved endpoints with classes using this resolver
     Resolver(asio::io_context& ctx, std::vector<asio::ip::tcp::endpoint> endpoints,
-             const bool ssl = false, std::shared_ptr<log::Logger> logger = {});
+             const bool ssl = false, std::shared_ptr<dht::Logger> logger = {});
     Resolver(asio::io_context& ctx, const std::string& url, std::vector<asio::ip::tcp::endpoint> endpoints,
-            std::shared_ptr<log::Logger> logger = {});
+            std::shared_ptr<dht::Logger> logger = {});
 
     ~Resolver();
 
@@ -192,7 +185,7 @@ public:
 
     void add_callback(ResolverCb cb, sa_family_t family = AF_UNSPEC);
 
-    std::shared_ptr<log::Logger> getLogger() const {
+    std::shared_ptr<Logger> getLogger() const {
         return logger_;
     }
 
@@ -210,7 +203,7 @@ private:
     bool completed_ {false};
     std::queue<ResolverCb> cbs_;
 
-    std::shared_ptr<log::Logger> logger_;
+    std::shared_ptr<dht::Logger> logger_;
 };
 
 class Request;
@@ -242,14 +235,14 @@ public:
 
     // resolves implicitly
     Request(asio::io_context& ctx, const std::string& url, const Json::Value& json, OnJsonCb jsoncb,
-            std::shared_ptr<log::Logger> logger = {});
+            std::shared_ptr<dht::Logger> logger = {});
     Request(asio::io_context& ctx, const std::string& url, OnJsonCb jsoncb,
-            std::shared_ptr<log::Logger> logger = {});
+            std::shared_ptr<dht::Logger> logger = {});
 
-    Request(asio::io_context& ctx, const std::string& url, std::shared_ptr<log::Logger> logger = {});
+    Request(asio::io_context& ctx, const std::string& url, std::shared_ptr<dht::Logger> logger = {});
     Request(asio::io_context& ctx, const std::string& host, const std::string& service,
-            const bool ssl = false, std::shared_ptr<log::Logger> logger = {});
-    Request(asio::io_context& ctx, const std::string& url, OnDoneCb onDone, std::shared_ptr<log::Logger> logger = {});
+            const bool ssl = false, std::shared_ptr<dht::Logger> logger = {});
+    Request(asio::io_context& ctx, const std::string& url, OnDoneCb onDone, std::shared_ptr<dht::Logger> logger = {});
 
     // user defined resolver
     Request(asio::io_context& ctx, std::shared_ptr<Resolver> resolver, sa_family_t family = AF_UNSPEC);
@@ -257,7 +250,7 @@ public:
 
     // user defined resolved endpoints
     Request(asio::io_context& ctx, std::vector<asio::ip::tcp::endpoint>&& endpoints,
-            const bool ssl = false, std::shared_ptr<log::Logger> logger = {});
+            const bool ssl = false, std::shared_ptr<dht::Logger> logger = {});
 
     ~Request();
 
@@ -268,11 +261,6 @@ public:
         return resolver_->get_url();
     };
 
-    void timeout(const std::chrono::seconds& timeout, HandlerCb cb = {}) {
-        timeout_ = timeout;
-        timeoutCb_ = cb;
-    }
-
     /** The previous request in case of redirect following */
     std::shared_ptr<Request> getPrevious() const {
         return prev_.lock();
@@ -284,7 +272,7 @@ public:
 
     void set_certificate_authority(std::shared_ptr<dht::crypto::Certificate> certificate);
     void set_identity(const dht::crypto::Identity& identity);
-    void set_logger(std::shared_ptr<log::Logger> logger);
+    void set_logger(std::shared_ptr<dht::Logger> logger);
 
     /**
      * Define the HTTP header/body as per https://tools.ietf.org/html/rfc7230.
@@ -330,8 +318,6 @@ private:
 
     void build();
 
-    static std::string url_encode(std::string_view value);
-
     void init_default_headers();
     /**
      * Initialized and wraps the http_parser callbacks with our user defined callbacks.
@@ -351,7 +337,7 @@ private:
 
     mutable std::mutex mutex_;
 
-    std::shared_ptr<log::Logger> logger_;
+    std::shared_ptr<dht::Logger> logger_;
 
     restinio::http_request_header_t header_;
     std::map<restinio::http_field_t, std::string> headers_;
@@ -384,11 +370,20 @@ private:
     std::weak_ptr<Request> prev_;
     unsigned num_redirect {0};
     bool follow_redirect {true};
-
-    HandlerCb timeoutCb_ {};
-    std::chrono::seconds timeout_ {0};
 };
 
 } // namespace http
 } // namespace dht
 
+#ifdef OPENDHT_PROXY_HTTP_PARSER_FORK
+namespace restinio
+{
+/* Custom HTTP-methods for RESTinio > 0.5.0.
+ * https://github.com/Stiffstream/restinio/issues/26
+ */
+constexpr const restinio::http_method_id_t method_listen {HTTP_LISTEN, "LISTEN"};
+constexpr const restinio::http_method_id_t method_stats {HTTP_STATS, "STATS"};
+constexpr const restinio::http_method_id_t method_sign {HTTP_SIGN, "SIGN"};
+constexpr const restinio::http_method_id_t method_encrypt {HTTP_ENCRYPT, "ENCRYPT"};
+} // namespace restinio
+#endif

include/opendht/indexation/pht.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *              Nicolas Reynaud <nicolas.reynaud@savoirfairelinux.com>

include/opendht/infohash.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #include "rng.h"
 
 #include <msgpack.hpp>
-#include <fmt/core.h>
 
 #ifndef _WIN32
 #include <netinet/in.h>
@@ -41,13 +40,10 @@ typedef uint16_t in_port_t;
 #include <iomanip>
 #include <array>
 #include <vector>
-#include <string_view>
 #include <algorithm>
 #include <stdexcept>
 #include <sstream>
-
 #include <cstring>
-#include <cstddef>
 
 namespace dht {
 
@@ -69,10 +65,10 @@ public:
     typedef typename T::iterator iterator;
     typedef typename T::const_iterator const_iterator;
 
-    Hash() noexcept {
+    Hash () noexcept {
         data_.fill(0);
     }
-    Hash(const uint8_t* h, size_t data_len) {
+    Hash (const uint8_t* h, size_t data_len) {
         if (data_len < N)
             data_.fill(0);
         else
@@ -83,12 +79,7 @@ public:
      * hex must be at least 2.HASH_LEN characters long.
      * If too long, only the first 2.HASH_LEN characters are read.
      */
-    explicit Hash(std::string_view hex) {
-        if (hex.size() < 2*N)
-            data_.fill(0);
-        else
-            fromString(hex.data());
-    }
+    explicit Hash(const std::string& hex);
 
     Hash(const msgpack::object& o) {
         msgpack_unpack(o);
@@ -105,7 +96,13 @@ public:
     static constexpr inline Hash zero() noexcept { return Hash{}; }
 
     bool operator==(const Hash& h) const {
-        return data_ == h.data_;
+        auto a = reinterpret_cast<const uint32_t*>(data_.data());
+        auto b = reinterpret_cast<const uint32_t*>(h.data_.data());
+        constexpr unsigned n = N / sizeof(uint32_t);
+        for (unsigned i=0; i < n; i++)
+            if (a[i] != b[i])
+                return false;
+        return true;
     }
     bool operator!=(const Hash& h) const { return !(*this == h); }
 
@@ -222,7 +219,7 @@ public:
         return v;
     }
 
-    static inline Hash get(std::string_view data) {
+    static inline Hash get(const std::string& data) {
         return get((const uint8_t*)data.data(), data.size());
     }
 
@@ -230,11 +227,6 @@ public:
         return get(data.data(), data.size());
     }
 
-    template <size_t H>
-    static Hash get(const Hash<H>& o) {
-        return get(o.data(), o.size());
-    }
-
     /**
      * Computes the hash from a given data buffer of size data_len.
      */
@@ -256,8 +248,6 @@ public:
     template <size_t M>
     OPENDHT_PUBLIC friend std::istream& operator>> (std::istream& s, Hash<M>& h);
 
-    /** Returns view to thread-allocated memory, only valid until the next call to this function. */
-    std::string_view to_view() const { return std::string_view(to_c_str(), N*2); }
     const char* to_c_str() const;
 
     std::string toString() const;
@@ -301,6 +291,14 @@ std::istream& operator>> (std::istream& s, Hash<N>& h)
     return s;
 }
 
+template <size_t N>
+Hash<N>::Hash(const std::string& hex) {
+    if (hex.size() < 2*N)
+        data_.fill(0);
+    else
+        fromString(hex.c_str());
+}
+
 template <size_t N>
 void
 Hash<N>::fromString(const char* in) {
@@ -344,7 +342,7 @@ Hash<N>::getRandom(Rd& rdev)
     return h;
 }
 
-struct alignas(std::max_align_t) HexMap : public std::array<std::array<char, 2>, 256> {
+struct HexMap : public std::array<std::array<char, 2>, 256> {
     HexMap() {
         for (size_t i=0; i<size(); i++) {
             auto& e = (*this)[i];
@@ -378,7 +376,7 @@ template <size_t N>
 const char*
 Hash<N>::to_c_str() const
 {
-    alignas(std::max_align_t) thread_local std::array<char, N*2+1> buf;
+    thread_local std::array<char, N*2+1> buf;
     for (size_t i=0; i<N; i++) {
         auto b = buf.data()+i*2;
         const auto& m = hex_map[data_[i]];
@@ -394,11 +392,25 @@ Hash<N>::toString() const
     return std::string(to_c_str(), N*2);
 }
 
-}
+struct OPENDHT_PUBLIC NodeExport {
+    InfoHash id;
+    sockaddr_storage ss;
+    socklen_t sslen;
 
-template <size_t N>
-struct fmt::formatter<dht::Hash<N>>: formatter<string_view> {
-  constexpr auto format(const dht::Hash<N>& c, format_context& ctx) const {
-    return formatter<string_view>::format(c.to_view(), ctx);
-  }
+    template <typename Packer>
+    void msgpack_pack(Packer& pk) const
+    {
+        pk.pack_map(2);
+        pk.pack(std::string("id"));
+        pk.pack(id);
+        pk.pack(std::string("addr"));
+        pk.pack_bin(sslen);
+        pk.pack_bin_body((char*)&ss, sslen);
+    }
+
+    void msgpack_unpack(msgpack::object o);
+
+    OPENDHT_PUBLIC friend std::ostream& operator<< (std::ostream& s, const NodeExport& h);
 };
+
+}

include/opendht/log.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
@@ -20,7 +20,7 @@
 #pragma once
 
 #include "def.h"
-#include "logger.h"
+#include "log_enable.h"
 
 #include <iostream>
 #include <memory>
@@ -34,6 +34,42 @@ class DhtRunner;
  */
 namespace log {
 
+/**
+ * Terminal colors for logging
+ */
+namespace Color {
+    enum Code {
+        FG_RED      = 31,
+        FG_GREEN    = 32,
+        FG_YELLOW   = 33,
+        FG_BLUE     = 34,
+        FG_DEFAULT  = 39,
+        BG_RED      = 41,
+        BG_GREEN    = 42,
+        BG_BLUE     = 44,
+        BG_DEFAULT  = 49
+    };
+    class Modifier {
+        const Code code;
+    public:
+        constexpr Modifier(Code pCode) : code(pCode) {}
+        friend std::ostream&
+        operator<<(std::ostream& os, const Modifier& mod) {
+            return os << "\033[" << mod.code << 'm';
+        }
+    };
+}
+
+constexpr const Color::Modifier def(Color::FG_DEFAULT);
+constexpr const Color::Modifier red(Color::FG_RED);
+constexpr const Color::Modifier yellow(Color::FG_YELLOW);
+
+/**
+ * Print va_list to std::ostream (used for logging).
+ */
+OPENDHT_PUBLIC void
+printLog(std::ostream &s, char const *m, va_list args);
+
 OPENDHT_PUBLIC
 std::shared_ptr<Logger> getStdLogger();
 

include/opendht/log_enable.h

@@ -0,0 +1,191 @@
+/*
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
+ *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "infohash.h"
+
+#include <cstdarg>
+
+#ifndef OPENDHT_LOG
+#define OPENDHT_LOG true
+#endif
+
+namespace dht {
+
+// Logging related utility functions
+
+/**
+ * Wrapper for logging methods
+ */
+struct LogMethod {
+    LogMethod() = default;
+
+    LogMethod(LogMethod&& l) : func(std::move(l.func)) {}
+    LogMethod(const LogMethod& l) : func(l.func) {}
+
+    LogMethod& operator=(dht::LogMethod&& l) {
+        func = std::forward<LogMethod>(l.func);
+        return *this;
+    }
+    LogMethod& operator=(const dht::LogMethod& l) {
+        func = l.func;
+        return *this;
+    }
+
+    template<typename T>
+    explicit LogMethod(T&& t) : func(std::forward<T>(t)) {}
+
+    template<typename T>
+    LogMethod(const T& t) : func(t) {}
+
+    void operator()(char const* format, ...) const {
+        va_list args;
+        va_start(args, format);
+        func(format, args);
+        va_end(args);
+    }
+    inline void log(char const* format, va_list args) const {
+        func(format, args);
+    }
+    explicit operator bool() const {
+        return (bool)func;
+    }
+
+    void logPrintable(const uint8_t *buf, size_t buflen) const {
+        std::string buf_clean(buflen, '\0');
+        for (size_t i=0; i<buflen; i++)
+            buf_clean[i] = isprint(buf[i]) ? buf[i] : '.';
+        (*this)("%s", buf_clean.c_str());
+    }
+private:
+    std::function<void(char const*, va_list)> func;
+};
+
+struct Logger {
+    LogMethod ERR = {};
+    LogMethod WARN = {};
+    LogMethod DBG = {};
+
+    Logger() = default;
+    Logger(LogMethod&& err, LogMethod&& warn, LogMethod&& dbg)
+        : ERR(std::move(err)), WARN(std::move(warn)), DBG(std::move(dbg)) {}
+    void setFilter(const InfoHash& f) {
+        filter_ = f;
+        filterEnable_ = static_cast<bool>(filter_);
+    }
+    inline void log0(const LogMethod& logger, char const* format, va_list args) const {
+#if OPENDHT_LOG
+        if (logger and not filterEnable_)
+            logger.log(format, args);
+#endif
+    }
+    inline void log1(const LogMethod& logger, const InfoHash& f, char const* format, va_list args) const {
+#if OPENDHT_LOG
+        if (logger and (not filterEnable_ or f == filter_))
+            logger.log(format, args);
+#endif
+    }
+    inline void log2(const LogMethod& logger, const InfoHash& f1, const InfoHash& f2, char const* format, va_list args) const {
+#if OPENDHT_LOG
+        if (logger and (not filterEnable_ or f1 == filter_ or f2 == filter_))
+            logger.log(format, args);
+#endif
+    }
+    inline void d(char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log0(DBG, format, args);
+        va_end(args);
+#endif
+    }
+    inline void d(const InfoHash& f, char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log1(DBG, f, format, args);
+        va_end(args);
+#endif
+    }
+    inline void d(const InfoHash& f1, const InfoHash& f2, char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log2(DBG, f1, f2, format, args);
+        va_end(args);
+#endif
+    }
+    inline void w(char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log0(WARN, format, args);
+        va_end(args);
+#endif
+    }
+    inline void w(const InfoHash& f, char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log1(WARN, f, format, args);
+        va_end(args);
+#endif
+    }
+    inline void w(const InfoHash& f1, const InfoHash& f2, char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log2(WARN, f1, f2, format, args);
+        va_end(args);
+#endif
+    }
+    inline void e(char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log0(ERR, format, args);
+        va_end(args);
+#endif
+    }
+    inline void e(const InfoHash& f, char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log1(ERR, f, format, args);
+        va_end(args);
+#endif
+    }
+    inline void e(const InfoHash& f1, const InfoHash& f2, char const* format, ...) const {
+#if OPENDHT_LOG
+        va_list args;
+        va_start(args, format);
+        log2(ERR, f1, f2, format, args);
+        va_end(args);
+#endif
+    }
+private:
+    bool filterEnable_ {false};
+    InfoHash filter_ {};
+};
+
+}

include/opendht/logger.h

@@ -1,118 +0,0 @@
-/*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
- *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "infohash.h"
-
-#include <fmt/format.h>
-#include <fmt/printf.h>
-
-#include <functional>
-#include <string_view>
-#include <cstdarg>
-
-namespace dht {
-namespace log {
-
-enum class LogLevel {
-    debug, warning, error
-};
-
-using LogMethod = std::function<void(LogLevel, std::string&&)>;
-
-struct OPENDHT_PUBLIC Logger {
-    Logger() = delete;
-    Logger(LogMethod&& l)
-        : logger(std::move(l)) {
-            if (!logger)
-                throw std::invalid_argument{"logger and loggerf must be set"};
-        }
-    void setFilter(const InfoHash& f) {
-        filter_ = f;
-        filterEnable_ = static_cast<bool>(filter_);
-    }
-    inline void log0(LogLevel level, fmt::string_view format, fmt::printf_args args) const {
-        if (not filterEnable_)
-            logger(level, fmt::vsprintf(format, args));
-    }
-    inline void log1(LogLevel level, const InfoHash& f, fmt::string_view format, fmt::printf_args args) const {
-        if (not filterEnable_ or f == filter_)
-            logger(level, fmt::vsprintf(format, args));
-    }
-    inline void log2(LogLevel level, const InfoHash& f1, const InfoHash& f2, fmt::string_view format, fmt::printf_args args) const {
-        if (not filterEnable_ or f1 == filter_ or f2 == filter_)
-            logger(level, fmt::vsprintf(format, args));
-    }
-    template<typename S, typename... Args>
-    inline void debug(S&& format, Args&&... args) const {
-        logger(LogLevel::debug, fmt::format(format, args...));
-    }
-    template<typename S, typename... Args>
-    inline void warn(S&& format, Args&&... args) const {
-        logger(LogLevel::warning, fmt::format(format, args...));
-    }
-    template<typename S, typename... Args>
-    inline void error(S&& format, Args&&... args) const {
-        logger(LogLevel::error, fmt::format(format, args...));
-    }
-    template <typename... T>
-    inline void d(fmt::format_string<T...> format, T&&... args) const {
-        log0(LogLevel::debug, format, fmt::make_printf_args(args...));
-    }
-    template <typename... T>
-    inline void d(const InfoHash& f, fmt::format_string<T...> format, T&&... args) const {
-        log1(LogLevel::debug, f, format, fmt::make_printf_args(args...));
-    }
-    template <typename... T>
-    inline void d(const InfoHash& f1, const InfoHash& f2, fmt::format_string<T...> format, T&&... args) const {
-        log2(LogLevel::debug, f1, f2, format, fmt::make_printf_args(args...));
-    }
-    template <typename... T>
-    inline void w(fmt::format_string<T...> format, T&&... args) const {
-        log0(LogLevel::warning, format, fmt::make_printf_args(args...));
-    }
-    template <typename... T>
-    inline void w(const InfoHash& f, fmt::format_string<T...> format, T&&... args) const {
-        log1(LogLevel::warning, f, format, fmt::make_printf_args(args...));
-    }
-    template <typename... T>
-    inline void w(const InfoHash& f1, const InfoHash& f2, fmt::format_string<T...> format, T&&... args) const {
-        log2(LogLevel::warning, f1, f2, format, fmt::make_printf_args(args...));
-    }
-    template <typename... T>
-    inline void e(fmt::format_string<T...> format, T&&... args) const {
-        log0(LogLevel::error, format, fmt::make_printf_args(args...));
-    }
-    template <typename... T>
-    inline void e(const InfoHash& f, fmt::format_string<T...> format, T&&... args) const {
-        log1(LogLevel::error, f, format, fmt::make_printf_args(args...));
-    }
-    template <typename... T>
-    inline void e(const InfoHash& f1, const InfoHash& f2, fmt::format_string<T...> format, T&&... args) const {
-        log2(LogLevel::error, f1, f2, format, fmt::make_printf_args(args...));
-    }
-private:
-    LogMethod logger = {};
-    bool filterEnable_ {false};
-    InfoHash filter_ {};
-};
-
-}
-using Logger = log::Logger;
-}

include/opendht/network_engine.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
@@ -27,7 +27,7 @@
 #include "utils.h"
 #include "rng.h"
 #include "rate_limiter.h"
-#include "logger.h"
+#include "log_enable.h"
 #include "network_utils.h"
 
 #include <vector>
@@ -252,12 +252,12 @@ public:
      * @param values      The values to send.
      * @param version     If version = 1, a request will be used to answer to the listener
      */
-    void tellListener(const Sp<Node>& n, Tid socket_id, const InfoHash& hash, want_t want, const Blob& ntoken,
+    void tellListener(Sp<Node> n, Tid socket_id, const InfoHash& hash, want_t want, const Blob& ntoken,
             std::vector<Sp<Node>>&& nodes, std::vector<Sp<Node>>&& nodes6,
             std::vector<Sp<Value>>&& values, const Query& q, int version);
 
-    void tellListenerRefreshed(const Sp<Node>& n, Tid socket_id, const InfoHash& hash, const Blob& ntoken, const std::vector<Value::Id>& values, int version);
-    void tellListenerExpired(const Sp<Node>& n, Tid socket_id, const InfoHash& hash, const Blob& ntoken, const std::vector<Value::Id>& values, int version);
+    void tellListenerRefreshed(Sp<Node> n, Tid socket_id, const InfoHash& hash, const Blob& ntoken, const std::vector<Value::Id>& values, int version);
+    void tellListenerExpired(Sp<Node> n, Tid socket_id, const InfoHash& hash, const Blob& ntoken, const std::vector<Value::Id>& values, int version);
 
     bool isRunning(sa_family_t af) const;
     inline want_t want () const { return dht_socket->hasIPv4() and dht_socket->hasIPv6() ? (WANT4 | WANT6) : -1; }
@@ -278,7 +278,7 @@ public:
      * @return the request with information concerning its success.
      */
     Sp<Request>
-    sendPing(const Sp<Node>& n, RequestCb&& on_done, RequestExpiredCb&& on_expired);
+    sendPing(Sp<Node> n, RequestCb&& on_done, RequestExpiredCb&& on_expired);
 
     /**
      * Send a "ping" request to a given node.
@@ -309,7 +309,7 @@ public:
      *
      * @return the request with information concerning its success.
      */
-    Sp<Request> sendFindNode(const Sp<Node>& n,
+    Sp<Request> sendFindNode(Sp<Node> n,
                              const InfoHash& hash,
                              want_t want = -1,
                              RequestCb&& on_done = {},
@@ -328,7 +328,7 @@ public:
      *
      * @return the request with information concerning its success.
      */
-    Sp<Request> sendGetValues(const Sp<Node>& n,
+    Sp<Request> sendGetValues(Sp<Node> n,
                               const InfoHash& hash,
                               const Query& query,
                               want_t want,
@@ -357,7 +357,7 @@ public:
      *
      * @return the request with information concerning its success.
      */
-    Sp<Request> sendListen(const Sp<Node>& n,
+    Sp<Request> sendListen(Sp<Node> n,
                            const InfoHash& hash,
                            const Query& query,
                            const Blob& token,
@@ -377,7 +377,7 @@ public:
      *
      * @return the request with information concerning its success.
      */
-    Sp<Request> sendAnnounceValue(const Sp<Node>& n,
+    Sp<Request> sendAnnounceValue(Sp<Node> n,
                                   const InfoHash& hash,
                                   const Sp<Value>& v,
                                   time_point created,
@@ -397,7 +397,7 @@ public:
      *
      * @return the request with information concerning its success.
      */
-    Sp<Request> sendRefreshValue(const Sp<Node>& n,
+    Sp<Request> sendRefreshValue(Sp<Node> n,
                                  const InfoHash& hash,
                                  const Value::Id& vid,
                                  const Blob& token,
@@ -416,19 +416,12 @@ public:
      *
      * @return the request with information concerning its success.
      */
-    void sendUpdateValues(const Sp<Node>& n,
+    Sp<Request> sendUpdateValues(Sp<Node> n,
                                  const InfoHash& infohash,
-                                 std::vector<Sp<Value>>&& values,
+                                 const std::vector<Sp<Value>>& values,
                                  time_point created,
                                  const Blob& token,
-                                 size_t sid);
-    Sp<Request> sendUpdateValues(const Sp<Node>& n,
-                                 const InfoHash& infohash,
-                                 std::vector<Sp<Value>>::iterator begin,
-                                 std::vector<Sp<Value>>::iterator end,
-                                 time_point created,
-                                 const Blob& token,
-                                 size_t sid);
+                                 const size_t& sid);
 
     /**
      * Parses a message and calls appropriate callbacks.
@@ -499,7 +492,8 @@ private:
 
     static constexpr size_t MTU {1280};
     static constexpr size_t MAX_PACKET_VALUE_SIZE {600};
-    static constexpr size_t MAX_MESSAGE_VALUE_SIZE {56 * 1024};
+
+    static const std::string my_v;
 
     void process(std::unique_ptr<ParsedMessage>&&, const SockAddr& from);
 
@@ -531,10 +525,7 @@ private:
     int send(const SockAddr& addr, const char *buf, size_t len, bool confirmed = false);
 
     void sendValueParts(Tid tid, const std::vector<Blob>& svals, const SockAddr& addr);
-    std::vector<Blob> packValueHeader(msgpack::sbuffer&, std::vector<Sp<Value>>::const_iterator, std::vector<Sp<Value>>::const_iterator) const;
-    std::vector<Blob> packValueHeader(msgpack::sbuffer& buf, const std::vector<Sp<Value>>& values) const {
-        return packValueHeader(buf, values.begin(), values.end());
-    }
+    std::vector<Blob> packValueHeader(msgpack::sbuffer&, const std::vector<Sp<Value>>&);
     void maintainRxBuffer(Tid tid);
 
     /*************

include/opendht/network_utils.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
 
 #include "sockaddr.h"
 #include "utils.h"
-#include "logger.h"
+#include "log_enable.h"
 
 #ifdef _WIN32
 #include <ws2tcpip.h>
@@ -42,7 +42,7 @@ namespace dht {
 namespace net {
 
 static const constexpr in_port_t DHT_DEFAULT_PORT = 4222;
-static const constexpr size_t RX_QUEUE_MAX_SIZE = 1024 * 64;
+static const constexpr size_t RX_QUEUE_MAX_SIZE = 1024 * 16;
 static const constexpr std::chrono::milliseconds RX_QUEUE_MAX_DELAY(650);
 
 int bindSocket(const SockAddr& addr, SockAddr& bound);

include/opendht/node.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
@@ -22,7 +22,6 @@
 #include "infohash.h" // includes socket structures
 #include "utils.h"
 #include "sockaddr.h"
-#include "node_export.h"
 
 #include <list>
 #include <map>
@@ -53,7 +52,7 @@ struct Node {
     Node(const InfoHash& id, const sockaddr* sa, socklen_t salen, std::mt19937_64& rd)
         : Node(id, SockAddr(sa, salen), rd) {}
 
-    const InfoHash& getId() const {
+    InfoHash getId() const {
         return id;
     }
     const SockAddr& getAddr() const { return addr; }
@@ -93,7 +92,8 @@ struct Node {
     NodeExport exportNode() const {
         NodeExport ne;
         ne.id = id;
-        ne.addr = addr;
+        ne.sslen = addr.getLength();
+        std::memcpy(&ne.ss, addr.get(), ne.sslen);
         return ne;
     }
     sa_family_t getFamily() const { return addr.getFamily(); }
@@ -139,7 +139,7 @@ struct Node {
      */
     Tid getNewTid() {
         ++transaction_id;
-        return transaction_id ? transaction_id : ++transaction_id;
+        return transaction_id ? ++transaction_id : transaction_id;
     }
 
     std::string toString() const;

include/opendht/node_cache.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

include/opendht/node_export.h

@@ -1,48 +0,0 @@
-/*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "def.h"
-#include "infohash.h"
-#include "sockaddr.h"
-
-#include <string_view>
-
-namespace dht {
-using namespace std::literals;
-
-struct OPENDHT_PUBLIC NodeExport {
-    InfoHash id;
-    SockAddr addr;
-
-    template <typename Packer>
-    void msgpack_pack(Packer& pk) const
-    {
-        pk.pack_map(2);
-        pk.pack("id"sv);
-        pk.pack(id);
-        pk.pack("addr"sv);
-        pk.pack_bin(addr.getLength());
-        pk.pack_bin_body((const char*)addr.get(), (size_t)addr.getLength());
-    }
-
-    void msgpack_unpack(msgpack::object o);
-
-    OPENDHT_PUBLIC friend std::ostream& operator<< (std::ostream& s, const NodeExport& h);
-};
-
-}

include/opendht/peer_discovery.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author(s) : Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
  *              Vsevolod Ivanov <vsevolod.ivanov@savoirfairelinux.com>
  *
@@ -22,7 +22,7 @@
 #include "def.h"
 #include "sockaddr.h"
 #include "infohash.h"
-#include "logger.h"
+#include "log_enable.h"
 
 #include <thread>
 

include/opendht/proxy.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

include/opendht/rate_limiter.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

include/opendht/rng.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

include/opendht/routing_table.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *

include/opendht/scheduler.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
@@ -36,9 +36,8 @@ namespace dht {
 class Scheduler {
 public:
     struct Job {
-        Job(std::function<void()>&& f, time_point t) : do_(std::move(f)), t_(t) {}
+        Job(std::function<void()>&& f) : do_(std::move(f)) {}
         std::function<void()> do_;
-        const time_point t_;
         void cancel() { do_ = {}; }
     };
 
@@ -51,12 +50,17 @@ public:
      * @return pointer to the newly scheduled job.
      */
     Sp<Scheduler::Job> add(time_point t, std::function<void()>&& job_func) {
-        auto job = std::make_shared<Job>(std::move(job_func), t);
+        auto job = std::make_shared<Job>(std::move(job_func));
         if (t != time_point::max())
             timers.emplace(std::move(t), job);
         return job;
     }
 
+    void add(const Sp<Scheduler::Job>& job, time_point t) {
+        if (t != time_point::max())
+            timers.emplace(std::move(t), job);
+    }
+
     /**
      * Reschedules a job.
      *
@@ -64,29 +68,16 @@ public:
      * @param t  The time at which the job shall be rescheduled.
      */
     void edit(Sp<Scheduler::Job>& job, time_point t) {
-        if (not job)
+        if (not job) {
             return;
+        }
         // std::function move doesn't garantee to leave the object empty.
         // Force clearing old value.
         auto task = std::move(job->do_);
-        cancel(job);
+        job->do_ = {};
         job = add(t, std::move(task));
     }
 
-    bool cancel(Sp<Scheduler::Job>& job) {
-        if (job) {
-            job->cancel();
-            for (auto r = timers.equal_range(job->t_); r.first != r.second; ++r.first) {
-                if (r.first->second == job) {
-                    timers.erase(r.first);
-                    job.reset();
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
     /**
      * Runs the jobs to do up to now.
      *

include/opendht/securedht.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Authors: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *           Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *           Sébastien Blin <sebastien.blin@savoirfairelinux.com>
@@ -61,9 +61,6 @@ public:
     PkId getLongId() const {
         return key_ ? key_->getPublicKey().getLongId() : PkId();
     }
-    Sp<crypto::PublicKey> getPublicKey() const {
-        return key_ ? key_->getSharedPublicKey() : Sp<crypto::PublicKey>{};
-    }
 
     ValueType secureType(ValueType&& type);
 
@@ -118,10 +115,6 @@ public:
     void putEncrypted(const InfoHash& hash, const InfoHash& to, Value&& v, DoneCallback callback, bool permanent = false) {
         putEncrypted(hash, to, std::make_shared<Value>(std::move(v)), callback, permanent);
     }
-    void putEncrypted(const InfoHash& hash, const crypto::PublicKey& to, Sp<Value> val, DoneCallback callback, bool permanent = false);
-    void putEncrypted(const InfoHash& hash, const crypto::PublicKey& to, Value&& v, DoneCallback callback, bool permanent = false) {
-        putEncrypted(hash, to, std::make_shared<Value>(std::move(v)), callback, permanent);
-    }
 
     /**
      * Take ownership of the value and sign it using our private key.
@@ -133,13 +126,13 @@ public:
     Value decrypt(const Value& v);
 
     void findCertificate(const InfoHash& node, const std::function<void(const Sp<crypto::Certificate>)>& cb);
-    void findPublicKey(const InfoHash& node, const std::function<void(const Sp<crypto::PublicKey>)>& cb);
+    void findPublicKey(const InfoHash& node, const std::function<void(const Sp<const crypto::PublicKey>)>& cb);
 
-    Sp<crypto::Certificate> registerCertificate(const InfoHash& node, const Blob& cert);
+    const Sp<crypto::Certificate> registerCertificate(const InfoHash& node, const Blob& cert);
     void registerCertificate(Sp<crypto::Certificate>& cert);
 
-    Sp<crypto::Certificate> getCertificate(const InfoHash& node) const;
-    Sp<crypto::PublicKey> getPublicKey(const InfoHash& node) const;
+    const Sp<crypto::Certificate> getCertificate(const InfoHash& node) const;
+    const Sp<const crypto::PublicKey> getPublicKey(const InfoHash& node) const;
 
     /**
      * Allows to set a custom callback called by the library to find a locally-stored certificate.
@@ -149,9 +142,6 @@ public:
     void setLocalCertificateStore(CertificateStoreQuery&& query_method) {
         localQueryMethod_ = std::move(query_method);
     }
-    void setOnPublicAddressChanged(PublicAddressChangedCb cb) override {
-        dht_->setOnPublicAddressChanged(cb);
-    }
 
     /**
      * SecureDht to Dht proxy
@@ -176,10 +166,6 @@ public:
     void setStorageLimit(size_t limit = DEFAULT_STORAGE_LIMIT) override {
         dht_->setStorageLimit(limit);
     }
-    size_t getStorageLimit() const override {
-        return dht_->getStorageLimit();
-    }
-
     std::vector<NodeExport> exportNodes() const override {
         return dht_->exportNodes();
     }
@@ -368,7 +354,7 @@ private:
 
     // our certificate cache
     std::map<InfoHash, Sp<crypto::Certificate>> nodesCertificates_ {};
-    std::map<InfoHash, Sp<crypto::PublicKey>> nodesPubKeys_ {};
+    std::map<InfoHash, Sp<const crypto::PublicKey>> nodesPubKeys_ {};
 
     std::atomic_bool forward_all_ {false};
     bool enableCache_ {false};
@@ -381,7 +367,7 @@ const ValueType CERTIFICATE_TYPE = {
         try {
             crypto::Certificate crt(v->data);
             // TODO check certificate signature
-            return crt.getPublicKey().getId() == id || InfoHash::get(crt.getPublicKey().getLongId()) == id;
+            return crt.getPublicKey().getId() == id;
         } catch (const std::exception& e) {}
         return false;
     },

include/opendht/sockaddr.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -20,10 +20,6 @@
 
 #include "def.h"
 
-#include <fmt/core.h>
-#include <fmt/format.h>
-#include <fmt/ostream.h>
-
 #ifndef _WIN32
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -52,7 +48,6 @@ typedef uint16_t in_port_t;
 
 namespace dht {
 
-OPENDHT_PUBLIC void print_addr(std::ostream& os, const sockaddr* sa, socklen_t slen);
 OPENDHT_PUBLIC std::string print_addr(const sockaddr* sa, socklen_t slen);
 OPENDHT_PUBLIC std::string print_addr(const sockaddr_storage& ss, socklen_t sslen);
 
@@ -241,15 +236,6 @@ public:
         return *reinterpret_cast<sockaddr_in6*>(get());
     }
 
-    /** 
-     * Releases the ownership of the managed object, if any.
-     * The caller is responsible for deleting the object with free().
-     */
-    inline sockaddr* release() {
-        len = 0;
-        return addr.release();
-    }
-
     /**
      * Return true if address is a loopback IP address.
      */
@@ -294,11 +280,6 @@ public:
                                (uint8_t*)b.get()+start, len) < 0;
         }
     };
-    OPENDHT_PUBLIC friend std::ostream& operator<< (std::ostream& s, const SockAddr& h) {
-        print_addr(s, h.get(), h.getLength());
-        return s;
-    }
-
 private:
     struct free_delete { void operator()(void* p) { ::free(p); } };
     std::unique_ptr<sockaddr, free_delete> addr {};
@@ -319,7 +300,3 @@ private:
 OPENDHT_PUBLIC bool operator==(const SockAddr& a, const SockAddr& b);
 
 }
-
-#if FMT_VERSION >= 90000
-template <> struct fmt::formatter<dht::SockAddr> : ostream_formatter {};
-#endif

include/opendht/thread_pool.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *
  *  Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
@@ -27,8 +27,6 @@
 #include <future>
 #include <functional>
 
-#include <ciso646> // fix windows compiler bug
-
 namespace dht {
 
 class OPENDHT_PUBLIC ThreadPool {
@@ -37,7 +35,7 @@ public:
     static ThreadPool& io();
 
     ThreadPool();
-    ThreadPool(unsigned minThreads, unsigned maxThreads = 0);
+    ThreadPool(size_t maxThreads);
     ~ThreadPool();
 
     void run(std::function<void()>&& cb);
@@ -61,23 +59,19 @@ public:
         return get(std::move(cb));
     }
 
-    void stop(bool wait = true);
+    void stop();
     void join();
 
 private:
+    struct ThreadState;
+    std::queue<std::function<void()>> tasks_ {};
+    std::vector<std::unique_ptr<ThreadState>> threads_;
+    unsigned readyThreads_ {0};
     std::mutex lock_ {};
     std::condition_variable cv_ {};
-    std::queue<std::function<void()>> tasks_ {};
-    std::vector<std::unique_ptr<std::thread>> threads_;
-    unsigned readyThreads_ {0};
-    bool running_ {true};
 
-    unsigned minThreads_;
     const unsigned maxThreads_;
-    std::chrono::steady_clock::duration threadExpirationDelay {std::chrono::minutes(5)};
-    double threadDelayRatio_ {2};
-
-    void threadEnded(std::thread&);
+    bool running_ {true};
 };
 
 class OPENDHT_PUBLIC Executor : public std::enable_shared_from_this<Executor> {

include/opendht/utils.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -178,8 +178,8 @@ msgpack::object* findMapValue(const msgpack::object& map, const char* key, size_
 inline msgpack::object* findMapValue(const msgpack::object& map, const char* key) {
     return findMapValue(map, key, strlen(key));
 }
-inline msgpack::object* findMapValue(const msgpack::object& map, std::string_view key) {
-    return findMapValue(map, key.data(), key.size());
+inline msgpack::object* findMapValue(const msgpack::object& map, const std::string& key) {
+    return findMapValue(map, key.c_str(), key.size());
 }
 
 } // namespace dht

include/opendht/value.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author(s) : Adrien Béraud <adrien.beraud@savoirfairelinux.com>
  *              Simon Désaulniers <simon.desaulniers@savoirfairelinux.com>
  *
@@ -27,7 +27,6 @@
 #include <msgpack.hpp>
 
 #include <string>
-#include <string_view>
 #include <sstream>
 #include <bitset>
 #include <vector>
@@ -43,9 +42,8 @@
 #endif
 
 namespace dht {
-using namespace std::literals;
 
-static constexpr auto VALUE_KEY_ID("id");
+static const std::string VALUE_KEY_ID("id");
 static const std::string VALUE_KEY_DAT("dat");
 static const std::string VALUE_KEY_PRIO("p");
 static const std::string VALUE_KEY_SIGNATURE("sig");
@@ -119,7 +117,7 @@ struct OPENDHT_PUBLIC ValueType {
 
     Id id {0};
     std::string name {};
-    duration expiration {std::chrono::minutes(10)};
+    duration expiration {60 * 10};
     StorePolicy storePolicy {DEFAULT_STORE_POLICY};
     EditPolicy editPolicy {DEFAULT_EDIT_POLICY};
 };
@@ -171,29 +169,29 @@ struct OPENDHT_PUBLIC Value
         template<typename Functor>
         Filter(Functor f) : std::function<bool(const Value&)>::function(f) {}
 
-        inline Filter chain(Filter&& f2) {
+        Filter chain(Filter&& f2) {
             auto f1 = *this;
             return chain(std::move(f1), std::move(f2));
         }
-        inline Filter chainOr(Filter&& f2) {
+        Filter chainOr(Filter&& f2) {
             auto f1 = *this;
             return chainOr(std::move(f1), std::move(f2));
         }
-        static inline Filter chain(Filter&& f1, Filter&& f2) {
+        static Filter chain(Filter&& f1, Filter&& f2) {
             if (not f1) return std::move(f2);
             if (not f2) return std::move(f1);
             return [f1 = std::move(f1), f2 = std::move(f2)](const Value& v) {
                 return f1(v) and f2(v);
             };
         }
-        static inline Filter chain(const Filter& f1, const Filter& f2) {
+        static Filter chain(const Filter& f1, const Filter& f2) {
             if (not f1) return f2;
             if (not f2) return f1;
             return [f1,f2](const Value& v) {
                 return f1(v) and f2(v);
             };
         }
-        static inline Filter chainAll(std::vector<Filter>&& set) {
+        static Filter chainAll(std::vector<Filter>&& set) {
             if (set.empty()) return {};
             return [set = std::move(set)](const Value& v) {
                 for (const auto& f : set)
@@ -202,18 +200,18 @@ struct OPENDHT_PUBLIC Value
                 return true;
             };
         }
-        static inline Filter chain(std::initializer_list<Filter> l) {
+        static Filter chain(std::initializer_list<Filter> l) {
             return chainAll(std::vector<Filter>(l.begin(), l.end()));
         }
-        static inline Filter chainOr(Filter&& f1, Filter&& f2) {
+        static Filter chainOr(Filter&& f1, Filter&& f2) {
             if (not f1 or not f2) return {};
             return [f1=std::move(f1),f2=std::move(f2)](const Value& v) {
                 return f1(v) or f2(v);
             };
         }
-        static inline Filter notFilter(Filter&& f) {
+        static Filter notFilter(Filter&& f) {
             if (not f) return [](const Value&) { return false; };
-            return [f = std::move(f)](const Value& v) { return not f(v); };
+            return [f](const Value& v) { return not f(v); };
         }
         std::vector<Sp<Value>> filter(const std::vector<Sp<Value>>& values) {
             if (not (*this))
@@ -228,51 +226,51 @@ struct OPENDHT_PUBLIC Value
 
     /* Sneaky functions disguised in classes */
 
-    static inline Filter AllFilter() {
+    static const Filter AllFilter() {
         return {};
     }
 
-    static inline Filter TypeFilter(const ValueType& t) {
+    static Filter TypeFilter(const ValueType& t) {
         return [tid = t.id](const Value& v) {
             return v.type == tid;
         };
     }
-    static inline Filter TypeFilter(const ValueType::Id& tid) {
+    static Filter TypeFilter(const ValueType::Id& tid) {
         return [tid](const Value& v) {
             return v.type == tid;
         };
     }
 
-    static inline Filter IdFilter(const Id id) {
+    static Filter IdFilter(const Id id) {
         return [id](const Value& v) {
             return v.id == id;
         };
     }
 
-    static inline Filter RecipientFilter(const InfoHash& r) {
+    static Filter RecipientFilter(const InfoHash& r) {
         return [r](const Value& v) {
             return v.recipient == r;
         };
     }
 
-    static inline Filter OwnerFilter(const crypto::PublicKey& pk) {
+    static Filter OwnerFilter(const crypto::PublicKey& pk) {
         return OwnerFilter(pk.getId());
     }
 
-    static inline Filter OwnerFilter(const InfoHash& pkh) {
+    static Filter OwnerFilter(const InfoHash& pkh) {
         return [pkh](const Value& v) {
             return v.owner and v.owner->getId() == pkh;
         };
     }
 
-    static inline Filter SeqNumFilter(uint16_t seq_no) {
+    static Filter SeqNumFilter(uint16_t seq_no) {
         return [seq_no](const Value& v) {
             return v.seq == seq_no;
         };
     }
 
-    static inline Filter UserTypeFilter(std::string ut) {
-        return [ut = std::move(ut)](const Value& v) {
+    static Filter UserTypeFilter(const std::string& ut) {
+        return [ut](const Value& v) {
             return v.user_type == ut;
         };
     }
@@ -343,10 +341,10 @@ struct OPENDHT_PUBLIC Value
         return unpack<T>(*this);
     }
 
-    inline bool isEncrypted() const {
+    bool isEncrypted() const {
         return not cypher.empty();
     }
-    inline bool isSigned() const {
+    bool isSigned() const {
         return owner and not signature.empty();
     }
 
@@ -355,24 +353,37 @@ struct OPENDHT_PUBLIC Value
      * Afterward, checkSignature() will return true and owner will
      * be set to the corresponding public key.
      */
-    void sign(const crypto::PrivateKey& key);
+    void sign(const crypto::PrivateKey& key) {
+        if (isEncrypted())
+            throw DhtException("Can't sign encrypted data.");
+        owner = std::make_shared<const crypto::PublicKey>(key.getPublicKey());
+        signature = key.sign(getToSign());
+    }
 
     /**
      * Check that the value is signed and that the signature matches.
      * If true, the owner field will contain the signer public key.
      */
-    inline bool checkSignature() const {
+    bool checkSignature() const {
         return isSigned() and owner->checkSignature(getToSign(), signature);
     }
 
-    inline std::shared_ptr<crypto::PublicKey> getOwner() const {
-        return owner;
+    std::shared_ptr<const crypto::PublicKey> getOwner() const {
+        return std::static_pointer_cast<const crypto::PublicKey>(owner);
     }
 
     /**
      * Sign the value with from and returns the encrypted version for to.
      */
-    Value encrypt(const crypto::PrivateKey& from, const crypto::PublicKey& to);
+    Value encrypt(const crypto::PrivateKey& from, const crypto::PublicKey& to) {
+        if (isEncrypted())
+            throw DhtException("Data is already encrypted.");
+        setRecipient(to.getId());
+        sign(from);
+        Value nv {id};
+        nv.setCypher(to.encrypt(getToEncrypt()));
+        return nv;
+    }
 
     Value() {}
 
@@ -427,7 +438,7 @@ struct OPENDHT_PUBLIC Value
     /**
      * Returns true if value contents are equals (not considering the value ID)
      */
-    inline bool contentEquals(const Value& o) const {
+    inline bool contentEquals(const Value& o) {
         return isEncrypted() ? cypher == o.cypher :
             ((owner == o.owner || (owner and o.owner and *owner == *o.owner))
                 && type == o.type
@@ -436,25 +447,22 @@ struct OPENDHT_PUBLIC Value
                 && signature == o.signature);
     }
 
-    inline bool operator== (const Value& o) const {
+    inline bool operator== (const Value& o) {
         return id == o.id and contentEquals(o);
     }
-    inline bool operator!= (const Value& o) const {
-        return !(*this == o);
-    }
 
-    inline void setRecipient(const InfoHash& r) {
+    void setRecipient(const InfoHash& r) {
         recipient = r;
     }
 
-    inline void setCypher(Blob&& c) {
+    void setCypher(Blob&& c) {
         cypher = std::move(c);
     }
 
     /**
      * Pack part of the data to be signed (must always be done the same way)
      */
-    inline Blob getToSign() const {
+    Blob getToSign() const {
         msgpack::sbuffer buffer;
         msgpack::packer<msgpack::sbuffer> pk(&buffer);
         msgpack_pack_to_sign(pk);
@@ -464,7 +472,7 @@ struct OPENDHT_PUBLIC Value
     /**
      * Pack part of the data to be encrypted
      */
-    inline Blob getToEncrypt() const {
+    Blob getToEncrypt() const {
         msgpack::sbuffer buffer;
         msgpack::packer<msgpack::sbuffer> pk(&buffer);
         msgpack_pack_to_encrypt(pk);
@@ -474,8 +482,8 @@ struct OPENDHT_PUBLIC Value
     /** print value for debugging */
     OPENDHT_PUBLIC friend std::ostream& operator<< (std::ostream& s, const Value& v);
 
-    inline std::string toString() const {
-        std::ostringstream ss;
+    std::string toString() const {
+        std::stringstream ss;
         ss << *this;
         return ss.str();
     }
@@ -586,7 +594,7 @@ struct OPENDHT_PUBLIC Value
     /**
      * Public key of the signer.
      */
-    std::shared_ptr<crypto::PublicKey> owner {};
+    std::shared_ptr<const crypto::PublicKey> owner {};
 
     /**
      * Hash of the recipient (optional).
@@ -628,16 +636,8 @@ struct OPENDHT_PUBLIC Value
      */
     unsigned priority {0};
 
-    inline bool isSignatureChecked() const {
-        return signatureChecked;
-    }
-    inline bool isDecrypted() const {
-        return decrypted;
-    }
-    bool checkSignature();
-    Sp<Value> decrypt(const crypto::PrivateKey& key);
-
 private:
+    friend class SecureDht;
     /* Cache for crypto ops */
     bool signatureChecked {false};
     bool signatureValid {false};
@@ -659,7 +659,7 @@ struct OPENDHT_PUBLIC FieldValue
     FieldValue() {}
     FieldValue(Value::Field f, uint64_t int_value) : field(f), intValue(int_value) {}
     FieldValue(Value::Field f, InfoHash hash_value) : field(f), hashValue(hash_value) {}
-    FieldValue(Value::Field f, Blob blob_value) : field(f), blobValue(std::move(blob_value)) {}
+    FieldValue(Value::Field f, Blob blob_value) : field(f), blobValue(blob_value) {}
 
     bool operator==(const FieldValue& fd) const;
 
@@ -672,9 +672,9 @@ struct OPENDHT_PUBLIC FieldValue
     template <typename Packer>
     void msgpack_pack(Packer& p) const {
         p.pack_map(2);
-        p.pack("f"sv); p.pack(static_cast<uint8_t>(field));
+        p.pack(std::string("f")); p.pack(static_cast<uint8_t>(field));
 
-        p.pack("v"sv);
+        p.pack(std::string("v"));
         switch (field) {
             case Value::Field::Id:
             case Value::Field::ValueType:
@@ -696,12 +696,12 @@ struct OPENDHT_PUBLIC FieldValue
         hashValue = {};
         blobValue.clear();
 
-        if (auto f = findMapValue(msg, "f"sv))
+        if (auto f = findMapValue(msg, "f"))
             field = (Value::Field)f->as<unsigned>();
         else
             throw msgpack::type_error();
 
-        auto v = findMapValue(msg, "v"sv);
+        auto v = findMapValue(msg, "v");
         if (not v)
             throw msgpack::type_error();
         else
@@ -741,7 +741,7 @@ private:
 struct OPENDHT_PUBLIC Select
 {
     Select() { }
-    Select(std::string_view q_str);
+    Select(const std::string& q_str);
 
     bool isSatisfiedBy(const Select& os) const;
 
@@ -774,7 +774,7 @@ struct OPENDHT_PUBLIC Select
     }
 
     std::string toString() const {
-        std::ostringstream ss;
+        std::stringstream ss;
         ss << *this;
         return ss.str();
     }
@@ -796,7 +796,7 @@ private:
 struct OPENDHT_PUBLIC Where
 {
     Where() { }
-    Where(std::string_view q_str);
+    Where(const std::string& q_str);
 
     bool isSatisfiedBy(const Where& where) const;
 
@@ -807,11 +807,11 @@ struct OPENDHT_PUBLIC Where
      *
      * @return the resulting Where instance.
      */
-    Where&& id(Value::Id id) {
+    Where& id(Value::Id id) {
         FieldValue fv {Value::Field::Id, id};
         if (std::find(filters_.begin(), filters_.end(), fv) == filters_.end())
             filters_.emplace_back(std::move(fv));
-        return std::move(*this);
+        return *this;
     }
 
     /**
@@ -821,11 +821,11 @@ struct OPENDHT_PUBLIC Where
      *
      * @return the resulting Where instance.
      */
-    Where&& valueType(ValueType::Id type) {
+    Where& valueType(ValueType::Id type) {
         FieldValue fv {Value::Field::ValueType, type};
         if (std::find(filters_.begin(), filters_.end(), fv) == filters_.end())
             filters_.emplace_back(std::move(fv));
-        return std::move(*this);
+        return *this;
     }
 
     /**
@@ -835,11 +835,11 @@ struct OPENDHT_PUBLIC Where
      *
      * @return the resulting Where instance.
      */
-    Where&& owner(InfoHash owner_pk_hash) {
+    Where& owner(InfoHash owner_pk_hash) {
         FieldValue fv {Value::Field::OwnerPk, owner_pk_hash};
         if (std::find(filters_.begin(), filters_.end(), fv) == filters_.end())
             filters_.emplace_back(std::move(fv));
-        return std::move(*this);
+        return *this;
     }
 
     /**
@@ -849,11 +849,11 @@ struct OPENDHT_PUBLIC Where
      *
      * @return the resulting Where instance.
      */
-    Where&& seq(uint16_t seq_no) {
+    Where& seq(uint16_t seq_no) {
         FieldValue fv {Value::Field::SeqNum, seq_no};
         if (std::find(filters_.begin(), filters_.end(), fv) == filters_.end())
             filters_.emplace_back(std::move(fv));
-        return std::move(*this);
+        return *this;
     }
 
     /**
@@ -863,11 +863,11 @@ struct OPENDHT_PUBLIC Where
      *
      * @return the resulting Where instance.
      */
-    Where&& userType(std::string_view user_type) {
+    Where& userType(std::string user_type) {
         FieldValue fv {Value::Field::UserType, Blob {user_type.begin(), user_type.end()}};
         if (std::find(filters_.begin(), filters_.end(), fv) == filters_.end())
             filters_.emplace_back(std::move(fv));
-        return std::move(*this);
+        return *this;
     }
 
     /**
@@ -876,10 +876,7 @@ struct OPENDHT_PUBLIC Where
      * @return the resulting Value::Filter.
      */
     Value::Filter getFilter() const {
-        if (filters_.empty())
-            return {};
-        if (filters_.size() == 1)
-            return filters_[0].getLocalFilter();
+        if (filters_.empty()) return {};
         std::vector<Value::Filter> fset;
         fset.reserve(filters_.size());
         for (const auto& f : filters_) {
@@ -897,7 +894,7 @@ struct OPENDHT_PUBLIC Where
     }
 
     std::string toString() const {
-        std::ostringstream ss;
+        std::stringstream ss;
         ss << *this;
         return ss.str();
     }
@@ -939,11 +936,11 @@ struct OPENDHT_PUBLIC Query
      *  - $string$: a simple string WITHOUT SPACES.
      *  - $integer$: a simple integer.
      */
-    Query(std::string_view q_str) {
+    Query(std::string q_str) {
         auto pos_W = q_str.find("WHERE");
         auto pos_w = q_str.find("where");
-        auto pos = std::min(pos_W != std::string_view::npos ? pos_W : q_str.size(),
-                            pos_w != std::string_view::npos ? pos_w : q_str.size());
+        auto pos = std::min(pos_W != std::string::npos ? pos_W : q_str.size(),
+                            pos_w != std::string::npos ? pos_w : q_str.size());
         select = q_str.substr(0, pos);
         where = q_str.substr(pos, q_str.size()-pos);
     }
@@ -963,7 +960,7 @@ struct OPENDHT_PUBLIC Query
     void msgpack_unpack(const msgpack::object& o);
 
     std::string toString() const {
-        std::ostringstream ss;
+        std::stringstream ss;
         ss << *this;
         return ss.str();
     }

m4/ax_cxx_compile_stdcxx.m4

@@ -10,13 +10,13 @@
 #
 #   Check for baseline language coverage in the compiler for the specified
 #   version of the C++ standard.  If necessary, add switches to CXX and
-#   CXXCPP to enable support.  VERSION may be '11', '14', '17', or '20' for
-#   the respective C++ standard version.
+#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
+#   or '14' (for the C++14 standard).
 #
 #   The second argument, if specified, indicates whether you insist on an
 #   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
 #   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for no added switch, and then for an extended mode.
+#   preference for an extended mode.
 #
 #   The third argument, if specified 'mandatory' or if left unspecified,
 #   indicates that baseline support for the specified C++ standard is
@@ -35,15 +35,13 @@
 #   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
 #   Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
 #   Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
-#   Copyright (c) 2020 Jason Merrill <jason@redhat.com>
-#   Copyright (c) 2021 Jörn Heusipp <osmanx@problemloesungsmaschine.de>
 #
 #   Copying and distribution of this file, with or without modification, are
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.  This file is offered as-is, without any
 #   warranty.
 
-#serial 14
+#serial 11
 
 dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
 dnl  (serial version number 13).
@@ -52,7 +50,6 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
   m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
         [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
         [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
-        [$1], [20], [ax_cxx_compile_alternatives="20"],
         [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
   m4_if([$2], [], [],
         [$2], [ext], [],
@@ -65,16 +62,6 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
   AC_LANG_PUSH([C++])dnl
   ac_success=no
 
-  m4_if([$2], [], [dnl
-    AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
-		   ax_cv_cxx_compile_cxx$1,
-      [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-        [ax_cv_cxx_compile_cxx$1=yes],
-        [ax_cv_cxx_compile_cxx$1=no])])
-    if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
-      ac_success=yes
-    fi])
-
   m4_if([$2], [noext], [], [dnl
   if test x$ac_success = xno; then
     for alternative in ${ax_cxx_compile_alternatives}; do
@@ -153,6 +140,7 @@ m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
   _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
 )
 
+
 dnl  Test body for checking C++14 support
 
 m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
@@ -160,24 +148,12 @@ m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
 )
 
-dnl  Test body for checking C++17 support
-
 m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
   _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
   _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
   _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
 )
 
-dnl  Test body for checking C++20 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_20],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_20
-)
-
-
 dnl  Tests for new features in C++11
 
 m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
@@ -973,33 +949,3 @@ namespace cxx17
 #endif  // __cplusplus < 201703L
 
 ]])
-
-
-dnl  Tests for new features in C++20
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_20], [[
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 202002L
-
-#error "This is not a C++20 compiler"
-
-#else
-
-#include <version>
-
-namespace cxx20
-{
-
-// As C++20 supports feature test macros in the standard, there is no
-// immediate need to actually test for feature availability on the
-// Autoconf side.
-
-}  // namespace cxx20
-
-#endif  // __cplusplus < 202002L
-
-]])

meson.build

@@ -1,99 +0,0 @@
-project('opendht', 'c', 'cpp',
-    version: '3.1.4',
-    default_options: [
-        'cpp_std=c++17',
-        'warning_level=3'
-    ])
-
-gnutls = dependency('gnutls')
-nettle = dependency('nettle')
-msgpack = dependency('msgpack-cxx', required : false)
-argon2 = dependency('libargon2')
-openssl = dependency('openssl', required: get_option('proxy_client'))
-jsoncpp = dependency('jsoncpp', required: get_option('proxy_client'))
-fmt = dependency('fmt')
-
-dirs=[]
-if host_machine.system() == 'freebsd'
-    dirs+='/usr/local/lib'
-elif host_machine.system() == 'darwin'
-    dirs+='/opt/homebrew/lib'
-endif
-http_parser = meson.get_compiler('c').find_library('http_parser', dirs: dirs, required: get_option('proxy_client'))
-deps = [fmt, gnutls, nettle, msgpack, argon2, openssl, jsoncpp, http_parser]
-
-add_project_arguments('-DMSGPACK_NO_BOOST', language : 'cpp')
-add_project_arguments(['-Wno-return-type','-Wno-deprecated','-Wnon-virtual-dtor','-pedantic-errors','-fvisibility=hidden'], language : 'cpp')
-
-opendht_inc = include_directories('include/opendht')
-opendht_interface_inc = include_directories('include', is_system: true)
-opendht_src = [
-    'src/utils.cpp',
-    'src/crypto.cpp',
-    'src/default_types.cpp',
-    'src/node.cpp',
-    'src/value.cpp',
-    'src/dht.cpp',
-    'src/callbacks.cpp',
-    'src/routing_table.cpp',
-    'src/node_cache.cpp',
-    'src/network_engine.cpp',
-    'src/securedht.cpp',
-    'src/dhtrunner.cpp',
-    'src/log.cpp',
-    'src/op_cache.cpp',
-    'src/network_utils.cpp'
-]
-if jsoncpp.found()
-    opendht_src += ['src/base64.cpp']
-    add_project_arguments('-DOPENDHT_JSONCPP', language : 'cpp')
-endif
-if http_parser.found()
-    opendht_src += ['src/http.cpp', 'src/compat/os_cert.cpp']
-    if host_machine.system() == 'darwin'
-        deps+=dependency('appleframeworks', modules : ['CoreFoundation', 'Security'])
-    endif
-endif
-if get_option('proxy_client').enabled()
-    opendht_src += ['src/dht_proxy_client.cpp']
-    add_project_arguments('-DOPENDHT_PROXY_CLIENT', language : 'cpp')
-endif
-if get_option('proxy_server').enabled()
-    opendht_src += 'src/dht_proxy_server.cpp'
-    add_project_arguments('-DOPENDHT_PROXY_SERVER', language : 'cpp')
-endif
-if get_option('peer_discovery').enabled()
-    opendht_src += 'src/peer_discovery.cpp'
-    add_project_arguments('-DOPENDHT_PEER_DISCOVERY', language : 'cpp')
-endif
-opendht = shared_library('opendht',
-    opendht_src,
-    include_directories : opendht_inc,
-    dependencies : deps,
-    cpp_args : ['-DOPENHT_BUILD', '-Dopendht_EXPORTS'],
-    install : true)
-
-readline = meson.get_compiler('c').find_library('readline', required: get_option('tools'))
-if get_option('tools').enabled()
-    dhtnode = executable('dhtnode', 'tools/dhtnode.cpp',
-        include_directories : opendht_interface_inc,
-        link_with : opendht,
-        dependencies : [readline, msgpack, fmt],
-        install : true)
-    dhtchat = executable('dhtchat', 'tools/dhtchat.cpp',
-        include_directories : opendht_interface_inc,
-        link_with : opendht,
-        dependencies : [readline, msgpack, fmt],
-        install : true)
-    dhtscanner = executable('dhtscanner', 'tools/dhtscanner.cpp',
-        include_directories : opendht_interface_inc,
-        link_with : opendht,
-        dependencies : [readline, msgpack, fmt],
-        install : true)
-    if http_parser.found()
-        durl = executable('durl', 'tools/durl.cpp',
-        include_directories : opendht_interface_inc,
-        link_with : opendht,
-        dependencies : [msgpack, openssl])
-    endif
-endif

meson_options.txt

@@ -1,4 +0,0 @@
-option('proxy_client', type : 'feature', value : 'disabled')
-option('proxy_server', type : 'feature', value : 'disabled')
-option('peer_discovery', type : 'feature', value : 'enabled')
-option('tools', type : 'feature', value : 'enabled')

opendht.pc.in

@@ -3,10 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 Name: OpenDHT
-Description: C++17 Distributed Hash Table library
+Description: C++14 Distributed Hash Table library
 Version: @VERSION@
 Libs: -L${libdir} -lopendht
 Libs.private: @http_parser_lib@ -pthread
-Requires: gnutls >= 3.3@jsoncpp_lib@@openssl_lib@
-Requires.private: nettle >= 2.4@argon2_lib@
+Requires.private: gnutls >= 3.3, nettle >= 2.4@argon2_lib@@jsoncpp_lib@@openssl_lib@
 Cflags: -I${includedir}

python/CMakeLists.txt

@@ -3,15 +3,10 @@ set(CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 configure_file(setup.py.in setup.py)
-configure_file(pyproject.toml pyproject.toml COPYONLY)
 
 add_custom_target(python ALL
     COMMAND python3 setup.py build
-    DEPENDS opendht opendht_cpp.pxd opendht.pyx pyproject.toml)
-
-add_custom_target(dist
-    COMMAND python3 -m build
-    DEPENDS opendht opendht_cpp.pxd opendht.pyx pyproject.toml)
+    DEPENDS opendht opendht_cpp.pxd opendht.pyx)
 
 install(CODE "execute_process(COMMAND python3 setup.py install --root=\$ENV{DESTDIR}/ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
 if (OPENDHT_TOOLS)

python/Makefile.am

@@ -2,8 +2,7 @@ if USE_CYTHON
 
 noinst_HEADERS = \
 	opendht.pyx \
-	opendht_cpp.pxd \
-	pyproject.toml
+	opendht_cpp.pxd
 
 PYTHON_INSTALL_RECORD = $(builddir)/install_record.txt
 

python/opendht.pyx

@@ -1,11 +1,11 @@
 # distutils: language = c++
-# distutils: extra_compile_args = -std=c++17
+# distutils: extra_compile_args = -std=c++14
 # distutils: include_dirs = ../../include
 # distutils: library_dirs = ../../src
 # distutils: libraries = opendht gnutls
 # cython: language_level=3
 #
-# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
 # Author(s): Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
 #            Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
@@ -42,7 +42,7 @@ cimport opendht_cpp as cpp
 
 import threading
 
-cdef inline void lookup_callback(cpp.vector[cpp.shared_ptr[cpp.IndexValue]]* values, cpp.Prefix* p, void *user_data) noexcept with gil:
+cdef inline void lookup_callback(cpp.vector[cpp.shared_ptr[cpp.IndexValue]]* values, cpp.Prefix* p, void *user_data) with gil:
     cbs = <object>user_data
     if 'lookup' in cbs and cbs['lookup']:
         vals = []
@@ -52,13 +52,13 @@ cdef inline void lookup_callback(cpp.vector[cpp.shared_ptr[cpp.IndexValue]]* val
             vals.append(v)
         cbs['lookup'](vals, p.toString())
 
-cdef inline void shutdown_callback(void* user_data) noexcept with gil:
+cdef inline void shutdown_callback(void* user_data) with gil:
     cbs = <object>user_data
     if 'shutdown' in cbs and cbs['shutdown']:
         cbs['shutdown']()
     ref.Py_DECREF(cbs)
 
-cdef inline bool get_callback(shared_ptr[cpp.Value] value, void *user_data) noexcept with gil:
+cdef inline bool get_callback(shared_ptr[cpp.Value] value, void *user_data) with gil:
     cbs = <object>user_data
     cb = cbs['get']
     f = cbs['filter'] if 'filter' in cbs else None
@@ -66,7 +66,7 @@ cdef inline bool get_callback(shared_ptr[cpp.Value] value, void *user_data) noex
     pv._value = value
     return cb(pv) if not f or f(pv) else True
 
-cdef inline bool value_callback(shared_ptr[cpp.Value] value, bool expired, void *user_data) noexcept with gil:
+cdef inline bool value_callback(shared_ptr[cpp.Value] value, bool expired, void *user_data) with gil:
     cbs = <object>user_data
     cb = cbs['valcb']
     f = cbs['filter'] if 'filter' in cbs else None
@@ -74,7 +74,7 @@ cdef inline bool value_callback(shared_ptr[cpp.Value] value, bool expired, void
     pv._value = value
     return cb(pv, expired) if not f or f(pv) else True
 
-cdef inline void done_callback(bool done, cpp.vector[shared_ptr[cpp.Node]]* nodes, void *user_data) noexcept with gil:
+cdef inline void done_callback(bool done, cpp.vector[shared_ptr[cpp.Node]]* nodes, void *user_data) with gil:
     node_ids = []
     for n in deref(nodes):
         h = NodeEntry()
@@ -86,7 +86,7 @@ cdef inline void done_callback(bool done, cpp.vector[shared_ptr[cpp.Node]]* node
         cbs['done'](done, node_ids)
     ref.Py_DECREF(cbs)
 
-cdef inline void done_callback_simple(bool done, void *user_data) noexcept with gil:
+cdef inline void done_callback_simple(bool done, void *user_data) with gil:
     cbs = <object>user_data
     if 'done' in cbs and cbs['done']:
         cbs['done'](done)
@@ -158,15 +158,6 @@ cdef class SockAddr(object):
         return self.toString().decode()
     def __repr__(self):
         return "<%s '%s'>" % (self.__class__.__name__, str(self))
-    @staticmethod
-    def resolve(str host, str service=None):
-        vals = []
-        result = cpp.SockAddr.resolve(host.encode(), service.encode() if service else b'')
-        for val in result:
-            a = SockAddr()
-            a._addr = val
-            vals.append(a)
-        return vals
 
 cdef class Node(_WithID):
     cdef shared_ptr[cpp.Node] _node
@@ -338,11 +329,11 @@ cdef class PrivateKey(_WithID):
     cdef shared_ptr[cpp.PrivateKey] _key
     def getId(self):
         h = InfoHash()
-        h._infohash = self._key.get().getSharedPublicKey().get().getId()
+        h._infohash = self._key.get().getPublicKey().getId()
         return h
     def getPublicKey(self):
         pk = PublicKey()
-        pk._key = self._key.get().getSharedPublicKey()
+        pk._key = self._key.get().getPublicKey()
         return pk
     def decrypt(self, bytes dat):
         cdef size_t d_len = len(dat)
@@ -367,17 +358,17 @@ cdef class PrivateKey(_WithID):
         return k
 
 cdef class PublicKey(_WithID):
-    cdef cpp.shared_ptr[cpp.PublicKey] _key
+    cdef cpp.PublicKey _key
     def getId(self):
         h = InfoHash()
-        h._infohash = self._key.get().getId()
+        h._infohash = self._key.getId()
         return h
     def encrypt(self, bytes dat):
         cdef size_t d_len = len(dat)
         cdef cpp.uint8_t* d_ptr = <cpp.uint8_t*>dat
         cdef cpp.Blob indat
         indat.assign(d_ptr, <cpp.uint8_t*>(d_ptr + d_len))
-        cdef cpp.Blob encrypted = self._key.get().encrypt(indat)
+        cdef cpp.Blob encrypted = self._key.encrypt(indat)
         cdef char* encrypted_c_str = <char *>encrypted.data()
         cdef Py_ssize_t length = encrypted.size()
         return encrypted_c_str[:length]
@@ -449,7 +440,7 @@ cdef class Identity(object):
     property publickey:
         def __get__(self):
             k = PublicKey()
-            k._key = self._id.first.get().getSharedPublicKey()
+            k._key = self._id.first.get().getPublicKey()
             return k
     property certificate:
         def __get__(self):
@@ -462,31 +453,11 @@ cdef class Identity(object):
             k._key = self._id.first
             return k
 
-def aesEncrypt(bytes data, str password) -> bytes :
-    cdef size_t d_len = len(data)
-    cdef cpp.uint8_t* d_ptr = <cpp.uint8_t*>data
-    cdef cpp.Blob indat
-    indat.assign(d_ptr, <cpp.uint8_t*>(d_ptr + d_len))
-    cdef cpp.Blob encrypted = cpp.aesEncrypt(indat, password.encode())
-    cdef char* encrypted_c_str = <char *>encrypted.data()
-    cdef Py_ssize_t length = encrypted.size()
-    return encrypted_c_str[:length]
-
-def aesDecrypt(bytes data, str password) -> bytes :
-    cdef size_t d_len = len(data)
-    cdef cpp.uint8_t* d_ptr = <cpp.uint8_t*>data
-    cdef cpp.Blob indat
-    indat.assign(d_ptr, <cpp.uint8_t*>(d_ptr + d_len))
-    cdef cpp.Blob decrypted = cpp.aesDecrypt(indat, password.encode())
-    cdef char* decrypted_c_str = <char *>decrypted.data()
-    cdef Py_ssize_t length = decrypted.size()
-    return decrypted_c_str[:length]
-
 cdef class DhtConfig(object):
     cdef cpp.DhtRunnerConfig _config
     def __init__(self):
         self._config = cpp.DhtRunnerConfig()
-        self._config.threaded = True
+        self._config.threaded = True;
     def setIdentity(self, Identity id):
         self._config.dht_config.id = id._id
     def setBootstrapMode(self, bool bootstrap):
@@ -500,19 +471,6 @@ cdef class DhtConfig(object):
     def setRateLimit(self, ssize_t max_req_per_sec, ssize_t max_peer_req_per_sec):
         self._config.dht_config.node_config.max_req_per_sec = max_req_per_sec
         self._config.dht_config.node_config.max_peer_req_per_sec = max_peer_req_per_sec
-    def setProxyInfo(self, str proxy_server, str push_node_id="", str push_token="", str push_topic="", str push_platform="", Certificate server_ca = Certificate()):
-        self._config.proxy_server = proxy_server.encode()
-        self._config.push_node_id = push_node_id.encode()
-        self._config.push_token = push_token.encode()
-        self._config.push_topic = push_topic.encode()
-        self._config.push_platform = push_platform.encode()
-        self._config.server_ca = server_ca._cert
-    def setPeerDiscovery(self, bool peer_discovery, bool peer_publish):
-        self._config.peer_discovery = peer_discovery
-        self._config.peer_publish = peer_publish
-    def setBound(self, SockAddr bind4, SockAddr bind6):
-        self._config.bind4 = bind4._addr
-        self._config.bind6 = bind6._addr
 
 cdef class DhtRunner(_WithID):
     cdef cpp.shared_ptr[cpp.DhtRunner] thisptr
@@ -629,8 +587,7 @@ cdef class DhtRunner(_WithID):
                 while pending > 0:
                     lock.wait()
             return res
-
-    def put(self, InfoHash key, Value val, done_cb=None, permanent=False):
+    def put(self, InfoHash key, Value val, done_cb=None):
         """Publish a new value on the DHT at key.
 
         key     -- the DHT key where to put the value
@@ -640,7 +597,7 @@ cdef class DhtRunner(_WithID):
         if done_cb:
             cb_obj = {'done':done_cb}
             ref.Py_INCREF(cb_obj)
-            self.thisptr.get().put(key._infohash, val._value, cpp.bindDoneCb(done_callback, <void*>cb_obj), cpp.time_point.max(), permanent)
+            self.thisptr.get().put(key._infohash, val._value, cpp.bindDoneCb(done_callback, <void*>cb_obj))
         else:
             lock = threading.Condition()
             pending = 0
@@ -657,76 +614,6 @@ cdef class DhtRunner(_WithID):
                 while pending > 0:
                     lock.wait()
             return ok
-
-    def putSigned(self, InfoHash key, Value val, done_cb=None, permanent=False):
-        if done_cb:
-            cb_obj = {'done':done_cb}
-            ref.Py_INCREF(cb_obj)
-            self.thisptr.get().putSigned(key._infohash, val._value, cpp.bindDoneCb(done_callback, <void*>cb_obj), permanent)
-        else:
-            lock = threading.Condition()
-            pending = 0
-            ok = False
-            def tmp_done(ok_ret, nodes):
-                nonlocal pending, ok, lock
-                with lock:
-                    ok = ok_ret
-                    pending -= 1
-                    lock.notify()
-            with lock:
-                pending += 1
-                self.putSigned(key, val, done_cb=tmp_done)
-                while pending > 0:
-                    lock.wait()
-            return ok
-
-    def putEncrypted(self, InfoHash key, InfoHash to, Value val, done_cb=None, bool permanent=False):
-        if done_cb:
-            cb_obj = {'done':done_cb}
-            ref.Py_INCREF(cb_obj)
-            self.thisptr.get().putEncrypted(key._infohash, to._infohash, val._value, cpp.bindDoneCb(done_callback, <void*>cb_obj), permanent)
-        else:
-            lock = threading.Condition()
-            pending = 0
-            ok = False
-            def tmp_done(ok_ret, nodes):
-                nonlocal pending, ok, lock
-                with lock:
-                    ok = ok_ret
-                    pending -= 1
-                    lock.notify()
-            with lock:
-                pending += 1
-                self.putEncrypted(key, to, val, done_cb=tmp_done, permanent=permanent)
-                while pending > 0:
-                    lock.wait()
-            return ok
-
-    def putEncrypted(self, InfoHash key, PublicKey to, Value val, done_cb=None, bool permanent=False):
-        if done_cb:
-            cb_obj = {'done':done_cb}
-            ref.Py_INCREF(cb_obj)
-            self.thisptr.get().putEncrypted(key._infohash, to._key, val._value, cpp.bindDoneCb(done_callback, <void*>cb_obj), permanent)
-        else:
-            lock = threading.Condition()
-            pending = 0
-            ok = False
-            def tmp_done(ok_ret, nodes):
-                nonlocal pending, ok, lock
-                with lock:
-                    ok = ok_ret
-                    pending -= 1
-                    lock.notify()
-            with lock:
-                pending += 1
-                self.putEncrypted(key, to, val, done_cb=tmp_done, permanent=permanent)
-                while pending > 0:
-                    lock.wait()
-            return ok
-
-    def cancelPut(self, InfoHash key, Value val):
-        self.thisptr.get().cancelPut(key._infohash, val._value)
-
     def listen(self, InfoHash key, value_cb):
         t = ListenToken()
         t._h = key._infohash

python/opendht_cpp.pxd

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
 #
@@ -21,13 +21,12 @@ from libcpp.string cimport string
 from libcpp.vector cimport vector
 from libcpp.utility cimport pair
 from libcpp.map cimport map
-from libcpp.memory cimport shared_ptr, make_shared
 from libc.string cimport const_char, const_uchar
 
 ctypedef uint16_t in_port_t
 ctypedef unsigned short int sa_family_t;
 
-cdef extern from "<chrono>" namespace "std::chrono" nogil:
+cdef extern from "<iostream>" namespace "std::chrono" nogil:
     cdef cppclass duration[ulong]:
         duration() except +
 
@@ -35,6 +34,16 @@ cdef extern from "<chrono>" namespace "std::chrono" nogil:
         duration seconds(uint64_t) except +
         duration seconds()
 
+cdef extern from "<memory>" namespace "std" nogil:
+    cdef cppclass shared_ptr[T]:
+        shared_ptr() except +
+        shared_ptr(T*) except +
+        T* get()
+        T operator*()
+        bool operator bool() const
+        void reset(T*)
+    shared_ptr[T] make_shared[T](...) except +
+
 cdef extern from "<functional>" namespace "std" nogil:
     cdef cppclass hash[T]:
         hash() except +
@@ -50,13 +59,6 @@ cdef extern from "<future>" namespace "std" nogil:
         bool valid() const
         shared_future[T] share()
 
-cdef extern from "opendht/utils.h" namespace "dht":
-    cdef cppclass time_point:
-        @staticmethod
-        time_point min() const
-        @staticmethod
-        time_point max() const
-
 cdef extern from "opendht/infohash.h" namespace "dht":
     cdef cppclass InfoHash:
         InfoHash() except +
@@ -86,20 +88,16 @@ cdef extern from "opendht/sockaddr.h" namespace "dht":
         bool isLoopback() const
         bool isPrivate() const
         bool isUnspecified() const
-        @staticmethod
-        vector[SockAddr] resolve(string host, string service) except +
 
 ctypedef vector[uint8_t] Blob
 
 cdef extern from "opendht/crypto.h" namespace "dht::crypto":
     ctypedef pair[shared_ptr[PrivateKey], shared_ptr[Certificate]] Identity
     cdef Identity generateIdentity(string name, Identity ca, unsigned bits)
-    cdef Blob aesEncrypt(Blob data, string password) except +
-    cdef Blob aesDecrypt(Blob encrypted, string password) except +
 
     cdef cppclass PrivateKey:
         PrivateKey()
-        shared_ptr[PublicKey] getSharedPublicKey() const
+        PublicKey getPublicKey() const
         Blob decrypt(Blob data) const
         @staticmethod
         PrivateKey generate()
@@ -241,18 +239,6 @@ cdef extern from "opendht/dhtrunner.h" namespace "dht":
         cppclass Config:
             SecureDhtConfig dht_config
             bool threaded
-            string proxy_server
-            string push_node_id
-            string push_token
-            string push_topic
-            string push_platform
-            bool peer_discovery
-            bool peer_publish
-            shared_ptr[Certificate] server_ca
-            Identity client_identity
-            SockAddr bind4
-            SockAddr bind6
-
         InfoHash getId() const
         InfoHash getNodeId() const
         void bootstrap(const_char*, const_char*)
@@ -268,11 +254,7 @@ cdef extern from "opendht/dhtrunner.h" namespace "dht":
         string getRoutingTablesLog(sa_family_t af) const
         string getSearchesLog(sa_family_t af) const
         void get(InfoHash key, GetCallback get_cb, DoneCallback done_cb, nullptr_t f, Where w)
-        void put(InfoHash key, shared_ptr[Value] val, DoneCallback done_cb, time_point created, bool permanent)
-        void putSigned(InfoHash key, shared_ptr[Value] val, DoneCallback done_cb, bool permanent) 
-        void putEncrypted(InfoHash key, InfoHash to, shared_ptr[Value] val, DoneCallback done_cb, bool permanent)
-        void putEncrypted(InfoHash key, shared_ptr[PublicKey] to, shared_ptr[Value] val, DoneCallback done_cb, bool permanent)
-        void cancelPut(InfoHash key, shared_ptr[Value] val)
+        void put(InfoHash key, shared_ptr[Value] val, DoneCallback done_cb)
         ListenToken listen(InfoHash key, ValueCallback get_cb)
         void cancelListen(InfoHash key, SharedListenToken token)
         vector[unsigned] getNodeMessageStats(bool i)

python/pyproject.toml

@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools", "wheel", "Cython"]
-build-backend = "setuptools.build_meta"

python/setup.py.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+# Copyright (C) 2014-2020 Savoir-faire Linux Inc.
 # Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
@@ -32,14 +32,17 @@ setup(name="opendht",
       author="Adrien Béraud, Guillaume Roguez, Simon Désaulniers",
       license="GPLv3",
       classifiers=[
-          'Development Status :: 5 - Production/Stable',
+          'Development Status :: 3 - Alpha',
           'Intended Audience :: Developers',
           'Topic :: Software Development :: Libraries :: Python Modules',
           'Topic :: System :: Distributed Computing',
           'Topic :: System :: Networking'
           'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.7',
+          'Programming Language :: Python :: 3.2',
+          'Programming Language :: Python :: 3.3',
+          'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: 3.5',
       ],
       cmdclass = { 'build_ext' : build_ext },
       ext_modules = cythonize(Extension(
@@ -47,8 +50,8 @@ setup(name="opendht",
           ["@CURRENT_SOURCE_DIR@/opendht.pyx"],
           include_dirs = ['@PROJECT_SOURCE_DIR@/include'],
           language="c++",
-          extra_compile_args=["-std=c++17"],
-          extra_link_args=["-std=c++17"],
+          extra_compile_args=["-std=c++14"],
+          extra_link_args=["-std=c++14"],
           libraries=["opendht"],
           library_dirs = ['@CURRENT_BINARY_DIR@', '@PROJECT_BINARY_DIR@']
       ))

python/tools/README.md

@@ -20,7 +20,7 @@ help).
 
 ## Python dependencies
 
-- pyroute2 >=0.6.9
+- pyroute2 >=0.3.14
 - matplotlib
 - GeoIP (used by `scanner.py` for drawing map of the world)
 - ipaddress

python/tools/benchmark.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+# Copyright (C) 2014-2020 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
 #

python/tools/dht/network.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
 #
@@ -30,7 +30,7 @@ import traceback
 import ipaddress
 import netifaces
 import numpy as np
-from pyroute2 import NSPopen
+from pyroute2.netns.process.proxy import NSPopen
 import msgpack
 
 from opendht import *

python/tools/dht/tests.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2015-2023 Savoir-Faire Linux Inc.
+# Copyright (C) 2015-2019 Savoir-Faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #            Simon Désaulniers <sim.desaulniers@gmail.com>
 

python/tools/dht/virtual_network_builder.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,253 +15,107 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; If not, see <http://www.gnu.org/licenses/>.
-import argparse
-import os
-import subprocess
 
-from pyroute2 import NDB, NSPopen
+import argparse, subprocess
 
+from pyroute2 import IPDB, NetNS
+from pyroute2.netns.process.proxy import NSPopen
 
-def int_range(mini, maxi):
-    def check_ifnum(arg):
-        try:
-            ret = int(arg)
-        except ValueError:
-            raise argparse.ArgumentTypeError('must be an integer')
-        if ret > maxi or ret < mini:
-            raise argparse.ArgumentTypeError(
-                f'must be {mini} <= int <= {maxi}'
-            )
-        return ret
-
-    return check_ifnum
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
-        description='Creates a virtual network topology for testing'
-    )
-    parser.add_argument(
-        '-i', '--ifname', help='interface name', default='ethdht'
-    )
-    parser.add_argument(
-        '-n',
-        '--ifnum',
-        type=int_range(1, 245),
-        help='number of isolated interfaces to create',
-        default=1,
-    )
-    parser.add_argument(
-        '-r',
-        '--remove',
-        help='remove instead of adding network interfaces',
-        action='store_true',
-    )
-    parser.add_argument(
-        '-l',
-        '--loss',
-        help='simulated packet loss (percent)',
-        type=int,
-        default=0,
-    )
-    parser.add_argument(
-        '-d', '--delay', help='simulated latency (ms)', type=int, default=0
-    )
-    parser.add_argument(
-        '-4', '--ipv4', help='Enable IPv4', action='store_true'
-    )
-    parser.add_argument(
-        '-6', '--ipv6', help='Enable IPv6', action='store_true'
-    )
-    parser.add_argument(
-        '-b',
-        '--debug',
-        help='Turn on debug logging and dump topology databases',
-        action='store_true',
-    )
-    parser.add_argument(
-        '-v',
-        '--verbose',
-        help='Turn on verbose output on netns and interfaces operations',
-        action='store_true',
-    )
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Creates a virtual network topology for testing')
+    parser.add_argument('-i', '--ifname', help='interface name', default='ethdht')
+    parser.add_argument('-n', '--ifnum', type=int, help='number of isolated interfaces to create', default=1)
+    parser.add_argument('-r', '--remove', help='remove instead of adding network interfaces', action="store_true")
+    parser.add_argument('-l', '--loss', help='simulated packet loss (percent)', type=int, default=0)
+    parser.add_argument('-d', '--delay', help='simulated latency (ms)', type=int, default=0)
+    parser.add_argument('-4', '--ipv4', help='Enable IPv4', action="store_true")
+    parser.add_argument('-6', '--ipv6', help='Enable IPv6', action="store_true")
 
     args = parser.parse_args()
 
     local_addr4 = '10.0.42.'
     local_addr6 = '2001:db9::'
-    bripv4 = f'{local_addr4}1/24'
-    bripv6 = f'{local_addr6}1/64'
-    bridge_name = f'br{args.ifname}'
-    tap_name = f'tap{args.ifname}'
-    veth_names = []
-    namespaces = []
-    ipv4addrs = []
-    ipv6addrs = []
-    for ifn in range(args.ifnum):
-        namespaces.append(f'node{ifn}')
-        veth_names.append(f'{args.ifname}{ifn}')
-        ipv4addrs.append(f'{local_addr4}{ifn+8}/24' if args.ipv4 else None)
-        ipv6addrs.append(f'{local_addr6}{ifn+8}/64' if args.ipv6 else None)
+    brige_name = 'br'+args.ifname
 
-    with NDB(log='debug' if args.debug else None) as ndb:
+    ip = None
+    try:
+        ip = IPDB()
         if args.remove:
-            # cleanup interfaces in the main namespace
-            for iface in veth_names + [bridge_name] + [tap_name]:
-                if iface in ndb.interfaces:
-                    ndb.interfaces[iface].remove().commit()
-                    if args.verbose:
-                        print(f'link: del main/{iface}')
-
-            # cleanup namespaces
-            for nsname in namespaces:
-                try:
-                    ndb.netns[nsname].remove().commit()
-                    if args.verbose:
-                        print(f'netns: del {nsname}')
-                except KeyError:
-                    pass
-        else:
-            # create ports
-            for veth, nsname, ipv4addr, ipv6addr in zip(
-                veth_names, namespaces, ipv4addrs, ipv6addrs
-            ):
-                # create a network namespace and launch NDB for it
-                #
-                # another possible solution could be simply to attach
-                # the namespace to the main NDB instance, but it can
-                # take a lot of memory in case of many interfaces, thus
-                # launch and discard netns NDB instances
-                netns = NDB(
-                    log='debug' if args.debug else None,
-                    sources=[
-                        {
-                            'target': 'localhost',
-                            'netns': nsname,
-                            'kind': 'netns',
-                        }
-                    ],
-                )
-                if args.verbose:
-                    print(f'netns: add {nsname}')
-                # create the port and push the peer into the namespace
-                (
-                    ndb.interfaces.create(
-                        **{
-                            'ifname': veth,
-                            'kind': 'veth',
-                            'state': 'up',
-                            'peer': {'ifname': veth, 'net_ns_fd': nsname},
-                        }
-                    ).commit()
-                )
-                if args.verbose:
-                    print(f'link: add main/{veth} <-> {nsname}/{veth}')
-                # bring up namespace's loopback
-                (
-                    netns.interfaces.wait(ifname='lo', timeout=3)
-                    .set('state', 'up')
-                    .commit()
-                )
-                if args.verbose:
-                    print(f'link: set {nsname}/lo')
-                # bring up the peer
-                with netns.interfaces.wait(ifname=veth, timeout=3) as i:
-                    i.set('state', 'up')
-                    if args.ipv4:
-                        i.add_ip(ipv4addr)
-                    if args.ipv6:
-                        i.add_ip(ipv6addr)
-                if args.verbose:
-                    print(f'link: set {nsname}/{veth}, {ipv4addr}, {ipv6addr}')
-                # disconnect the namespace NDB agent, not removing the NS
-                if args.debug:
-                    fname = f'{nsname}-ndb.db'
-                    print(f'dump: netns topology database {fname}')
-                    netns.schema.backup(fname)
+            # cleanup interfaces
+            for ifn in range(args.ifnum):
+                iface = args.ifname+str(ifn)
+                if iface in ip.interfaces:
+                    with ip.interfaces[iface] as i:
+                        i.remove()
+            if 'tap'+args.ifname in ip.interfaces:
+                with ip.interfaces['tap'+args.ifname] as i:
+                    i.remove()
+            if brige_name in ip.interfaces:
+                with ip.interfaces[brige_name] as i:
+                    i.remove()
+            for ifn in range(args.ifnum):
+                netns = NetNS('node'+str(ifn))
                 netns.close()
-                # set up the emulation QDisc
-                nsp = NSPopen(
-                    nsname,
-                    [
-                        'tc',
-                        'qdisc',
-                        'add',
-                        'dev',
-                        veth,
-                        'root',
-                        'netem',
-                        'delay',
-                        f'{args.delay}ms',
-                        f'{int(args.delay)/2}ms',
-                        'loss',
-                        f'{args.loss}%',
-                        '25%',
-                    ],
-                    stdout=subprocess.PIPE,
-                )
+                netns.remove()
+        else:
+            for ifn in range(args.ifnum):
+                iface = args.ifname+str(ifn)
+                if not iface in ip.interfaces:
+                    ip.create(kind='veth', ifname=iface, peer=iface+'.1').commit()
+
+            ip.create(kind='tuntap', ifname='tap'+args.ifname, mode='tap').commit()
+
+            with ip.create(kind='bridge', ifname=brige_name) as i:
+                for ifn in range(args.ifnum):
+                    iface = args.ifname+str(ifn)
+                    i.add_port(ip.interfaces[iface])
+                i.add_port(ip.interfaces['tap'+args.ifname])
+                if args.ipv4:
+                    i.add_ip(local_addr4+'1/24')
+                if args.ipv6:
+                    i.add_ip(local_addr6+'1/64')
+                i.up()
+
+            with ip.interfaces['tap'+args.ifname] as tap:
+                tap.up()
+
+            for ifn in range(args.ifnum):
+                iface = args.ifname+str(ifn)
+
+                nns = NetNS('node'+str(ifn))
+                iface1 = iface+'.1'
+                with ip.interfaces[iface1] as i:
+                    i.net_ns_fd = nns.netns
+
+                with ip.interfaces[iface] as i:
+                    i.up()
+
+                ip_ns = IPDB(nl=nns)
+                try:
+                    with ip_ns.interfaces.lo as lo:
+                        lo.up()
+                    with ip_ns.interfaces[iface1] as i:
+                        if args.ipv4:
+                            i.add_ip(local_addr4+str(ifn+8)+'/24')
+                        if args.ipv6:
+                            i.add_ip(local_addr6+str(ifn+8)+'/64')
+                        i.up()
+                finally:
+                    ip_ns.release()
+
+                nsp = NSPopen(nns.netns, ["tc", "qdisc", "add", "dev", iface1, "root", "netem", "delay", str(args.delay)+"ms", str(int(args.delay/2))+"ms", "loss", str(args.loss)+"%", "25%"], stdout=subprocess.PIPE)
+                #print(nsp.communicate()[0].decode())
                 nsp.communicate()
                 nsp.wait()
                 nsp.release()
-                if args.verbose:
-                    print(
-                        f'netem: add {nsname}/{veth}, '
-                        f'{args.delay}, {args.loss}'
-                    )
 
-            # create the tap
-            #
-            # for some reason we should create the tap inteface first,
-            # and only then bring it up, thus two commit() calls
-            (
-                ndb.interfaces.create(
-                    kind='tuntap', ifname=tap_name, mode='tap'
-                )
-                .commit()
-                .set('state', 'up')
-                .commit()
-            )
-            if args.verbose:
-                print(f'link: add main/{tap_name}')
+            if args.ipv4:
+                subprocess.call(["sysctl", "-w", "net.ipv4.conf."+brige_name+".forwarding=1"])
+            if args.ipv6:
+                subprocess.call(["sysctl", "-w", "net.ipv6.conf."+brige_name+".forwarding=1"])
 
-            # create the bridge and add all the ports
-            with ndb.interfaces.create(
-                ifname=bridge_name, kind='bridge', state='up'
-            ) as i:
-                if args.ipv4:
-                    i.add_ip(bripv4)
-                if args.ipv6:
-                    i.add_ip(bripv6)
-                for iface in veth_names + [tap_name]:
-                    i.add_port(iface)
-            if args.verbose:
-                print(f'link: add main/{bridge_name}, {bripv4}, {bripv6}')
-
-            with open(os.devnull, 'w') as fnull:
-                if args.ipv4:
-                    subprocess.call(
-                        [
-                            'sysctl',
-                            '-w',
-                            f'net.ipv4.conf.{bridge_name}.forwarding=1',
-                        ],
-                        stdout=fnull,
-                    )
-                if args.verbose:
-                    print(f'sysctl: set {bridge_name} ipv4 forwarding')
-                if args.ipv6:
-                    subprocess.call(
-                        [
-                            'sysctl',
-                            '-w',
-                            f'net.ipv6.conf.{bridge_name}.forwarding=1',
-                        ],
-                        stdout=fnull,
-                    )
-                if args.verbose:
-                    print(f'sysctl: set {bridge_name} ipv4 forwarding')
-
-            if args.debug:
-                fname = 'main-ndb.db'
-                print('dump: the main netns topology database')
-                ndb.schema.backup(fname)
+    except Exception as e:
+          print('Error',e)
+    finally:
+        if ip:
+            ip.release()

python/tools/dhtcluster.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+# Copyright (C) 2014-2020 Savoir-faire Linux Inc.
 # Author(s): Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify

python/tools/http_server.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2016-2023 Savoir-faire Linux Inc.
+# Copyright (c) 2016-2019 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -72,7 +72,7 @@ if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Launch an OpenDHT node with an HTTP control interface')
     parser.add_argument('-p', '--port', help='OpenDHT port to bind', type=int, default=4222)
     parser.add_argument('-hp', '--http-port', help='HTTP port to bind', type=int, default=8080)
-    parser.add_argument('-b', '--bootstrap', help='bootstrap address', default="bootstrap.jami.net:4222")
+    parser.add_argument('-b', '--bootstrap', help='bootstrap address', default="bootstrap.ring.cx:4222")
     args = parser.parse_args()
     endpoints.serverFromString(reactor, "tcp:"+str(args.http_port)).listen(server.Site(DhtServer(args.port, args.bootstrap)))
     reactor.run()

python/tools/network_monitor.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -24,7 +24,7 @@ from datetime import datetime
 import opendht as dht
 
 parser = argparse.ArgumentParser(description='Create a dht network of -n nodes')
-parser.add_argument('-b', '--bootstrap', help='bootstrap address', default='bootstrap.jami.net')
+parser.add_argument('-b', '--bootstrap', help='bootstrap address', default='bootstrap.ring.cx')
 parser.add_argument('-n', '--num-ops', help='number of concurrent operations on the DHT', type=int, default=8)
 parser.add_argument('-p', '--period', help='duration between each test (seconds)', type=int, default=60)
 parser.add_argument('-t', '--timeout', help='timeout for a test to complete (seconds)', type=float, default=15)

python/tools/pingpong.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,8 @@ config.setRateLimit(-1, -1)
 ping_node = dht.DhtRunner()
 ping_node.run(config=config)
 #ping_node.enableLogging()
-#ping_node.bootstrap("bootstrap.jami.net", "4222")
+#ping_node.bootstrap("bootstrap.ring.cx", "4222")
+
 pong_node = dht.DhtRunner()
 pong_node.run(config=config)
 #pong_node.enableLogging()

python/tools/scanner.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2015-2023 Savoir-faire Linux Inc.
+# Copyright (c) 2015-2019 Savoir-faire Linux Inc.
 # Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
 #
 # This program is free software; you can redistribute it and/or modify

rust/Cargo.toml

@@ -8,4 +8,4 @@ edition = "2018"
 
 [dependencies]
 libc="0.2.0"
-os_socketaddr="0.2.3"
+os_socketaddr="0.1.0"

rust/examples/dhtnode.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/blob.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/crypto.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/dhtrunner.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -47,8 +47,6 @@ impl DhtRunnerConfig {
             proxy_server: ptr::null(),
             push_node_id: ptr::null(),
             push_token: ptr::null(),
-            push_topic: ptr::null(),
-            push_platform: ptr::null(),
             peer_discovery: false,
             peer_publish: false,
             server_ca: ptr::null_mut(),
@@ -75,14 +73,6 @@ impl DhtRunnerConfig {
         self.push_token = CString::new(push_token).unwrap().as_ptr();
     }
 
-    pub fn set_push_topic(&mut self, push_topic: &str) {
-        self.push_topic = CString::new(push_topic).unwrap().as_ptr();
-    }
-
-    pub fn set_push_platform(&mut self, push_platform: &str) {
-        self.push_platform = CString::new(push_platform).unwrap().as_ptr();
-    }
-
     pub fn set_identity(&mut self, certificate: Box<DhtCertificate>, privatekey: Box<PrivateKey>) {
         self.dht_config.id.privatekey = Box::into_raw(privatekey);
         self.dht_config.id.certificate = Box::into_raw(certificate);

rust/src/ffi.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -118,8 +118,6 @@ pub struct DhtRunnerConfig
     pub proxy_server: *const c_char,
     pub push_node_id: *const c_char,
     pub push_token: *const c_char,
-    pub push_topic: *const c_char,
-    pub push_platform: *const c_char,
     pub peer_discovery: bool,
     pub peer_publish: bool,
     pub server_ca: *mut DhtCertificate,

rust/src/infohash.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/lib.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/pkid.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

rust/src/value.rs

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *  Author: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify

src/Makefile.am

@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libopendht.la
 
 libopendht_la_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include/opendht @Argon2_CFLAGS@ @JsonCpp_CFLAGS@ @MsgPack_CFLAGS@ @OpenSSL_CFLAGS@ @Fmt_CFLAGS@
 libopendht_la_LIBADD   = @Argon2_LIBS@ @JsonCpp_LIBS@ @GnuTLS_LIBS@ @Nettle_LIBS@ @OpenSSL_LIBS@ @Fmt_LIBS@
-libopendht_la_LDFLAGS  = @LDFLAGS@ -version-number @OPENDHT_MAJOR_VERSION@:@OPENDHT_MINOR_VERSION@:@OPENDHT_PATCH_VERSION@
+libopendht_la_LDFLAGS  = @LDFLAGS@ @Argon2_LDFLAGS@ -version-number @OPENDHT_MAJOR_VERSION@:@OPENDHT_MINOR_VERSION@:@OPENDHT_PATCH_VERSION@
 libopendht_la_SOURCES  = \
         dht.cpp \
         storage.h \
@@ -19,6 +19,7 @@ libopendht_la_SOURCES  = \
         routing_table.cpp \
         network_engine.cpp \
         utils.cpp \
+        infohash.cpp \
         node.cpp \
         value.cpp \
         crypto.cpp \
@@ -39,7 +40,6 @@ nobase_include_HEADERS = \
         ../include/opendht/dht.h \
         ../include/opendht/callbacks.h \
         ../include/opendht/node_cache.h \
-        ../include/opendht/node_export.h \
         ../include/opendht/routing_table.h \
         ../include/opendht/network_engine.h \
         ../include/opendht/scheduler.h \
@@ -54,7 +54,7 @@ nobase_include_HEADERS = \
         ../include/opendht/dhtrunner.h \
         ../include/opendht/default_types.h \
         ../include/opendht/log.h \
-        ../include/opendht/logger.h \
+        ../include/opendht/log_enable.h \
         ../include/opendht/network_utils.h \
         ../include/opendht/rng.h \
         ../include/opendht/thread_pool.h
@@ -84,3 +84,33 @@ if ENABLE_INDEXATION
 libopendht_la_SOURCES += indexation/pht.cpp
 nobase_include_HEADERS += ../include/opendht/indexation/pht.h
 endif
+
+clean-local:
+	rm -rf libargon2.la
+
+######################
+#  ARGON2 submodule  #
+######################
+
+if WITH_INCLUDED_ARGON2
+noinst_LTLIBRARIES         = libargon2.la
+libopendht_la_DEPENDENCIES = libargon2.la
+
+libargon2_la_CFLAGS  = -std=c89 -fPIC -pthread -O3 -Wall -I@top_builddir@/argon2/include -I@top_builddir@/argon2/src
+libargon2_la_SOURCES = \
+        @top_builddir@/argon2/src/argon2.c \
+        @top_builddir@/argon2/src/core.c \
+        @top_builddir@/argon2/src/blake2/blake2b.c \
+        @top_builddir@/argon2/src/thread.c \
+        @top_builddir@/argon2/src/ref.c \
+        @top_builddir@/argon2/src/encoding.c
+
+noinst_HEADERS = \
+        @top_builddir@/argon2/include/argon2.h \
+        @top_builddir@/argon2/src/blake2/blake2.h \
+        @top_builddir@/argon2/src/blake2/blake2-impl.h \
+        @top_builddir@/argon2/src/blake2/blamka-round-ref.h \
+        @top_builddir@/argon2/src/core.h \
+        @top_builddir@/argon2/src/encoding.h \
+        @top_builddir@/argon2/src/thread.h
+endif

src/base64.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2014-2023 Savoir-faire Linux Inc.
+ *  Copyright (C) 2014-2020 Savoir-faire Linux Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by