Merge pull request #3010 from defnax/workflow-fix

Removed jsonapi & webui config from workflow

.github/workflows/ci-mingw64.yml

@@ -0,0 +1,70 @@
+name: MINGW64 Qt5 Build
+
+on:
+  push:
+    paths-ignore:
+    - '**/*.md'
+  pull_request:
+    paths-ignore:
+    - '**/*.md'
+
+concurrency:  
+  group: ${{ github.workflow}}-${{ github.head_ref }}  
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-latest
+    permissions:
+      actions: write
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Setup MSYS2
+        uses: msys2/setup-msys2@40677d36a502eb2cf0fb808cc9dec31bf6152638 # v2.28.0
+        with:
+          msystem: MINGW64
+          update: true
+          install: >-
+            base-devel
+            git
+            wget
+            p7zip
+            gcc
+            perl
+            ruby
+            doxygen
+            cmake
+            mingw-w64-x86_64-toolchain
+            mingw-w64-x86_64-miniupnpc
+            mingw-w64-x86_64-libxslt
+            mingw-w64-x86_64-xapian-core
+            mingw-w64-x86_64-sqlcipher
+            mingw-w64-x86_64-qt5-base
+            mingw-w64-x86_64-qt5-multimedia
+            mingw-w64-x86_64-ccmake
+            mingw-w64-x86_64-rapidjson
+            mingw-w64-x86_64-json-c
+            mingw-w64-x86_64-libbotan
+            mingw-w64-x86_64-asio
+
+      - name: Checkout submodules
+        run: |
+          env
+          git submodule update --init --remote libbitdht/ libretroshare/ retroshare-webui/
+          git submodule update --init supportlibs/librnp supportlibs/rapidjson supportlibs/restbed
+
+      - name: CI-Build
+        run: |
+          qmake . -r -spec win32-g++ "CONFIG+=release" "CONFIG+=rs_autologin" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_sam3_libsam3"
+          mingw32-make -j3

.github/workflows/ci-ucrt64.yml

@@ -0,0 +1,70 @@
+name: UCRT64 Qt5 Build
+
+on:
+  push:
+    paths-ignore:
+    - '**/*.md'
+  pull_request:
+    paths-ignore:
+    - '**/*.md'
+
+concurrency:  
+  group: ${{ github.workflow}}-${{ github.head_ref }}  
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-latest
+    permissions:
+      actions: write
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Setup MSYS2
+        uses: msys2/setup-msys2@40677d36a502eb2cf0fb808cc9dec31bf6152638 # v2.28.0
+        with:
+          msystem: UCRT64
+          update: true
+          install: >-
+            base-devel
+            git
+            wget
+            p7zip
+            gcc
+            perl
+            ruby
+            doxygen
+            cmake
+            mingw-w64-ucrt-x86_64-toolchain
+            mingw-w64-ucrt-x86_64-miniupnpc
+            mingw-w64-ucrt-x86_64-libxslt
+            mingw-w64-ucrt-x86_64-xapian-core
+            mingw-w64-ucrt-x86_64-sqlcipher
+            mingw-w64-ucrt-x86_64-qt5-base
+            mingw-w64-ucrt-x86_64-qt5-multimedia
+            mingw-w64-ucrt-x86_64-ccmake
+            mingw-w64-ucrt-x86_64-rapidjson
+            mingw-w64-ucrt-x86_64-json-c
+            mingw-w64-ucrt-x86_64-libbotan
+            mingw-w64-ucrt-x86_64-asio
+
+      - name: Checkout submodules
+        run: |
+          env
+          git submodule update --init --remote libbitdht/ libretroshare/ retroshare-webui/
+          git submodule update --init supportlibs/librnp supportlibs/rapidjson supportlibs/restbed
+
+      - name: CI-Build
+        run: |
+          qmake . -r -spec win32-g++ "CONFIG+=release" "CONFIG+=rs_autologin" "CONFIG+=no_rs_sam3" "CONFIG+=no_rs_sam3_libsam3"
+          mingw32-make -j3

.gitignore

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: (C) 2004-2019 Retroshare Team <contact@retroshare.cc>
+# SPDX-FileCopyrightText: (C) 2004-2022 Retroshare Team <contact@retroshare.cc>
 # SPDX-License-Identifier: CC0-1.0
 
 *.o
@@ -15,3 +15,23 @@ Thumbs.db
 *.pro.user
 .kdev4
 *.kdev4
+
+.qmake.stash
+
+!supportlibs/libsam3/Makefile
+
+# QtCreator cruft
+*CMakeLists.txt.user*
+
+# Build artifacts
+/jsonapi-generator/src/jsonapi-generator
+/jsonapi-generator/src/jsonapi-generator-doxygen-final.conf
+/jsonapi-generator/src/jsonapi-includes.inl
+/jsonapi-generator/src/jsonapi-wrappers.inl
+/jsonapi-generator/src/xml/
+/retroshare-friendserver/src/retroshare-friendserver
+/retroshare-gui/src/include/
+/retroshare-gui/src/retroshare
+/retroshare-gui/src/temp/
+/retroshare-service/src/retroshare-service
+/*.tar.?z

.gitlab-ci.yml

@@ -1,32 +1,50 @@
-image: docker:stable
+image: docker:latest
 
 services:
-    - docker:stable-dind
+  - docker:dind
+
+stages:
+  - build
+  - test
 
 workflow:
   rules:
     - if: $CI_MERGE_REQUEST_ID
     - if: $CI_COMMIT_BRANCH
 
-build-and-test:
+variables:
+  UBUNTU_TESTING_IMAGE_TAG: "$CI_REGISTRY_IMAGE/gitlabci_outputs/ubuntu_testing:$CI_COMMIT_SHA"
+        
+build-ubuntu-test-image:
+    stage: build
     script:
+        - docker --version
         - > 
-          if [ -n "$CI_MERGE_REQUEST_ID" ]; then
-          REPO_ARGS="--build-arg REPO_URL=$CI_MERGE_REQUEST_SOURCE_PROJECT_URL" ;
-          REPO_ARGS="$REPO_ARGS --build-arg REPO_BRANCH=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ;
-          else
-          REPO_ARGS="--build-arg REPO_URL=$CI_REPOSITORY_URL" ;
-          REPO_ARGS="$REPO_ARGS --build-arg REPO_BRANCH=$CI_COMMIT_BRANCH" ;
-          fi ;
-          export REPO_ARGS ;
-          echo REPO_ARGS=$REPO_ARGS ;
+          docker login "$CI_REGISTRY"
+          --username "$CI_REGISTRY_USER"
+          --password "$CI_REGISTRY_PASSWORD"
         - mkdir Dockercontext
         - >
-          docker build -t retroshare:testing $REPO_ARGS
+          docker build
+          -t $UBUNTU_TESTING_IMAGE_TAG
+          $($CI_PROJECT_DIR/build_scripts/GitlabCI/getRepoArgs.sh)
           --file $CI_PROJECT_DIR/build_scripts/GitlabCI/gitlabCI.Dockerfile
           Dockercontext
+        - docker push $UBUNTU_TESTING_IMAGE_TAG
+        - echo UBUNTU_TESTING_IMAGE_TAG=$UBUNTU_TESTING_IMAGE_TAG
+
+test-ubuntu:
+    stage: test
+    script:
+        - docker --version
         - > 
-          docker run --name retroshare --detach --tty retroshare:testing
+          docker login "$CI_REGISTRY"
+          --username "$CI_REGISTRY_USER"
+          --password "$CI_REGISTRY_PASSWORD"
+        - echo UBUNTU_TESTING_IMAGE_TAG=$UBUNTU_TESTING_IMAGE_TAG
+        - docker pull $UBUNTU_TESTING_IMAGE_TAG
+        - >
+          docker run --name retroshare --detach --tty $UBUNTU_TESTING_IMAGE_TAG
           retroshare-service --jsonApiPort 9092
         - apk add jq
         - >

.gitmodules

@@ -10,7 +10,34 @@
 [submodule "supportlibs/udp-discovery-cpp"]
 	path = supportlibs/udp-discovery-cpp
 	url = https://github.com/truvorskameikin/udp-discovery-cpp.git
-	branch = develop
+	branch = master
+# develop branch was removed we were using it at commit f3a3103a6c52e5707629e8d0a7e279a7758fe845
 [submodule "supportlibs/rapidjson"]
 	path = supportlibs/rapidjson
 	url = https://github.com/Tencent/rapidjson.git
+[submodule "supportlibs/libsam3"]
+	path = supportlibs/libsam3
+	url = https://github.com/i2p/libsam3.git
+[submodule "supportlibs/jni.hpp"]
+	path = supportlibs/jni.hpp
+	url = https://github.com/RetroShare/jni.hpp.git
+[submodule "openpgpsdk"]
+	path = openpgpsdk
+	url = ../OpenPGP-SDK
+	branch = master
+[submodule "libbitdht"]
+	path = libbitdht
+	url = ../BitDHT
+	branch = master
+[submodule "libretroshare"]
+	path = libretroshare
+	url = https://github.com/RetroShare/libretroshare.git
+	branch = master
+[submodule "retroshare-webui"]
+	path = retroshare-webui
+	url = https://github.com/RetroShare/RSNewWebUI.git
+	branch = master
+[submodule "supportlibs/librnp"]
+	path = supportlibs/librnp
+	url = https://github.com/rnpgp/rnp.git
+	branch = main

.travis.yml

@@ -8,12 +8,12 @@ language: cpp
 
 matrix:
   include:
-    - os: linux
-      dist: bionic
-      sudo: required
-      compiler: gcc
+#    - os: linux
+#      dist: bionic
+#      sudo: required
+#      compiler: gcc
     - os: osx
-      osx_image: xcode10.1
+      osx_image: xcode10.2
       compiler: clang
       sudo: false
 
@@ -68,11 +68,11 @@ before_script:
     fi
 
 script:
-  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j4; fi
+  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then travis_wait 30 make -j$(nproc); fi
 
 after_success:
   - if [ $TRAVIS_OS_NAME == osx ]; then build_scripts/OSX/travis_makeOSXPackage.sh ; fi
-  - if [ $TRAVIS_OS_NAME == linux ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j2; fi
+#  - if [ $TRAVIS_OS_NAME == linux ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j2; fi
 
 
 # branches:

README.asciidoc

@@ -1,56 +0,0 @@
-// SPDX-FileCopyrightText: Retroshare Team <contact@retroshare.cc>
-// SPDX-License-Identifier: CC-BY-SA-4.0
-
-= RetroShare
-
-RetroShare is a decentralized, private, secure, cross-platform, communication
-toolkit.
-RetroShare provides file sharing, chat, messages, forums, channels and more.
-
-.Build Status
-|===============================================================================
-|GNU/Linux (via Gitlab CI) | image:https://gitlab.com/RetroShare/RetroShare/badges/master/pipeline.svg[link="https://gitlab.com/RetroShare/RetroShare/-/commits/master",title="pipeline status"]
-|GNU/Linux, macOS, (via Travis CI) | image:https://travis-ci.org/RetroShare/RetroShare.svg?branch=master[link="https://travis-ci.org/RetroShare/RetroShare"]
-|Windows (via AppVeyor) | image:https://ci.appveyor.com/api/projects/status/github/RetroShare/RetroShare?svg=true[link="https://ci.appveyor.com/project/RetroShare58622/retroshare"]
-|===============================================================================
-
-
-== Compilation
-
-Short of comprehensive and updated documentation on how to build RetroShare
-(for the many supported platforms it runs on), scripts and recipes are provided
-in the aim of creating packages for the supported platforms (and more)
-in the `build_scripts` directory of this repository.
-
-Those packaging receipts together with the continuous integration files
-`.travis.yml` and `appveyor.yml` are a good source of knowledge on how to
-compile RetroShare on different platforms.
-
-
-== Using RetroShare on a headless computer with web UI
-
-WARNING: This section is outdated need to be adapted to the new web UI
-
-The web UI needs to be enabled as a parameter option to the retroshare-service:
-
-[source,bash]
---------
-./retroshare-nogui --webinterface 9090 --docroot /usr/share/retroshare/webui/
---------
-
-The web UI is only accessible on localhost:9090. It is advised to keep it that way so that your RS
-cannot be controlled using an untrusted connection.
-
-To access your web UI from a distance, just open a SSH tunnel to it:
-
-[source,bash]
---------
-distant_machine:~/ >  ssh rs_host -L 9090:localhost:9090 -N
---------
-
-"rs_host" is the machine running `retroshare-nogui`. Then on the distant machine, access your web UI on 
-
-
-      http://localhost:9090
-
-(This can also be done from the RetroShare GUI.)

README.md

@@ -0,0 +1,46 @@
+## RetroShare
+
+RetroShare is a decentralized, private, secure, cross-platform, communication
+toolkit.
+RetroShare provides file sharing, chat, messages, forums, channels, boards and more.
+
+[![GitHub release](https://img.shields.io/github/release/retroshare/retroshare.svg?label=latest%20release)](https://github.com/retroshare/retroshare/releases/latest)
+[![Downloads](https://img.shields.io/github/downloads/retroshare/retroshare/total)](https://github.com/retroshare/retroshare/releases/latest)
+[![GNU/Linux (via Gitlab CI)](https://gitlab.com/RetroShare/RetroShare/badges/master/pipeline.svg)](https://gitlab.com/RetroShare/RetroShare/-/commits/master)
+[![libretroshare GNU/Linux, Android (via Gitlab CI)](https://gitlab.com/RetroShare/libretroshare/badges/master/pipeline.svg)](https://gitlab.com/RetroShare/libretroshare/-/commits/master)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/RetroShare/RetroShare)
+
+## Get the source
+
+Clone this repository, enter the directory and then get the submodules with the
+following command
+
+    git submodule update --init --remote --force libbitdht/ libretroshare/ openpgpsdk/
+
+
+
+## Compilation
+
+Short of comprehensive and updated documentation on how to build RetroShare
+(for the many supported platforms it runs on), scripts and recipes are provided
+in the aim of creating packages for the supported platforms (and more)
+in the [build_scripts](https://github.com/RetroShare/RetroShare/tree/master/build_scripts) directory of this repository.
+
+## Compilation on Windows
+Follow this file : [WindowsMSys2_InstallGuide.md](https://github.com/RetroShare/RetroShare/blob/master/build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md)
+
+## Compilation on MacOSX
+
+Follow this file : [MacOS_X_InstallGuide](https://github.com/RetroShare/RetroShare/blob/master/build_scripts/OSX/MacOS_X_InstallGuide.md)
+
+## Releases
+
+Latest release [here](https://github.com/RetroShare/RetroShare/releases)
+
+Other Builds [RetroShare Downloads](https://retroshare.cc/downloads.html)
+
+
+## Documentation
+
+- [RetroShare Docs](https://retrosharedocs.readthedocs.io/en/latest/)
+

RetroShare.pro

@@ -25,9 +25,6 @@ CONFIG += c++14
 
 TEMPLATE = subdirs
 
-SUBDIRS += openpgpsdk
-openpgpsdk.file = openpgpsdk/src/openpgpsdk.pro
-
 rs_jsonapi:isEmpty(JSONAPI_GENERATOR_EXE) {
     SUBDIRS += jsonapi-generator
     jsonapi-generator.file = jsonapi-generator/src/jsonapi-generator.pro
@@ -36,7 +33,7 @@ rs_jsonapi:isEmpty(JSONAPI_GENERATOR_EXE) {
 
 SUBDIRS += libbitdht
 libbitdht.file = libbitdht/src/libbitdht.pro
-libretroshare.depends += openpgpsdk libbitdht
+libretroshare.depends += libbitdht
 
 SUBDIRS += libretroshare
 libretroshare.file = libretroshare/src/libretroshare.pro
@@ -55,6 +52,12 @@ retroshare_service {
     retroshare_service.target = retroshare_service
 }
 
+retroshare_friendserver {
+    SUBDIRS += retroshare_friendserver
+    retroshare_friendserver.file = retroshare-friendserver/src/retroshare-friendserver.pro
+    retroshare_friendserver.depends = libretroshare
+    retroshare_friendserver.target = retroshare_friendserver
+}
 retroshare_plugins {
     SUBDIRS += plugins
     plugins.file = plugins/plugins.pro
@@ -62,6 +65,13 @@ retroshare_plugins {
     plugins.target = plugins
 }
 
+rs_webui {
+    SUBDIRS += retroshare-webui
+    retroshare-webui.file = retroshare-webui/webui.pro
+    retroshare-webui.target = rs_webui
+    retroshare-webui.depends = retroshare_gui
+}
+
 wikipoos {
     SUBDIRS += pegmarkdown
     pegmarkdown.file = supportlibs/pegmarkdown/pegmarkdown.pro

appveyor.yml

@@ -1,312 +0,0 @@
-# SPDX-FileCopyrightText: (C) 2004-2019 Retroshare Team <contact@retroshare.cc>
-# SPDX-License-Identifier: CC0-1.0
-
-# Notes:
-#   - Minimal appveyor.yml file is an empty file. All sections are optional.
-#   - Indent each level of configuration with 2 spaces. Do not use tabs!
-#   - All section names are case-sensitive.
-#   - Section names should be unique on each level.
-# from example:
-# https://github.com/Phonations/Joker/blob/master/appveyor.yml
-# https://github.com/unicorn-engine/autobuild/blob/master/.appveyor.yml
-      
-#---------------------------------#
-#      general configuration      #
-#---------------------------------#
-
-# version format
-version: RetroShare-git-{branch}-{build}
-image: Visual Studio 2019
-
-# you can use {branch} name in version format too
-# version: 1.0.{build}-{branch}
-
-# branches to build
-branches:
-  # whitelist
-  #only:
-  #  - master
-
-  # blacklist
-  except:
-    - /^skipthisbranch$/
-
-# Do not build on tags (GitHub only)
-skip_tags: true
-
-# Skipping commits with particular message or from user
-skip_commits:
-  message: /Created.*\.(png|jpg|jpeg|bmp|gif)/       # Regex for matching commit message
-  #author: Anonymous        # Commit author's username, name, email or regexp maching one of these.
-
-#---------------------------------#
-#    environment configuration    #
-#---------------------------------#
-
-# Operating system (build VM template)
-#os: Windows Server 2012
-
-# scripts that are called at very beginning, before repo cloning
-init:
-  - git config --global core.autocrlf input
-  #To get RDP while compiling
-  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-on_finish:
-  #To get RDP running after compiling
-  #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
-# clone directory
-clone_folder: C:\projects\RetroShare
-
-# fetch repository as zip archive
-#shallow_clone: true                 # default is "false"
-
-# set clone depth
-clone_depth: 2000                    # clone entire repository history if not defined
-
-environment:
-  global:
-## Qt: https://www.appveyor.com/docs/installed-software#qt
-#    QTDIR: C:\Qt\5.10.1\mingw53_32
-    MSYS2_ARCH: i686
-    TARGET: i686_32-pc-msys
-    MINGW_PREFIX: C:\msys64\mingw32
-    RS_DEPLOY: RetroShare_deploy
-
-
-# build cache to preserve files/folders between builds
-#cache:
-# Disabled because it's bigger then supported by appveyor free plan
-#  - C:\msys64\var\cache\pacman\pkg
-
-# scripts that run after cloning repository
-#install:
-#  # by default, all script lines are interpreted as batch
-#  - echo This is batch
-#  # to run script as a PowerShell command prepend it with ps:
-#  - ps: Write-Host 'This is PowerShell'
-#  # batch commands start from cmd:
-#  - cmd: echo This is batch again
-#  - cmd: set MY_VAR=12345
-install:
-  # We cannot get OBS submodule as it use illegal folder name for windows.
-  #- git submodule update --init
-  # Configuring MSys2
-  - set PATH=C:\msys64\usr\bin;%PATH%
-  - set PATH=C:\msys64\mingw32\bin;%PATH%
-  - >
-    pacman --noconfirm -Sy
-    mingw-w64-i686-qt5 mingw-w64-i686-miniupnpc mingw-w64-i686-rapidjson
-    mingw-w64-i686-sqlcipher mingw-w64-i686-xapian-core mingw-w64-i686-cmark
-  #- set PATH=C:\msys64\mingw32\qt5-static\bin\;%PATH%
-
-  # Configuring Qt
-#  - set PATH=%QTDIR%\bin;C:\Qt\Tools\mingw491_32\bin;%PATH%
-
-  # Hack for new MSys2
-  - copy C:\msys64\mingw32\i686-w64-mingw32\bin\ar.exe C:\msys64\mingw32\bin\i686-w64-mingw32-ar.exe
-  - copy C:\msys64\mingw32\i686-w64-mingw32\bin\ranlib.exe C:\msys64\mingw32\bin\i686-w64-mingw32-ranlib.exe
-  - copy C:\msys64\mingw32\bin\windres.exe C:\msys64\mingw32\bin\i686-w64-mingw32-windres.exe
-  - copy C:\msys64\mingw64\x86_64-w64-mingw32\bin\ar.exe C:\msys64\mingw64\bin\x86_64-w64-mingw32-ar.exe
-  - copy C:\msys64\mingw64\x86_64-w64-mingw32\bin\ranlib.exe C:\msys64\mingw64\bin\x86_64-w64-mingw32-ranlib.exe
-  - copy C:\msys64\mingw64\bin\windres.exe C:\msys64\mingw64\bin\x86_64-w64-mingw32-windres.exe
-
-  # Work-around linker looking for Qt dll in wrong place
-  - copy C:\msys64\mingw32\bin\Qt5PrintSupport.dll C:\msys64\mingw32\lib\Qt5PrintSupport.dll
-  - copy C:\msys64\mingw32\bin\Qt5Widgets.dll C:\msys64\mingw32\lib\Qt5Widgets.dll
-  - copy C:\msys64\mingw32\bin\Qt5Multimedia.dll C:\msys64\mingw32\lib\Qt5Multimedia.dll
-  - copy C:\msys64\mingw32\bin\Qt5Gui.dll C:\msys64\mingw32\lib\Qt5Gui.dll
-  - copy C:\msys64\mingw32\bin\Qt5Network.dll C:\msys64\mingw32\lib\Qt5Network.dll
-  - copy C:\msys64\mingw32\bin\Qt5Xml.dll C:\msys64\mingw32\lib\Qt5Xml.dll
-  - copy C:\msys64\mingw32\bin\Qt5Core.dll C:\msys64\mingw32\lib\Qt5Core.dll
-
-
-#---------------------------------#
-#       build configuration       #
-#---------------------------------#
-
-# build platform, i.e. x86, x64, Any CPU. This setting is optional.
-platform: x86
-
-# to add several platforms to build matrix:
-#platform:
-#  - x86
-#  - Any CPU
-
-# build Configuration, i.e. Debug, Release, etc.
-configuration: Release
-
-# to add several configurations to build matrix:
-#configuration:
-#  - Debug
-#  - Release
-
-# scripts to run before build
-before_build:
-  - cd C:\projects\RetroShare
-  - git submodule update --init
-  - cd C:\projects\
-  - mkdir RetroShare-build
-  - cd RetroShare-build
-#  - find C:\ > filelist.txt
-
-# scripts to run *after* solution is built and *before* automatic packaging occurs (web apps, NuGet packages, Azure Cloud Services)
-before_package:
-
-# to run your custom scripts instead of automatic MSBuild
-build_script:
-  - env
-  - qmake ../RetroShare -spec win32-g++ "CONFIG+=debug"
-  - mingw32-make -j3
-
-# scripts to run after build
-after_build:
-  - find .
-
-  - mkdir %RS_DEPLOY%
-  - copy retroshare-gui\src\debug\retroshare.exe %RS_DEPLOY%\
-  - copy retroshare-service\src\debug\retroshare-service.exe %RS_DEPLOY%\
-#  - copy retroshare-service\src\retroshare-service.exe %RS_DEPLOY%\
-#  - copy retroshare-gui\src\retroshare.exe %RS_DEPLOY%\
-
-## In Debug build winedeplyqt forget the non debug Qt libs
-  - copy C:\msys64\mingw32\bin\Qt5Svg.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\Qt5Core.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\Qt5Multimedia.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\Qt5Widgets.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\Qt5Xml.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\Qt5PrintSupport.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\Qt5Gui.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\Qt5Network.dll %RS_DEPLOY%\
-
-  - mkdir %RS_DEPLOY%\playlistformats\
-  - copy C:\msys64\mingw32\share\qt5\plugins\playlistformats\qtmultimedia_m3u.dll %RS_DEPLOY%\playlistformats
-
-  - mkdir %RS_DEPLOY%\printsupport\
-  - copy C:\msys64\mingw32\share\qt5\plugins\printsupport\windowsprintersupport.dll %RS_DEPLOY%\printsupport\
-
-  - mkdir %RS_DEPLOY%\iconengines\
-  - copy C:\msys64\mingw32\share\qt5\plugins\iconengines\qsvgicon.dll %RS_DEPLOY%\iconengines\
-
-  - mkdir %RS_DEPLOY%\bearer\
-  - copy C:\msys64\mingw32\share\qt5\plugins\bearer\qgenericbearer.dll %RS_DEPLOY%\bearer\
-
-  - mkdir %RS_DEPLOY%\mediaservice\
-  - copy C:\msys64\mingw32\share\qt5\plugins\mediaservice\qtmedia_audioengine.dll %RS_DEPLOY%\mediaservice\
-  - copy C:\msys64\mingw32\share\qt5\plugins\mediaservice\dsengine.dll %RS_DEPLOY%\mediaservice\
-
-  - mkdir %RS_DEPLOY%\styles\
-  - copy C:\msys64\mingw32\share\qt5\plugins\styles\qwindowsvistastyle.dll %RS_DEPLOY%\styles\
-
-  - mkdir %RS_DEPLOY%\imageformats\
-  - copy C:\msys64\mingw32\share\qt5\plugins\imageformats\qwebp.dll %RS_DEPLOY%\imageformats\
-  - copy C:\msys64\mingw32\share\qt5\plugins\imageformats\qicns.dll %RS_DEPLOY%\imageformats\
-  - copy C:\msys64\mingw32\share\qt5\plugins\imageformats\qjpeg.dll %RS_DEPLOY%\imageformats\
-  - copy C:\msys64\mingw32\share\qt5\plugins\imageformats\qtiff.dll %RS_DEPLOY%\imageformats\
-  - copy C:\msys64\mingw32\share\qt5\plugins\imageformats\qtga.dll %RS_DEPLOY%\imageformats\
-  - copy C:\msys64\mingw32\share\qt5\plugins\imageformats\qjp2.dll %RS_DEPLOY%\imageformats\
-  - copy C:\msys64\mingw32\share\qt5\plugins\imageformats\qico.dll %RS_DEPLOY%\imageformats\
-  - copy C:\msys64\mingw32\share\qt5\plugins\imageformats\qwbmp.dll %RS_DEPLOY%\imageformats\
-  - copy C:\msys64\mingw32\share\qt5\plugins\imageformats\qicns.dll %RS_DEPLOY%\imageformats\
-  - copy C:\msys64\mingw32\share\qt5\plugins\imageformats\qgif.dll %RS_DEPLOY%\imageformats\
-  - copy C:\msys64\mingw32\share\qt5\plugins\imageformats\qsvg.dll %RS_DEPLOY%\imageformats\
-
-  - mkdir %RS_DEPLOY%\platforms\
-  - copy C:\msys64\mingw32\share\qt5\plugins\platforms\qwindows.dll %RS_DEPLOY%\platforms\
-
-  - mkdir %RS_DEPLOY%\audio\
-  - copy C:\msys64\mingw32\share\qt5\plugins\audio\qtaudio_windows.dll %RS_DEPLOY%\audio\
-
-  - windeployqt %RS_DEPLOY%\retroshare.exe
-
-  - copy C:\msys64\mingw32\bin\libbz2*.dll %RS_DEPLOY%\
-  #- copy C:\msys64\mingw32\bin\libeay32.dll %RS_DEPLOY%\
-  - copy C:\OpenSSL-Win32\libeay32.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libminiupnpc.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libsqlcipher*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libsqlite3*.dll %RS_DEPLOY%\
-  #- copy C:\msys64\mingw32\bin\ssleay32.dll %RS_DEPLOY%\
-  - copy C:\OpenSSL-Win32\ssleay32.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\zlib*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libgcc_s_dw2*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libstdc*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libwinpthread*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libicu*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libpcre*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libharfbuzz*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libpng*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libfreetype*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libglib*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libgraphite2.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libintl*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libiconv*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libjasper*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libjpeg*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libtiff*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libwebp*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libwebpdemux*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\liblzma*.dll %RS_DEPLOY%\
-
-## Needed for cmark
-  - copy C:\msys64\mingw32\bin\libcmark*.dll %RS_DEPLOY%\
-  - copy C:\msys64\mingw32\bin\libdouble-conversion*.dll %RS_DEPLOY%\
-
-# to disable automatic builds
-#build: off
-
-#---------------------------------#
-#      artifacts configuration    #
-#---------------------------------#
-
-#artifacts:
-#  - path: '**\*.exe'
-#  - path: filelist.txt
-# - path: $(RS_DEPLOY)
-
-#
-#  # pushing a single file
-#  - path: test.zip
-#
-#  # pushing a single file with environment variable in path and "Deployment name" specified
-#  - path: MyProject\bin\$(configuration)
-#    name: myapp
-#
-#  # pushing entire folder as a zip archive
-#  - path: logs
-
-
-#---------------------------------#
-#     deployment configuration    #
-#---------------------------------#
-#No deployment under unknown  computer!!!
-
-#---------------------------------#
-#        global handlers          #
-#---------------------------------#
-
-# on successful build
-#on_success:
-#  - do something
-
-# on build failure
-#on_failure:
-#  - do something
-
-# after build failure or success
-#on_finish:
-#  - do something
-
-  
-#---------------------------------#
-#         notifications           #
-#---------------------------------#
-  
-notifications:
-
-  # Email
-  - provider: Email
-    to:
-      - retrosharephenom@gmail.com
-    subject: 'Build {{status}}'                  # optional
-    message: "{{message}}, {{commitId}}, ..."    # optional
-    on_build_status_changed: true

build_scripts/Android/README.asciidoc

@@ -1,399 +0,0 @@
-= RetroShare development on Android
-
-// SPDX-FileCopyrightText: RetroShare Team <contact@retroshare.cc>
-// SPDX-License-Identifier: CC-BY-SA-4.0
-
-
-Compiling an application for Android is not as easy as one would imagine,
-expecially one like RetroShare that has a big codebase and is not well
-documented. This document is aimed to empower the reader so she can hopefully
-succed or at least have a significant help in compiling her own RetroShare APK
-installable on Android.
-
-
-== Preparing The Environement
-
-First of all setup your Qt for Android development environement following the
-guide on the link:http://doc.qt.io/qt-5/androidgs.html[Qt for android web site].
-At this point you should have Android SDK, Android NDK, and Qt for Android
-working fine, and you should be capable of executing on an Android emulator or
-on your Android phone Qt for Android examples.
-
-But RetroShare is not as simple to compile as those examples. The good news is
-that Android NDK ships all the necessary to build a custom toolchain that is
-suitable to build RetroShare.
-In order to build the toolchain with needed libraries RetroShare provides the
-+android-prepare-toolchain.sh+ script; before you execute it you should define
-some variables the script cannot determine in an easy and reliable manner by
-itself in your terminal.
-
-[source,bash]
--------------------------------------------------------------------------------
-## The path where Android NDK is installed in your system
-export ANDROID_NDK_PATH="/opt/android-ndk/"
-
-## The path where your fresh compiled toolchain will be installed, make sure
-## the parent exists
-export NATIVE_LIBS_TOOLCHAIN_PATH="${HOME}/Builds/android-toolchains/retroshare-android/"
-
-## The CPU architecture of the Android device you want to target
-export ANDROID_NDK_ARCH="arm"
-
-## The Android API level the Android device you want to target
-export ANDROID_PLATFORM_VER="16"
-
-## The number of core that yout host CPU have (just to speed up compilation) set
-## it to 1 if unsure
-export HOST_NUM_CPU=1
-
-./android-prepare-toolchain.sh
--------------------------------------------------------------------------------
-
-
-== Preparing Qt Creator
-
-Now that your environement is set up you should configure Qt Creator for Android
-following the
-link:http://doc.qt.io/qtcreator/creator-developing-android.html[official guide].
-At the end of this step your Qt Creator should recognize the Android compiler
-and the Qt for Android kit.
-
-Your Kit is now ready to use. Now you can open RetroShare as a Qt Creator
-project and in the Projects left menu add the newly created kit if not already
-present, so you can select it on the build type selection button down on the
-left.
-
-Now you need to set properly a few options like `JSONAPI_GENERATOR_EXE` and
-disable some of RetroShare modules like `retroshare-gui` that are not available
-on Android so you will have to go to
-
-_Qt Creator left pane -> Projects -> Build and Run -> Android SOMESTUFF kit ->
-Build Steps -> qmake -> Additional arguments_  +
-
-and add the following configurations (change `Your_Path` according to your
-deployment)
-
-[source,makefile]
--------------------------------------------------------------------------------
-CONFIG+=retroshare_service CONFIG+=rs_jsonapi CONFIG+=rs_deep_search
-RS_UPNP_LIB=miniupnpc
-JSONAPI_GENERATOR_EXE=Your_Path/jsonapi-generator/src/jsonapi-generator
-NATIVE_LIBS_TOOLCHAIN_PATH=Your_Path/retroshare-android-16-arm/
-CONFIG+=no_retroshare_gui CONFIG+=no_rs_service_webui_terminal_password
-CONFIG+=no_rs_service_terminal_login
--------------------------------------------------------------------------------
-
-TIP: Some versions of QtCreator try to find the Android SDK in
-`/opt/android/sdk`. A workaround to this is to make a symbolic link there
-pointing to your SDK installation path, like
-+mkdir -p /opt/android/sdk && ln -s /home/user/android-sdk-linux
-/opt/android/sdk+
-
-
-== Quircks
-
-=== Protected Apps
-
-On some Android devices like +Huawei ALE-L21+ background applications are
-killed when screen is turned off unless they are in the _protected app_ list.
-At moment seems apps developers don't have a way to have the application
-_protected_ by default, unless the phone vendor decide the app is _popular_ so
-the user have to enable _protection_ for RetroShare manually on those mobile
-phones. +
-
-{empty} +
-To enable enable _protection_: +Android menu -> Settings -> Privacy & security 
--> Protected apps -> RetroShare+ +
-{empty} +
-
-Other devices may offer similar _features_ please report them.
-
-
-=== APK signature mismatch
-
-If you try to install a RetroShare APK that comes from a different source
-(eg: if you try to upgrade from F-Droid when you originally installed an APK
-build by yourself) Android will prevent that from happening. In that case the
-only solution is to uninstall the app and then install the new APK but if you do
-it also the application data and your precious cryptographic keys, friend list
-etc. will be lost forever.
-To avoid that you can attempt to manually backup and then restore from the
-command-line (`adb backup` seems not working either) to change the app source
-without erasing the appliation data.
-
-CAUTION: Following steps require root access on your Android device
-
-.Backup RetroShare Android application data
-[source,bash]
---------------------------------------------------------------------------------
-export ORIG_DIR="/data/data/org.retroshare.android.qml_app"
-export BACKUP_DIR="org.retroshare.android.qml_app.backup"
-
-adb root
-
-adb shell am force-stop org.retroshare.android.qml_app
-sleep 1s
-
-mkdir ${BACKUP_DIR}
-
-# Avoid adb pull failing
-adb shell rm ${ORIG_DIR}/files/.retroshare/libresapi.sock
-adb pull ${ORIG_DIR}/files/ ${BACKUP_DIR}/files/
---------------------------------------------------------------------------------
-
-After this you should be able to uninstall the old APK with your preferred
-method, as example from the command-line.
-
-.Uninstall RetroShare Android from the command-line
-[source,bash]
---------------------------------------------------------------------------------
-adb uninstall org.retroshare.android.qml_app
---------------------------------------------------------------------------------
-
-Now you can install a different signature APK and then restore the application
-data with the following commands.
-
-[source,bash]
---------------------------------------------------------------------------------
-export ORIG_DIR="/data/data/org.retroshare.android.qml_app"
-export BACKUP_DIR="org.retroshare.android.qml_app.backup"
-
-adb root
-
-## Launch the app to make sure the parent directory exists and has proper owner
-adb shell monkey -p org.retroshare.android.qml_app -c android.intent.category.LAUNCHER 1
-sleep 1s
-
-adb shell am force-stop org.retroshare.android.qml_app
-sleep 1s
-
-
-APP_OWNER="$(adb shell busybox ls -lnd ${ORIG_DIR} | awk '{print $3":"$4}')"
-adb shell rm -rf ${ORIG_DIR}/files
-adb push ${BACKUP_DIR}/files/ ${ORIG_DIR}/files/
-adb shell busybox chown -R ${APP_OWNER} ${ORIG_DIR}/files/
---------------------------------------------------------------------------------
-
-Opening RetroShare android app now should show your old profile.
-
-
-== Debugging with GDB
-
-If building RetroShare Android package seems tricky, setting up a functional
-debugging environement for it feels like black magic. This section is meant to
-help you doing it with less headache and hopefully in a reproducible way.
-
-Unfortunately at the time of the last update to this guide, Qt build system
-strips debugging symbols from the package and from the buildroot also if you
-compile with debugging enabled. Fiddling with `qmake` configurations and
-variables like `CONFIG+=debug`, `CONFIG+=force_debug_info` or `QMAKE_STRIP`
-either as commandline arguments or inside retroshare `.pro` and `.pri` files is
-uneffective. IMHO Qt should handle this on itself so it is probably worth
-reporting a bug to them. So to workaround this problem you need to fiddle a bit
-with the Android NDK. In my case I always keep +Debug+ or +Release+ suffix in
-my build directory name depending on what kind of build it is, so I use this
-information and modify `llvm-strip` in a way that it will strip only if stripped
-file path doesn't contain +Debug+.
-
-.Modify llvm-strip inside Android NDK
---------------------------------------------------------------------------------
-## Set ANDROID_NDK_PATH to your Android NDK installation path
-export ANDROID_NDK_PATH="/opt/android-ndk/"
-
-## Define a convenience variable with llvm-strip path
-export ANDROID_NDK_LLVM_STRIP="${ANDROID_NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip"
-
-## If not existing yer create a backup of the original llvm-strip
-[ -f "${ANDROID_NDK_LLVM_STRIP}.back" ] ||
-	cp "${ANDROID_NDK_LLVM_STRIP}" "${ANDROID_NDK_LLVM_STRIP}.back"
-
-## Create a new llvm-strip that does nothing if the argument path contains Debug
-cat > "${ANDROID_NDK_LLVM_STRIP}" << LLVMSTRIPTRICK
-#!/bin/bash
-
-echo "\${2}" | grep -q Debug ||
-	"${ANDROID_NDK_LLVM_STRIP}.back" --strip-all "\${2}"
-
-LLVMSTRIPTRICK
-
-## Eventually you can revert back simply by running
-# `mv "${ANDROID_NDK_LLVM_STRIP}.back" "${ANDROID_NDK_LLVM_STRIP}"`
---------------------------------------------------------------------------------
-
-
-To attach to the `retroshare-service` running on Android you need also to pull a
-debugging sysroot out of your device first, RetroShare sources provides an
-helper script to do that.
-
-.Prepare debugging sysroot with helper script
-[source,bash]
---------------------------------------------------------------------------------
-## Set RetroShare source path
-export RS_SOURCE_DIR="${HOME}/Development/rs-develop"
-
-## Optionally set your device ID first available will be used, you can run
-## `adb devices` to list available devices.
-#export ANDROID_SERIAL="YT013PSPGK"
-
-## Optionally set a path where to save the debugging sysroot otherwise default
-## is used.
-#export DEBUG_SYSROOT="${HOME}/Builds/debug_sysroot/${ANDROID_SERIAL}/"
-
-## Run the helper script
-${RS_SOURCE_DIR}/build_scripts/Android/pull_sysroot.sh
---------------------------------------------------------------------------------
-
-.Prepare Android NDK GDB configurations
-[source,bash]
---------------------------------------------------------------------------------
-## Optionally set Qt version variable consistently with your installation
-export QT_VERSION="5.12.7"
-
-## Optionally set Qt architecture variable consistently with Android device
-export QT_ARCH="arm64_v8a"
-
-## Optionally set Qt path variable consistently with your installation
-export QT_DIR="/opt/Qt-${QT_VERSION}/${QT_VERSION}/"
-
-## Optionally set RetroShare buildroot path
-export RS_BUILD_DIR="${HOME}/Builds/RetroShare-Android_for_${QT_ARCH}_Clang_Qt_${QT_VERSION//./_}_android_${QT_ARCH}-Debug/"
-
-## Optionally set gdb config file path
-export GDB_CONFIGS_FILE="${HOME}/Builds/gdb_configs_${QT_ARCH}"
-
-## Generate Android NDK GDB configuration
-${RS_SOURCE_DIR}/build_scripts/Android/generate_gdb_init_commands.sh
---------------------------------------------------------------------------------
-
-
-You will need to run the following steps everytime you want to debug
-`retroshare-service` on Android.
-
-Make sure `retroshare-service` is running on your connected Android device.
-
-.Run GDB server on your Android device from your host console
-[source,bash]
---------------------------------------------------------------------------------
-${RS_SOURCE_DIR}/build_scripts/Android/start_gdbserver.sh
---------------------------------------------------------------------------------
-
-
-.Run Android NDK GDB on your workstation and attach
-[source,bash]
---------------------------------------------------------------------------------
-## Start NDK gdb
-${ANDROID_NDK_PATH}/prebuilt/linux-x86_64/bin/gdb
-
-## Instruct GDB how and where to find debugging symbols
-(gdb) source $GDB_CONFIGS_FILE
-
-## Connect to the gdbserver running on the phone
-(gdb) target remote 127.0.01:5039
-
-## Have fun debugging
-(gdb)
---------------------------------------------------------------------------------
-
-
-== Debugging with Qt Creator
-
-WARNING: As of the last update to this guide, debugging retroshare-service
-running on Android via Qt creator doesn't wrok even with all the trickery
-explained in this section, you better learn how to debug with GDB reading
-carefully previous section.
-
-Qt Creator actually support debugging only for the foreground activity, so to
-debug what's happening in the core extra trickery is needed.
-
-- Run the App in Debug mode from QtCreator "Start Debugging" button
-- Enable QtCreator debugger console view Menu->Window->Debugger Log
-- Run +show solib-search-path+ in the QtCreator GDB console
-- Take note of the output you get in the right pane of the console
-- Thanks https://stackoverflow.com/a/31164313 for the idea
-
-TIP: QtCreator GDB console seems a bit buggy and easly trigger timeout
-message when a command is run, in that case attempt to run the command while the
-debugging is paused or at breakpoint, or with other similar tricks.
-
-CAUTION: Following steps require root access on your Android device
-
-Now on your phone yuo need to authorize root access to applications, then once
-you plug your sacrifical Android phone run this commands
-
-.Run gdbserver as root on Android phone
-[source,bash]
---------------------------------------------------------------------------------
-## Open a shell from your workstation on the connected Android phone
-adb shell
-
-## take the note of the phone IP address
-ip address show
-
-## Gain root permissions on the shell
-su
-
-## Attach with gdbserver and listen on one TCP port
-gdbserver :4567 --attach $(pgrep org.retroshare.android.qml_app:rs)
---------------------------------------------------------------------------------
-
-
-.Prepare and run Android NDK GDB on your workstation
-[source,bash]
---------------------------------------------------------------------------------
-## Setup some convenience variables
-NDK_GDB="${ANDROID_NDK_PATH}/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-gdb"
-RS_BUILD_PATH="${HOME}/Builds/RetroShare-Android_for_armeabi_v7a_GCC_4_9_Qt_5_9_2_android_armv7-Debug/"
-
-## Start Android NDK GDB of your phone architecture passing the executable
-$NDK_GDB $RS_BUILD_PATH/retroshare-android-service/src/libretroshare-android-service.so
-
-## Instruct GDB how and where to find debugging symbols
-(gdb) set auto-solib-add on
-(gdb) set solib-search-path THE:BIG:LIST:OF:DIRECTORIES:YOU:TAKE:NOTE:BEFORE
-
-## Connect to the gdbserver running on the phone
-(gdb) target remote $PHONE_IP:4567
-
-## Have fun debugging
-(gdb)
---------------------------------------------------------------------------------
-
-TIP: Some time WiFi power saving on Android mess with the GDB connection,
-to prevent that from appening open another +adb shell+ and live +ping+ toward
-your work-station running
-
-== Embedding into other Android packages
-
-As showed by https://elrepo.io/[elRepo.io] developers it is possible and quite
-easy to embed `retroshare-service` into other Android packages see description
-
-https://gitlab.com/elRepo.io/elRepo.io-android/-/blob/master/README.adoc
-
-And implementation details
-
-https://gitlab.com/elRepo.io/elRepo.io-android/-/blob/master/android/app/build.gradle
-
-
-== Furter Readings
-
-- link:http://doc.qt.io/qt-5/android-support.html[]
-- link:https://developer.android.com/ndk/guides/libs.html[]
-- link:retroshare://forum?name=Compiling%20nogui%20for%20android&id=8fd22bd8f99754461e7ba1ca8a727995&msgid=4e0f92330600bba9cf978f384f4b7b2f2ca64eff[]
-- link:retroshare://file?name=Android%20Native%20Development%20Kit%20Cookbook.pdf&size=29214468&hash=0123361c1b14366ce36118e82b90faf7c7b1b136[]
-- link:https://groups.google.com/forum/#!topic/android-developers/srATPaL0aRU[]
-- link:https://stackoverflow.com/questions/31638986/protected-apps-setting-on-huawei-phones-and-how-to-handle-it[]
-- link:https://tthtlc.wordpress.com/2012/09/19/how-to-do-remote-debugging-via-gdbserver-running-inside-the-android-phone/[]
-- link:https://source.android.com/devices/tech/debug/[]
-- link:https://source.android.com/devices/tech/debug/gdb[]
-- link:https://fw4spl-org.github.io/fw4spl-blog/2015/07/27/Native-debugging-on-Android-with-QtCreator.html[]
-- link:https://fragglet.livejournal.com/19646.html[]
-- link:https://github.com/android-ndk/ndk/issues/773[How to build without using standalone toolchain?]
-
-== License
-
-Copyright (C) 2016-2020  Gioacchino Mazzurco <gio@eigenlab.org> +
-Copyright (C) 2020       Asociación Civil Altermundi <info@altermundi.net> +
-
-This work is licensed under a Creative Commons Attribution-Share Alike 4.0 International License.
-
-image::https://i.creativecommons.org/l/by-sa/4.0/88x31.png[Creative Commons License, link=http://creativecommons.org/licenses/by-sa/4.0/]

build_scripts/Android/generate_gdb_init_commands.sh

@@ -1,85 +0,0 @@
-#!/bin/bash
-
-# Script to prepare Android NDK GDB configurations to debug retroshare-service
-#
-# Copyright (C) 2020  Gioacchino Mazzurco <gio@eigenlab.org>
-# Copyright (C) 2020  Asociación Civil Altermundi <info@altermundi.net>
-#
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, version 3.
-#
-# 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License along
-# with this program. If not, see <https://www.gnu.org/licenses/>
-
-
-## Define default value for variable, take two arguments, $1 variable name,
-## $2 default variable value, if the variable is not already define define it
-## with default value.
-function define_default_value()
-{
-	VAR_NAME="${1}"
-	DEFAULT_VALUE="${2}"
-
-	[ -z "${!VAR_NAME}" ] && export ${VAR_NAME}="${DEFAULT_VALUE}"
-}
-
-define_default_value QT_VERSION "5.12.4"
-define_default_value QT_ARCH "arm64_v8a"
-define_default_value QT_DIR "/opt/Qt-${QT_VERSION}/${QT_VERSION}/"
-define_default_value ANDROID_SERIAL "$(adb devices | head -n 2 | tail -n 1 | awk '{print $1}')"
-define_default_value RS_BUILD_DIR "${HOME}/Builds/RetroShare-Android_for_${QT_ARCH}_Clang_Qt_${QT_VERSION//./_}_android_${QT_ARCH}-Debug/"
-define_default_value RS_SOURCE_DIR "${HOME}/Development/rs-develop/"
-define_default_value DEBUG_SYSROOT "${HOME}/Builds/debug_sysroot/${ANDROID_SERIAL}/"
-define_default_value GDB_CONFIGS_FILE "${HOME}/Builds/gdb_configs_${QT_ARCH}"
-
-scanDir()
-{
-	find "$1" -type d -not -path '*/\.git/*' | tr '\n' ':' >> $GDB_CONFIGS_FILE
-}
-
-putSeparator()
-{
-	echo >> $GDB_CONFIGS_FILE
-	echo >> $GDB_CONFIGS_FILE
-}
-
-echo "set sysroot ${DEBUG_SYSROOT}" > $GDB_CONFIGS_FILE
-putSeparator
-
-echo "set auto-solib-add on" >> $GDB_CONFIGS_FILE
-echo -n "set solib-search-path " >> $GDB_CONFIGS_FILE
-scanDir "${RS_BUILD_DIR}"
-scanDir "${DEBUG_SYSROOT}"
-scanDir "${QT_DIR}/android_${QT_ARCH}/lib/"
-scanDir "${QT_DIR}/android_${QT_ARCH}/plugins/"
-scanDir "${QT_DIR}/android_${QT_ARCH}/qml/"
-putSeparator
-
-echo -n "directory " >> $GDB_CONFIGS_FILE
-scanDir ${RS_SOURCE_DIR}/jsonapi-generator/src
-scanDir ${RS_SOURCE_DIR}/libbitdht/src
-scanDir ${RS_SOURCE_DIR}/openpgpsdk/src
-scanDir ${RS_SOURCE_DIR}/libretroshare/src
-scanDir ${RS_SOURCE_DIR}/retroshare-service/src
-scanDir ${RS_SOURCE_DIR}/supportlibs/rapidjson/include/
-scanDir ${RS_SOURCE_DIR}/supportlibs/restbed/source/
-scanDir ${RS_SOURCE_DIR}/supportlibs/udp-discovery-cpp/
-scanDir ${RS_SOURCE_DIR}/supportlibs/restbed/dependency/asio/asio/include/
-scanDir ${RS_SOURCE_DIR}/supportlibs/restbed/dependency/catch/include/
-putSeparator
-
-## see https://stackoverflow.com/questions/28972367/gdb-backtrace-without-stopping
-echo "catch signal SIGSEGV" >> $GDB_CONFIGS_FILE
-echo "commands
-   bt
-   continue
-   end" >> $GDB_CONFIGS_FILE
-putSeparator
-
-echo GDB_CONFIGS_FILE=$GDB_CONFIGS_FILE

build_scripts/Android/prepare-toolchain-clang.sh

@@ -1,549 +0,0 @@
-#!/bin/bash
-
-# Script to prepare RetroShare Android package building toolchain
-#
-# Copyright (C) 2016-2020  Gioacchino Mazzurco <gio@eigenlab.org>
-#
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, version 3.
-#
-# 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License along
-# with this program. If not, see <https://www.gnu.org/licenses/>
-#
-# SPDX-FileCopyrightText: Retroshare Team <contact@retroshare.cc>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-
-## Define default value for variable, take two arguments, $1 variable name,
-## $2 default variable value, if the variable is not already define define it
-## with default value.
-function define_default_value()
-{
-	VAR_NAME="${1}"
-	DEFAULT_VALUE="${2}"
-
-	[ -z "${!VAR_NAME}" ] && export ${VAR_NAME}="${DEFAULT_VALUE}" || true
-}
-
-## You are supposed to provide the following variables according to your system setup
-define_default_value ANDROID_NDK_PATH "/opt/android-ndk/"
-define_default_value ANDROID_NDK_ARCH "arm"
-define_default_value ANDROID_PLATFORM_VER "16"
-define_default_value NATIVE_LIBS_TOOLCHAIN_PATH "${HOME}/Builds/android-toolchains/retroshare-android-${ANDROID_PLATFORM_VER}-${ANDROID_NDK_ARCH}/"
-define_default_value HOST_NUM_CPU $(nproc)
-
-define_default_value BZIP2_SOURCE_VERSION "1.0.6"
-define_default_value BZIP2_SOURCE_SHA256 a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
-
-define_default_value OPENSSL_SOURCE_VERSION "1.1.1c"
-define_default_value OPENSSL_SOURCE_SHA256 f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90
-
-define_default_value SQLITE_SOURCE_YEAR "2018"
-define_default_value SQLITE_SOURCE_VERSION "3250200"
-define_default_value SQLITE_SOURCE_SHA256 da9a1484423d524d3ac793af518cdf870c8255d209e369bd6a193e9f9d0e3181
-
-define_default_value SQLCIPHER_SOURCE_VERSION "4.2.0"
-define_default_value SQLCIPHER_SOURCE_SHA256 105c1b813f848da038c03647a8bfc9d42fb46865e6aaf4edfd46ff3b18cdccfc
-
-define_default_value LIBUPNP_SOURCE_VERSION "1.8.4"
-define_default_value LIBUPNP_SOURCE_SHA256 976c3e4555604cdd8391ed2f359c08c9dead3b6bf131c24ce78e64d6669af2ed
-
-define_default_value INSTALL_QT_ANDROID "false"
-define_default_value QT_VERSION "5.12.0"
-define_default_value QT_ANDROID_INSTALLER_SHA256 a214084e2295c9a9f8727e8a0131c37255bf724bfc69e80f7012ba3abeb1f763
-
-define_default_value RESTBED_SOURCE_VERSION f74f9329dac82e662c1d570b7cd72c192b729eb4
-
-define_default_value UDP_DISCOVERY_CPP_SOURCE "https://github.com/truvorskameikin/udp-discovery-cpp.git"
-define_default_value UDP_DISCOVERY_CPP_VERSION "develop"
-
-define_default_value XAPIAN_SOURCE_VERSION "1.4.7"
-define_default_value XAPIAN_SOURCE_SHA256 13f08a0b649c7afa804fa0e85678d693fd6069dd394c9b9e7d41973d74a3b5d3
-
-define_default_value RAPIDJSON_SOURCE_VERSION "1.1.0"
-define_default_value RAPIDJSON_SOURCE_SHA256 bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
-
-define_default_value MINIUPNPC_SOURCE_VERSION "2.1.20190625"
-define_default_value MINIUPNPC_SOURCE_SHA256 8723f5d7fd7970de23635547700878cd29a5c2bb708b5e5475b2d1d2510317fb
-
-
-## $1 filename, $2 sha256 hash
-function check_sha256()
-{
-	echo ${2} "${1}" | sha256sum -c &> /dev/null
-}
-
-## $1 filename, $2 sha256 hash, $3 url
-function verified_download()
-{
-	FILENAME="$1"
-	SHA256="$2"
-	URL="$3"
-
-	check_sha256 "${FILENAME}" "${SHA256}" ||
-	{
-		rm -rf "${FILENAME}"
-
-		wget -O "${FILENAME}" "$URL" ||
-		{
-			echo "Failed downloading ${FILENAME} from $URL"
-			exit 1
-		}
-
-		check_sha256 "${FILENAME}" "${SHA256}" ||
-		{
-			echo "SHA256 mismatch for ${FILENAME} from ${URL} expected sha256 ${SHA256} got $(sha256sum ${FILENAME} | awk '{print $1}')"
-			exit 1
-		}
-	}
-}
-
-cArch=""
-eABI=""
-
-case "${ANDROID_NDK_ARCH}" in
-"arm")
-	cArch="${ANDROID_NDK_ARCH}"
-	eABI="eabi"
-	;;
-"arm64")
-	cArch="aarch64"
-	eABI=""
-	;;
-"x86")
-	cArch="i686"
-	eABI=""
-	;;
-esac
-
-export SYSROOT="${NATIVE_LIBS_TOOLCHAIN_PATH}/sysroot/"
-export PREFIX="${SYSROOT}/usr/"
-export CC="${NATIVE_LIBS_TOOLCHAIN_PATH}/bin/${cArch}-linux-android${eABI}-clang"
-export CXX="${NATIVE_LIBS_TOOLCHAIN_PATH}/bin/${cArch}-linux-android${eABI}-clang++"
-export AR="${NATIVE_LIBS_TOOLCHAIN_PATH}/bin/${cArch}-linux-android${eABI}-ar"
-export RANLIB="${NATIVE_LIBS_TOOLCHAIN_PATH}/bin/${cArch}-linux-android${eABI}-ranlib"
-
-
-## More information available at https://android.googlesource.com/platform/ndk/+/ics-mr0/docs/STANDALONE-TOOLCHAIN.html
-build_toolchain()
-{
-	echo "build_toolchain()
-################################################################################
-################################################################################
-################################################################################
-"
-
-	rm -rf ${NATIVE_LIBS_TOOLCHAIN_PATH}
-	${ANDROID_NDK_PATH}/build/tools/make_standalone_toolchain.py --verbose \
-		--arch ${ANDROID_NDK_ARCH} --install-dir ${NATIVE_LIBS_TOOLCHAIN_PATH} \
-		--api ${ANDROID_PLATFORM_VER}
-	find "${PREFIX}/include/" -not -type d > "${NATIVE_LIBS_TOOLCHAIN_PATH}/deletefiles"
-}
-
-## This avoid <cmath> include errors due to -isystem and -I ordering issue
-delete_copied_includes()
-{
-	echo "delete_copied_includes()
-################################################################################
-################################################################################
-################################################################################
-"
-	cat "${NATIVE_LIBS_TOOLCHAIN_PATH}/deletefiles" | while read delFile ; do
-		rm "$delFile"
-	done
-}
-
-## More information available at https://gitlab.com/relan/provisioners/merge_requests/1 and http://stackoverflow.com/a/34032216
-install_qt_android()
-{
-	echo "install_qt_android()
-################################################################################
-################################################################################
-################################################################################
-"
-
-	QT_VERSION_CODE=$(echo $QT_VERSION | tr -d .)
-	QT_INSTALL_PATH=${NATIVE_LIBS_TOOLCHAIN_PATH}/Qt
-	QT_INSTALLER="qt-unified-linux-x64-3.0.2-online.run"
-
-	verified_download $QT_INSTALLER $QT_ANDROID_INSTALLER_SHA256 \
-		http://master.qt.io/archive/online_installers/3.0/${QT_INSTALLER}
-
-	chmod a+x ${QT_INSTALLER}
-
-	QT_INSTALLER_SCRIPT="qt_installer_script.js"
-	cat << EOF > "${QT_INSTALLER_SCRIPT}"
-function Controller() {
-    installer.autoRejectMessageBoxes();
-    installer.installationFinished.connect(function() {
-        gui.clickButton(buttons.NextButton);
-    });
-
-    var welcomePage = gui.pageWidgetByObjectName("WelcomePage");
-    welcomePage.completeChanged.connect(function() {
-        if (gui.currentPageWidget().objectName == welcomePage.objectName)
-            gui.clickButton(buttons.NextButton);
-    });
-}
-
-Controller.prototype.WelcomePageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.CredentialsPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.IntroductionPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.TargetDirectoryPageCallback = function() {
-    gui.currentPageWidget().TargetDirectoryLineEdit.setText("$QT_INSTALL_PATH");
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.ComponentSelectionPageCallback = function() {
-    var widget = gui.currentPageWidget();
-
-    // You can get these component names by running the installer with the
-    // --verbose flag. It will then print out a resource tree.
-
-    widget.deselectComponent("qt.tools.qtcreator");
-    widget.deselectComponent("qt.tools.doc");
-    widget.deselectComponent("qt.tools.examples");
-
-    widget.selectComponent("qt.$QT_VERSION_CODE.android_armv7");
-
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.LicenseAgreementPageCallback = function() {
-    gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.StartMenuDirectoryPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.ReadyForInstallationPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.FinishedPageCallback = function() {
-    var checkBoxForm = gui.currentPageWidget().LaunchQtCreatorCheckBoxForm;
-    if (checkBoxForm && checkBoxForm.launchQtCreatorCheckBox)
-        checkBoxForm.launchQtCreatorCheckBox.checked = false;
-    gui.clickButton(buttons.FinishButton);
-}
-EOF
-
-QT_QPA_PLATFORM=minimal ./${QT_INSTALLER} --script ${QT_INSTALLER_SCRIPT}
-}
-
-## More information available at retroshare://file?name=Android%20Native%20Development%20Kit%20Cookbook.pdf&size=29214468&hash=0123361c1b14366ce36118e82b90faf7c7b1b136
-build_bzlib()
-{
-	echo "build_bzlib()
-################################################################################
-################################################################################
-################################################################################
-"
-
-	B_dir="bzip2-${BZIP2_SOURCE_VERSION}"
-	rm -rf $B_dir
-
-	verified_download $B_dir.tar.gz $BZIP2_SOURCE_SHA256 \
-		http://distfiles.gentoo.org/distfiles/bzip2-${BZIP2_SOURCE_VERSION}.tar.gz
-
-	tar -xf $B_dir.tar.gz
-	cd $B_dir
-	sed -i "/^CC=.*/d" Makefile
-	sed -i "/^AR=.*/d" Makefile
-	sed -i "/^RANLIB=.*/d" Makefile
-	sed -i "/^LDFLAGS=.*/d" Makefile
-	sed -i "s/^all: libbz2.a bzip2 bzip2recover test/all: libbz2.a bzip2 bzip2recover/" Makefile
-	make -j${HOST_NUM_CPU}
-	make install PREFIX=${PREFIX}
-#	sed -i "/^CC=.*/d" Makefile-libbz2_so
-#	make -f Makefile-libbz2_so -j${HOST_NUM_CPU}
-#	cp libbz2.so.1.0.6 ${SYSROOT}/usr/lib/libbz2.so
-	cd ..
-}
-
-## More information available at http://doc.qt.io/qt-5/opensslsupport.html
-build_openssl()
-{
-	echo "build_openssl()
-################################################################################
-################################################################################
-################################################################################
-"
-
-	B_dir="openssl-${OPENSSL_SOURCE_VERSION}"
-	rm -rf $B_dir
-
-	verified_download $B_dir.tar.gz $OPENSSL_SOURCE_SHA256 \
-		https://www.openssl.org/source/$B_dir.tar.gz
-
-	tar -xf $B_dir.tar.gz
-	cd $B_dir
-## We link openssl statically to avoid android silently sneaking in his own
-## version of libssl.so (we noticed this because it had some missing symbol
-## that made RS crash), the crash in some android version is only one of the
-## possible problems the fact that android insert his own binary libssl.so pose
-## non neglegible security concerns.
-	oBits="32"
-	[[ ${ANDROID_NDK_ARCH} =~ .*64.* ]] && oBits=64
-
-	ANDROID_NDK="${ANDROID_NDK_PATH}" PATH="${SYSROOT}/bin/:${PATH}" \
-		./Configure linux-generic${oBits} -fPIC --prefix="${PREFIX}" \
-		--openssldir="${SYSROOT}/etc/ssl"
-#	sed -i 's/LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \\/LIBNAME=$$i \\/g' Makefile
-#	sed -i '/LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \\/d' Makefile
-	make -j${HOST_NUM_CPU}
-	make install
-	rm -f ${PREFIX}/lib/libssl.so*
-	rm -f ${PREFIX}/lib/libcrypto.so*
-	cd ..
-}
-
-build_sqlite()
-{
-	echo "build_sqlite()
-################################################################################
-################################################################################
-################################################################################
-"
-
-	B_dir="sqlite-autoconf-${SQLITE_SOURCE_VERSION}"
-	rm -rf $B_dir
-
-	verified_download $B_dir.tar.gz $SQLITE_SOURCE_SHA256 \
-		https://www.sqlite.org/${SQLITE_SOURCE_YEAR}/$B_dir.tar.gz
-
-	tar -xf $B_dir.tar.gz
-	cd $B_dir
-	./configure --with-pic --prefix="${PREFIX}" --host=${cArch}-linux
-	make -j${HOST_NUM_CPU}
-	make install
-	rm -f ${PREFIX}/lib/libsqlite3.so*
-#	${CC} -shared -o libsqlite3.so -fPIC sqlite3.o -ldl
-#	cp libsqlite3.so "${SYSROOT}/usr/lib"
-	cd ..
-}
-
-build_sqlcipher()
-{
-	echo "build_sqlcipher()
-################################################################################
-################################################################################
-################################################################################
-"
-
-	B_dir="sqlcipher-${SQLCIPHER_SOURCE_VERSION}"
-	rm -rf $B_dir
-
-	T_file="${B_dir}.tar.gz"
-
-	verified_download $T_file $SQLCIPHER_SOURCE_SHA256 \
-		https://github.com/sqlcipher/sqlcipher/archive/v${SQLCIPHER_SOURCE_VERSION}.tar.gz
-
-	tar -xf $T_file
-	cd $B_dir
-	case "${ANDROID_NDK_ARCH}" in
-	"arm64")
-	# SQLCipher config.sub is outdated and doesn't recognize newer architectures
-		rm config.sub
-		autoreconf --verbose --install --force
-		automake --add-missing --copy --force-missing
-	;;
-	esac
-	./configure --with-pic --build=$(sh ./config.guess) \
-		--host=${cArch}-linux \
-		--prefix="${PREFIX}" --with-sysroot="${SYSROOT}" \
-		--enable-tempstore=yes \
-		--disable-tcl --disable-shared \
-		CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="${PREFIX}/lib/libcrypto.a"
-	make -j${HOST_NUM_CPU}
-	make install
-	cd ..
-}
-
-build_libupnp()
-{
-	echo "build_libupnp()
-################################################################################
-################################################################################
-################################################################################
-"
-
-	B_dir="pupnp-release-${LIBUPNP_SOURCE_VERSION}"
-	B_ext=".tar.gz"
-	B_file="${B_dir}${B_ext}"
-	rm -rf $B_dir
-
-	verified_download $B_file $LIBUPNP_SOURCE_SHA256 \
-		https://github.com/mrjimenez/pupnp/archive/release-${LIBUPNP_SOURCE_VERSION}${B_ext}
-
-	tar -xf $B_file
-	cd $B_dir
-	./bootstrap
-## liupnp must be configured as static library because if not the linker will
-## look for libthreadutils.so.6 at runtime that cannot be packaged on android
-## as it supports only libname.so format for libraries, thus resulting in a
-## crash at startup.
-	./configure --with-pic --enable-static --disable-shared --disable-samples \
-		--disable-largefile \
-		--prefix="${PREFIX}" --host=${cArch}-linux
-	make -j${HOST_NUM_CPU}
-	make install
-	cd ..
-}
-
-build_rapidjson()
-{
-	echo "build_rapidjson()
-################################################################################
-################################################################################
-################################################################################
-"
-
-	B_dir="rapidjson-${RAPIDJSON_SOURCE_VERSION}"
-	D_file="${B_dir}.tar.gz"
-	verified_download $D_file $RAPIDJSON_SOURCE_SHA256 \
-		https://github.com/Tencent/rapidjson/archive/v${RAPIDJSON_SOURCE_VERSION}.tar.gz
-	tar -xf $D_file
-	cp -r "${B_dir}/include/rapidjson/" "${PREFIX}/include/rapidjson"
-}
-
-build_restbed()
-{
-	echo "build_restbed()
-################################################################################
-################################################################################
-################################################################################
-"
-
-	[ -d restbed ] || git clone --depth=2000 https://github.com/Corvusoft/restbed.git
-	cd restbed
-#	git fetch --tags
-#	git checkout tags/${RESTBED_SOURCE_VERSION}
-	git checkout ${RESTBED_SOURCE_VERSION}
-	git submodule update --init dependency/asio
-	git submodule update --init dependency/catch
-	git submodule update --init dependency/kashmir
-	cd ..
-
-	rm -rf restbed-build; mkdir restbed-build ; cd restbed-build
-	cmake \
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON BUILD_TESTS=OFF \
-		-DBUILD_SSL=OFF -DCMAKE_INSTALL_PREFIX="${PREFIX}" -B. -H../restbed
-	make -j${HOST_NUM_CPU}
-	make install
-	cp "${PREFIX}/library/librestbed.a" "${PREFIX}/lib/"
-	cd ..
-}
-
-build_udp-discovery-cpp()
-{
-	echo "build_udp-discovery-cpp()
-################################################################################
-################################################################################
-################################################################################
-"
-
-	S_dir="udp-discovery-cpp"
-	[ -d $S_dir ] || git clone $UDP_DISCOVERY_CPP_SOURCE $S_dir
-	cd $S_dir
-	git checkout $UDP_DISCOVERY_CPP_VERSION
-	cd ..
-
-	B_dir="udp-discovery-cpp-build"
-	rm -rf ${B_dir}; mkdir ${B_dir}; cd ${B_dir}
-	cmake \
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-		-DCMAKE_INSTALL_PREFIX="${PREFIX}" -B. -H../udp-discovery-cpp
-	make -j${HOST_NUM_CPU}
-	cp libudp-discovery.a "${PREFIX}/lib/"
-	cp ../$S_dir/*.hpp "${PREFIX}/include/"
-	cd ..
-}
-
-build_xapian()
-{
-	echo "build_xapian()
-################################################################################
-################################################################################
-################################################################################
-"
-
-	B_dir="xapian-core-${XAPIAN_SOURCE_VERSION}"
-	D_file="$B_dir.tar.xz"
-	verified_download $D_file $XAPIAN_SOURCE_SHA256 \
-		https://oligarchy.co.uk/xapian/${XAPIAN_SOURCE_VERSION}/$D_file
-	rm -rf $B_dir
-	tar -xf $D_file
-	cd $B_dir
-	B_endiannes_detection_failure_workaround="ac_cv_c_bigendian=no"
-	B_large_file=""
-	[ "${ANDROID_PLATFORM_VER}" -lt "24" ] && B_large_file="--disable-largefile"
-	./configure ${B_endiannes_detection_failure_workaround} ${B_large_file} \
-		--with-pic \
-		--disable-backend-inmemory --disable-backend-remote \
-		--disable--backend-chert --enable-backend-glass \
-		--host=${cArch}-linux --enable-static --disable-shared \
-		--prefix="${PREFIX}" --with-sysroot="${SYSROOT}"
-	make -j${HOST_NUM_CPU}
-	make install
-}
-
-build_miniupnpc()
-{
-	echo "build_miniupnpc()
-################################################################################
-################################################################################
-################################################################################
-"
-	S_dir="miniupnpc-${MINIUPNPC_SOURCE_VERSION}"
-	B_dir="miniupnpc-${MINIUPNPC_SOURCE_VERSION}-build"
-	D_file="$S_dir.tar.gz"
-	verified_download $D_file $MINIUPNPC_SOURCE_SHA256 \
-		http://miniupnp.free.fr/files/${D_file}
-	rm -rf $S_dir $B_dir
-	tar -xf $D_file
-	mkdir $B_dir
-	cd $B_dir
-	cmake \
-		-DUPNPC_BUILD_STATIC=TRUE \
-		-DUPNPC_BUILD_SHARED=FALSE \
-		-DUPNPC_BUILD_TESTS=FALSE \
-		-DUPNPC_BUILD_SAMPLE=FALSE \
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-		-DCMAKE_INSTALL_PREFIX="${PREFIX}" -B. -S../$S_dir
-	make -j${HOST_NUM_CPU}
-	make install
-}
-
-build_toolchain
-[ "${INSTALL_QT_ANDROID}X" != "trueX" ] || install_qt_android
-build_bzlib
-build_openssl
-build_sqlite
-build_sqlcipher
-build_libupnp
-build_rapidjson
-build_restbed
-build_udp-discovery-cpp
-build_xapian
-build_miniupnpc
-delete_copied_includes
-
-echo NATIVE_LIBS_TOOLCHAIN_PATH=${NATIVE_LIBS_TOOLCHAIN_PATH}

build_scripts/Android/pull_sysroot.sh

@@ -1,90 +0,0 @@
-#!/bin/bash
-
-# Script to pull debugging sysroot from Android devices
-#
-# Copyright (C) 2020  Gioacchino Mazzurco <gio@eigenlab.org>
-# Copyright (C) 2020  Asociación Civil Altermundi <info@altermundi.net>
-#
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, version 3.
-#
-# 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License along
-# with this program. If not, see <https://www.gnu.org/licenses/>
-
-<<"ASCIIDOC"
-
-Pull files from Android device to prepare a debugging sysroot
-Inspired by:
-https://fw4spl-org.github.io/fw4spl-blog/2015/07/27/Native-debugging-on-Android-with-QtCreator.html
-
-The goal is to have a local copy of the sysroot of the connected device.
-For that we use the command `adb pull <remote_dir_or_file> <local_dir_or_file>`
-
-We will get a copy of:
-
-- `/system/lib/`
-- `/vendor/lib/`
-- `libc.so`
-- `libcutils.so`
-
-As well as the binaries `linker` and `app_process`
-
-IMPORTANT:
-from one device to another, the remote file `app_process` can be a binary file
-or a symlink to a binary file - which is NOT ok for us.
-That's so we will try to pull every known possible variants of `app_process`,
-e.g. `app_process32` or `app_process_init`
-
-ASCIIDOC
-
-
-## Define default value for variable, take two arguments, $1 variable name,
-## $2 default variable value, if the variable is not already define define it
-## with default value.
-function define_default_value()
-{
-	VAR_NAME="${1}"
-	DEFAULT_VALUE="${2}"
-
-	[ -z "${!VAR_NAME}" ] && export ${VAR_NAME}="${DEFAULT_VALUE}"
-}
-
-define_default_value ANDROID_SERIAL "$(adb devices | head -n 2 | tail -n 1 | awk '{print $1}')"
-define_default_value DEBUG_SYSROOT "${HOME}/Builds/debug_sysroot/${ANDROID_SERIAL}/"
-
-rm -rf "${DEBUG_SYSROOT}"
-
-for mDir in  "/system/lib/" "/vendor/lib/"; do
-	mkdir -p "${DEBUG_SYSROOT}/${mDir}"
-	# adb pull doesn't behave like rsync dirA/ dirB/ so avoid nesting the
-	# directory by deleting last one before copying
-	rmdir "${DEBUG_SYSROOT}/${mDir}"
-	adb pull "${mDir}" "${DEBUG_SYSROOT}/${mDir}"
-done
-
-# Retrieve the specific binaries - some of these adb commands will fail, since
-# some files may not exist, but that's ok.
-
-mkdir -p "${DEBUG_SYSROOT}/system/bin/"
-for mBin in "/system/bin/linker" "/system/bin/app_process" \
-	"/system/bin/app_process_init" "/system/bin/app_process32" \
-	"/system/bin/app_process64" ; do
-	adb pull "${mBin}" "${DEBUG_SYSROOT}/${mBin}"
-done
-
-# Verify which variants of the specific binaries could be pulled 
-echo
-echo "Found the following specific binaries:"
-echo
-ls -1 "${DEBUG_SYSROOT}/system/bin/"*
-ls -1 "${DEBUG_SYSROOT}/system/lib/libc.so"*
-ls -1 "${DEBUG_SYSROOT}/system/lib/libcutils.so"*
-echo
-
-echo DEBUG_SYSROOT="${DEBUG_SYSROOT}"

build_scripts/Android/start_gdbserver.sh

@@ -1,116 +0,0 @@
-#!/bin/bash
-
-# Script to start gdbserver on Android device and attach to retroshare-service
-#
-# Copyright (C) 2020  Gioacchino Mazzurco <gio@eigenlab.org>
-# Copyright (C) 2020  Asociación Civil Altermundi <info@altermundi.net>
-#
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Affero General Public License as published by the
-# Free Software Foundation, version 3.
-#
-# 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License along
-# with this program. If not, see <https://www.gnu.org/licenses/>
-
-<<"ASCIIDOC"
-
-Start gdbserver on Android device and attach it to the retroshare service
-process
-
-Inspired by:
-https://fw4spl-org.github.io/fw4spl-blog/2015/07/27/Native-debugging-on-Android-with-QtCreator.html
-
-ASCIIDOC
-
-
-## Define default value for variable, take two arguments, $1 variable name,
-## $2 default variable value, if the variable is not already define define it
-## with default value.
-function define_default_value()
-{
-	VAR_NAME="${1}"
-	DEFAULT_VALUE="${2}"
-
-	[ -z "${!VAR_NAME}" ] && export ${VAR_NAME}="${DEFAULT_VALUE}" || true
-}
-
-define_default_value ANDROID_APK_PACKAGE "org.retroshare.service"
-define_default_value ANDROID_PROCESS_NAME "org.retroshare.service:rs"
-define_default_value ANDROID_INSTALL_PATH ""
-define_default_value LIB_GDB_SERVER_PATH ""
-define_default_value ANDROID_SERIAL "$(adb devices | head -n 2 | tail -n 1 | awk '{print $1}')"
-define_default_value GDB_SERVER_PORT 5039
-
-adb_ushell()
-{
-	adb shell run-as ${ANDROID_APK_PACKAGE} $@
-}
-
-[ -z "${ANDROID_INSTALL_PATH}" ] &&
-{
-	ANDROID_INSTALL_PATH="$(adb_ushell pm path "${ANDROID_APK_PACKAGE}")"
-	ANDROID_INSTALL_PATH="$(dirname ${ANDROID_INSTALL_PATH#"package:"})"
-	[ -z "${ANDROID_INSTALL_PATH}" ] &&
-		cat <<EOF
-Cannot find install path for ${ANDROID_APK_PACKAGE} make sure it is installed,
-or manually specify ANDROID_INSTALL_PATH
-
-
-EOF
-}
-
-## If not passed as environement variable try to determine gdbserver path
-## shipped withing APK
-[ -z "${LIB_GDB_SERVER_PATH}" ] &&
-{
-	
-	for mUsualPath in \
-		"${ANDROID_INSTALL_PATH}/lib/libgdbserver.so" \
-		"${ANDROID_INSTALL_PATH}/lib/arm64/libgdbserver.so"
-	do
-		adb_ushell ls "${mUsualPath}" &&
-			export LIB_GDB_SERVER_PATH="${mUsualPath}" && break
-	done
-}
-
-[ -z "${LIB_GDB_SERVER_PATH}" ] &&
-{
-	cat <<EOF
-libgdbserver.so not found in any of the usual path attempting to look for it
-with find, it will take a little more time. Take note of the discovered path and
-define LIB_GDB_SERVER_PATH on your commandline at next run to avoid waiting
-again.
-
-
-EOF
-	tFile="$(mktemp)"
-	adb_ushell find ${ANDROID_INSTALL_PATH} -type f -name 'libgdbserver.so' | \
-		tee "${tFile}"
-
-	LIB_GDB_SERVER_PATH="$(head -n 1 "${tFile}")"
-	rm "${tFile}"
-}
-
-[ -z "${LIB_GDB_SERVER_PATH}" ] &&
-{
-	echo "Cannot find libgdbserver.so, are you sure your package ships it?"
-	exit -1
-}
-
-mPid="$(adb_ushell ps | grep ${ANDROID_PROCESS_NAME} | awk '{print $2}')"
-[ -z "${mPid}" ] &&
-{
-	echo "Failed ${ANDROID_PROCESS_NAME} PID retrival are you sure it is running?"
-	exit -2
-}
-
-
-## Establish port forwarding so we can connect to gdbserver with gdb
-adb forward tcp:${GDB_SERVER_PORT} tcp:${GDB_SERVER_PORT}
-
-((adb_ushell ${LIB_GDB_SERVER_PATH} 127.0.0.1:${GDB_SERVER_PORT} --attach ${mPid})&)

build_scripts/GitlabCI/Android.Dockerfile

@@ -0,0 +1,48 @@
+ARG ANDROID_NDK_ARCH=arm
+FROM registry.gitlab.com/retroshare/retroshare:android_${ANDROID_NDK_ARCH}_base
+
+ENV APT_UNAT="--assume-yes --quiet"
+
+RUN apt-get update $APT_UNAT && apt-get upgrade $APT_UNAT --show-upgraded
+
+ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git
+ARG REPO_BRANCH=master
+
+WORKDIR /RetroShare
+RUN git remote add testing $REPO_URL && \
+	git fetch --tags testing $REPO_BRANCH && \
+	git reset --hard testing/$REPO_BRANCH && \
+	git --no-pager log --max-count 1
+
+RUN rm -rf /jsonapi-generator-build ; mkdir /jsonapi-generator-build
+WORKDIR /jsonapi-generator-build/
+RUN qmake ../RetroShare/jsonapi-generator/src/ \
+		CONFIG+=no_retroshare_plugins \
+		CONFIG+=no_retroshare_service CONFIG+=no_retroshare_gui \
+		CONFIG+=rs_jsonapi CONFIG+=no_rs_sam3_libsam3 && \
+	make -j$(nproc)
+
+RUN rm -rf /retroshare-service-android-build ; mkdir /retroshare-service-android-build
+WORKDIR /retroshare-service-android-build
+
+# ARG declared before FROM get wiped after it, so we need declaring it again
+ARG ANDROID_NDK_ARCH=arm
+ARG RS_SERVICE_QMAKE_EXTRA_OPTS
+RUN $($PREPARE_TOOLCHAIN get_qt_dir | head -n 1)/bin/qmake ../RetroShare \
+	-spec android-clang \
+	CONFIG+=retroshare_service CONFIG+=rs_jsonapi \
+	RS_UPNP_LIB=miniupnpc \
+	JSONAPI_GENERATOR_EXE=/jsonapi-generator-build/jsonapi-generator \
+	NATIVE_LIBS_TOOLCHAIN_PATH=$NATIVE_LIBS_TOOLCHAIN_PATH \
+	CONFIG+=no_retroshare_gui CONFIG+=no_rs_service_webui_terminal_password \
+	CONFIG+=no_rs_service_terminal_login \
+	CONFIG+=no_rs_sam3 CONFIG+=no_rs_sam3_libsam3 \
+	$RS_SERVICE_QMAKE_EXTRA_OPTS
+RUN	make -j$(nproc)
+RUN make install INSTALL_ROOT=/retroshare-service-android-build/android-build/
+
+ARG ANDROID_PLATFORM_VER=16
+RUN $($PREPARE_TOOLCHAIN get_qt_dir | head -n 1)/bin/androiddeployqt \
+	--input retroshare-service/src/android-libretroshare-service.so-deployment-settings.json \
+	--output android-build --android-platform android-$ANDROID_PLATFORM_VER \
+	--jdk $JAVA_HOME --gradle

build_scripts/GitlabCI/base.Dockerfile

@@ -2,42 +2,61 @@
 ## force cloning a new
 
 ## To prepare an image suitable as base for Gitlab CI use
-# docker build -t "${CI_REGISTRY_IMAGE}:base" --build-arg KEEP_SOURCE=true --build-arg REPO_DEPTH="" -f base.Dockerfile .
-
-## Now you need to tag it so you can later push it
-# docker tag ${ID_OF_THE_CREATED_IMAGE} registry.gitlab.com/retroshare/${CI_REGISTRY_IMAGE}:base
+# export CI_REGISTRY_IMAGE="registry.gitlab.com/retroshare/retroshare:base"
+# docker build -t "${CI_REGISTRY_IMAGE}" -f base.Dockerfile .
 
 ## To push it to gitlab CI registry you need first to login and the to push
 # docker login registry.gitlab.com
-# docker push registry.gitlab.com/retroshare/${CI_REGISTRY_IMAGE}:base
-
+# docker push "${CI_REGISTRY_IMAGE}"
 
 ## To run the container
-# docker run -it -p 127.0.0.1:9092:9092 "${CI_REGISTRY_IMAGE}:base" retroshare-service --jsonApiPort 9092 --jsonApiBindAddress 0.0.0.0
+# docker run -it -p 127.0.0.1:9092:9092 "${CI_REGISTRY_IMAGE}" retroshare-service --jsonApiPort 9092 --jsonApiBindAddress 0.0.0.0
 
-FROM ubuntu
+FROM ubuntu:22.04
 
-ARG CACHEBUST=0
-RUN \
-	apt-get update -y && apt-get upgrade -y && \
-	apt-get install -y build-essential libssl-dev libbz2-dev libsqlite3-dev \
-		libsqlcipher-dev libupnp-dev pkg-config libz-dev \
-		qt5-default libxapian-dev qttools5-dev doxygen rapidjson-dev \
-		git cmake curl
+ENV DEBIAN_FRONTEND=noninteractive
+ENV APT_UNAT="--assume-yes --quiet"
+
+RUN apt-get update $APT_UNAT && \
+	apt-get upgrade --show-upgraded $APT_UNAT && \
+	apt-get clean $APT_UNAT && \
+	apt-get install --no-install-recommends $APT_UNAT \
+		bash build-essential cimg-dev libssl-dev libbz2-dev \
+		libminiupnpc-dev \
+		libsqlite3-dev libsqlcipher-dev \
+		pkg-config libz-dev \
+		libxapian-dev doxygen rapidjson-dev \
+		git cmake curl python3
+
+## Avoid git cloning spuriously failing with
+#  server certificate verification failed. CAfile: none CRLfile: none
+RUN apt-get install --no-install-recommends $APT_UNAT --reinstall \
+	ca-certificates
+
+RUN git clone --depth 1 https://github.com/aetilius/pHash.git && \
+	rm -rf pHash-build && mkdir pHash-build && cd pHash-build && \
+	cmake -B. -H../pHash -DCMAKE_INSTALL_PREFIX=/usr && \
+	make -j$(nproc) && make install && cd .. && \
+	rm -rf pHash-build pHash
 
 ARG FRESHCLONE=0
-ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git
+ARG REPO_URL=https://github.com/RetroShare/RetroShare.git
 ARG REPO_BRANCH=master
 ARG REPO_DEPTH="--depth 2000"
-ARG KEEP_SOURCE=false
-RUN apt-get update -y && apt-get upgrade -y
-RUN git clone $REPO_DEPTH $REPO_URL -b $REPO_BRANCH && cd RetroShare && \
-	git fetch --tags && cd ..
+RUN git clone $REPO_DEPTH $REPO_URL -b $REPO_BRANCH && \
+	cd RetroShare && \
+	git fetch --tags && \
+	git submodule update --init \
+		libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ \
+		supportlibs/restbed/ && \
+	cd supportlibs/restbed/ && \
+	git submodule update --init \
+		dependency/asio/ dependency/kashmir/ && \
+	cd ../../../
+
 RUN \
 	mkdir RetroShare-build && cd RetroShare-build && \
-	qmake ../RetroShare \
-		CONFIG+=no_retroshare_plugins CONFIG+=ipv6 \
-		CONFIG+=retroshare_service CONFIG+=no_retroshare_gui \
-		CONFIG+=rs_jsonapi CONFIG+=rs_deep_search && \
-	(make -j$(nproc) || make -j$(nproc) || make) && make install && \
-	cd .. && rm -rf RetroShare-build && ($KEEP_SOURCE || rm -rf RetroShare)
+	cmake -B. -S../RetroShare/retroshare-service \
+		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON -DRS_WEBUI=ON && \
+	make -j$(nproc) && make install && \
+	cd .. && rm -rf RetroShare-build

build_scripts/GitlabCI/getRepoArgs.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+[ -n "$CI_MERGE_REQUEST_ID" ] &&
+	echo \
+		--build-arg REPO_URL="$CI_MERGE_REQUEST_SOURCE_PROJECT_URL" \
+		--build-arg REPO_BRANCH="$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ||
+	echo \
+		--build-arg REPO_URL="$CI_REPOSITORY_URL" \
+		--build-arg REPO_BRANCH="$CI_COMMIT_BRANCH"

build_scripts/GitlabCI/gitlabCI.Dockerfile

@@ -2,17 +2,19 @@ FROM registry.gitlab.com/retroshare/retroshare:base
 
 RUN apt-get update -y && apt-get upgrade -y
 
-ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git
+ARG REPO_URL=https://github.com/RetroShare/RetroShare.git
 ARG REPO_BRANCH=master
 RUN \
 	cd RetroShare && git remote add testing $REPO_URL && \
 	git fetch --tags testing $REPO_BRANCH && \
 	git reset --hard testing/$REPO_BRANCH && \
+	git submodule update --init \
+		libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ && \
 	git --no-pager log --max-count 1
 RUN \
 	mkdir RetroShare-build && cd RetroShare-build && \
-	qmake ../RetroShare CONFIG+=no_retroshare_gui \
-		CONFIG+=retroshare_service \
-		CONFIG+=rs_jsonapi CONFIG+=rs_deep_search && \
-	(make -j$(nproc) || make -j$(nproc) || make) && make install && \
+	cmake -B. -S../RetroShare/retroshare-service \
+		-DRS_FORUM_DEEP_INDEX=ON -DRS_JSON_API=ON -DRS_WEBUI=ON \
+		-DRS_WARN_DEPRECATED=OFF -DRS_WARN_LESS=ON && \
+	make -j$(nproc) && make install && \
 	cd .. && rm -rf RetroShare-build

build_scripts/OBS

@@ -1 +1 @@
-Subproject commit b0d7ae39fe9d9192848bbf7b8902d2188da895c9
+Subproject commit 0a3997cc1355b2c848161dca015b7e2df039707b

build_scripts/OSX/MacOS.10.6_RS_Compilation_Instructions.txt

@@ -1,60 +0,0 @@
-Hi there,
-
-I heard about RetroShare recently (on Slashdot) and really like the goal of the program; it's something I've been wanting for a long time now. I'm a software developer so I figured I could help contribute to the project. I started by getting a build up and running on my mac, which was non-trivial as it looks like the Mac build hasn't been maintained (or maybe it's just targetting older OS X version?). Anyway, I have instructions and patches to get a build going on OS X 10.6, if you want to put them up on the wiki or something. The steps I used boiled down to running the following commands in a directory that also contains the retroshare-mac-build.patch file, which I posted at https://staktrace.com/pub/retroshare-mac-build.patch (you can also see the changes at https://github.com/staktrace/retroshare/commit/51f554f909086f4baca7be215d5edacab744dea4)
-
-sudo port selfupdate
-sudo port install qt4-mac
-sudo port install wget
-
-wget ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.bz2
-tar xjf libgpg-error-1.10.tar.bz2
-rm libgpg-error-1.10.tar.bz2
-pushd libgpg-error-1.10
-./configure --prefix=$PWD/build --enable-static=yes --enable-shared=no
-make
-make install
-popd
-
-wget ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.3.1.tar.bz2
-tar xjf gpgme-1.3.1.tar.bz2
-rm gpgme-1.3.1.tar.bz2
-pushd gpgme-1.3.1
-./configure --prefix=$PWD/build --enable-static=yes --enable-shared=no --with-gpg-error-prefix=$PWD/../libgpg-error-1.10/build
-make
-make install
-popd
-
-wget http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.3.tar.gz
-tar xzf miniupnpc-1.3.tar.gz
-rm miniupnpc-1.3.tar.gz
-pushd miniupnpc-1.3
-make upnpc-static
-popd
-
-git clone https://github.com/kigeia/retroshare
-pushd retroshare
-git apply ../retroshare-mac-build.patch
-popd
-
-pushd retroshare/libbitdht/src
-qmake
-make
-popd
-
-pushd retroshare/libretroshare/src
-qmake
-make
-popd
-
-pushd retroshare/retroshare-gui/src
-qmake
-make
-popd
-
-At the end there is a RetroShare.App in the retroshare/retroshare-gui/ folder which seems to work as expected.
-
-Now that I've gotten it building and working, I'd like to start working on adding features. One that I would like to see is taking advantage of the RetroShare platform to enable F2F games. A while back I wrote a P2P collaborative crossword solver app in Java; porting that to work as a RetroShare plugin would probably be a good start for me. I looked briefly at the existing plugins in the source tree but haven't yet had time to peruse the rsplugin.h API in detail; if you have any tips or pointers before I dive in, please do let me know. I'll probably start work on it in a couple of days and progress might be a little slow because I'm also fairly busy with other things right now.
-
-Cheers,
-kats
-

build_scripts/OSX/MacOS_X_InstallGuide.md

@@ -2,41 +2,50 @@
 
 ## Qt Installation
 
-Install Qt via: [Qt Download](http://www.qt.io/download/)
+Qt 5.15 is not available as install package.
 
-Use default options. And add Qt Script support.
+Download Qt 5.15.x from here: [Qt 5.15.17](https://download.qt.io/archive/qt/5.15/5.15.17/single/qt-everywhere-opensource-src-5.15.17.tar.xz)
 
+Instruction howto Build Qt 5.15.x on macOS: [macOS Building](https://doc.qt.io/archives/qt-5.15/macos-building.html)
+## Set the Environment Variables
 Add to the PATH environment variable by editing your *~/.profile* file.
 
-       export PATH="/users/$USER/Qt/5.5/clang_64/bin:$PATH"
+       export PATH="/users/$USER/Qt/5.15.17/clang_64/bin:$PATH"
 
 Depends on which version of Qt you use.
 
-## ***Choose if you use MacPort or HomeBrew***
+## Get RetroShare
 
-### MacPort Installation
+In Qt Creator Projects -> New -> Import Project -> Git Clone -> Choose
+Add Repository and Continoue
 
-Install MacPort and XCode following this guide: [MacPort and XCode](http://guide.macports.org/#installing.xcode)
+       Repository: https://github.com/RetroShare/RetroShare.git 
 
-Start XCode to get it updated and to able C compiler to create executables.
+via Terminal:
 
-#### Install libraries  
+       cd <your development directory>
+       git clone https://github.com/RetroShare/RetroShare.git retroshare
 
-       $sudo port -v selfupdate
-       $sudo port install openssl
-       $sudo port install miniupnpc
-       $sudo port install libmicrohttpd
+via GitHub Desktop: [GitHub Desktop Download](https://central.github.com/deployments/desktop/desktop/latest/darwin)
 
-For VOIP Plugin: 
+In GitHub Desktop -> Clone Repository -> URL
 
-       $sudo port install speex-devel
-       $sudo port install opencv
+       Add Repository URL: https://github.com/RetroShare/RetroShare.git and Clone
 
-Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
+## ***Get XCode & MacOSX SDK***
 
-### HOMEBREW Installation
+To identify the correct version of Xcode to install, you need to know which OS you are running. Go to the [x] menu -> "About This Mac" and read the macOS version number.
 
-Install HomeBrew following this guide: [HomeBrew](http://brew.sh/)
+If you are running macOS Ventura 13.5 or later, you can install Xcode directly from App Store using the instructions below. 
+
+You can find older versions of Xcode at [Apple Developer Downloads](https://developer.apple.com/downloads/). Find the appropriate .xip file for your macOS version
+
+To install from App Store:
+
+Select [x] menu - > "App Store…".
+Search for Xcode. Download and install.
+
+Once Xcode has installed, you must drag the XCode icon into your Applications folder. After you have done this, open Xcode from the Applications folder by double-clicking on the icon and then follow the remaining instructions below. 
 
 Install XCode command line developer tools:
 
@@ -44,11 +53,33 @@ Install XCode command line developer tools:
 
 Start XCode to get it updated and to able C compiler to create executables.
 
+Older MacOSX SDK is available from here: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
+
+### MacPort Installation
+
+Install MacPort following this guide: [MacPort](http://guide.macports.org/#installing.xcode)
+
+### HOMEBREW Installation
+
+Install HomeBrew following this guide: [HomeBrew](http://brew.sh/)
+
 #### Install libraries  
 
-       $brew install openssl
-       $brew install miniupnpc
-       $brew install libmicrohttpd
+       $ brew install openssl
+       $ brew install miniupnpc
+       $ brew install rapidjson
+       $ brew install sqlcipher
+
+For RNP lib:
+
+	   $ brew install bzip2
+	   $ brew install zlib
+	   $ brew install json-c
+	   $ brew install botan@2
+
+#### Install CMake 
+
+       $ brew install cmake
        
 If you have error in linking, run this:
 
@@ -56,37 +87,130 @@ If you have error in linking, run this:
 
 For VOIP Plugin: 
 
-       $brew install speex
-       $brew install speexdsp
-       $brew install homebrew/science/opencv
-       $brew install ffmpeg
+       $ brew install speex
+       $ brew install speexdsp
+       $ brew install opencv
+       $ brew install ffmpeg
 
-Get Your OSX SDK if missing: [MacOSX-SDKs](https://github.com/phracker/MacOSX-SDKs)
+For FeedReader Plugin:
+
+       $ brew install libxslt
+       $ brew install libxml2
 
 ## Last Settings
 
-In QtCreator Option Git select "Pull" with "Rebase"
+In QtCreator Projects -> Manage Kits > Version Control > Git:
 
-## Compil missing libraries
-### SQLCipher
+       select "Pull with rebase"
 
-       cd <your development directory>
-       git clone https://github.com/sqlcipher/sqlcipher.git
-       cd sqlcipher
-       ./configure --disable-shared --disable-tcl --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC -I/opt/local/include" LDFLAGS="-lcrypto"
-       make 
-       sudo make install
+In QtCreator Projects -> Build -> Build Settings -> Build Environment -> Add this path:
 
-NOTE, might be necessary to *chmod 000 /usr/local/ssl* temporarily during *./configure* if 
-homebrew uses newer, non-stock ssl dependencies found there. Configure might get confused.
+       /usr/local/bin
 
-You can now compile RS into Qt Creator or with terminal
+In QtCreator Projects -> Build -> Build Settings -> Build Steps -> Add Additional arguments:
 
-       cd <your development directory>
-       git clone https://github.com/RetroShare/RetroShare.git retroshare
-       cd retroshare
-       qmake; make
+       "CONFIG+=rs_autologin" "CONFIG+=rs_use_native_dialogs" 
+
+## Set your Mac OS SDK version
+
+
+Edit retroshare.pri and set your installed sdk version example for 11.1 -> rs_macos11.1 (line 135:)
+
+    macx:CONFIG *= rs_macos11.1
+    rs_macos10.8:CONFIG -= rs_macos11.1
+    rs_macos10.9:CONFIG -= rs_macos11.1
+    rs_macos10.10:CONFIG -= rs_macos11.1
+    rs_macos10.12:CONFIG -= rs_macos11.1
+    rs_macos10.13:CONFIG -= rs_macos11.1
+    rs_macos10.14:CONFIG -= rs_macos11.1
+    rs_macos10.15:CONFIG -= rs_macos11.1
+
+
+## Link Include & Libraries
+
+When required edit your retroshare.pri macx-* section, check if the Include and Lib path are correct (macx-* section)
+
+    INCLUDEPATH += "/usr/local/opt/openssl/include"
+    QMAKE_LIBDIR += "/usr/local/opt/openssl/lib"
+    QMAKE_LIBDIR += "/usr/local/opt/sqlcipher/lib"
+    QMAKE_LIBDIR += "/usr/local/opt/miniupnpc/lib"
+
+alternative via Terminal
+
+    $ qmake 
+    INCLUDEPATH+="/usr/local/opt/openssl/include" \
+    QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" \
+    QMAKE_LIBDIR+="/usr/local/opt/sqlcipher/lib" \
+    QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib" \
+    CONFIG+=rs_autologin \
+    CONFIG+=rs_use_native_dialogs \
+    CONFIG+=release \
+    ..
+
+For FeedReader Plugin:
+
+    INCLUDEPATH += "/usr/local/opt/libxml2/include/libxml2"
+
+With plugins:
+
+    $ qmake \
+    INCLUDEPATH+="/usr/local/opt/openssl/include" QMAKE_LIBDIR+="/usr/local/opt/openssl/lib" \
+    QMAKE_LIBDIR+="/usr/local/opt/sqlcipher/lib" \
+    QMAKE_LIBDIR+="/usr/local/opt/miniupnpc/lib" \
+    INCLUDEPATH+="/usr/local/opt/opencv/include/opencv4" QMAKE_LIBDIR+="/usr/local/opt/opencv/lib" \
+    INCLUDEPATH+="/usr/local/opt/speex/include" QMAKE_LIBDIR+="/usr/local/opt/speex/lib/" \
+    INCLUDEPATH+="/usr/local/opt/speexdsp/include" QMAKE_LIBDIR+="/usr/local/opt/speexdsp/lib/" \
+    INCLUDEPATH+="/usr/local/opt/libxslt/include" QMAKE_LIBDIR+="/usr/local/opt/libxslt/lib" \
+    QMAKE_LIBDIR+="/usr/local/opt/ffmpeg/lib" \
+    LIBS+=-lopencv_videoio \
+    CONFIG+=retroshare_plugins \
+    CONFIG+=rs_autologin \
+    CONFIG+=rs_use_native_dialogs \
+    CONFIG+=release \
+    ..
+
+## Compile RetroShare 
+
+You can now compile RetroShare into Qt Creator or with Terminal
+
+       $ cd /path/to/retroshare
+       $ qmake ..
+       $ make
 
 You can change Target and SDK in *./retroshare.pri:82* changing value of QMAKE_MACOSX_DEPLOYMENT_TARGET and QMAKE_MAC_SDK
 
-You can find compiled application on *./retroshare/retroshare-gui/src/retroshare.app*
+You can find the compiled application at *./retroshare/retroshare-gui/src/retroshare.app*
+
+## Issues
+
+If you have issues with openssl (Undefined symbols for architecture x86_64) try to add to *~/.profile* file this or via Terminal
+
+       export PATH="/usr/local/opt/openssl/bin:$PATH"
+       export LDFLAGS="-L/usr/local/opt/openssl/lib"
+       export CPPFLAGS="-I/usr/local/opt/openssl/include"
+       export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig"
+
+For Qt Creator -> QtCreator Projects -> Build -> Build Settings -> Build Steps -> Add Additional arguments:
+
+       LDFLAGS="-L/usr/local/opt/openssl/lib"
+       CPPFLAGS="-I/usr/local/opt/openssl/include"
+
+
+
+## Copy Plugins
+
+    $ cp \
+    ./plugins/FeedReader/lib/libFeedReader.dylib \
+    ./plugins/VOIP/lib/libVOIP.dylib \
+    ./plugins/RetroChess/lib/libRetroChess.dylib \
+    ./retroshare-gui/src/RetroShare.app/Contents/Resources/
+
+### Compile Retroshare-Service & Webui with CMake
+before you can compile overwrite the file "asio/include/asio/detail/config.hpp" here is a fix for macos [
+asio fix](https://github.com/chriskohlhoff/asio/commit/68df16d560c68944809bb2947360fe8035e9ae0a)   
+
+       $ cd retroshare-service
+       $ mkdir build-dir
+       $ cd build-dir
+       $ cmake -DRS_WEBUI=ON -DCMAKE_BUILD_TYPE=Release ..
+       $ make

build_scripts/OSX/OSX_RS_Compilation_Instructions.txt

@@ -1,66 +0,0 @@
-
-Mac OSX Build Instructions.
--------------------------------------------
-
-There are several complications with building Retroshare under OSX.
- 1) Support Libraries must be built and installed seperately.
- 2) Universal and OSX 10.5 support is a little tricky, mainly due to the support libraries.
-
-Additional Libraries
----------------------
-
- * GnuPG Package, that comes with Retroshare OSX install image. (GnuPG-1.4.9.dmg)
-
-GPG Development libraries
- * libassuan    (I'm using 2.0.1)
- * libgpg-error (I'm using 1.9)
- * libgpgme     (I'm using 1.3.0)
-
-These libraries use standard UNIX installation systems: AUTOCONF/AUTOMAKE (configure, make, etc)
-Unfortunately, this makes it difficult and a little manual to compile Universal and 10.5 libraries.
-
-UPNPC (for OSX and windows)
- * miniupnpc    (I'm using 1.0)
-
-You will also need to install 
- * XCode (available on the Apple Install CDs)
- * Qt4 (from trolltech.com)
-
-First Compilation...
--------------------- 
-
-The First challenge is to build Retroshare on your Mac. For this first compilation, 
-we only build for your specific machine, and not attempt a Generic / 10.5 / Univeral build.
-
-
-1) Install / Compile all the packages listed above.
-     be sure to use a configure command like this where applicable to only create a static library.
-    ./configure --enable-static=yes --enable-shared=no CFLAGS="-arch i386" CPPFLAGS="-arch i386"
-
-2) Check out the Retroshare SVN.
-
-3) compile libbitdht:
-	cd libbitdht/src
-	qmake    
-
-	This recreates a xcodeproj file for compilation using XCode.
-	Open with Xcode, and build.
-
-4) compile libretroshare: same way.
-5) compile retroshare-gui: same way.
-
-
-Creating Retroshare OSX Distribution Packages.
------------------------------------------------
- TODO, once I've got feedback on First Compilation!
-
-
-
-
-	
-
-
-
-
-
-

build_scripts/OSX/makeOSXPackage.sh

@@ -0,0 +1,51 @@
+#!/bin/sh
+
+APP="RetroShare"
+RSVERSION="0.6.7a"
+QTVERSION="Qt-5.15.11"
+
+# Install the 7z to create dmg archives.
+#brew list p7zip || brew install p7zip
+
+# Package your app
+echo "Packaging retroshare..."
+#cd ${project_dir}/build/macOS/clang/x86_64/release/
+cd retroshare-gui/src/
+
+# Remove build directories that you don't want to deploy
+rm -rf moc
+rm -rf obj
+rm -rf qrc
+
+# This sets the CFBundleVersion & CFBundleShortVersionString string
+/usr/libexec/PlistBuddy -c "Delete :CFBundleGetInfoString" retroshare.app/Contents/Info.plist
+/usr/libexec/PlistBuddy -c "Add :CFBundleVersion string $RSVERSION" retroshare.app/Contents/Info.plist
+/usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string $RSVERSION" retroshare.app/Contents/Info.plist
+/usr/libexec/PlistBuddy -c "Delete :NSRequiresAquaSystemAppearance" retroshare.app/Contents/Info.plist
+
+# This automatically creates retroshare.dmg
+
+echo "Creating dmg archive..."
+macdeployqt retroshare.app -dmg
+
+DATE=`date +"%m-%d-%Y"`
+MACVERSION=`sw_vers -productVersion`
+#RSVERSION=`git describe --abbrev=0 --tags`
+GITHEAD=`git rev-parse --short HEAD`
+
+mv $APP.dmg "$APP-$RSVERSION-$GITHEAD-$DATE-MacOS-$MACVERSION-$QTVERSION.dmg"
+
+# You can use the appdmg command line app to create your dmg file if
+# you want to use a custom background and icon arrangement. I'm still
+# working on this for my apps, myself. If you want to do this, you'll
+# remove the -dmg option above.
+# appdmg json-path YourApp_${TRAVIS_TAG}.dmg
+
+# Copy other project files
+cp "../../libbitdht/src/bitdht/bdboot.txt" "retroshare.app/Contents/Resources/"
+cp "../../plugins/FeedReader/lib/libFeedReader.dylib" "retroshare.app/Contents/Resources/"
+cp -R "sounds" "retroshare.app/Contents/Resources/sounds"
+
+# cp "${project_dir}/README.md" "README.md"
+# cp "${project_dir}/LICENSE" "LICENSE"
+# cp "${project_dir}/Qt License" "Qt License"

build_scripts/OSX/retroshare-mac-build.patch

@@ -1,94 +0,0 @@
-commit 51f554f909086f4baca7be215d5edacab744dea4
-Author: Kartikaya Gupta <kats@calvin.staktrace.com>
-Date:   Wed Mar 7 23:30:48 2012 -0500
-
-    Modifications needed to get build working on Mac OS X 10.6
-
-diff --git a/.gitignore b/.gitignore
-new file mode 100644
-index 0000000..3e90033
---- /dev/null
-+++ b/.gitignore
-@@ -0,0 +1,6 @@
-+*.o
-+Makefile
-+libbitdht/src/lib/
-+libretroshare/src/lib/
-+retroshare-gui/src/RetroShare.app/
-+retroshare-gui/src/temp/
-diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
-index 6f35e01..267cc91 100644
---- a/libretroshare/src/libretroshare.pro
-+++ b/libretroshare/src/libretroshare.pro
-@@ -312,7 +312,7 @@ mac {
- 		OBJECTS_DIR = temp/obj
- 		MOC_DIR = temp/moc
- 		#DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW
--                #DEFINES *= MINIUPNPC_VERSION=13
-+		DEFINES *= MINIUPNPC_VERSION=13
- 		DESTDIR = lib
- 
-                 #miniupnp implementation files
-@@ -326,12 +326,11 @@ mac {
- 		# Beautiful Hack to fix 64bit file access.
-                 QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dfopen64=fopen -Dvstatfs64=vstatfs
- 
--                UPNPC_DIR = ../../../miniupnpc-1.0
--		GPG_ERROR_DIR = ../../../../libgpg-error-1.7
--		GPGME_DIR  = ../../../../gpgme-1.1.8
-+		UPNPC_DIR = ../../../miniupnpc-1.3
-+		GPG_ERROR_DIR = ../../../libgpg-error-1.10
-+		GPGME_DIR  = ../../../gpgme-1.3.1
- 
--		INCLUDEPATH += . $${UPNPC_DIR} 
--		#INCLUDEPATH += . $${UPNPC_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
-+		INCLUDEPATH += . $${UPNPC_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
- }
- 
- ################################# FreeBSD ##########################################
-diff --git a/libretroshare/src/pqi/sslfns.cc b/libretroshare/src/pqi/sslfns.cc
-index 2588cb8..305433f 100644
---- a/libretroshare/src/pqi/sslfns.cc
-+++ b/libretroshare/src/pqi/sslfns.cc
-@@ -586,8 +586,8 @@ X509 *loadX509FromDER(const uint8_t *ptr, uint32_t len)
- 	X509 *tmp = NULL;
- #ifdef __APPLE__
- 	// This depends on which version you are compiling for... OSX10.5 doesn't have consts (old OpenSSL!)
--	unsigned char **certptr = (unsigned char **) &ptr;
--	//const unsigned char **certptr = (const unsigned char **) &ptr;
-+	//unsigned char **certptr = (unsigned char **) &ptr;
-+	const unsigned char **certptr = (const unsigned char **) &ptr;
- #else
- 	const unsigned char **certptr = (const unsigned char **) &ptr;
- #endif
-diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro
-index adcb5a0..ffbf669 100644
---- a/retroshare-gui/src/RetroShare.pro
-+++ b/retroshare-gui/src/RetroShare.pro
-@@ -140,19 +140,21 @@ win32 {
- 
- macx {
-     # ENABLE THIS OPTION FOR Univeral Binary BUILD.
--    	CONFIG += ppc x86
--	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
-+	# CONFIG += ppc x86
-+	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
- 
- 	CONFIG += version_detail_bash_script
- 	LIBS += ../../libretroshare/src/lib/libretroshare.a
--        LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
--	LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
-+	LIBS += ../../../libgpg-error-1.10/build/lib/libgpg-error.a
-+	LIBS += ../../../gpgme-1.3.1/build/lib/libgpgme.a
-+	LIBS += ../../../miniupnpc-1.3/libminiupnpc.a
-+	LIBS += -lssl -lcrypto -lz -lassuan
- 	LIBS += -framework CoreFoundation
- 	LIBS += -framework Security
- 
-  #	LIBS += -framework CoreServices
- 
--    	INCLUDEPATH += .
-+	INCLUDEPATH += . ../../../gpgme-1.3.1/src
- 	#DEFINES* = MAC_IDLE # for idle feature
- 	CONFIG -= uitools
- 

build_scripts/RedHat+Fedora/data/retroshare.desktop

@@ -1,10 +1,11 @@
 [Desktop Entry]
+Encoding=UTF-8
 Version=1.0
 Name=RetroShare
-Comment=Securely share files with your friends
+Comment=Securely communicate with your friends
 Exec=/usr/bin/retroshare %U
 Icon=/usr/share/pixmaps/retroshare.xpm
 Terminal=false
 Type=Application
-Categories=Network;P2P;
+Categories=Network;Email;InstantMessaging;Chat;Feed;FileTransfer;P2P
 MimeType=x-scheme-handler/retroshare;

build_scripts/Windows-msys2/WindowsMSys2_InstallGuide.md

@@ -18,8 +18,8 @@ At the end, you'll get at ..\\*-msys2\deploy\ the Portable 7zip file.
 
 ### MSYS2 INSTALLATION (for editing or debugging)
 
-Download MSYS2 from [MSYS2](http://www.msys2.org/). Get the i686 version
-if you run a 32-bit Windows or the x86_64 if you run a 64-bit Windows.
+Download MSYS2 from [MSYS2](http://www.msys2.org/). Installing 
+MSYS2 requires 64 bit Windows 10 or newer.
 
 Run the installer and install MSYS2.
 
@@ -40,26 +40,29 @@ Run MSYS2 MSYS again and finish updating with:
 
 Install the default programs needed to build:
 
-	pacman -S base-devel git wget p7zip gcc perl ruby python2 doxygen cmake
+	pacman -S base-devel git wget p7zip gcc perl ruby doxygen cmake
 
-Install the 32-bit toolchain:
+Install the 64-bit toolchain:
 
-	pacman -S mingw-w64-i686-toolchain
+	pacman -S mingw-w64-x86_64-toolchain
 
 Install all needed dependencies:
 
-	pacman -S mingw-w64-i686-miniupnpc
-	pacman -S mingw-w64-i686-libmicrohttpd
-	pacman -S mingw-w64-i686-libxslt
-	pacman -S mingw-w64-i686-xapian-core
-	pacman -S mingw-w64-i686-sqlcipher
-	pacman -S mingw-w64-i686-qt5
-	pacman -S mingw32/mingw-w64-i686-cmake
-	pacman -S mingw-w64-i686-rapidjson
+	pacman -S mingw-w64-x86_64-miniupnpc
+	pacman -S mingw-w64-x86_64-libxslt
+	pacman -S mingw-w64-x86_64-xapian-core
+	pacman -S mingw-w64-x86_64-sqlcipher
+	pacman -S mingw-w64-x86_64-qt5-base
+	pacman -S mingw-w64-x86_64-qt5-multimedia
+	pacman -S mingw-w64-x86_64-ccmake
+	pacman -S mingw-w64-x86_64-rapidjson
+	pacman -S mingw-w64-x86_64-json-c
+	pacman -S mingw-w64-x86_64-libbotan
+	pacman -S mingw-w64-x86_64-asio
 
 If you want to use QtCreator as IDE, prefer using this one publish by MSYS2 as all build Kit are already setted.
 
-	pacman -S mingw-w64-i686-qt-creator
+	pacman -S mingw-w64-x86_64-qt-creator
 *You can start it from MSYS2 terminal.*
 
 
@@ -67,7 +70,7 @@ We're done installing MSYS2, close the shell terminal.
 
 ### BUILDING RETROSHARE
 
-Now run the MSYS2 MinGW 32-bit shell terminal (it's in the start menu).
+Now run the MSYS2 MinGW 64-bit shell terminal (it's in the start menu).
 We will use it to checkout Retroshare and build it:
 
 	git clone https://github.com/RetroShare/RetroShare.git

build_scripts/Windows-msys2/build/build-installer.bat

@@ -43,6 +43,7 @@ set NSIS_PARAM=%NSIS_PARAM% /DDEPLOYDIR="%RsDeployPath%"
 set NSIS_PARAM=%NSIS_PARAM% /DOUTDIR="%RsPackPath%"
 set NSIS_PARAM=%NSIS_PARAM% /DINSTALLERADD="%RsArchiveAdd%"
 set NSIS_PARAM=%NSIS_PARAM% /DARCHITECTURE="%RsArchitecture%"
+set NSIS_PARAM=%NSIS_PARAM% /DTOOLCHAIN="%RsToolchain%"
 set NSIS_PARAM=%NSIS_PARAM% /DREVISION=%RsVersion.Extra%
 
 set QtMainVersion=%QtVersion:~0,1%

build_scripts/Windows-msys2/build/build.bat

@@ -18,20 +18,32 @@ if errorlevel 1 goto error_env
 if not "%ParamNoupdate%"=="1" (
 	:: Install needed things
 	%EnvMSYS2Cmd% "pacman --noconfirm --needed -S make git mingw-w64-%RsMSYS2Architecture%-toolchain mingw-w64-%RsMSYS2Architecture%-qt5 mingw-w64-%RsMSYS2Architecture%-miniupnpc mingw-w64-%RsMSYS2Architecture%-sqlcipher mingw-w64-%RsMSYS2Architecture%-cmake mingw-w64-%RsMSYS2Architecture%-rapidjson"
+	:: rnp
+	%EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-json-c mingw-w64-%RsMSYS2Architecture%-libbotan"
 
 	:: Webui
-	if "%ParamWebui%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-doxygen"
+	if "%ParamWebui%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-doxygen mingw-w64-%RsMSYS2Architecture%-asio"
 
 	:: Plugins
 	if "%ParamPlugins%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-speex mingw-w64-%RsMSYS2Architecture%-speexdsp mingw-w64-%RsMSYS2Architecture%-curl mingw-w64-%RsMSYS2Architecture%-libxslt mingw-w64-%RsMSYS2Architecture%-opencv mingw-w64-%RsMSYS2Architecture%-ffmpeg"
 
 	:: Clang
-	if "%ParamClang%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-clang"
+	if "%ClangCompiler%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-clang"
 
 	:: Indexing
 	if "%ParamIndexing%"=="1" %EnvMSYS2Cmd% "pacman --noconfirm --needed -S mingw-w64-%RsMSYS2Architecture%-xapian-core mingw-w64-%RsMSYS2Architecture%-libvorbis mingw-w64-%RsMSYS2Architecture%-flac mingw-w64-%RsMSYS2Architecture%-taglib"
 )
 
+:: Fix webui compilation (TODO: remove when whole RS switched to cmake)
+if "%ParamWebui%"=="1" (
+	pushd "%SourcePath%"
+	copy "%SourcePath%\libretroshare\src\jsonapi\jsonapi-generator-doxygen.conf" "%SourcePath%\jsonapi-generator\src\jsonapi-generator-doxygen.conf" %Quite%
+	copy "%SourcePath%\libretroshare\src\jsonapi\async-method-wrapper-template.cpp.tmpl" "%SourcePath%\jsonapi-generator\src\async-method-wrapper-template.cpp.tmpl" %Quite%
+	copy "%SourcePath%\libretroshare\src\jsonapi\method-wrapper-template.cpp.tmpl" "%SourcePath%\jsonapi-generator\src\method-wrapper-template.cpp.tmpl" %Quite%
+	git update-index --assume-unchanged "jsonapi-generator\src\jsonapi-generator-doxygen.conf" "jsonapi-generator\src\async-method-wrapper-template.cpp.tmpl" "jsonapi-generator\src\method-wrapper-template.cpp.tmpl"
+	popd
+)
+
 :: Initialize environment
 call "%~dp0env.bat" %*
 if errorlevel 2 exit /B 2
@@ -66,11 +78,11 @@ echo %RS_QMAKE_CONFIG% > buildinfo.txt
 echo %RsBuildConfig% >> buildinfo.txt
 echo %RsArchitecture% >> buildinfo.txt
 echo Qt %QtVersion% >> buildinfo.txt
-echo %RsCompiler% >> buildinfo.txt
+echo %RsToolchain% >> buildinfo.txt
 
 call "%ToolsPath%\msys2-path.bat" "%SourcePath%" MSYS2SourcePath
 call "%ToolsPath%\msys2-path.bat" "%EnvMSYS2Path%" MSYS2EnvMSYS2Path
-if "%ParamClang%"=="1" (
+if "%ClangCompiler%"=="1" (
 	%EnvMSYS2Cmd% "qmake "%MSYS2SourcePath%/RetroShare.pro" -r -spec win32-clang-g++ %RS_QMAKE_CONFIG%"
 ) else (
 	%EnvMSYS2Cmd% "qmake "%MSYS2SourcePath%/RetroShare.pro" -r -spec win32-g++ %RS_QMAKE_CONFIG%"
@@ -86,11 +98,6 @@ title Build - %SourceName%-%RsBuildConfig% [make]
 %EnvMSYS2Cmd% "make -j %CoreCount%"
 if errorlevel 1 goto error
 
-:: Webui
-if "%ParamWebui%"=="1" (
-	call "%~dp0..\tools\webui.bat"
-)
-
 :error
 popd
 

build_scripts/Windows-msys2/build/env-base.bat

@@ -1,25 +1,46 @@
 :: Process commandline parameter
-set Param32=0
-set Param64=0
 set ParamRelease=0
 set ParamDebug=0
 set ParamAutologin=0
 set ParamPlugins=0
 set ParamTor=0
 set ParamWebui=0
-set ParamClang=0
+set ClangCompiler=0
 set ParamIndexing=0
+set ParamFriendserver=0
 set ParamNoupdate=0
 set CoreCount=%NUMBER_OF_PROCESSORS%
 set RS_QMAKE_CONFIG=
+set RsToolchain=
+set tcc=0
 
 :parameter_loop
 if "%~1" NEQ "" (
 	for /f "tokens=1,2 delims==" %%a in ("%~1") do (
 		if "%%~a"=="32" (
-			set Param32=1
+			set RsToolchain=mingw32
+			set /A tcc=tcc+1
 		) else if "%%~a"=="64" (
-			set Param64=1
+			set RsToolchain=mingw64
+			set /A tcc=tcc+1
+		) else if "%%~a"=="mingw32" (
+			set RsToolchain=mingw32
+			set /A tcc=tcc+1
+		) else if "%%~a"=="mingw64" (
+			set RsToolchain=mingw64
+			set /A tcc=tcc+1
+		) else if "%%~a"=="ucrt64" (
+			set RsToolchain=ucrt64
+			set /A tcc=tcc+1
+		) else if "%%~a"=="clang64" (
+			set RsToolchain=clang64
+			set /A tcc=tcc+1
+		) else if "%%~a"=="clang32" (
+			set RsToolchain=clang32
+			set /A tcc=tcc+1
+		) else if "%%~a"=="clangarm64" (
+			set RsToolchain=clangarm64
+			set /A tcc=tcc+1
 		) else if "%%~a"=="release" (
 			set ParamRelease=1
 		) else if "%%~a"=="debug" (
@@ -34,10 +55,10 @@ if "%~1" NEQ "" (
 			set ParamWebui=1
 		) else if "%%~a"=="singlethread" (
 			set CoreCount=1
-		) else if "%%~a"=="clang" (
-			set ParamClang=1
 		) else if "%%~a"=="indexing" (
 			set ParamIndexing=1
+		) else if "%%~a"=="friendserver" (
+			set ParamFriendserver=1
 		) else if "%%~a"=="noupdate" (
 			set ParamNoupdate=1
 		) else if "%%~a"=="CONFIG+" (
@@ -52,32 +73,39 @@ if "%~1" NEQ "" (
 	goto parameter_loop
 )
 
-if "%Param32%"=="1" (
-	if "%Param64%"=="1" (
-		echo.
-		echo 32-bit or 64-bit?
+if %tcc% NEQ 1 (
+	echo Multiple or no toolchain specified
 	goto :usage
-	)
+)
 
-	set RsBit=32
+if "%RsToolchain%"=="mingw32" (
 	set RsArchitecture=x86
 	set RsMSYS2Architecture=i686
-)
-
-if "%Param64%"=="1" (
-	set RsBit=64
+	set MSYSTEM=MINGW32
+) else if "%RsToolchain%"=="mingw64" (
 	set RsArchitecture=x64
 	set RsMSYS2Architecture=x86_64
+	set MSYSTEM=MINGW64
+) else if "%RsToolchain%"=="ucrt64" (
+	set RsArchitecture=x64
+	set RsMSYS2Architecture=ucrt-x86_64
+	set MSYSTEM=UCRT64
+) else if "%RsToolchain%"=="clang64" (
+	set RsArchitecture=x64
+	set RsMSYS2Architecture=clang-x86_64
+	set MSYSTEM=CLANG64
+	set ClangCompiler=1
+) else if "%RsToolchain%"=="clang32" (
+	set RsArchitecture=x86
+	set RsMSYS2Architecture=clang-i686
+	set MSYSTEM=CLANG32
+	set ClangCompiler=1
+) else if "%RsToolchain%"=="clangarm64" (
+	set RsArchitecture=arm64
+	set RsMSYS2Architecture=clang-aarch64
+	set MSYSTEM=CLANGARM64
 )
 
-if "%ParamClang%"=="1" (
-	set RsCompiler=Clang
-) else (
-	set RsCompiler=GCC
-)
-
-if "%RsBit%"=="" goto :usage
-
 if "%ParamRelease%"=="1" (
 	if "%ParamDebug%"=="1" (
 		echo.
@@ -104,14 +132,21 @@ if "%ParamIndexing%"=="1" (
 	set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=rs_deep_channels_index" "CONFIG+=rs_deep_files_index" "CONFIG+=rs_deep_files_index_ogg" "CONFIG+=rs_deep_files_index_flac" "CONFIG+=rs_deep_files_index_taglib"
 )
 
+if "%ParamFriendserver%"=="1" (
+	set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=rs_efs"
+)
+
 exit /B 0
 
 :usage
 echo.
-echo Usage: 32^|64 release^|debug [autologin plugins webui singlethread clang indexing noupdate] ["CONFIG+=..."]
+echo Usage: 32^|64^|other release^|debug [autologin plugins webui singlethread clang indexing friendserver noupdate] ["CONFIG+=..."]
 echo.
 echo Mandatory parameter
-echo 32^|64              32-bit or 64-bit Version
+echo 32^|64              32-bit or 64-bit version (same as mingw32 or mingw64)
+echo                    Or you can specify any other toolchain supported by msys2:
+echo                         mingw32^|mingw64^|clang32^|clang64^|ucrt64^|clangarm64
+echo                         More info: https://www.msys2.org/docs/environments
 echo release^|debug      Build release or debug version
 echo.
 echo Optional parameter (need clean when changed)
@@ -119,8 +154,8 @@ echo autologin          Build with autologin
 echo plugins            Build plugins
 echo webui              Enable JsonAPI and pack webui files
 echo singlethread       Use only 1 thread for building
-echo clang              Use clang compiler instead of GCC
 echo indexing           Build with deep channel and file indexing support
+echo friendserver       Enable friendserver support
 echo noupdate           Skip updating the libraries
 echo "CONFIG+=..."      Enable some extra features, you can find the almost complete list in retroshare.pri
 echo.

build_scripts/Windows-msys2/build/env.bat

@@ -2,8 +2,6 @@ call "%~dp0env-base.bat" %*
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 
-set MSYSTEM=MINGW%RsBit%
-
 set BuildPath=%EnvRootPath%\builds
 set DeployPath=%EnvRootPath%\deploy
 
@@ -14,13 +12,13 @@ if not exist "%DeployPath%" mkdir "%DeployPath%"
 call "%ToolsPath%\get-qt-version.bat" QtVersion
 if "%QtVersion%"=="" %cecho% error "Cannot get Qt version." & exit /B 1
 
-set RsMinGWPath=%EnvMSYS2BasePath%\mingw%RsBit%
+set RsMinGWPath=%EnvMSYS2BasePath%\%RsToolchain%
 
-set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsArchitecture%-%RsCompiler%-%RsBuildConfig%
-set RsDeployPath=%DeployPath%\Qt-%QtVersion%%RsType%-%RsArchitecture%-%RsCompiler%-%RsBuildConfig%
+set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%RsToolchain%-%RsBuildConfig%
+set RsDeployPath=%DeployPath%\Qt-%QtVersion%-%RsToolchain%%RsType%-%RsBuildConfig%
 set RsPackPath=%DeployPath%
 set RsArchiveAdd=
-set RsWebuiPath=%RootPath%\%SourceName%-webui
+set RsWebuiBuildPath=%RsBuildPath%\retroshare-webui\webui
 
 if not exist "%~dp0env-mod.bat" goto no_mod
 call "%~dp0env-mod.bat"

build_scripts/Windows-msys2/build/pack.bat

@@ -55,10 +55,11 @@ set RsVersion=%RsVersion.Major%.%RsVersion.Minor%.%RsVersion.Mini%
 :: Check WMIC is available
 wmic.exe alias /? >nul 2>&1 || echo WMIC is not available.&& goto error
 
-:: Use WMIC to retrieve date in format YYYYMMDD
-set RsDate=
-for /f "tokens=2 delims==" %%I in ('wmic os get localdatetime /format:list') do set RsDate=%%I
-set RsDate=%RsDate:~0,4%%RsDate:~4,2%%RsDate:~6,2%
+:: Get date
+call "%ToolsPath%\get-rs-date.bat" "%SourcePath%" RsDate
+if errorlevel 1 %cecho% error "Could not get date."& goto error
+
+if "%RsDate%"=="" %cecho% error "Could not get date."& goto error
 
 set QtMainVersion=%QtVersion:~0,1%
 set QtSharePath=%RsMinGWPath%\share\qt%QtMainVersion%\
@@ -71,9 +72,9 @@ if "%QtMainVersion%"=="4" set QtMainVersion2=4
 if "%QtMainVersion%"=="5" set QtMainVersion1=5
 
 if "%RsBuildConfig%" NEQ "release" (
-	set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsArchitecture%-msys2%RsType%%RsArchiveAdd%-%RsBuildConfig%.7z
+	set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsToolchain%-msys2%RsType%%RsArchiveAdd%-%RsBuildConfig%.7z
 ) else (
-	set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsArchitecture%-msys2%RsType%%RsArchiveAdd%.7z
+	set Archive=%RsPackPath%\RetroShare-%RsVersion%-Windows-Portable-%RsDate%-%RsVersion.Extra%-%RsToolchain%-msys2%RsType%%RsArchiveAdd%.7z
 )
 
 if exist "%Archive%" del /Q "%Archive%"
@@ -105,6 +106,10 @@ copy "%RsBuildPath%\retroshare-nogui\src\%RsBuildConfig%\retroshare*-nogui.exe"
 copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
 copy "%RsBuildPath%\supportlibs\cmark\build\src\libcmark.dll" "%RsDeployPath%" %Quite%
 if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite%
+if exist "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" copy "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" "%RsDeployPath%" %Quite%
+if exist "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" (
+	copy "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" "%RsDeployPath%" %Quite%
+)
 
 echo copy extensions
 for /D %%D in ("%RsBuildPath%\plugins\*") do (
@@ -132,8 +137,14 @@ del /Q "%RsDeployPath%\imageformats\*d?.dll" %Quite%
 
 if "%ParamTor%"=="1" (
 	echo copy tor
-	copy "%RsMinGWPath%\bin\tor.exe" "%RsDeployPath%" %Quite%
-	copy "%RsMinGWPath%\bin\tor-gencert.exe" "%RsDeployPath%" %Quite%
+	if not exist "%RsDeployPath%\tor" mkdir "%RsDeployPath%\tor"
+	copy "%RsMinGWPath%\bin\tor.exe" "%RsDeployPath%\tor" %Quite%
+	copy "%RsMinGWPath%\bin\tor-gencert.exe" "%RsDeployPath%\tor" %Quite%
+
+	echo copy tor dependencies
+	for /R "%RsDeployPath%\tor" %%D in (*.exe) do (
+		call :copy_dependencies "%%D" "%RsDeployPath%\tor"
+	)
 )
 
 echo copy dependencies
@@ -141,8 +152,10 @@ for /R "%RsDeployPath%" %%D in (*.dll, *.exe) do (
 	call :copy_dependencies "%%D" "%RsDeployPath%"
 )
 
-echo copy qss
-xcopy /S "%SourcePath%\retroshare-gui\src\qss" "%RsDeployPath%\qss" %Quite%
+if exist "%SourcePath%\retroshare-gui\src\qss" (
+	echo copy qss
+	xcopy /S "%SourcePath%\retroshare-gui\src\qss" "%RsDeployPath%\qss" %Quite%
+)
 
 echo copy stylesheets
 xcopy /S "%SourcePath%\retroshare-gui\src\gui\qss\chat" "%RsDeployPath%\stylesheets" %Quite%
@@ -176,12 +189,12 @@ echo copy buildinfo.txt
 copy "%RsBuildPath%\buildinfo.txt" "%RsDeployPath%" %Quite%
 
 if "%ParamWebui%"=="1" (
-	if exist "%RsWebuiPath%\webui" (
+	if exist "%RsWebuiBuildPath%" (
 		echo copy webui
 		mkdir "%RsDeployPath%\webui"
-		xcopy /S "%RsWebuiPath%\webui" "%RsDeployPath%\webui" %Quite%
+		xcopy /S "%RsWebuiBuildPath%" "%RsDeployPath%\webui" %Quite%
 	) else (
-		%cecho% error "Webui is enabled, but no webui data found at %RsWebuiPath%\webui"
+		%cecho% error "Webui is enabled, but no webui data found at %RsWebuiBuildPath%"
 		goto error
 	)
 )

build_scripts/Windows-msys2/env/tools/prepare-msys2.bat

@@ -16,7 +16,13 @@ if "%~1"=="clean" (
 	goto exit
 )
 
-if exist "%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\pacman.exe" (
+set MSYS2Version=20250622
+
+set MSYS2Install=msys2-base-x86_64-%MSYS2Version%.sfx.exe
+set MSYS2Url=https://github.com/msys2/msys2-installer/releases/download/%MSYS2Version:~0,4%-%MSYS2Version:~4,2%-%MSYS2Version:~6,2%/%MSYS2Install%
+set MSYS2UnpackPath=%EnvMSYS2Path%\msys64
+
+if exist "%MSYS2UnpackPath%\usr\bin\pacman.exe" (
 	if "%~1"=="reinstall" (
 		choice /M "Found existing MSYS2 version. Do you want to proceed?"
 		if !ERRORLEVEL!==2 goto exit
@@ -25,28 +31,26 @@ if exist "%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\pacman.exe" (
 	)
 )
 
-set MSYS2Install=msys2-base-%MSYS2Architecture%-20200720.tar.xz
-set MSYS2Url=http://sourceforge.net/projects/msys2/files/Base/%MSYS2Architecture%/%MSYS2Install%/download
+if exist "%MSYS2UnpackPath%" (
+	%cecho% info "Remove previous MSYS2 version"
+	call "%ToolsPath%\remove-dir.bat" "%MSYS2UnpackPath%"
+)
 
-%cecho% info "Remove previous MSYS2 version"
-call "%ToolsPath%\remove-dir.bat" "%EnvMSYS2Path%"
-
-%cecho% info "Download installation files"
+%cecho% info "Download MSYS2 installation files"
 if not exist "%EnvDownloadPath%\%MSYS2Install%" call "%ToolsPath%\download-file.bat" "%MSYS2Url%" "%EnvDownloadPath%\%MSYS2Install%"
 if not exist "%EnvDownloadPath%\%MSYS2Install%" %cecho% error "Cannot download MSYS" & goto error
 
 %cecho% info "Unpack MSYS2"
-"%EnvSevenZipExe%" x -so "%EnvDownloadPath%\%MSYS2Install%" | "%EnvSevenZipExe%" x -y -si -ttar -o"%EnvMSYS2Path%"
+"%EnvDownloadPath%\%MSYS2Install%" -y -o"%EnvMSYS2Path%"
 
-set MSYS2SH=%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\sh
+set MSYS2SH=%MSYS2UnpackPath%\usr\bin\sh
 
 %cecho% info "Initialize MSYS2"
-"%MSYS2SH%" -lc "pacman -Sy"
-"%MSYS2SH%" -lc "pacman --noconfirm --needed -S bash pacman pacman-mirrors msys2-runtime"
+"%MSYS2SH%" -lc "yes | pacman --noconfirm -Syuu msys2-keyring"
+"%MSYS2SH%" -lc "pacman --noconfirm -Sy"
+"%MSYS2SH%" -lc "pacman --noconfirm -Su"
 
-call "%EnvMSYS2Path%\msys%MSYS2Base%\autorebase.bat"
-call "%EnvRootPath%\update-msys2.bat"
-call "%EnvRootPath%\update-msys2.bat"
+call "%MSYS2UnpackPath%\autorebase.bat"
 
 :exit
 endlocal

build_scripts/Windows-msys2/env/tools/prepare-tools.bat

@@ -34,7 +34,7 @@ if not exist "%EnvToolsPath%\cecho.exe" (
 	if not exist "%EnvDownloadPath%\%cCEhoInstall%" echo Cannot download cecho installation& goto error
 
 	echo Unpack cecho
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CEchoInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CEchoInstall%" -y -bso0
 	copy "%EnvTempPath%\cecho.exe" "%EnvToolsPath%"
 
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"

build_scripts/Windows-msys2/env/tools/root/update-msys2.bat

@@ -2,18 +2,13 @@
 
 setlocal
 
-if exist "%~dp0msys2\msys32" call :update 32
-if exist "%~dp0msys2\msys64" call :update 64
+if not exist "%~dp0msys2\msys64" goto :EOF
 
-goto :EOF
+set MSYS2SH=%~dp0msys2\msys64\usr\bin\sh
 
-:update
-set MSYSSH=%~dp0msys2\msys%~1\usr\bin\sh
+echo Update MSYS2
+"%MSYS2SH%" -lc "yes | pacman --noconfirm -Syuu msys2-keyring"
+"%MSYS2SH%" -lc "pacman --noconfirm -Su"
 
-echo Update MSYS2 %~1
-"%MSYSSH%" -lc "pacman -Sy"
-"%MSYSSH%" -lc "pacman --noconfirm -Su"
-
-:exit
 endlocal
 goto :EOF

build_scripts/Windows-msys2/installer/retroshare-Qt5.nsi

@@ -9,6 +9,7 @@
 ;!define REVISION ""
 ;!define DEPLOYDIR ""
 ;!define ARCHITECTURE ""
+;!define TOOLCHAIN ""
 
 # Optional defines
 ;!define OUTDIR ""
@@ -21,6 +22,9 @@
 !ifndef ARCHITECTURE
 !error "ARCHITECTURE is not defined"
 !endif
+!ifndef TOOLCHAIN
+!error "TOOLCHAIN is not defined"
+!endif
 
 # Check optional defines
 !ifdef OUTDIR
@@ -72,7 +76,7 @@ ${!defineifexist} TOR_EXISTS "${DEPLOYDIR}\tor.exe"
 # Main Install settings
 Name "${APPNAMEANDVERSION}"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-${ARCHITECTURE}${RSTYPE}${INSTALLERADD}-setup.exe"
+OutFile "${OUTDIR_}RetroShare-${VERSION}-${Date}-${REVISION}-${TOOLCHAIN}-msys2${RSTYPE}${INSTALLERADD}-setup.exe"
 BrandingText "${APPNAMEANDVERSION}"
 RequestExecutionlevel highest
 # Use compression
@@ -218,7 +222,7 @@ Section $(Section_Data) Section_Data
 
   ; Stylesheets
   SetOutPath "$INSTDIR\qss"
-  File /r "${DEPLOYDIR}\qss\*.*"
+  File /nonfatal /r "${DEPLOYDIR}\qss\*.*"
 SectionEnd
 
 ;Section $(Section_Link) Section_Link

build_scripts/Windows-msys2/readme.md

@@ -55,7 +55,6 @@ Run the scripts in this order:
   * "CONFIG+=..."       enable other extra compile time features, you can find the almost complete list in file *<sourcefolder>\retroshare.pri*
 * For fixing compile problems (optional)
   * singlethread:       use only 1 thread for building, slow but useful if you don't find the error message in the console
-  * clang:              use clang compiler instead of GCC
   * noupdate:           skip the msys2 update step, sometimes some msys2 packages are broken, you can manually switch back to the older package, and this option will prevent updating to the broken version again
 
 Example:

build_scripts/Windows-msys2/tools/get-rs-date.bat

@@ -0,0 +1,32 @@
+REM Usage:
+REM call get-rs-date.bat SourcePath Variable
+
+setlocal
+
+set SourcePath=%~1
+set Variable=%~2
+if "%Variable%"=="" (
+	echo.
+	echo Parameter error
+	exit /B 1
+)
+
+:: Check git executable
+set GitPath=
+call "%~dp0find-in-path.bat" GitPath git.exe
+if "%GitPath%"=="" (
+	echo.
+	echo Git executable not found in PATH.
+	exit /B 1
+)
+
+set Date=
+
+pushd "%SourcePath%"
+rem This doesn't work: git log -1 --date=format:"%Y%m%d" --format="%ad"
+for /F "tokens=1,2,3* delims=-" %%A in ('git log -1 --date^=short --format^="%%ad"') do set Date=%%A%%B%%C
+popd
+
+:exit
+endlocal & set %Variable%=%Date%
+exit /B 0

build_scripts/Windows-msys2/tools/webui.bat

@@ -1,22 +0,0 @@
-setlocal
-
-echo.
-echo === webui
-echo.
-title Build webui
-
-if not exist "%RsWebuiPath%" (
-	echo Checking out webui source into %RsWebuiPath%
-	if not "%ParamNoupdate%"=="1" (
-		%EnvMSYS2Cmd% "pacman --noconfirm --needed -S git"
-	)
-	git clone https://github.com/RetroShare/RSNewWebUI.git "%RsWebuiPath%"
-) else (
-	echo Webui source found at %RsWebuiPath%		
-)
-
-pushd "%RsWebuiPath%\webui-src\make-src"
-%EnvMSYS2Cmd% "sh build.sh"
-popd
-
-endlocal

build_scripts/Windows/Windows-QtCreator-InstallGuide.md

@@ -0,0 +1,35 @@
+## Build Retroshare with QtCreator & Qt 6.9 on Windows
+
+### Qt 6.9 Installation
+
+Download Qt 6.9 from: https://www.qt.io/download-dev
+
+Run the installer and install Qt 6.9
+
+Add GCC.exe to Path
+
+	C:\Qt\Tools\mingw1310_64\bin
+
+Compile the external libs start build-libs.bat:
+
+Open Qt Command Prompt:
+
+	cd C:\Users\User\Documents\GitHub\RetroShare\build_scripts\Windows\build-libs
+
+Type (this will take some time to build all libs):
+
+	build-libs.bat
+
+Open Qt Creator
+
+	Open project -> RetroShare.pro
+
+After Project loaded, go to: 
+
+	Projects->Build->Build Steps->Additional arguments: 
+
+Add EXTERNAL_LIB_DIR:
+
+	"EXTERNAL_LIB_DIR=%{sourceDir}\..\RetroShare-env\build-libs\gcc-13.1.0\x64\libs"
+
+After done, Build Project

build_scripts/Windows/build-libs/Makefile

@@ -1,25 +1,32 @@
-ZLIB_VERSION=1.2.3
-BZIP2_VERSION=1.0.6
-MINIUPNPC_VERSION=2.0
-OPENSSL_VERSION=1.1.1h
-SPEEX_VERSION=1.2.0
-SPEEXDSP_VERSION=1.2rc3
-OPENCV_VERSION=4.5.0
-LIBXML2_VERSION=2.9.7
-LIBXSLT_VERSION=1.1.32
-CURL_VERSION=7.58.0
+ZLIB_VERSION=1.2.11
+BZIP2_VERSION=1.0.8
+MINIUPNPC_VERSION=2.2.3
+OPENSSL_VERSION=1.1.1w
+SPEEX_VERSION=1.2.1
+SPEEXDSP_VERSION=1.2.1
+LIBXML2_MAIN_VERSION=2.14
+LIBXML2_VERSION=$(LIBXML2_MAIN_VERSION).5
+LIBXSLT_MAIN_VERSION=1.1
+LIBXSLT_VERSION=$(LIBXSLT_MAIN_VERSION).43
+CURL_VERSION=8.9.1
 TCL_VERSION=8.6.10
-SQLCIPHER_VERSION=4.4.0
-LIBMICROHTTPD_VERSION=0.9.59
-FFMPEG_VERSION=3.4
+SQLCIPHER_VERSION=4.5.0
+FFMPEG_VERSION=4.4.6
 RAPIDJSON_VERSION=1.1.0
-XAPIAN_VERSION=1.4.7
+XAPIAN_VERSION=1.4.29
+ASIO_VERSION=1-34-2
+#RNP_VERSION=0.17.1
+
+# libaries for rnp
+JSON_C_VERSION=0.18
+BOTAN_VERSION=2.19.5
 
 DOWNLOAD_PATH?=download
 BUILD_PATH=build
 LIBS_PATH?=libs
 
-all: dirs zlib bzip2 miniupnpc openssl speex speexdsp opencv libxml2 libxslt curl sqlcipher libmicrohttpd ffmpeg rapidjson xapian copylibs
+all: dirs zlib bzip2 miniupnpc openssl speex speexdsp libxml curl sqlcipher ffmpeg rapidjson xapian jsonc botan asio copylibs
+#rnp
 
 download: \
 	$(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz \
@@ -28,14 +35,12 @@ download: \
 	$(DOWNLOAD_PATH)/openssl-$(OPENSSL_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tar.gz \
-	$(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz \
-	$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz \
-	$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz \
+	$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz \
+	$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz \
 	$(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/tcl$(TCL_VERSION)-src.tar.gz \
 	$(DOWNLOAD_PATH)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz \
-	$(DOWNLOAD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz \
-	$(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz \
+	$(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz \
 	$(DOWNLOAD_PATH)/rapidjson-$(RAPIDJSON_VERSION).tar.gz \
 	$(DOWNLOAD_PATH)/xapian-core-$(XAPIAN_VERSION).tar.xz
 
@@ -58,9 +63,7 @@ $(BUILD_PATH)/zlib-$(ZLIB_VERSION): $(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz
 	rm -r -f $(BUILD_PATH)/zlib-*
 	tar xvf $(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz
 	# build
-	cd zlib-$(ZLIB_VERSION) && ./configure
-	#cd zlib-$(ZLIB_VERSION) && make install prefix="`pwd`/../$(BUILD_PATH)"
-	cd zlib-$(ZLIB_VERSION) && make
+	cd zlib-$(ZLIB_VERSION) && make -j -f win32/Makefile.gcc libz.a
 	# copy files
 	mkdir -p $(BUILD_PATH)/zlib-$(ZLIB_VERSION).tmp/include
 	cp zlib-$(ZLIB_VERSION)/zlib.h $(BUILD_PATH)/zlib-$(ZLIB_VERSION).tmp/include/
@@ -74,7 +77,7 @@ $(BUILD_PATH)/zlib-$(ZLIB_VERSION): $(DOWNLOAD_PATH)/zlib-$(ZLIB_VERSION).tar.gz
 bzip2: $(BUILD_PATH)/bzip2-$(BZIP2_VERSION)
 
 $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz:
-	wget https://sourceforge.net/projects/bzip2/files/bzip2-$(BZIP2_VERSION).tar.gz/download -O $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz
+	wget https://www.sourceware.org/pub/bzip2/bzip2-$(BZIP2_VERSION).tar.gz -O $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz
 
 $(BUILD_PATH)/bzip2-$(BZIP2_VERSION): $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz
 	# prepare
@@ -82,7 +85,7 @@ $(BUILD_PATH)/bzip2-$(BZIP2_VERSION): $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).ta
 	tar xvf $(DOWNLOAD_PATH)/bzip2-$(BZIP2_VERSION).tar.gz
 	# build
 	#cd bzip2-$(BZIP2_VERSION) && make install PREFIX="`pwd`/../$(BUILD_PATH)"
-	cd bzip2-$(BZIP2_VERSION) && make
+	cd bzip2-$(BZIP2_VERSION) && make -j
 	# copy files
 	mkdir -p $(BUILD_PATH)/bzip2-$(BZIP2_VERSION).tmp/include
 	cp bzip2-$(BZIP2_VERSION)/bzlib.h $(BUILD_PATH)/bzip2-$(BZIP2_VERSION).tmp/include/
@@ -102,10 +105,10 @@ $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION): $(DOWNLOAD_PATH)/miniupnpc-$(MINIU
 	rm -r -f $(BUILD_PATH)/miniupnpc-*
 	tar xvf $(DOWNLOAD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tar.gz
 	# build
-	cd miniupnpc-$(MINIUPNPC_VERSION) && export CC=gcc && export PATH=.:$$PATH && make -f Makefile.mingw init libminiupnpc.a miniupnpc.dll
+	cd miniupnpc-$(MINIUPNPC_VERSION) && export CC=gcc && export PATH=.:$$PATH && make -j -f Makefile.mingw libminiupnpc.a miniupnpc.dll
 	# copy files
 	mkdir -p $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tmp/include/miniupnpc
-	cp miniupnpc-$(MINIUPNPC_VERSION)/*.h $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tmp/include/miniupnpc/
+	cp miniupnpc-$(MINIUPNPC_VERSION)/include/*.h $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tmp/include/miniupnpc/
 	mkdir -p $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tmp/lib
 	cp miniupnpc-$(MINIUPNPC_VERSION)/miniupnpc.lib $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tmp/lib/
 	mkdir -p $(BUILD_PATH)/miniupnpc-$(MINIUPNPC_VERSION).tmp/bin
@@ -127,7 +130,7 @@ $(BUILD_PATH)/openssl-$(OPENSSL_VERSION): $(DOWNLOAD_PATH)/openssl-$(OPENSSL_VER
 	#cd openssl-$(OPENSSL_VERSION) && ./config --prefix="`pwd`/../$(BUILD_PATH)"
 	#cd openssl-$(OPENSSL_VERSION) && make install
 	cd openssl-$(OPENSSL_VERSION) && ./config shared
-	cd openssl-$(OPENSSL_VERSION) && make
+	cd openssl-$(OPENSSL_VERSION) && make -j
 	# copy files
 	mkdir -p $(BUILD_PATH)/openssl-$(OPENSSL_VERSION).tmp/include/openssl
 	cp openssl-$(OPENSSL_VERSION)/include/openssl/*.h $(BUILD_PATH)/openssl-$(OPENSSL_VERSION).tmp/include/openssl/
@@ -156,7 +159,7 @@ $(BUILD_PATH)/speex-$(SPEEX_VERSION): $(DOWNLOAD_PATH)/speex-$(SPEEX_VERSION).ta
 	# build
 	cd speex-$(SPEEX_VERSION) && ./configure
 	#cd speex-$(SPEEX_VERSION) && make install exec_prefix="`pwd`/../$(BUILD_PATH)"
-	cd speex-$(SPEEX_VERSION) && make
+	cd speex-$(SPEEX_VERSION) && make -j
 	# copy files
 	mkdir -p $(BUILD_PATH)/speex-$(SPEEX_VERSION).tmp/include/speex
 	cp speex-$(SPEEX_VERSION)/include/speex/*.h $(BUILD_PATH)/speex-$(SPEEX_VERSION).tmp/include/speex/
@@ -177,7 +180,7 @@ $(BUILD_PATH)/speexdsp-$(SPEEXDSP_VERSION): $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP
 	tar xvf $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tar.gz
 	# build
 	cd speexdsp-$(SPEEXDSP_VERSION) && ./configure
-	cd speexdsp-$(SPEEXDSP_VERSION) && make
+	cd speexdsp-$(SPEEXDSP_VERSION) && make -j
 	# copy files
 	mkdir -p $(BUILD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tmp/include/speex
 	cp speexdsp-$(SPEEXDSP_VERSION)/include/speex/*.h $(BUILD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tmp/include/speex/
@@ -187,75 +190,52 @@ $(BUILD_PATH)/speexdsp-$(SPEEXDSP_VERSION): $(DOWNLOAD_PATH)/speexdsp-$(SPEEXDSP
 	rm -r -f speexdsp-$(SPEEXDSP_VERSION)
 	mv $(BUILD_PATH)/speexdsp-$(SPEEXDSP_VERSION).tmp $(BUILD_PATH)/speexdsp-$(SPEEXDSP_VERSION)
 
-opencv: $(BUILD_PATH)/opencv-$(OPENCV_VERSION)
+libxml: \
+	$(BUILD_PATH)/libxml2-$(LIBXML2_VERSION) \
+	$(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION)
 
-$(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz:
-	wget --no-check-certificate https://github.com/opencv/opencv/archive/$(OPENCV_VERSION).tar.gz -O $(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz
+$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz:
+	wget --no-check-certificate https://download.gnome.org/sources/libxml2/$(LIBXML2_MAIN_VERSION)/libxml2-$(LIBXML2_VERSION).tar.xz -O $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz
 
-$(BUILD_PATH)/opencv-$(OPENCV_VERSION): $(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz
-	# prepare
-	rm -r -f $(BUILD_PATH)/opencv-*
-	tar xvf $(DOWNLOAD_PATH)/opencv-$(OPENCV_VERSION).tar.gz
-	# Remove version numbers from libraries. Is there a switch?
-	sed -i -e's/\(ocv_update(OPENCV_DLLVERSION \).*$$/\1"")/' opencv-$(OPENCV_VERSION)/CMakeLists.txt
-	# build
-	mkdir -p opencv-$(OPENCV_VERSION)/build
-	#cd opencv-$(OPENCV_VERSION)/build && cmake .. -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="`pwd`/../../build"
-	cd opencv-$(OPENCV_VERSION)/build && cmake .. -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DENABLE_CXX11=ON -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -DSTRSAFE_NO_DEPRECATE" -DCMAKE_INSTALL_PREFIX="`pwd`/install"
-	cd opencv-$(OPENCV_VERSION)/build && make install
-	# copy files
-	mkdir -p $(BUILD_PATH)/opencv-$(OPENCV_VERSION).tmp/include
-	cp -r opencv-$(OPENCV_VERSION)/build/install/include/* $(BUILD_PATH)/opencv-$(OPENCV_VERSION).tmp/include/
-	mkdir -p $(BUILD_PATH)/opencv-$(OPENCV_VERSION).tmp/lib/opencv
-	cp -r opencv-$(OPENCV_VERSION)/build/install/x64/mingw/staticlib/* $(BUILD_PATH)/opencv-$(OPENCV_VERSION).tmp/lib/opencv/
-	# cleanup
-	rm -r -f opencv-$(OPENCV_VERSION)
-	mv $(BUILD_PATH)/opencv-$(OPENCV_VERSION).tmp $(BUILD_PATH)/opencv-$(OPENCV_VERSION)
+$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz:
+	wget --no-check-certificate https://download.gnome.org/sources/libxslt/$(LIBXSLT_MAIN_VERSION)/libxslt-$(LIBXSLT_VERSION).tar.xz -O $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz
 
-libxml2: $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION)
-
-$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz:
-	wget ftp://xmlsoft.org/libxml2/libxml2-$(LIBXML2_VERSION).tar.gz -O $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz
-
-$(BUILD_PATH)/libxml2-$(LIBXML2_VERSION): $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz
-	# prepare
+$(BUILD_PATH)/libxml2-$(LIBXML2_VERSION) $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION): \
+	$(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz \
+	$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz
+	# libxml2: prepare
+	pacman --needed --noconfirm -S python3 pkg-config
 	rm -r -f $(BUILD_PATH)/libxml2-*
-	tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz
-	# build
+	tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz
+	# libxslt: prepare
+	rm -r -f $(BUILD_PATH)/libxslt-*
+	tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.xz
+	tar xvf $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.xz
+	# libxml2: build
 	cd libxml2-$(LIBXML2_VERSION) && ./configure --without-iconv -enable-shared=no
 	#cd libxml2-$(LIBXML2_VERSION) && make install exec_prefix="`pwd`/../$(BUILD_PATH)"
-	cd libxml2-$(LIBXML2_VERSION) && make
-	# copy files
+	cd libxml2-$(LIBXML2_VERSION) && make -j libxml2.la
+	# libxslt: build
+	cd libxslt-$(LIBXSLT_VERSION) && ./configure --with-libxml-src=../libxml2-$(LIBXML2_VERSION) -enable-shared=no CFLAGS=-DLIBXML_STATIC
+	cd libxslt-$(LIBXSLT_VERSION)/libxslt && make -j
+	cd libxslt-$(LIBXSLT_VERSION)/libexslt && make -j
+	# libxml2: copy files
 	mkdir -p $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp/include/libxml
 	cp libxml2-$(LIBXML2_VERSION)/include/libxml/*.h $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp/include/libxml/
 	mkdir -p $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp/lib
 	cp libxml2-$(LIBXML2_VERSION)/.libs/libxml2.a $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp/lib/
-	# cleanup
-	#rm -r -f libxml2-$(LIBXML2_VERSION) # see libxslt
-	mv $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION)
-
-libxslt: $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION)
-
-$(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz:
-	wget ftp://xmlsoft.org/libxml2/libxslt-$(LIBXSLT_VERSION).tar.gz -O $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz
-
-$(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION): $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz
-	# prepare
-	rm -r -f $(BUILD_PATH)/libxslt-*
-	tar xvf $(DOWNLOAD_PATH)/libxml2-$(LIBXML2_VERSION).tar.gz
-	tar xvf $(DOWNLOAD_PATH)/libxslt-$(LIBXSLT_VERSION).tar.gz
-	# build
-	cd libxslt-$(LIBXSLT_VERSION) && ./configure --with-libxml-src=../libxml2-$(LIBXML2_VERSION) -enable-shared=no CFLAGS=-DLIBXML_STATIC
-	cd libxslt-$(LIBXSLT_VERSION) && make
-	# copy files
+	# libxslt: copy files
 	mkdir -p $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/include/libxslt
 	cp libxslt-$(LIBXSLT_VERSION)/libxslt/*.h $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/include/libxslt/
 	mkdir -p $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/lib
 	cp libxslt-$(LIBXSLT_VERSION)/libxslt/.libs/libxslt.a $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/lib/
 	cp libxslt-$(LIBXSLT_VERSION)/libexslt/.libs/libexslt.a $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp/lib/
-	# cleanup
+	# libxml2: cleanup
 	rm -r -f libxml2-$(LIBXML2_VERSION)
+	# libxslt: cleanup
 	rm -r -f libxslt-$(LIBXSLT_VERSION)
+	# finish
+	mv $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION).tmp $(BUILD_PATH)/libxml2-$(LIBXML2_VERSION)
 	mv $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION).tmp $(BUILD_PATH)/libxslt-$(LIBXSLT_VERSION)
 
 curl: $(BUILD_PATH)/curl-$(CURL_VERSION)
@@ -270,7 +250,7 @@ $(BUILD_PATH)/curl-$(CURL_VERSION): $(DOWNLOAD_PATH)/curl-$(CURL_VERSION).tar.gz
 	# build
 	cd curl-$(CURL_VERSION) && ./configure --disable-shared --with-ssl="`pwd`/../$(BUILD_PATH)/openssl-$(OPENSSL_VERSION)"
 	#cd curl-$(CURL_VERSION) && make install exec_prefix="`pwd`/../$(BUILD_PATH)"
-	cd curl-$(CURL_VERSION) && make
+	cd curl-$(CURL_VERSION)/lib && make -j
 	# copy files
 	mkdir -p $(BUILD_PATH)/curl-$(CURL_VERSION).tmp/include/curl
 	cp curl-$(CURL_VERSION)/include/curl/*.h $(BUILD_PATH)/curl-$(CURL_VERSION).tmp/include/curl/
@@ -295,14 +275,14 @@ $(BUILD_PATH)/sqlcipher-$(SQLCIPHER_VERSION): $(DOWNLOAD_PATH)/tcl$(TCL_VERSION)
 	tar xvf $(DOWNLOAD_PATH)/tcl$(TCL_VERSION)-src.tar.gz
 	mkdir -p tcl$(TCL_VERSION)/build
 	cd tcl$(TCL_VERSION)/build && ../win/configure
-	cd tcl$(TCL_VERSION)/build && make
+	cd tcl$(TCL_VERSION)/build && make -j
 	#sqlcipher
 	tar xvf $(DOWNLOAD_PATH)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz
 	cd sqlcipher-$(SQLCIPHER_VERSION) && ln -s ../tcl$(TCL_VERSION)/build/tclsh86.exe tclsh
 	mkdir -p tcl$(TCL_VERSION)/lib
 	ln -s `pwd`/tcl$(TCL_VERSION)/library `pwd`/tcl$(TCL_VERSION)/lib/tcl8.6
 	# build
-	cd sqlcipher-$(SQLCIPHER_VERSION) && PATH=.:$$PATH:`pwd`/../tcl$(TCL_VERSION)/build && export LIBS="-L`pwd`/../$(BUILD_PATH)/openssl-$(OPENSSL_VERSION)/lib -lgdi32 $$LIBS" && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC -I`pwd`/../$(BUILD_PATH)/openssl-$(OPENSSL_VERSION)/include -I`pwd`/../tcl$(TCL_VERSION)/generic" LDFLAGS="-L`pwd`/../$(BUILD_PATH)/openssl-$(OPENSSL_VERSION)/lib -lcrypto -lgdi32" --with-tcl="`pwd`/../tcl$(TCL_VERSION)/build" && make install prefix="`pwd`/install"
+	cd sqlcipher-$(SQLCIPHER_VERSION) && PATH=.:$$PATH:`pwd`/../tcl$(TCL_VERSION)/build && export LIBS="-L`pwd`/../$(BUILD_PATH)/openssl-$(OPENSSL_VERSION)/lib -lgdi32 $$LIBS" && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC -I`pwd`/../$(BUILD_PATH)/openssl-$(OPENSSL_VERSION)/include -I`pwd`/../tcl$(TCL_VERSION)/generic" LDFLAGS="-L`pwd`/../$(BUILD_PATH)/openssl-$(OPENSSL_VERSION)/lib -lcrypto -lgdi32" --with-tcl="`pwd`/../tcl$(TCL_VERSION)/build" && make -j install prefix="`pwd`/install"
 	# copy files
 	mkdir -p $(BUILD_PATH)/sqlcipher-$(SQLCIPHER_VERSION).tmp/include
 	cp -r sqlcipher-$(SQLCIPHER_VERSION)/install/include/* $(BUILD_PATH)/sqlcipher-$(SQLCIPHER_VERSION).tmp/include/
@@ -315,34 +295,18 @@ $(BUILD_PATH)/sqlcipher-$(SQLCIPHER_VERSION): $(DOWNLOAD_PATH)/tcl$(TCL_VERSION)
 	rm -r -f tcl$(TCL_VERSION)
 	mv $(BUILD_PATH)/sqlcipher-$(SQLCIPHER_VERSION).tmp $(BUILD_PATH)/sqlcipher-$(SQLCIPHER_VERSION)
 
-libmicrohttpd: $(BUILD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION)
-
-$(DOWNLOAD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz:
-	wget --no-check-certificate http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz -O $(DOWNLOAD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz
-
-$(BUILD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION): $(DOWNLOAD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz
-	# prepare
-	rm -r -f $(BUILD_PATH)/libmicrohttpd-*
-	tar xvf $(DOWNLOAD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz
-	# build
-	cd libmicrohttpd-$(LIBMICROHTTPD_VERSION) && ./configure --disable-shared --enable-static --prefix="`pwd`/../$(BUILD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tmp"
-	cd libmicrohttpd-$(LIBMICROHTTPD_VERSION) && make install
-	# cleanup
-	rm -r -f libmicrohttpd-$(LIBMICROHTTPD_VERSION)
-	mv $(BUILD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION).tmp $(BUILD_PATH)/libmicrohttpd-$(LIBMICROHTTPD_VERSION)
-
 ffmpeg: $(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION)
 
-$(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz:
-	wget --no-check-certificate https://ffmpeg.org/releases/ffmpeg-$(FFMPEG_VERSION).tar.gz -O $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz
+$(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz:
+	wget --no-check-certificate https://ffmpeg.org/releases/ffmpeg-$(FFMPEG_VERSION).tar.xz -O $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz
 
-$(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION): $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz
+$(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION): $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz
 	# prepare
 	rm -r -f $(BUILD_PATH)/ffmpeg-*
-	tar xvf $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.gz
+	tar xvf $(DOWNLOAD_PATH)/ffmpeg-$(FFMPEG_VERSION).tar.xz
 	# build
-	cd ffmpeg-$(FFMPEG_VERSION) && ./configure --disable-shared --enable-static --disable-programs --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-yasm --disable-everything --enable-encoder=mpeg4 --enable-decoder=mpeg4 --prefix="`pwd`/../$(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION).tmp"
-	cd ffmpeg-$(FFMPEG_VERSION) && make install
+	cd ffmpeg-$(FFMPEG_VERSION) && ./configure --disable-shared --enable-static --disable-programs --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-yasm --disable-everything --enable-encoder=mpeg4 --enable-decoder=mpeg4 --prefix="`pwd`/../$(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION).tmp"
+	cd ffmpeg-$(FFMPEG_VERSION) && make -j install
 	# cleanup
 	rm -r -f ffmpeg-$(FFMPEG_VERSION)
 	mv $(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION).tmp $(BUILD_PATH)/ffmpeg-$(FFMPEG_VERSION)
@@ -380,7 +344,7 @@ $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION): $(DOWNLOAD_PATH)/xapian-core-$(XAPI
 	#cd xapian-core-$(XAPIAN_VERSION) && ./configure --disable-shared --enable-static --prefix="`pwd`/../$(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION).tmp"
 	#cd xapian-core-$(XAPIAN_VERSION) && make install
 	cd xapian-core-$(XAPIAN_VERSION) && ./configure --disable-shared --enable-static
-	cd xapian-core-$(XAPIAN_VERSION) && make
+	cd xapian-core-$(XAPIAN_VERSION) && make -j
 	# copy files
 	mkdir -p $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION).tmp/include
 	cp -r xapian-core-$(XAPIAN_VERSION)/include/* $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION).tmp/include/
@@ -391,8 +355,73 @@ $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION): $(DOWNLOAD_PATH)/xapian-core-$(XAPI
 	rm -r -f xapian-core-$(XAPIAN_VERSION)
 	mv $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION).tmp $(BUILD_PATH)/xapian-core-$(XAPIAN_VERSION)
 
+jsonc: $(BUILD_PATH)/json-c-$(JSON_C_VERSION)
+
+$(BUILD_PATH)/json-c-$(JSON_C_VERSION):
+	# prepare
+	rm -r -f $(BUILD_PATH)/json-c-*
+	[ -d "json-c-$(JSON_C_VERSION)" ] || git clone https://github.com/json-c/json-c.git --depth=1 --branch json-c-$(JSON_C_VERSION) "json-c-$(JSON_C_VERSION)"
+	# build
+	mkdir -p json-c-$(JSON_C_VERSION)/build
+	cd json-c-$(JSON_C_VERSION)/build && cmake .. -G"MSYS Makefiles" -Wno-dev -DCMAKE_BUILD_TYPE="release" -DBUILD_SHARED_LIBS=off -DBUILD_STATIC_LIBS=on -DBUILD_TESTING=off -DCMAKE_CXX_FLAGS="-D__MINGW_USE_VC2005_COMPAT" -DCMAKE_INSTALL_PREFIX="`pwd`/install" -DCMAKE_INSTALL_PREFIX="`pwd`/../../$(BUILD_PATH)/json-c-$(JSON_C_VERSION).tmp"
+	cd json-c-$(JSON_C_VERSION)/build && make -j install
+	# cleanup
+	rm -r -f json-c-$(JSON_C_VERSION)
+	mv $(BUILD_PATH)/json-c-$(JSON_C_VERSION).tmp $(BUILD_PATH)/json-c-$(JSON_C_VERSION)
+
+botan: $(BUILD_PATH)/botan-$(BOTAN_VERSION)
+
+$(BUILD_PATH)/botan-$(BOTAN_VERSION):
+	# prepare
+	pacman --needed --noconfirm -S python3
+	rm -r -f $(BUILD_PATH)/botan-*
+	[ -d "botan-$(BOTAN_VERSION)" ] || git clone https://github.com/randombit/botan.git --depth=1 --branch $(BOTAN_VERSION) "botan-$(BOTAN_VERSION)"
+	# build
+	if [ $(MSYSTEM) = "MINGW32" ] ; then cd botan-$(BOTAN_VERSION) && ./configure.py --os=mingw --cpu=x86_32 --disable-shared-library --enable-static-library --extra-cxxflags="-D__MINGW_USE_VC2005_COMPAT" --prefix="`pwd`/../$(BUILD_PATH)/botan-$(BOTAN_VERSION).tmp" ; fi
+	if [ $(MSYSTEM) = "MINGW64" ] ; then cd botan-$(BOTAN_VERSION) && ./configure.py --os=mingw --cpu=x86_64 --disable-shared-library --enable-static-library --prefix="`pwd`/../$(BUILD_PATH)/botan-$(BOTAN_VERSION).tmp" ; fi
+	cd botan-$(BOTAN_VERSION) && make -j install
+	# cleanup
+	rm -r -f botan-$(BOTAN_VERSION)
+	mv $(BUILD_PATH)/botan-$(BOTAN_VERSION).tmp $(BUILD_PATH)/botan-$(BOTAN_VERSION)
+
+asio: $(BUILD_PATH)/asio-$(ASIO_VERSION)
+
+$(BUILD_PATH)/asio-$(ASIO_VERSION):
+	# prepare
+	rm -r -f $(BUILD_PATH)/asio-*
+	[ -d "asio-$(ASIO_VERSION)" ] || git clone https://github.com/chriskohlhoff/asio.git --depth=1 --branch asio-$(ASIO_VERSION) "asio-$(ASIO_VERSION)"
+	# copy files
+	mkdir -p $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp/include/asio
+	cp asio-$(ASIO_VERSION)/asio/include/*.hpp $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp/include/
+	cp -r asio-$(ASIO_VERSION)/asio/include/asio/* $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp/include/asio/
+	# cleanup
+	rm -r -f asio-$(ASIO_VERSION)
+	mv $(BUILD_PATH)/asio-$(ASIO_VERSION).tmp $(BUILD_PATH)/asio-$(ASIO_VERSION)
+
+rnp: $(BUILD_PATH)/rnp-$(RNP_VERSION)
+
+$(BUILD_PATH)/rnp-$(RNP_VERSION):
+	# prepare
+	rm -r -f $(BUILD_PATH)/rnp-*
+	[ -d "rnp-$(RNP_VERSION)" ] || git clone https://github.com/rnpgp/rnp.git --depth=1 --branch v$(RNP_VERSION) --recurse-submodules --shallow-submodules "rnp-$(RNP_VERSION)"
+	# build
+	mkdir -p rnp-$(RNP_VERSION)/build
+	cd rnp-$(RNP_VERSION)/build && cmake .. -G"MSYS Makefiles" -Wno-dev -DCMAKE_INSTALL_PREFIX="`pwd`/install" -DBUILD_SHARED_LIBS=yes -DBUILD_TESTING=off -DCMAKE_CXX_FLAGS="-D__MINGW_USE_VC2005_COMPAT -D__STDC_FORMAT_MACROS" -DBZIP2_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/bzip2-$(BZIP2_VERSION)/include" -DBZIP2_LIBRARY_RELEASE="`pwd`/../../$(BUILD_PATH)/bzip2-$(BZIP2_VERSION)/lib/libbz2.a" -DBZIP2_LIBRARIES="`pwd`/../../$(BUILD_PATH)/bzip2-$(BZIP2_VERSION)/lib/libbz2.a" -DZLIB_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/zlib-$(ZLIB_VERSION)/include" -DZLIB_LIBRARY="`pwd`/../../$(BUILD_PATH)/zlib-$(ZLIB_VERSION)/lib/libz.a" -DJSON-C_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/json-c-$(JSON_C_VERSION)/include/json-c" -DJSON-C_LIBRARY="`pwd`/../../$(BUILD_PATH)/json-c-$(JSON_C_VERSION)/lib/libjson-c.a" -DBOTAN_INCLUDE_DIR="`pwd`/../../$(BUILD_PATH)/botan-$(BOTAN_VERSION)/include/botan-`echo $(BOTAN_VERSION) | cut -c1-1`" -DBOTAN_LIBRARY="`pwd`/../../$(BUILD_PATH)/botan-$(BOTAN_VERSION)/lib/libbotan-`echo $(BOTAN_VERSION) | cut -c1-1`.a"
+	cmake --build rnp-$(RNP_VERSION)/build
+	# copy files
+	mkdir -p $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/include/rnp
+	cp -r rnp-$(RNP_VERSION)/include/rnp/* $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/include/rnp/
+	cp -r rnp-$(RNP_VERSION)/build/src/lib/rnp/* $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/include/rnp/
+	mkdir -p $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/lib
+	cp -r rnp-$(RNP_VERSION)/build/src/lib/librnp.dll.a $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/lib/
+	mkdir -p $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/bin
+	cp -r rnp-$(RNP_VERSION)/build/src/lib/librnp.dll $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp/bin/
+	# cleanup
+	rm -r -f rnp-$(RNP_VERSION)
+	mv $(BUILD_PATH)/rnp-$(RNP_VERSION).tmp $(BUILD_PATH)/rnp-$(RNP_VERSION)
+
 copylibs:
 	rm -r -f $(LIBS_PATH) ; \
 	mkdir -p $(LIBS_PATH) ; \
-	cp $(BUILD_PATH)/gcc-version $(LIBS_PATH) ; \
-	find $(BUILD_PATH) -mindepth 1 -maxdepth 1 -type d -not -name "*.tmp" -print -exec cp -r {}/. $(LIBS_PATH) \; ; \
+	cp -p $(BUILD_PATH)/gcc-version $(LIBS_PATH) ; \
+	find $(BUILD_PATH) -mindepth 1 -maxdepth 1 -type d -not -name "*.tmp" -print -exec cp -r -p {}/. $(LIBS_PATH) \; ; \

build_scripts/Windows/build.bat

@@ -13,11 +13,11 @@ call "%~dp0build-libs\build-libs.bat"
 if errorlevel 1 %cecho% error "Failed to build libraries." & exit /B %ERRORLEVEL%
 
 %cecho% info "Build %SourceName%"
-call "%~dp0build\build.bat" release autologin jsonapi plugins nativedialogs
+call "%~dp0build\build.bat" release autologin webui plugins nativedialogs service
 if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL%
 
 %cecho% info "Pack %SourceName%"
-call "%~dp0build\pack.bat" release plugins
+call "%~dp0build\pack.bat" release webui plugins service
 if errorlevel 1 %cecho% error "Failed to pack %SourceName%." & exit /B %ERRORLEVEL%
 
 %cecho% info "Build installer"

build_scripts/Windows/build/build-installer.bat

@@ -9,7 +9,7 @@ call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
 :: Initialize environment
-call "%~dp0env.bat" release
+call "%~dp0env.bat" installer release
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 
@@ -40,6 +40,7 @@ set NSIS_PARAM=%NSIS_PARAM% /DARCHITECTURE="%GCCArchitecture%"
 set NSIS_PARAM=%NSIS_PARAM% /DDATE="%RsDate%"
 
 if exist "%EnvTorPath%\Tor\tor.exe" set NSIS_PARAM=%NSIS_PARAM% /DTORDIR="%EnvTorPath%\Tor"
+if exist "%RsWebuiBuildPath%" set NSIS_PARAM=%NSIS_PARAM% /DWEBUIDIR="%RsWebuiBuildPath%"
 
 :: Get compiled version
 call "%ToolsPath%\get-rs-version.bat" "%RsBuildPath%\retroshare-gui\src\%RsBuildConfig%\retroshare.exe" RsVersion

build_scripts/Windows/build/build.bat

@@ -9,7 +9,7 @@ call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
 :: Initialize environment
-call "%~dp0env.bat" %*
+call "%~dp0env.bat" build %*
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 
@@ -49,11 +49,15 @@ echo.
 
 title Build - %SourceName%-%RsBuildConfig% [qmake]
 
-set RS_QMAKE_CONFIG=%RsBuildConfig% no_rs_cppwarning
+set RS_QMAKE_CONFIG=%RsBuildConfig%
 if "%ParamAutologin%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_autologin
 if "%ParamJsonApi%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_jsonapi
+if "%ParamWebui%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_webui
 if "%ParamPlugins%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% retroshare_plugins
 if "%ParamUseNativeDialogs%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_use_native_dialogs
+if "%ParamService%" NEQ "1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% no_retroshare_service
+if "%ParamFriendServer%" NEQ "1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% no_retroshare_friendserver
+if "%ParamEmbeddedFriendServer%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_efs
 
 qmake "%SourcePath%\RetroShare.pro" -r -spec win32-g++ "CONFIG+=%RS_QMAKE_CONFIG%" "EXTERNAL_LIB_DIR=%BuildLibsPath%\libs"
 if errorlevel 1 goto error

build_scripts/Windows/build/clean.bat

@@ -8,7 +8,7 @@ if errorlevel 1 goto error_env
 call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
-call "%~dp0env.bat" %*
+call "%~dp0env.bat" clean %*
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 

build_scripts/Windows/build/env.bat

@@ -4,11 +4,18 @@ set ParamDebug=0
 set ParamAutologin=0
 set ParamPlugins=0
 set ParamJsonApi=0
+set ParamWebui=0
+set ParamService=0
+set ParamFriendServer=0
+set ParamEmbeddedFriendServer=0
 set ParamUseNativeDialogs=0
 set ParamTor=0
 set NonInteractive=0
 set CoreCount=%NUMBER_OF_PROCESSORS%
 
+set Module=%~1
+shift /1
+
 :parameter_loop
 if "%~1" NEQ "" (
 	for /f "tokens=1,2 delims==" %%a in ("%~1") do (
@@ -20,6 +27,15 @@ if "%~1" NEQ "" (
 			set ParamAutologin=1
 		) else if "%%~a"=="jsonapi" (
 			set ParamJsonApi=1
+		) else if "%%~a"=="webui" (
+			set ParamJsonApi=1
+			set ParamWebui=1
+		) else if "%%~a"=="service" (
+			set ParamService=1
+		) else if "%%~a"=="friendserver" (
+			set ParamFriendServer=1
+		) else if "%%~a"=="embedded-friendserver" (
+			set ParamEmbeddedFriendServer=1
 		) else if "%%~a"=="plugins" (
 			set ParamPlugins=1
 		) else if "%%~a"=="tor" (
@@ -32,7 +48,7 @@ if "%~1" NEQ "" (
 			set ParamUseNativeDialogs=1
 		) else (
 			echo.
-			echo Unknown parameter %1
+			echo Unknown parameter %1 for %Module%
 			goto :usage
 		)
 	)
@@ -89,6 +105,7 @@ set RsBuildPath=%BuildPath%\Qt-%QtVersion%-%GCCArchitecture%-%RsBuildConfig%
 set RsDeployPath=%DeployPath%\Qt-%QtVersion%-%GCCArchitecture%%RsType%-%RsBuildConfig%
 set RsPackPath=%DeployPath%
 set RsArchiveAdd=
+set RsWebuiBuildPath=%RsBuildPath%\retroshare-webui\webui
 
 if not exist "%~dp0env-mod.bat" goto no_mod
 call "%~dp0env-mod.bat"
@@ -104,19 +121,31 @@ echo.
 echo Mandatory parameter
 echo release^|debug         Build release or debug version
 echo.
-echo Optional parameter (need clean when changed)
-echo autologin          Build with autologin
-echo jsonapi            Build with jsonapi
-echo plugins            Build plugins
-echo nativedialogs      Build with native dialogs
-echo.
-echo Optional parameter
-echo singlethread       Use only 1 thread for building
-echo.
-echo Parameter for pack
-echo tor                Pack tor version
-echo.
-echo Parameter for git-log
-echo non-interactive    Non-interactive mode
+if "%Module%"=="build" (
+	echo Optional parameter ^(need clean when changed^)
+	echo autologin             Build with autologin
+	echo jsonapi               Build with jsonapi
+	echo webui                 Build with jsonapi and webui
+	echo service               Build service
+	echo friendserver          Build Friend Server
+	echo embedded-friendserver Build with embedded Friend Server
+	echo plugins               Build plugins
+	echo nativedialogs         Build with native dialogs
+	echo.
+	echo Optional parameter
+	echo singlethread          Use only 1 thread for building
+)
+if "%Module%"=="pack" (
+	echo Optional parameter
+	echo webui                 Pack webui
+	echo service               Pack service
+	echo friendserver          Pack Friend Server ^(needs Tor^)
+	echo tor                   Pack Tor version
+	echo plugins               Pack plugins
+)
+if "%Module%"=="git-log" (
+	echo Optional parameter
+	echo non-interactive       Non-interactive mode
+)
 echo.
 exit /B 2

build_scripts/Windows/build/git-log.bat

@@ -8,7 +8,7 @@ if errorlevel 1 goto error_env
 call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
-call "%~dp0env.bat" %*
+call "%~dp0env.bat" git-log %*
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 
@@ -88,6 +88,10 @@ echo %RsRef%>"%RsLastRefFile%"
 
 exit /B %ERRORLEVEL%
 
+:error
+%cecho% error "\n%~n0 failed\n"
+exit /B 1
+
 :error_env
 echo Failed to initialize environment.
 endlocal

build_scripts/Windows/build/pack.bat

@@ -11,7 +11,7 @@ call "%EnvPath%\env.bat"
 if errorlevel 1 goto error_env
 
 :: Initialize environment
-call "%~dp0env.bat" %*
+call "%~dp0env.bat" pack %*
 if errorlevel 2 exit /B 2
 if errorlevel 1 goto error_env
 
@@ -95,8 +95,23 @@ copy nul "%RsDeployPath%\portable" %Quite%
 
 echo copy binaries
 copy "%RsBuildPath%\retroshare-gui\src\%RsBuildConfig%\retroshare*.exe" "%RsDeployPath%" %Quite%
-copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
 if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite%
+if exist "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" copy "%RsBuildPath%\supportlibs\librnp\Build\src\lib\librnp.dll" "%RsDeployPath%" %Quite%
+
+if "%ParamService%"=="1" (
+	copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
+	if errorlevel 1 %cecho% error "Service not found"& goto error
+)
+
+if "%ParamFriendServer%"=="1" (
+	if "%ParamTor%"=="1" (
+		copy "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" "%RsDeployPath%" %Quite%
+		if errorlevel 1 %cecho% error "Friend Server not found"& goto error
+	) else (
+		%cecho% error "Friend Server needs Tor"
+		goto error
+	)
+)
 
 echo copy extensions
 if "%ParamPlugins%"=="1" (
@@ -132,8 +147,10 @@ if exist "%QtPath%\..\plugins\styles\qwindowsvistastyle.dll" (
 copy "%QtPath%\..\plugins\imageformats\*.dll" "%RsDeployPath%\imageformats" %Quite%
 del /Q "%RsDeployPath%\imageformats\*d?.dll" %Quite%
 
-echo copy qss
-xcopy /S "%SourcePath%\retroshare-gui\src\qss" "%RsDeployPath%\qss" %Quite%
+if exist "%SourcePath%\retroshare-gui\src\qss" (
+	echo copy qss
+	xcopy /S "%SourcePath%\retroshare-gui\src\qss" "%RsDeployPath%\qss" %Quite%
+)
 
 echo copy stylesheets
 xcopy /S "%SourcePath%\retroshare-gui\src\gui\qss\chat" "%RsDeployPath%\stylesheets" %Quite%
@@ -165,15 +182,17 @@ copy "%SourcePath%\libbitdht\src\bitdht\bdboot.txt" "%RsDeployPath%" %Quite%
 echo copy changelog.txt
 copy "%RsBuildPath%\changelog.txt" "%RsDeployPath%" %Quite%
 
-if exist "%SourcePath%\libresapi\src\webui" (
+if defined ParamWebui (
 	echo copy webui
 	mkdir "%RsDeployPath%\webui"
-	xcopy /S "%SourcePath%\libresapi\src\webui" "%RsDeployPath%\webui" %Quite%
+	xcopy /S "%RsWebuiBuildPath%" "%RsDeployPath%\webui" %Quite%
+	if errorlevel 1 %cecho% error "WebUi not found"& goto error
 )
 
 if "%ParamTor%"=="1" (
 	echo copy tor
-	echo n | copy /-y "%EnvTorPath%\Tor\*.*" "%RsDeployPath%" %Quite%
+	if not exist "%RsDeployPath%\tor" mkdir "%RsDeployPath%\tor"
+	echo n | copy /-y "%EnvTorPath%\Tor\*.*" "%RsDeployPath%\tor" %Quite%
 )
 
 rem pack files

build_scripts/Windows/env/env-msys2.bat

@@ -5,7 +5,6 @@
 call "%~dp0env.bat"
 if errorlevel 1 goto error_env
 
-rem openssl x86 doesn't compile with mingw64 x64
 :: Get gcc versions
 call "%ToolsPath%\get-gcc-version.bat" GCCVersion GCCArchitecture
 if "%GCCVersion%"=="" %cecho% error "Cannot get gcc version." & exit /B 1
@@ -23,11 +22,12 @@ if "%GCCArchitecture%"=="x64" (
 )
 
 set EnvMSYS2Path=%EnvRootPath%\msys2
+set EnvMSYS2BasePath=%EnvMSYS2Path%\msys64
 
 call "%~dp0tools\prepare-msys2.bat" %1
 if errorlevel 1 exit /B %ERRORLEVEL%
 
-set EnvMSYS2SH=%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\sh.exe
+set EnvMSYS2SH=%EnvMSYS2BasePath%\usr\bin\sh.exe
 if not exist "%EnvMSYS2SH%" if errorlevel 1 goto error_env
 
 set EnvMSYS2Cmd="%EnvMSYS2SH%" -lc

build_scripts/Windows/env/env.bat

@@ -28,6 +28,9 @@ if errorlevel 1 exit /B %ERRORLEVEL%
 set PATH=%EnvToolsPath%\MinGit\cmd;%EnvToolsPath%\cmake\bin;%PATH%
 set HOME=%EnvToolsPath%\MinGit\home
 
+:: Add Doxygen to PATH
+set PATH=%EnvToolsPath%\doxygen;%PATH%
+
 exit /B 0
 
 :error_env

build_scripts/Windows/env/tools/prepare-msys2.bat

@@ -16,7 +16,15 @@ if "%~1"=="clean" (
 	goto exit
 )
 
-if exist "%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\pacman.exe" (
+set MSYS2Version=20250622
+
+set MSYS2Install=msys2-base-x86_64-%MSYS2Version%.sfx.exe
+set MSYS2Url=https://github.com/msys2/msys2-installer/releases/download/%MSYS2Version:~0,4%-%MSYS2Version:~4,2%-%MSYS2Version:~6,2%/%MSYS2Install%
+set MSYS2UnpackPath=%EnvMSYS2Path%\msys64
+set CMakeInstall=cmake-3.31.3-windows-i386.zip
+set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.31.3/%CMakeInstall%
+
+if exist "%MSYS2UnpackPath%\usr\bin\pacman.exe" (
 	if "%~1"=="reinstall" (
 		choice /M "Found existing MSYS2 version. Do you want to proceed?"
 		if !ERRORLEVEL!==2 goto exit
@@ -25,18 +33,12 @@ if exist "%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\pacman.exe" (
 	)
 )
 
-set MSYS2Install=msys2-base-%MSYS2Architecture%-20190524.tar.xz
-set MSYS2Url=http://sourceforge.net/projects/msys2/files/Base/%MSYS2Architecture%/%MSYS2Install%/download
-set CMakeInstall=cmake-3.19.0-win32-x86.zip
-set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.19.0/%CMakeInstall%
-set CMakeUnpackPath=%EnvMSYS2Path%\msys%MSYS2Base%
-
-if exist "%EnvMSYS2Path%\msys%MSYS2Base%" (
+if exist "%MSYS2UnpackPath%" (
 	%cecho% info "Remove previous MSYS2 version"
-	call "%ToolsPath%\remove-dir.bat" "%EnvMSYS2Path%\msys%MSYS2Base%"
+	call "%ToolsPath%\remove-dir.bat" "%MSYS2UnpackPath%"
 )
 
-%cecho% info "Download installation files"
+%cecho% info "Download MSYS2 installation files"
 if not exist "%EnvDownloadPath%\%MSYS2Install%" call "%ToolsPath%\download-file.bat" "%MSYS2Url%" "%EnvDownloadPath%\%MSYS2Install%"
 if not exist "%EnvDownloadPath%\%MSYS2Install%" %cecho% error "Cannot download MSYS" & goto error
 
@@ -44,37 +46,32 @@ if not exist "%EnvDownloadPath%\%CMakeInstall%" call "%ToolsPath%\download-file.
 if not exist "%EnvDownloadPath%\%CMakeInstall%" %cecho% error "Cannot download CMake" & goto error
 
 %cecho% info "Unpack MSYS2"
-"%EnvSevenZipExe%" x -so "%EnvDownloadPath%\%MSYS2Install%" | "%EnvSevenZipExe%" x -y -si -ttar -o"%EnvMSYS2Path%"
+"%EnvDownloadPath%\%MSYS2Install%" -y -o"%EnvMSYS2Path%"
 
 %cecho% info "Unpack CMake"
-"%EnvSevenZipExe%" x -o"%CMakeUnpackPath%" "%EnvDownloadPath%\%CMakeInstall%"
+"%EnvSevenZipExe%" x -o"%MSYS2UnpackPath%" "%EnvDownloadPath%\%CMakeInstall%" -y -bso0
 
 %cecho% info "Install CMake"
 set CMakeVersion=
-for /D %%F in (%CMakeUnpackPath%\cmake*) do set CMakeVersion=%%~nxF
+for /D %%F in (%MSYS2UnpackPath%\cmake*) do set CMakeVersion=%%~nxF
 if "%CMakeVersion%"=="" %cecho% error "CMake version not found." & goto :exit
 %cecho% info "Found CMake version %CMakeVersion%"
 
 set FoundProfile=
-for /f "tokens=3" %%F in ('find /c /i "%CMakeVersion%" "%EnvMSYS2Path%\msys%MSYS2Base%\etc\profile"') do set FoundProfile=%%F
+for /f "tokens=3" %%F in ('find /c /i "%CMakeVersion%" "%MSYS2UnpackPath%\etc\profile"') do set FoundProfile=%%F
 
 if "%FoundProfile%"=="0" (
-	echo export PATH="${PATH}:/%CMakeVersion%/bin">>"%EnvMSYS2Path%\msys%MSYS2Base%\etc\profile"
+	echo export PATH="${PATH}:/%CMakeVersion%/bin">>"%MSYS2UnpackPath%\etc\profile"
 )
 
-set MSYS2SH=%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\sh
-
-%cecho% info "Update keyring"
-"%MSYS2SH%" -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
-"%MSYS2SH%" -lc "pacman --noconfirm -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
+set MSYS2SH=%MSYS2UnpackPath%\usr\bin\sh
 
 %cecho% info "Initialize MSYS2"
-"%MSYS2SH%" -lc "pacman -Sy"
-"%MSYS2SH%" -lc "pacman --noconfirm --needed -S bash pacman pacman-mirrors msys2-runtime"
+"%MSYS2SH%" -lc "yes | pacman --noconfirm -Syuu msys2-keyring"
+"%MSYS2SH%" -lc "pacman --noconfirm -Sy"
+"%MSYS2SH%" -lc "pacman --noconfirm -Su"
 
-call "%EnvMSYS2Path%\msys%MSYS2Base%\autorebase.bat"
-call "%EnvRootPath%\update-msys2.bat"
-call "%EnvRootPath%\update-msys2.bat"
+call "%MSYS2UnpackPath%\autorebase.bat"
 
 :exit
 endlocal

build_scripts/Windows/env/tools/prepare-tools.bat

@@ -16,9 +16,12 @@ set NSISInstallPath=%EnvToolsPath%\NSIS
 set MinGitInstall=MinGit-2.28.0-32-bit.zip
 set MinGitUrl=https://github.com/git-for-windows/git/releases/download/v2.28.0.windows.1/%MinGitInstall%
 set MinGitInstallPath=%EnvToolsPath%\MinGit
-set CMakeVersion=cmake-3.19.0-win32-x86
+set DoxygenInstall=doxygen-1.9.6.windows.x64.bin.zip
+set DoxygenUrl=https://github.com/doxygen/doxygen/releases/download/Release_1_9_6/%DoxygenInstall%
+set DoxygenInstallPath=%EnvToolsPath%\doxygen
+set CMakeVersion=cmake-3.31.3-windows-i386
 set CMakeInstall=%CMakeVersion%.zip
-set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.19.0/%CMakeInstall%
+set CMakeUrl=https://github.com/Kitware/CMake/releases/download/v3.31.3/%CMakeInstall%
 set CMakeInstallPath=%EnvToolsPath%\cmake
 set TorProjectUrl=https://www.torproject.org
 set TorDownloadIndexUrl=%TorProjectUrl%/download/tor
@@ -50,7 +53,7 @@ if not exist "%EnvToolsPath%\cecho.exe" (
 	if not exist "%EnvDownloadPath%\%cCEhoInstall%" echo Cannot download cecho installation& goto error
 
 	echo Unpack cecho
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CEchoInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CEchoInstall%" -y -bso0
 	copy "%EnvTempPath%\cecho.exe" "%EnvToolsPath%"
 
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
@@ -66,7 +69,7 @@ if not exist "%EnvToolsPath%\depends.exe" (
 	if not exist "%EnvDownloadPath%\%DependsInstall%" %cecho% error "Cannot download Dependendy Walker installation" & goto error
 
 	%cecho% info "Unpack Dependency Walker"
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%DependsInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%DependsInstall%" -y -bso0
 	copy "%EnvTempPath%\*" "%EnvToolsPath%"
 
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
@@ -82,7 +85,7 @@ if not exist "%EnvToolsPath%\cut.exe" (
 	if not exist "%EnvDownloadPath%\%UnixToolsInstall%" %cecho% error "Cannot download Unix Tools installation" & goto error
 
 	%cecho% info "Unpack Unix Tools"
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%" -y -bso0
 	copy "%EnvTempPath%\cut.exe" "%EnvToolsPath%"
 
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
@@ -98,7 +101,7 @@ if not exist "%EnvToolsPath%\sed.exe" (
 	if not exist "%EnvDownloadPath%\%UnixToolsInstall%" %cecho% error "Cannot download Unix Tools installation" & goto error
 
 	%cecho% info "Unpack Unix Tools"
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%UnixToolsInstall%" -y -bso0
 	copy "%EnvTempPath%\sed.exe" "%EnvToolsPath%"
 
 	call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
@@ -118,7 +121,7 @@ if not exist "%NSISInstallPath%\nsis.exe" (
 	if not exist "%EnvDownloadPath%\%NSISInstall%" %cecho% error "Cannot download NSIS installation" & goto error
 
 	%cecho% info "Unpack NSIS"
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%NSISInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%NSISInstall%" -y -bso0
 	if not exist "%NSISInstallPath%" mkdir "%NSISInstallPath%"
 	xcopy /s "%EnvTempPath%" "%NSISInstallPath%"
 
@@ -132,7 +135,20 @@ if not exist "%MinGitInstallPath%\cmd\git.exe" (
 	if not exist "%EnvDownloadPath%\%MinGitInstall%" %cecho% error "Cannot download MinGit installation" & goto error
 
 	%cecho% info "Unpack MinGit"
-	"%EnvSevenZipExe%" x -o"%MinGitInstallPath%" "%EnvDownloadPath%\%MinGitInstall%"
+	"%EnvSevenZipExe%" x -o"%MinGitInstallPath%" "%EnvDownloadPath%\%MinGitInstall%" -y -bso0
+)
+
+if not exist "%EnvDownloadPath%\%DoxygenInstall%" call "%ToolsPath%\remove-dir.bat" "%DoxygenInstallPath%"
+if not exist "%DoxygenInstallPath%\doxygen.exe" (
+	if exist "%DoxygenInstallPath%" call "%ToolsPath%\remove-dir.bat" "%DoxygenInstallPath%"
+
+	%cecho% info "Download Doxygen installation"
+
+	if not exist "%EnvDownloadPath%\%DoxygenInstall%" call "%ToolsPath%\download-file.bat" "%DoxygenUrl%" "%EnvDownloadPath%\%DoxygenInstall%"
+	if not exist "%EnvDownloadPath%\%DoxygenInstall%" %cecho% error "Cannot download doxygen installation" & goto error
+
+	%cecho% info "Unpack Doxygen"
+	"%EnvSevenZipExe%" x -o"%DoxygenInstallPath%" "%EnvDownloadPath%\%DoxygenInstall%" -y -bso0
 )
 
 if not exist "%EnvDownloadPath%\%CMakeInstall%" call "%ToolsPath%\remove-dir.bat" "%CMakeInstallPath%"
@@ -147,7 +163,7 @@ if not exist "%CMakeInstallPath%\bin\cmake.exe" (
 	if not exist "%EnvDownloadPath%\%CMakeInstall%" %cecho% error "Cannot download CMake installation" & goto error
 
 	%cecho% info "Unpack CMake"
-	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CMakeInstall%"
+	"%EnvSevenZipExe%" x -o"%EnvTempPath%" "%EnvDownloadPath%\%CMakeInstall%" -y -bso0
 
 	move "%EnvTempPath%\%CMakeVersion%" "%CMakeInstallPath%"
 
@@ -160,7 +176,7 @@ mkdir "%EnvTempPath%"
 call "%ToolsPath%\download-file.bat" "%TorDownloadIndexUrl%" "%EnvTempPath%\index.html"
 if not exist "%EnvTempPath%\index.html" %cecho% error "Cannot download Tor installation" & goto error
 
-for /F "tokens=1,2 delims= " %%A in ('%EnvSedExe% -r -n -e"s/.*href=\"^(.*^)^(tor-win32.*\.zip^)\".*/\2 \1\2/p" "%EnvTempPath%\index.html"') do set TorInstall=%%A& set TorDownloadUrl=%TorProjectUrl%%%B
+for /F "tokens=1,2 delims= " %%A in ('%EnvSedExe% -r -n -e"s/.*href=\"^(.*^)^(tor-.*windows-i686.*\.tar\.gz^)\".*/\2 \1\2/p" "%EnvTempPath%\index.html"') do set TorInstall=%%A& set TorDownloadUrl=%%B
 call "%ToolsPath%\remove-dir.bat" "%EnvTempPath%"
 if "%TorInstall%"=="" %cecho% error "Cannot download Tor installation" & goto error
 if "%TorDownloadUrl%"=="" %cecho% error "Cannot download Tor installation" & goto error
@@ -173,7 +189,7 @@ if not exist "%EnvTorPath%\Tor\tor.exe" (
 	if not exist "%EnvDownloadPath%\%TorInstall%" %cecho% error "Cannot download Tor installation" & goto error
 
 	%cecho% info "Unpack Tor"
-	"%EnvSevenZipExe%" x -o"%EnvTorPath%" "%EnvDownloadPath%\%TorInstall%"
+	"%EnvSevenZipExe%" x -so "%EnvDownloadPath%\%TorInstall%" | "%EnvSevenZipExe%" x -si -ttar -o"%EnvTorPath%" -y -bso0
 )
 
 :exit

build_scripts/Windows/env/tools/root/update-msys2.bat

@@ -2,18 +2,13 @@
 
 setlocal
 
-if exist "%~dp0msys2\msys32" call :update 32
-if exist "%~dp0msys2\msys64" call :update 64
+if not exist "%~dp0msys2\msys64" goto :EOF
 
-goto :EOF
+set MSYS2SH=%~dp0msys2\msys64\usr\bin\sh
 
-:update
-set MSYSSH=%~dp0msys2\msys%~1\usr\bin\sh
+echo Update MSYS2
+"%MSYS2SH%" -lc "yes | pacman --noconfirm -Syuu msys2-keyring"
+"%MSYS2SH%" -lc "pacman --noconfirm -Su"
 
-echo Update MSYS2 %~1
-"%MSYSSH%" -lc "pacman -Sy"
-"%MSYSSH%" -lc "pacman --noconfirm -Su"
-
-:exit
 endlocal
 goto :EOF

build_scripts/Windows/installer/lang/ca_ES.nsh

@@ -2,6 +2,12 @@
 !insertmacro LANG_STRING Section_Main_Desc "Instal·la ${APPNAME} i els components necessaris."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Pells"
 !insertmacro LANG_STRING Section_Data_Desc "Instal·la pells."
 !insertmacro LANG_STRING Section_Shortcuts "Icones d'accés directe"

build_scripts/Windows/installer/lang/de.nsh

@@ -2,6 +2,12 @@
 !insertmacro LANG_STRING Section_Main_Desc "Installiert ${APPNAME} und die benötigten Komponenten."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installiert Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installiert WebUI."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installiert Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installiert Friend Server."
 !insertmacro LANG_STRING Section_Data "Skins"
 !insertmacro LANG_STRING Section_Data_Desc "Skins installieren."
 !insertmacro LANG_STRING Section_Shortcuts "Verknüpfungssymbole"

build_scripts/Windows/installer/lang/en.nsh

@@ -2,6 +2,12 @@
 !insertmacro LANG_STRING Section_Main_Desc "Installs ${APPNAME} and required components."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Skins"
 !insertmacro LANG_STRING Section_Data_Desc "Installs skins."
 !insertmacro LANG_STRING Section_Shortcuts "Shortcut icons"

build_scripts/Windows/installer/lang/es.nsh

@@ -2,6 +2,12 @@
 !insertmacro LANG_STRING Section_Main_Desc "Instala ${APPNAME} y los componentes requeridos."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Coberturas (skins)"
 !insertmacro LANG_STRING Section_Data_Desc "Instalar coberturas"
 !insertmacro LANG_STRING Section_Shortcuts "Iconos de accesos directos"

build_scripts/Windows/installer/lang/fr.nsh

@@ -2,6 +2,12 @@
 !insertmacro LANG_STRING Section_Main_Desc "Installe ${APPNAME} et les composants requis."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Habillages"
 !insertmacro LANG_STRING Section_Data_Desc "Installe des habillages."
 !insertmacro LANG_STRING Section_Shortcuts "Icônes de raccourci"

build_scripts/Windows/installer/lang/pl.nsh

@@ -2,6 +2,12 @@
 !insertmacro LANG_STRING Section_Main_Desc "Instaluje ${APPNAME} oraz wymagane komponenty."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Skórki"
 !insertmacro LANG_STRING Section_Data_Desc "Instaluje skórki."
 !insertmacro LANG_STRING Section_Shortcuts "Ikony skrótów"

build_scripts/Windows/installer/lang/ru.nsh

@@ -2,6 +2,12 @@
 !insertmacro LANG_STRING Section_Main_Desc "Установка ${APPNAME} и необходимых компонентов."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Оболочки"
 !insertmacro LANG_STRING Section_Data_Desc "Установка оболочек."
 !insertmacro LANG_STRING Section_Shortcuts "Ярлыки"

build_scripts/Windows/installer/lang/tr.nsh

@@ -2,6 +2,12 @@
 !insertmacro LANG_STRING Section_Main_Desc "${APPNAME} ve gerekli bileşenleri kurar."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "Temalar"
 !insertmacro LANG_STRING Section_Data_Desc "Tema yükleyin."
 !insertmacro LANG_STRING Section_Shortcuts "Kısayol simgeleri"

build_scripts/Windows/installer/lang/ts/en.ts

@@ -22,6 +22,48 @@
     <translation type="unfinished"></translation> 
   </message> 
 </context> 
+<context> 
+  <name>Section_WebUI</name> 
+  <message> 
+    <source>WebUI</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
+<context> 
+  <name>Section_WebUI_Desc</name> 
+  <message> 
+    <source>Installs WebUI.</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
+<context> 
+  <name>Section_Service</name> 
+  <message> 
+    <source>Service</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
+<context> 
+  <name>Section_Service_Desc</name> 
+  <message> 
+    <source>Installs Service.</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
+<context> 
+  <name>Section_FriendServer</name> 
+  <message> 
+    <source>Friend Server</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
+<context> 
+  <name>Section_FriendServer_Desc</name> 
+  <message> 
+    <source>Installs Friend Server.</source> 
+    <translation type="unfinished"></translation> 
+  </message> 
+</context> 
 <context> 
   <name>Section_Data</name> 
   <message> 

build_scripts/Windows/installer/lang/zh_CN.nsh

@@ -2,6 +2,12 @@
 !insertmacro LANG_STRING Section_Main_Desc "Installs ${APPNAME} and required components."
 !insertmacro LANG_STRING Section_Tor "Tor"
 !insertmacro LANG_STRING Section_Tor_Desc "Installs Tor."
+!insertmacro LANG_STRING Section_WebUI "WebUI"
+!insertmacro LANG_STRING Section_WebUI_Desc "Installs WebUI."
+!insertmacro LANG_STRING Section_Service "Service"
+!insertmacro LANG_STRING Section_Service_Desc "Installs Service."
+!insertmacro LANG_STRING Section_FriendServer "Friend Server"
+!insertmacro LANG_STRING Section_FriendServer_Desc "Installs Friend Server."
 !insertmacro LANG_STRING Section_Data "皮肤"
 !insertmacro LANG_STRING Section_Data_Desc "安装皮肤"
 !insertmacro LANG_STRING Section_Shortcuts "快捷方式图标"

build_scripts/Windows/installer/retroshare-Qt5.nsi

@@ -60,6 +60,9 @@
 !define /date DATE "%Y%m%d"
 !endif
 
+# Service
+${!defineifexist} SERVICE_EXISTS "${RELEASEDIR}\retroshare-service\src\release\retroshare-service.exe"
+
 # Tor
 !ifdef TORDIR
 ${!defineifexist} TOR_EXISTS "${TORDIR}\tor.exe"
@@ -68,6 +71,20 @@ ${!defineifexist} TOR_EXISTS "${TORDIR}\tor.exe"
 !endif
 !endif
 
+# WebUI
+!ifdef WEBUIDIR
+${!defineifexist} WEBUI_EXISTS "${WEBUIDIR}\index.html"
+!ifndef WEBUI_EXISTS
+!error "WebUI files not found"
+!endif
+!endif
+
+# Friend Server
+!ifdef TOR_EXISTS
+# Add Friend Server with Tor only
+#${!defineifexist} FRIENDSERVER_EXISTS "${RELEASEDIR}\retroshare-friendserver\src\release\retroshare-friendserver.exe"
+!endif
+
 # Application name and version
 !define APPNAME "RetroShare"
 !define APPNAMEANDVERSION "${APPNAME} ${VERSION}"
@@ -193,7 +210,6 @@ Section $(Section_Main) Section_Main
   ; Main binaries
   SetOutPath "$INSTDIR"
   File "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe"
-  File "${RELEASEDIR}\retroshare-service\src\release\retroshare-service.exe"
   File /nonfatal "${RELEASEDIR}\libretroshare\src\lib\retroshare.dll"
 
   ; Qt binaries
@@ -231,6 +247,7 @@ Section $(Section_Main) Section_Main
 
   ; External binaries
   File "${EXTERNAL_LIB_DIR}\bin\miniupnpc.dll"
+  File "${RELEASEDIR}\supportlibs\librnp\Build\src\lib\librnp.dll"
   !if ${ARCHITECTURE} == "x86"
     File "${EXTERNAL_LIB_DIR}\bin\libcrypto-1_1.dll"
     File "${EXTERNAL_LIB_DIR}\bin\libssl-1_1.dll"
@@ -282,11 +299,35 @@ Section $(Section_Main) Section_Main
   File /r "${SOURCEDIR}\retroshare-gui\src\license\*.*"
 SectionEnd
 
+# Service
+!ifdef SERVICE_EXISTS
+  Section /o $(Section_Service) Section_Service
+    SetOutPath "$INSTDIR"
+  File "${RELEASEDIR}\retroshare-service\src\release\retroshare-service.exe"
+  SectionEnd
+!endif
+
+# Friend Server
+!ifdef FRIENDSERVER_EXISTS
+  Section /o $(Section_FriendServer) Section_FriendServer
+    SetOutPath "$INSTDIR"
+    File "${RELEASEDIR}\retroshare-friendserver\src\release\retroshare-friendserver.exe"
+  SectionEnd
+!endif
+
 # Tor
 !ifdef TOR_EXISTS
   Section /o $(Section_Tor) Section_Tor
-    SetOutPath "$INSTDIR"
-    File /r "${TORDIR}\*"
+    SetOutPath "$INSTDIR\tor"
+    File "${TORDIR}\*"
+  SectionEnd
+!endif
+
+# WebUI
+!ifdef WEBUI_EXISTS
+  Section /o $(Section_WebUI) Section_WebUI
+    SetOutPath "$INSTDIR\webui"
+    File /r "${WEBUIDIR}\*"
   SectionEnd
 !endif
 
@@ -334,7 +375,7 @@ Section $(Section_Data) Section_Data
 
   ; Stylesheets
   SetOutPath "$INSTDIR\qss"
-  File /r "${SOURCEDIR}\retroshare-gui\src\qss\*.*"
+  File /nonfatal /r "${SOURCEDIR}\retroshare-gui\src\qss\*.*"
 SectionEnd
 
 ;Section $(Section_Link) Section_Link
@@ -355,6 +396,22 @@ Section $(Section_StartMenu) Section_StartMenu
   CreateDirectory "$SMPROGRAMS\${APPNAME}"
   CreateShortCut "$SMPROGRAMS\${APPNAME}\$(Link_Uninstall).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
   CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\retroshare.exe" "" "$INSTDIR\retroshare.exe" 0
+
+!ifdef SERVICE_EXISTS
+  SectionGetFlags ${Section_Service} $0
+  IntOp $0 $0 & ${SF_SELECTED}
+  ${If} $0 == ${SF_SELECTED}
+    CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME} Service.lnk" "$INSTDIR\retroshare-service.exe" "" "$INSTDIR\retroshare-service.exe" 0
+  ${EndIf}
+!endif
+
+!ifdef FRIENDSERVER_EXISTS
+  SectionGetFlags ${Section_FriendServer} $0
+  IntOp $0 $0 & ${SF_SELECTED}
+  ${If} $0 == ${SF_SELECTED}
+    CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME} Friend Server.lnk" "$INSTDIR\retroshare-friendserver.exe" "" "$INSTDIR\retroshare-friendserver.exe" 0
+  ${EndIf}
+!endif
 SectionEnd
 
 Section $(Section_Desktop) Section_Desktop
@@ -407,6 +464,9 @@ SectionEnd
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${Section_Link} $(Section_Link_Desc)
   !insertmacro MUI_DESCRIPTION_TEXT ${Section_AutoStart} $(Section_AutoStart_Desc)
   !insertmacro MUI_DESCRIPTION_TEXT ${Section_Tor} $(Section_Tor_Desc)
+  !insertmacro MUI_DESCRIPTION_TEXT ${Section_WebUI} $(Section_WebUI_Desc)
+  !insertmacro MUI_DESCRIPTION_TEXT ${Section_Service} $(Section_Service_Desc)
+  !insertmacro MUI_DESCRIPTION_TEXT ${Section_FriendServer} $(Section_FriendServer_Desc)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 # Uninstall
@@ -461,6 +521,26 @@ Function .onInit
   !insertmacro MUI_LANGDLL_DISPLAY
 FunctionEnd
 
+!ifdef FRIENDSERVER_EXISTS
+Function .onSelChange
+  SectionGetFlags ${Section_FriendServer} $0
+  IntOp $0 $0 & ${SF_SELECTED}
+  ${If} $0 == ${SF_SELECTED}
+    # Activate Tor and set readonly
+    SectionGetFlags ${Section_Tor} $1
+    IntOp $1 $1 | ${SF_SELECTED}
+    IntOp $1 $1 | ${SF_RO}
+    SectionSetFlags ${Section_Tor} $1
+  ${Else}
+    # Remove readonly from Tor
+    SectionGetFlags ${Section_Tor} $1
+    IntOp $2 ${SF_RO} ~
+    IntOp $1 $1 & $2
+    SectionSetFlags ${Section_Tor} $1
+  ${EndIf}
+FunctionEnd
+!endif
+
 # Installation mode
 
 Function RequireAdmin

build_scripts/Windows/tools/generate-changelog.bat

@@ -18,6 +18,8 @@ copy nul %logfile% > nul
 
 pushd %~1
 
+set Percent=%%
+
 set last=HEAD
 for /f %%t in ('git tag --sort=-taggerdate --merged ^| findstr v') do (
 	echo generating changelog for !last!..%%t	
@@ -30,7 +32,7 @@ for /f %%t in ('git tag --sort=-taggerdate --merged ^| findstr v') do (
 	rem echo !last! ---^> %%t >> %logfile%
 	echo ----------------------------------------------- >> %logfile%
 	echo. >> %logfile%
-	git log %%t..!last! --no-merges "--pretty=format:%%h %%ai %%<(10,trunc)%%an %%s" >> %logfile%
+	git log %%t..!last! --no-merges "--pretty=format:!Percent!h !Percent!ai !Percent!<(10,trunc)!Percent!an !Percent!s" >> %logfile%
 	echo. >> %logfile%
 	echo. >> %logfile%
 	set last=%%t

build_scripts/git_tag_cleaner.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+function git_del_tag()
+{
+	mTag=$1
+
+	for mRemote in $(git remote); do
+		echo "Attempting tag $mTag removal from remote $mRemote"
+		GIT_TERMINAL_PROMPT=0 git push $mRemote :$mTag || true
+	done
+	git tag --delete $mTag
+}
+
+for mModule in . build_scripts/OBS/ libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ ; do
+	pushd $mModule
+	git_del_tag v0.6.7a
+	git tag --list | grep untagged | while read mTag; do git_del_tag $mTag ; done
+	popd
+done
+

data/retroshare.desktop

@@ -7,5 +7,5 @@ Exec=/usr/bin/retroshare %U
 Icon=/usr/share/pixmaps/retroshare.xpm
 Terminal=false
 Type=Application
-Categories=Application;Network;P2P;Feed;Chat;InstantMessaging
+Categories=Network;Email;InstantMessaging;Chat;Feed;FileTransfer;P2P
 MimeType=x-scheme-handler/retroshare;

jsonapi-generator/README.adoc

@@ -1,447 +1,10 @@
-// SPDX-FileCopyrightText: (C) 2004-2019 Retroshare Team <contact@retroshare.cc>
+// SPDX-FileCopyrightText: (C) 2021 Retroshare Team <contact@retroshare.cc>
 // SPDX-License-Identifier: CC0-1.0
 
-RetroShare JSON API
-===================
+= Moved
 
-:Cxx: C&#43;&#43;
+JSON API generator is now part of `libretroshare` look under `src/jsonapi/`
+directory in `libretroshare` repository.
 
-== How to use RetroShare JSON API
-
-Look for methods marked with +@jsonapi+ doxygen custom command into
-+libretroshare/src/retroshare+. The method path is composed by service instance
-pointer name like +rsGxsChannels+ for +RsGxsChannels+, and the method name like
-+createGroup+ and pass the input paramethers as a JSON object.
-
-.Service instance pointer in rsgxschannels.h
-[source,cpp]
---------------------------------------------------------------------------------
-/**
- * Pointer to global instance of RsGxsChannels service implementation
- * @jsonapi{development}
- */
-extern RsGxsChannels* rsGxsChannels;
---------------------------------------------------------------------------------
-
-.Method declaration in rsgxschannels.h
-[source,cpp]
---------------------------------------------------------------------------------
-	/**
-	 * @brief Request channel creation.
-	 * The action is performed asyncronously, so it could fail in a subsequent
-	 * phase even after returning true.
-	 * @jsonapi{development}
-	 * @param[out] token Storage for RsTokenService token to track request
-	 * status.
-	 * @param[in] group Channel data (name, description...)
-	 * @return false on error, true otherwise
-	 */
-	virtual bool createGroup(uint32_t& token, RsGxsChannelGroup& group) = 0;
---------------------------------------------------------------------------------
-
-.paramethers.json
-[source,json]
---------------------------------------------------------------------------------
-{
-    "group":{
-        "mMeta":{
-            "mGroupName":"JSON test group",
-            "mGroupFlags":4,
-            "mSignFlags":520
-        },
-        "mDescription":"JSON test group description"
-    },
-    "caller_data":"Here can go any kind of JSON data (even objects) that the caller want to get back together with the response"
-}
---------------------------------------------------------------------------------
-
-.Calling the JSON API with curl on the terminal
-[source,bash]
---------------------------------------------------------------------------------
-curl -u $API_USER --data @paramethers.json http://127.0.0.1:9092/rsGxsChannels/createGroup
---------------------------------------------------------------------------------
-
-.JSON API call result
-[source,json]
---------------------------------------------------------------------------------
-{
-    "caller_data": "Here can go any kind of JSON data (even objects) that the caller want to get back together with the response",
-    "retval": true,
-    "token": 3
-}
---------------------------------------------------------------------------------
-
-Even if it is less efficient because of URL encoding HTTP +GET+ method is
-supported too, so in cases where the client cannot use +POST+ she can still use
-+GET+ taking care of encoding the JSON data. With +curl+ this can be done at
-least in two different ways.
-
-.Calling the JSON API with GET method with curl on the terminal
-[source,bash]
---------------------------------------------------------------------------------
-curl -u $API_USER --get --data-urlencode jsonData@paramethers.json \
-	http://127.0.0.1:9092/rsGxsChannels/createGroup
---------------------------------------------------------------------------------
-
-Letting +curl+ do the encoding is much more elegant but it is semantically
-equivalent to the following.
-
-.Calling the JSON API with GET method and pre-encoded data with curl on the terminal
---------------------------------------------------------------------------------
-curl -u $API_USER http://127.0.0.1:9092/rsGxsChannels/createGroup?jsonData=%7B%0A%20%20%20%20%22group%22%3A%7B%0A%20%20%20%20%20%20%20%20%22mMeta%22%3A%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%22mGroupName%22%3A%22JSON%20test%20group%22%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%22mGroupFlags%22%3A4%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20%22mSignFlags%22%3A520%0A%20%20%20%20%20%20%20%20%7D%2C%0A%20%20%20%20%20%20%20%20%22mDescription%22%3A%22JSON%20test%20group%20description%22%0A%20%20%20%20%7D%2C%0A%20%20%20%20%22caller_data%22%3A%22Here%20can%20go%20any%20kind%20of%20JSON%20data%20%28even%20objects%29%20that%20the%20caller%20want%20to%20get%20back%20together%20with%20the%20response%22%0A%7D
---------------------------------------------------------------------------------
-
-Note that using +GET+ method +?jsonData=+ and then the JSON data URL encoded are
-added after the path in the HTTP request.
-
-
-== JSON API authentication
-
-Most of JSON API methods require authentication as they give access to
-RetroShare user data, and we don't want any application running on the system
-eventually by other users be able to access private data indiscriminately.
-JSON API support HTTP Basic as authentication scheme, this is enough as JSON API
-server is intented for usage on the same system (127.0.0.1) not over an
-untrusted network.
-If you need to use JSON API over an untrusted network consider using a reverse
-proxy with HTTPS such as NGINX in front of JSON API server.
-If RetroShare login has been effectuated through the JSON API you can use your
-location SSLID as username and your PGP password as credential for the JSON API,
-but we suggests you use specific meaningful and human readable credentials for
-each JSON API client so the human user can have better control over which client
-can access the JSON API.
-
-.NewToken.json
-[source,json]
---------------------------------------------------------------------------------
-{
-	"token": "myNewUser:myNewPassword"
-}
---------------------------------------------------------------------------------
-
-.An authenticated client can authorize new tokens like this
---------------------------------------------------------------------------------
-curl -u $API_USER --data @NewToken.json http://127.0.0.1:9092/jsonApiServer/authorizeToken
---------------------------------------------------------------------------------
-
-.An unauthenticated JSON API client can request access with
---------------------------------------------------------------------------------
-curl --data @NewToken.json http://127.0.0.1:9092/jsonApiServer/requestNewTokenAutorization
---------------------------------------------------------------------------------
-
-When an unauthenticated client request his token to be authorized, JSON API
-server will try to ask confirmation to the human user if possible through
-+mNewAccessRequestCallback+, if it is not possible or the user didn't authorized
-the token +false+ is returned.
-
-
-== Offer new RetroShare services through JSON API
-
-To offer a retroshare service through the JSON API, first of all one need find
-the global pointer to the service instance and document it in doxygen syntax,
-plus marking with the custom doxygen command +@jsonapi{RS_VERSION}+ where
-+RS_VERSION+ is the retroshare version in which this service became available
-with the current semantic (major changes to the service semantic, changes the
-meaning of the service itself, so the version should be updated in the
-documentation in that case).
-
-.Service instance pointer in rsgxschannels.h
-[source,cpp]
---------------------------------------------------------------------------------
-/**
- * Pointer to global instance of RsGxsChannels service implementation
- * @jsonapi{development}
- */
-extern RsGxsChannels* rsGxsChannels;
---------------------------------------------------------------------------------
-
-
-Once the service instance itself is known to the JSON API you need to document
-in doxygen syntax and mark with the custom doxygen command
-+@jsonapi{RS_VERSION}+ the methods of the service that you want to make
-available through JSON API.
-
-.Offering RsGxsChannels::getChannelDownloadDirectory in rsgxschannels.h
-[source,cpp]
---------------------------------------------------------------------------------
-	/**
-	 * Get download directory for the given channel
-	 * @jsonapi{development}
-	 * @param[in] channelId id of the channel
-	 * @param[out] directory reference to string where to store the path
-	 * @return false on error, true otherwise
-	 */
-	virtual bool getChannelDownloadDirectory( const RsGxsGroupId& channelId,
-	                                          std::string& directory ) = 0;
---------------------------------------------------------------------------------
-
-For each paramether you must specify if it is used as input +@param[in]+ as
-output +@param[out]+ or both +@param[inout]+. Paramethers and return value
-types must be of a type supported by +RsTypeSerializer+ which already support
-most basic types (+bool+, +std::string+...), +RsSerializable+ and containers of
-them like +std::vector<std::string>+. Paramethers passed by value and by
-reference of those types are both supported, while passing by pointer is not
-supported. If your paramether or return +class+/+struct+ type is not supported
-yet by +RsTypeSerializer+ most convenient approach is to make it derive from
-+RsSerializable+ and implement +serial_process+ method like I did with
-+RsGxsChannelGroup+.
-
-.Deriving RsGxsChannelGroup from RsSerializable in rsgxschannels.h
-[source,cpp]
---------------------------------------------------------------------------------
-struct RsGxsChannelGroup : RsSerializable
-{
-	RsGroupMetaData mMeta;
-	std::string mDescription;
-	RsGxsImage mImage;
-
-	bool mAutoDownload;
-
-	/// @see RsSerializable
-	virtual void serial_process( RsGenericSerializer::SerializeJob j,
-	                             RsGenericSerializer::SerializeContext& ctx )
-	{
-		RS_SERIAL_PROCESS(mMeta);
-		RS_SERIAL_PROCESS(mDescription);
-		RS_SERIAL_PROCESS(mImage);
-		RS_SERIAL_PROCESS(mAutoDownload);
-	}
-};
---------------------------------------------------------------------------------
-
-You can do the same recursively for any member of your +struct+ that is not yet
-supported by +RsTypeSerializer+.
-
-Some Retroshare {Cxx} API functions are asyncronous, historically RetroShare
-didn't follow a policy on how to expose asyncronous API so differents services
-and some times even differents method of the same service follow differents
-asyncronous patterns, thus making automatic generation of JSON API wrappers for
-those methods impractical. Instead of dealing with all those differents patterns
-I have chosed to support only one new pattern taking advantage of modern {Cxx}11
-and restbed features. On the {Cxx}11 side lambdas and +std::function+s are used,
-on the restbed side Server Side Events are used to send asyncronous results.
-
-Lets see an example so it will be much esier to understand.
-
-.RsGxsChannels::turtleSearchRequest asyncronous API
-[source,cpp]
---------------------------------------------------------------------------------
-	/**
-	 * @brief Request remote channels search
-	 * @jsonapi{development}
-	 * @param[in] matchString string to look for in the search
-	 * @param multiCallback function that will be called each time a search
-	 * result is received
-	 * @param[in] maxWait maximum wait time in seconds for search results
-	 * @return false on error, true otherwise
-	 */
-	virtual bool turtleSearchRequest(
-	        const std::string& matchString,
-	        const std::function<void (const RsGxsGroupSummary& result)>& multiCallback,
-	        std::time_t maxWait = 300 ) = 0;
---------------------------------------------------------------------------------
-
-+RsGxsChannels::turtleSearchRequest(...)+ is an asyncronous method because it
-send a channel search request on turtle network and then everytime a result is
-received from the network +multiCallback+ is called and the result is passed as
-parameter. To be supported by the automatic JSON API wrappers generator an
-asyncronous method need a parameter of type +std::function<void (...)>+ called
-+callback+ if the callback will be called only once or +multiCallback+ if the
-callback is expected to be called more then once like in this case.
-A second mandatory parameter is +maxWait+ of type +std::time_t+ it indicates the
-maximum amount of time in seconds for which the caller is willing to wait for
-results, in case the timeout is reached the callback will not be called anymore.
-
-[IMPORTANT]
-================================================================================
-+callback+ and +multiCallback+ parameters documentation must *not* specify
-+[in]+, +[out]+, +[inout]+, in Doxygen documentation as this would fool the
-automatic wrapper generator, and ultimately break the compilation.
-================================================================================
-
-.RsFiles::turtleSearchRequest asyncronous JSON API usage example
-[source,bash]
---------------------------------------------------------------------------------
-$ cat turtle_search.json
-{
-    "matchString":"linux"
-}
-$ curl --data @turtle_search.json http://127.0.0.1:9092/rsFiles/turtleSearchRequest
-data: {"retval":true}
-
-data: {"results":[{"size":157631,"hash":"69709b4d01025584a8def5cd78ebbd1a3cf3fd05","name":"kill_bill_linux_1024x768.jpg"},{"size":192560,"hash":"000000000000000000009a93e5be8486c496f46c","name":"coffee_box_linux2.jpg"},{"size":455087,"hash":"9a93e5be8486c496f46c00000000000000000000","name":"Linux.png"},{"size":182004,"hash":"e8845280912ebf3779e400000000000000000000","name":"Linux_2_6.png"}]}
-
-data: {"results":[{"size":668,"hash":"e8845280912ebf3779e400000000000000000000","name":"linux.png"},{"size":70,"hash":"e8845280912ebf3779e400000000000000000000","name":"kali-linux-2016.2-amd64.txt.sha1sum"},{"size":3076767744,"hash":"e8845280912ebf3779e400000000000000000000","name":"kali-linux-2016.2-amd64.iso"},{"size":2780872,"hash":"e8845280912ebf3779e400000000000000000000","name":"openwrt-ar71xx-generic-vmlinux.bin"},{"size":917504,"hash":"e8845280912ebf3779e400000000000000000000","name":"openwrt-ar71xx-generic-vmlinux.lzma"},{"size":2278404096,"hash":"e8845280912ebf3779e400000000000000000000","name":"gentoo-linux-livedvd-amd64-multilib-20160704.iso"},{"size":151770333,"hash":"e8845280912ebf3779e400000000000000000000","name":"flashtool-0.9.23.0-linux.tar.7z"},{"size":2847372,"hash":"e8845280912ebf3779e400000000000000000000","name":"openwrt-ar71xx-generic-vmlinux.elf"},{"size":1310720,"hash":"e8845280912ebf3779e400000000000000000000","name":"openwrt-ar71xx-generic-vmlinux.gz"},{"size":987809,"hash":"e8845280912ebf3779e400000000000000000000","name":"openwrt-ar71xx-generic-vmlinux-lzma.elf"}]}
-
---------------------------------------------------------------------------------
-
-By default JSON API methods requires client authentication and their wrappers
-are automatically generated by +json-api-generator+.
-In some cases methods need do be accessible without authentication such as
-+rsLoginHelper/getLocations+ so in the doxygen documentaion they have the custom
-command +@jsonapi{RS_VERSION,unauthenticated}+.
-Other methods such as +/rsControl/rsGlobalShutDown+ need special care so they
-are marked with the custom doxygen command +@jsonapi{RS_VERSION,manualwrapper}+
-and their wrappers are not automatically generated but written manually into
-+JsonApiServer::JsonApiServer(...)+.
-
-== Quirks
-
-=== 64 bits integers handling
-
-While JSON doesn't have problems representing 64 bits integers JavaScript, Dart
-and other languages are not capable to handle those numbers natively.
-To overcome this limitation JSON API output 64 bit integers as an object with
-two keys, one as proper integer and one as string representation.
-
-.JSON API 64 bit integer output example
-[source,json]
---------------------------------------------------------------------------------
-"lobby_id": { "xint64": 6215642878098695544, "xstr64": "6215642878098695544" }
---------------------------------------------------------------------------------
-
-So from languages that have proper 64bit integers support like Python or C++ one
-better read from `xint64` which is represented as a JSON integer, from languages
-where there is no proper 64bit integers support like JavaScript one can read from
-`xstr64` which is represented as JSON string (note that the first is not wrapped
-in "" while the latter is).
-
-When one input a 64bit integer into the JSON API it first try to parse it as if
-it was sent the old way for retrocompatibility.
-
-.JSON API 64 bit integer deprecated format input example
-[source,json]
---------------------------------------------------------------------------------
-"lobby_id":6215642878098695544
---------------------------------------------------------------------------------
-
-This way is *DEPRECATED* and may disappear in the future, it is TEMPORALLY kept
-only for retrocompatibiliy with old clients.
-
-If retrocompatible parsing attempt fail then it try to parse with the new way
-with proper JSON integer format.
-
-.JSON API 64 bit integer new proper integer format input example
-[source,json]
---------------------------------------------------------------------------------
-lobby_id": { "xint64": 6215642878098695544 }
---------------------------------------------------------------------------------
-
-If this fails then it try to parse with the new way with JSON string format.
-
-.JSON API 64 bit integer new string format input example
-[source,json]
---------------------------------------------------------------------------------
-"lobby_id": { "xstr64": "6215642878098695544" }
---------------------------------------------------------------------------------
-
-[WARNING]
-================================================================================
-Clients written in languages without proper 64bit integers support must
-use *ONLY* the string format otherwise they will send approximated values and
-get unexpected results from the JSON API, because parsing will success but the
-value will not be exactly the one you believe you sent.
-================================================================================
-
-
-== A bit of history
-
-=== First writings about this
-
-The previous attempt of exposing a RetroShare JSON API is called +libresapi+ and
-unfortunatley it requires a bunch of boilerplate code when we want to expose
-something present in the {Cxx} API in the JSON API.
-
-As an example here you can see the libresapi that exposes part of the retroshare
-chat {Cxx} API and lot of boilerplate code just to convert {Cxx} objects to JSON
-
-https://github.com/RetroShare/RetroShare/blob/v0.6.4/libresapi/src/api/ChatHandler.cpp#L44
-
-To avoid the {Cxx} to JSON and back conversion boilerplate code I have worked out
-an extension to our {Cxx} serialization code so it is capable to serialize and
-deserialize to JSON you can see it in this pull request
-
-https://github.com/RetroShare/RetroShare/pull/1155
-
-So first step toward having a good API is to take advantage of the fact that RS
-is now capable of converting C++ objects from and to JSON.
-
-The current API is accessible via HTTP and unix socket, there is no
-authentication in both of them, so anyone having access to the HTTP server or to
-the unix socket can access the API without extra restrictions.
-Expecially for the HTTP API this is a big risk because also if the http server
-listen on 127.0.0.1 every application on the machine (even rogue javascript
-running on your web browser) can access that and for example on android it is
-not safe at all (because of that I implemented the unix socket access so at
-least in android API was reasonably safe) because of this.
-
-A second step to improve the API would be to implement some kind of API
-authentication mechanism (it would be nice that the mechanism is handled at API
-level and not at transport level so we can use it for any API trasport not just
-HTTP for example)
-
-The HTTP server used by libresapi is libmicrohttpd server that is very minimal,
-it doesn't provide HTTPS nor modern HTTP goodies, like server notifications,
-websockets etc. because the lack of support we have a token polling mechanism in
-libresapi to avoid polling for every thing but it is still ugly, so if we can
-completely get rid of polling in the API that would be really nice.
-I have done a crawl to look for a replacement and briefly looked at
-
-- https://www.gnu.org/software/libmicrohttpd/
-- http://wolkykim.github.io/libasyncd/
-- https://github.com/corvusoft/restbed
-- https://code.facebook.com/posts/1503205539947302/introducing-proxygen-facebook-s-c-http-framework/
-- https://github.com/cmouse/yahttp
-
-taking in account a few metrics like modern HTTP goodies support, license,
-platform support, external dependencies and documentation it seemed to me that
-restbed is the more appropriate.
-
-Another source of boilerplate code into libresapi is the mapping between JSON
-API requests and C++ API methods as an example you can look at this
-
-https://github.com/RetroShare/RetroShare/blob/v0.6.4/libresapi/src/api/ChatHandler.cpp#L158
-
-and this
-
-https://github.com/RetroShare/RetroShare/blob/v0.6.4/libresapi/src/api/ApiServer.cpp#L253
-
-The abstract logic of this thing is, when libreasapi get a request like
-+/chat/initiate_distant_chat+ then call
-+ChatHandler::handleInitiateDistantChatConnexion+ which in turn is just a
-wrapper of +RsMsgs::initiateDistantChatConnexion+ all this process is basically
-implemented as boilerplate code and would be unnecessary in a smarter design of
-the API because almost all the information needed is already present in the
-C++ API +libretroshare/src/retroshare+.
-
-So a third step to improve the JSON API would be to remove this source of
-boilerplate code by automatizing the mapping between C++ and JSON API call.
-
-This may result a little tricky as language parsing or other adevanced things
-may be required.
-
-Hope this dive is useful for you +
-Cheers +
-G10h4ck
-
-=== Second writings about this
-
-I have been investigating a bit more about:
-[verse, G10h4ck]
-________________________________________________________________________________
-So a third step to improve the JSON API would be to remove this source of
-boilerplate code by automatizing the mapping between C++ and JSON API call
-________________________________________________________________________________
-
-After spending some hours investigating this topic the most reasonable approach
-seems to:
-
-1. Properly document headers in +libretroshare/src/retroshare/+ in doxygen syntax
-specifying wihich params are input and/or output (doxygen sysntax for this is
-+@param[in/out/inout]+) this will be the API documentation too.
-
-2. At compile time use doxygen to generate XML description of the headers and use
-the XML to generate the JSON api server stub.
-http://www.stack.nl/~dimitri/doxygen/manual/customize.html#xmlgenerator
-
-3. Enjoy
+This directory and all it's content is kept as is only for retro-compatibility
+with the old, deprecated `qmake` build system.

jsonapi-generator/src/async-method-wrapper-template.cpp.tmpl

@@ -1,80 +0,0 @@
-/*******************************************************************************
- * RetroShare JSON API                                                         *
- *                                                                             *
- * Copyright (C) 2018-2019  Gioacchino Mazzurco <gio@eigenlab.org>             *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero General Public License version 3 as    *
- * published by the Free Software Foundation.                                  *
- *                                                                             *
- * 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-registerHandler( "$%apiPath%$",
-                 [this](const std::shared_ptr<rb::Session> session)
-{
-	const std::multimap<std::string, std::string> headers
-	{
-		{ "Connection", "keep-alive" },
-		{ "Content-Type", "text/event-stream" }
-	};
-	session->yield(rb::OK, headers);
-
-	size_t reqSize = session->get_request()->get_header("Content-Length", 0);
-	session->fetch( reqSize, [this](
-					const std::shared_ptr<rb::Session> session,
-					const rb::Bytes& body )
-	{
-		INITIALIZE_API_CALL_JSON_CONTEXT;
-
-		if( !checkRsServicePtrReady(
-		            $%instanceName%$, "$%instanceName%$", cAns, session ) )
-			return;
-
-$%paramsDeclaration%$
-
-$%inputParamsDeserialization%$
-
-		const std::weak_ptr<rb::Service> weakService(mService);
-		const std::weak_ptr<rb::Session> weakSession(session);
-		$%callbackName%$ = [weakService, weakSession]($%callbackParams%$)
-		{
-			auto session = weakSession.lock();
-			if(!session || session->is_closed()) return;
-
-			auto lService = weakService.lock();
-			if(!lService || lService->is_down()) return;
-
-$%callbackParamsSerialization%$
-
-			std::stringstream sStream;
-			sStream << "data: " << compactJSON << ctx.mJson << "\n\n";
-			const std::string message = sStream.str();
-
-			lService->schedule( [weakSession, message]()
-			{
-				auto session = weakSession.lock();
-				if(!session || session->is_closed()) return;
-				session->yield(message);
-				$%sessionEarlyClose%$
-			} );
-		};
-
-$%functionCall%$
-
-$%outputParamsSerialization%$
-
-		// return them to the API caller
-		std::stringstream message;
-		message << "data: " << compactJSON << cAns.mJson << "\n\n";
-		session->yield(message.str());
-		$%sessionDelayedClose%$
-	} );
-}, $%requiresAuth%$ );

jsonapi-generator/src/async-method-wrapper-template.cpp.tmpl

@@ -0,0 +1 @@
+../../libretroshare/src/jsonapi/async-method-wrapper-template.cpp.tmpl

jsonapi-generator/src/jsonapi-generator-doxygen.conf

@@ -1,230 +0,0 @@
-DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = "libretroshare"
-
-ALIASES += jsonapi{1}="\xmlonly<jsonapi minversion=\"\1\"/>\endxmlonly"
-ALIASES += jsonapi{2}="\xmlonly<jsonapi minversion=\"\1\" access=\"\2\"/>\endxmlonly"
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = YES
-
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
-# Note: If this tag is empty the current directory is searched.
-
-#INPUT                  =
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
-#
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
-
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.java \
-                         *.ii \
-                         *.ixx \
-                         *.ipp \
-                         *.i++ \
-                         *.inl \
-                         *.idl \
-                         *.ddl \
-                         *.odl \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.h++ \
-                         *.cs \
-                         *.d \
-                         *.php \
-                         *.php4 \
-                         *.php5 \
-                         *.phtml \
-                         *.inc \
-                         *.m \
-                         *.markdown \
-                         *.md \
-                         *.mm \
-                         *.dox \
-                         *.py \
-                         *.pyw \
-                         *.f90 \
-                         *.f95 \
-                         *.f03 \
-                         *.f08 \
-                         *.f \
-                         *.for \
-                         *.tcl \
-                         *.vhd \
-                         *.vhdl \
-                         *.ucf \
-                         *.qsf
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = NO
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = YES
-
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-

jsonapi-generator/src/jsonapi-generator-doxygen.conf

@@ -0,0 +1 @@
+../../libretroshare/src/jsonapi/jsonapi-generator-doxygen.conf

jsonapi-generator/src/method-wrapper-template.cpp.tmpl

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * RetroShare JSON API                                                         *
- *                                                                             *
- * Copyright (C) 2018-2019  Gioacchino Mazzurco <gio@eigenlab.org>             *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-registerHandler( "$%apiPath%$",
-                 [](const std::shared_ptr<rb::Session> session)
-{
-	size_t reqSize = session->get_request()->get_header("Content-Length", 0);
-	session->fetch( reqSize, [](
-	                const std::shared_ptr<rb::Session> session,
-	                const rb::Bytes& body )
-	{
-		INITIALIZE_API_CALL_JSON_CONTEXT;
-
-		if( !checkRsServicePtrReady(
-		            $%instanceName%$, "$%instanceName%$", cAns, session ) )
-			return;
-
-$%paramsDeclaration%$
-
-		// deserialize input parameters from JSON
-$%inputParamsDeserialization%$
-
-		// call retroshare C++ API
-$%functionCall%$
-
-		// serialize out parameters and return value to JSON
-$%outputParamsSerialization%$
-
-		// return them to the API caller
-		DEFAULT_API_CALL_JSON_RETURN(rb::OK);
-	} );
-}, $%requiresAuth%$ );
-

jsonapi-generator/src/method-wrapper-template.cpp.tmpl

@@ -0,0 +1 @@
+../../libretroshare/src/jsonapi/method-wrapper-template.cpp.tmpl

libbitdht

@@ -0,0 +1 @@
+Subproject commit 2ddc86fb575a61170f4c06a00152e3e7dc74c8f4

libbitdht/src/README.txt

@@ -1,25 +0,0 @@
-# SPDX-FileCopyrightText: (C) 2004-2019 Retroshare Team <contact@retroshare.cc>
-# SPDX-License-Identifier: CC0-1.0
-
-What's in the Package
----------------------------------------------------------------
-bitdht          - base BitDHT Code.
-util		- generic utils for networking and threading.
-udp		- UDP interfacing code.
-lib             - Where the library is created.
-tests           - basic unit tests.
-example		- example code of how to use libbitdht.
-libbitdht.pro	- build script for Qt's qmake.
-README.txt	- this file.
-
-
-HOWTO libbitdht.
-----------------------------------------------
-This version is build using Qt's qmake system.
-
-1) Install Qt's qmake system:  libqt-dev
-2) type ./qmake
-3) type ./make
-4) check out the example and tests to learn how to interface with libbitdht.
-
-

libbitdht/src/bitdht/bdaccount.cc

@@ -1,133 +0,0 @@
-/*******************************************************************************
- * bitdht/bdaccount.cc                                                         *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2011 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#include "bitdht/bdaccount.h"
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <iostream>
-#include <iomanip>
-
-
-#define LPF_FACTOR  (0.90)
-
-bdAccount::bdAccount()
-	:mNoStats(BDACCOUNT_NUM_ENTRIES), 
-	mCountersOut(BDACCOUNT_NUM_ENTRIES), mCountersRecv(BDACCOUNT_NUM_ENTRIES), 
-	mLpfOut(BDACCOUNT_NUM_ENTRIES), mLpfRecv(BDACCOUNT_NUM_ENTRIES), 
-	mLabel(BDACCOUNT_NUM_ENTRIES)
-{
-
-	mLabel[BDACCOUNT_MSG_OUTOFDATEPING] 	=	 "OUTOFDATEPING  ";
-	mLabel[BDACCOUNT_MSG_PING] 		=	 "PING           ";
-	mLabel[BDACCOUNT_MSG_PONG] 		=	 "PONG           ";
-	mLabel[BDACCOUNT_MSG_QUERYNODE] 	=	 "QUERYNODE      ";
-	mLabel[BDACCOUNT_MSG_QUERYHASH] 	=	 "QUERYHASH      ";
-	mLabel[BDACCOUNT_MSG_REPLYFINDNODE] 	=	 "REPLYFINDNODE  ";
-	mLabel[BDACCOUNT_MSG_REPLYQUERYHASH] 	=	 "REPLYQUERYHASH ";
-
-	mLabel[BDACCOUNT_MSG_POSTHASH] 		=	 "POSTHASH       ";
-	mLabel[BDACCOUNT_MSG_REPLYPOSTHASH] 	=	 "REPLYPOSTHASH  ";
-
-	mLabel[BDACCOUNT_MSG_CONNECTREQUEST] 	=	 "CONNECTREQUEST ";
-	mLabel[BDACCOUNT_MSG_CONNECTREPLY] 	=	 "CONNECTREPLY   ";
-	mLabel[BDACCOUNT_MSG_CONNECTSTART] 	=	 "CONNECTSTART   ";
-	mLabel[BDACCOUNT_MSG_CONNECTACK] 	=	 "CONNECTACK     ";
-	
-	resetStats();
-}
-
-
-void bdAccount::incCounter(uint32_t idx, bool out)
-{
-	if ((signed) idx > mNoStats-1)
-	{
-		std::cerr << "bdAccount::incCounter() Invalid Index";
-		std::cerr << std::endl;
-	}
-
-	if (out)
-	{
-		mCountersOut[idx]++;
-	}
-	else
-	{
-		mCountersRecv[idx]++;
-	}
-	return;
-}
-
-
-void bdAccount::doStats()
-{
-	int i;
-	for(i = 0; i < mNoStats; i++)
-	{
-		mLpfOut[i] *= (LPF_FACTOR) ;
-		mLpfOut[i] += (1.0 - LPF_FACTOR) * mCountersOut[i];
-
-		mLpfRecv[i] *= (LPF_FACTOR) ;
-		mLpfRecv[i] += (1.0 - LPF_FACTOR) * mCountersRecv[i];
-	}
-	resetCounters();
-}
-
-void bdAccount::printStats(std::ostream &out)
-{
-	int i;
-	out << "  Send                                                 Recv: ";
-	out << std::endl;
-	for(i = 0; i < mNoStats; i++)
-	{
-
-		out << "Send" << mLabel[i] << " : " << std::setw(10) << mLpfOut[i];
-		out << "          ";
-		out << "Recv" << mLabel[i] << " : " << std::setw(10) << mLpfRecv[i];
-		out << std::endl;
-	}
-}
-
-void bdAccount::resetCounters()
-{
-	int i;
-	for(i = 0; i < mNoStats; i++)
-	{
-		mCountersOut[i] = 0;
-		mCountersRecv[i] = 0;
-	}
-}
-
-void bdAccount::resetStats()
-{
-	int i;
-	for(i = 0; i < mNoStats; i++)
-	{
-		mLpfOut[i] = 0;
-		mLpfRecv[i] = 0;
-	}
-	resetCounters();
-}
-
-
-
-

libbitdht/src/bitdht/bdaccount.h

@@ -1,76 +0,0 @@
-#ifndef BITDHT_ACCOUNT_H
-#define BITDHT_ACCOUNT_H
-
-/*******************************************************************************
- * bitdht/bdaccount.h                                                          *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2011 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#include <vector>
-#include <string>
-#include <inttypes.h>
-
-#define 	BDACCOUNT_MSG_OUTOFDATEPING		0
-#define 	BDACCOUNT_MSG_PING			1
-#define 	BDACCOUNT_MSG_PONG			2
-#define 	BDACCOUNT_MSG_QUERYNODE			3
-#define 	BDACCOUNT_MSG_QUERYHASH			4
-#define 	BDACCOUNT_MSG_REPLYFINDNODE		5
-#define 	BDACCOUNT_MSG_REPLYQUERYHASH		6
-
-#define 	BDACCOUNT_MSG_POSTHASH			7
-#define 	BDACCOUNT_MSG_REPLYPOSTHASH		8
-
-#define 	BDACCOUNT_MSG_CONNECTREQUEST		9
-#define 	BDACCOUNT_MSG_CONNECTREPLY		10
-#define 	BDACCOUNT_MSG_CONNECTSTART		11
-#define 	BDACCOUNT_MSG_CONNECTACK		12
-
-#define 	BDACCOUNT_NUM_ENTRIES 			13
-
-class bdAccount
-{
-	public:
-
-	bdAccount();
-
-	void incCounter(uint32_t idx, bool out);
-	void doStats();
-	void printStats(std::ostream &out);	
-	void resetCounters();
-	void resetStats();
-
-	private:
-
-	int mNoStats;
-
-	std::vector<double> mCountersOut;
-	std::vector<double> mCountersRecv;
-
-	std::vector<double> mLpfOut;
-	std::vector<double> mLpfRecv;
-
-	std::vector<std::string> mLabel;
-	// Statistics.
-};
-
-
-
-#endif // BITDHT_ACCOUNT_H

libbitdht/src/bitdht/bdboot.txt

@@ -1,267 +0,0 @@
-1.162.168.21 8956
-2.6.224.136 17320
-5.116.142.222 13755
-5.189.185.57 6968
-5.202.101.3 4000
-5.227.124.122 1024
-5.227.124.122 20600
-5.227.124.122 64196
-5.39.94.218 6991
-5.79.102.9 6881
-5.89.120.163 2457
-14.117.182.22 1091
-14.8.109.32 17160
-23.115.236.180 42375
-24.153.98.173 1024
-24.38.199.13 10583
-27.150.87.242 1123
-27.151.179.38 51413
-27.152.212.182 1424
-31.24.186.40 16143
-31.36.78.93 30020
-31.44.90.218 51413
-37.120.213.132 19525
-37.14.113.18 3815
-37.146.76.158 51413
-37.187.105.230 5169
-37.232.184.93 6881
-37.46.150.58 51413
-39.111.152.200 17527
-39.154.68.57 28007
-42.200.116.4 18578
-42.3.188.207 19771
-45.176.111.21 1434
-45.32.43.51 49091
-45.76.218.165 52911
-45.77.214.200 44350
-46.172.86.23 46039
-46.223.161.46 23693
-46.237.96.68 16536
-46.52.174.214 24012
-46.7.227.47 27644
-46.7.9.41 21374
-49.64.73.215 51413
-49.74.50.28 60893
-49.75.73.147 51413
-49.79.26.15 51413
-49.83.226.50 20864
-49.83.241.222 51413
-52.9.197.152 6881
-58.209.188.12 20994
-59.149.118.196 51413
-59.2.250.243 57099
-59.6.53.18 57437
-60.104.89.4 51413
-60.124.114.239 16925
-60.178.44.27 1050
-60.99.229.14 20617
-61.223.34.21 17881
-61.227.127.222 22223
-61.239.28.169 18873
-62.210.82.193 51413
-64.191.5.92 56891
-65.92.141.96 58361
-67.215.246.10 6881
-68.151.213.83 20047
-69.40.178.254 50793
-71.34.2.150 8053
-72.95.247.56 12956
-73.157.77.166 5477
-74.109.243.24 7250
-74.140.153.59 24757
-74.72.13.99 9613
-76.29.106.98 41447
-77.202.207.190 33034
-77.21.64.116 22222
-77.245.14.94 9910
-78.131.78.35 51238
-78.158.1.15 7433
-78.231.125.98 12162
-78.242.250.55 55946
-79.164.245.5 49001
-80.147.23.201 32746
-80.200.171.90 16294
-80.99.222.34 51414
-81.171.17.30 42254
-82.221.103.244 6881
-82.235.78.193 44097
-82.244.32.78 43518
-82.64.181.170 38240
-82.64.249.25 51413
-82.64.44.119 51413
-82.65.164.218 15726
-82.65.68.9 51413
-82.77.146.109 53713
-83.46.92.34 50000
-84.195.46.218 54600
-84.40.106.115 12046
-85.149.0.42 21045
-86.121.194.1 51413
-86.98.50.30 21455
-87.123.166.45 4145
-87.169.199.211 10496
-88.7.217.202 31348
-88.99.25.154 38051
-89.135.26.33 51413
-89.17.134.184 10327
-89.245.86.20 32417
-89.253.118.133 8621
-90.101.94.104 20780
-90.151.95.110 2199
-90.219.241.30 51413
-90.219.8.170 11916
-91.121.136.132 59001
-91.123.72.241 49001
-91.142.65.40 51413
-91.173.208.204 16300
-91.211.245.40 7369
-91.92.194.144 1031
-91.98.96.76 5385
-92.244.238.115 3115
-92.97.68.210 58000
-93.100.182.236 32249
-93.11.175.113 22948
-93.115.202.240 64493
-93.152.132.9 12332
-94.154.81.100 12345
-94.222.188.14 29299
-95.211.117.105 62086
-95.219.143.102 10360
-95.222.119.133 43087
-95.42.138.33 16550
-96.39.191.231 52000
-99.192.24.198 52552
-103.226.250.79 3521
-103.82.242.163 8083
-104.156.238.118 34731
-104.237.149.26 64879
-107.155.5.39 6881
-109.129.202.63 11076
-109.148.168.121 21651
-109.24.244.111 33334
-110.81.114.66 24732
-111.175.84.3 6881
-111.216.9.68 13493
-113.105.18.227 16001
-113.194.69.53 53858
-113.219.200.7 12935
-113.252.78.238 23474
-113.68.239.87 6396
-113.69.96.171 51443
-114.188.193.161 22555
-114.231.190.193 51413
-114.232.201.253 30350
-114.32.153.245 26233
-114.32.1.94 7788
-114.38.137.40 24062
-114.75.44.238 6881
-115.133.66.181 9460
-115.205.157.105 51413
-116.1.193.182 51413
-117.247.200.35 5353
-117.60.240.145 35709
-117.60.62.8 51413
-117.93.101.232 51413
-118.123.245.182 5060
-119.177.21.161 27048
-119.64.245.112 56265
-121.171.118.184 11566
-121.178.169.67 49259
-121.234.117.237 15398
-122.116.102.22 14054
-123.202.146.112 23118
-123.217.135.139 7830
-128.68.229.32 51413
-134.209.114.242 8000
-139.28.218.4 34826
-142.113.115.71 26453
-148.251.68.55 50000
-148.70.53.219 2551
-150.117.108.250 21902
-150.117.44.190 25052
-151.224.15.227 51413
-157.157.157.41 51413
-161.97.102.243 51902
-162.208.6.211 51413
-167.179.83.227 60220
-168.70.68.30 18325
-169.0.60.179 64494
-171.5.165.129 6881
-172.104.76.77 60542
-172.104.93.28 35617
-172.98.144.81 19186
-173.176.138.246 9545
-173.199.70.134 39045
-173.212.205.73 51432
-173.212.219.143 6881
-174.89.174.228 51413
-175.197.1.120 52574
-176.9.8.143 58250
-178.118.86.145 51413
-178.162.139.87 10029
-178.32.220.92 6881
-178.67.121.182 49001
-182.138.217.58 6881
-182.138.90.72 50288
-182.139.213.160 39587
-183.131.239.178 57835
-183.22.252.15 21568
-185.126.33.59 50024
-185.156.175.187 1025
-185.157.221.247 25401
-185.252.60.243 49001
-185.45.195.156 28074
-185.45.195.181 28185
-185.45.195.190 28136
-185.61.148.114 64879
-188.133.192.123 19967
-188.235.1.208 7890
-188.240.208.187 51413
-192.181.103.63 19627
-192.241.151.29 6881
-193.242.205.145 49001
-193.77.153.124 59835
-194.176.114.54 51413
-194.35.233.206 20124
-195.154.172.169 36097
-195.154.172.169 38340
-195.154.172.169 48043
-195.154.172.169 48799
-195.154.179.2 22794
-195.154.179.2 41210
-195.154.179.2 42687
-195.154.179.2 49156
-195.154.179.2 50385
-195.154.179.2 50944
-195.154.181.225 37558
-195.191.246.240 1026
-196.191.92.25 22937
-197.157.219.137 22629
-197.61.66.105 24612
-198.13.48.70 37360
-199.254.238.193 15374
-200.63.107.82 13323
-201.241.63.68 38705
-203.130.242.178 28280
-203.213.61.76 50559
-207.154.222.13 51111
-210.195.211.60 49771
-210.6.145.50 15207
-212.102.42.202 7611
-212.129.19.188 27096
-212.129.19.188 29812
-212.129.19.188 50117
-212.129.19.188 51965
-212.129.33.59 6881
-212.32.231.67 51413
-212.86.51.7 65148
-213.136.79.7 11910
-218.161.100.192 51413
-218.219.199.148 18753
-220.189.94.56 13279
-222.211.148.83 8080
-222.77.110.143 46016
-223.116.81.154 10655
-223.16.153.107 51413
-223.26.31.77 21440
-223.65.101.235 25159

libbitdht/src/bitdht/bdboot_generate.sh

@@ -1,55 +0,0 @@
-#!/bin/bash
-
-<<LICENSE
-
-Copyright (C) 2020  Gioacchino Mazzurco <gio@eigenlab.org>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero 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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-LICENSE
-
-<<README
-Generate a clean DHT bootstrap node list.
-Feeds on previously known nodes from standard input and a few well known
-mainline DHT bootstrap nodes. Prints only nodes that appears to be active to a
-quick nmap check. Make sure your internet connection is working well before
-using this.
-
-Example usage:
---------------------------------
-cat bdboot.txt | bdboot_generate.sh | tee /tmp/bdboot_generated.txt
-cat /tmp/bdboot_generated.txt | sort -u > bdboot.txt
---------------------------------
-README
-
-function check_dht_host()
-{
-	mHost="$1"
-	mPort="$2"
-	
-	sudo nmap -oG - -sU -p $mPort $mHost | grep open | \
-		awk '{print $2" "$5}' | awk -F/ '{print $1}'
-}
-
-cat | while read line; do
-	hostIP="$(echo $line | awk '{print $1}')"
-	hostPort="$(echo $line | awk '{print $2}')"
-	check_dht_host $hostIP $hostPort
-done
-
-check_dht_host router.utorrent.com 6881
-check_dht_host router.bittorrent.com 6881
-check_dht_host dht.libtorrent.org 25401
-check_dht_host dht.transmissionbt.com 6881
-

libbitdht/src/bitdht/bdconnection.h

@@ -1,314 +0,0 @@
-/*******************************************************************************
- * bitdht/bdconnection.h                                                       *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2011 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#ifndef BITDHT_CONNECTION_H
-#define BITDHT_CONNECTION_H
-
-#include "bitdht/bdiface.h"
-
-class bdQueryManager;
-class bdNodePublisher;
-
-/************************************************************************************************************
-************************************** ProxyTuple + Connection State ****************************************
-************************************************************************************************************/
-
-#define BITDHT_CONNREQUEST_READY		1
-#define BITDHT_CONNREQUEST_PAUSED		2
-#define BITDHT_CONNREQUEST_INPROGRESS		3
-#define BITDHT_CONNREQUEST_EXTCONNECT		4
-#define BITDHT_CONNREQUEST_DONE			5
-
-#define BITDHT_CONNREQUEST_TIMEOUT_CONNECT	300  // MAKE THIS LARGE - SHOULD NEVER HAPPEN.
-#define BITDHT_CONNREQUEST_TIMEOUT_INPROGRESS	30
-#define BITDHT_CONNREQUEST_MAX_AGE		60
-
-
-#define BITDHT_CONNECTION_WAITING_AUTH		1
-#define BITDHT_CONNECTION_WAITING_REPLY		2
-#define BITDHT_CONNECTION_WAITING_START		3
-#define BITDHT_CONNECTION_WAITING_ACK		4
-#define BITDHT_CONNECTION_COMPLETED		5
-
-
-#define BD_CONNECTION_START_RETRY_PERIOD	3  // Should only take a couple of seconds to get reply.
-#define BD_CONNECTION_START_MAX_RETRY		3
-#define BD_CONNECTION_MAX_TIMEOUT		20 /* should be quick */
-
-
-
-class bdProxyTuple 
-{
-	public:
-	bdProxyTuple() { return; }
-	bdProxyTuple(bdNodeId *s, bdNodeId *p, bdNodeId *d)
-	:srcId(*s), proxyId(*p), destId(*d) { return; }
-
-	bdNodeId srcId;
-	bdNodeId proxyId;
-	bdNodeId destId;
-};
-
-std::ostream &operator<<(std::ostream &out, const bdProxyTuple &t);
-int operator<(const bdProxyTuple &a, const bdProxyTuple &b);
-int operator==(const bdProxyTuple &a, const bdProxyTuple &b);
-
-
-class bdConnection
-{
-	public:
-	bdConnection();
-
-	/** Functions to tweak the connection status */
-
-	// User initialised Connection.
-	int ConnectionSetup(bdId *proxyId, bdId *srcConnAddr, bdId *destConnAddr, int mode, int delay);
-	int ConnectionSetupDirect(bdId *destId, bdId *srcConnAddr);
-
-	// Initialise a new Connection. (receiving a Connection Request)
-	int ConnectionRequestDirect(bdId *id, bdId *srcConnAddr, bdId *destConnAddr);
-	int ConnectionRequestProxy(bdId *id, bdId *srcConnAddr, bdNodeId *ownId, bdId *destConnAddr, int mode, int delay);
-	int ConnectionRequestEnd(bdId *id, bdId *srcConnAddr, bdId *destConnAddr, int mode);
-
-	// Setup Finishing Stage, (receiving a Connection Reply).
-	int upgradeProxyConnectionToFinish(bdId *id, bdId *srcConnAddr, bdId *destConnAddr, int mode, int delay, int status);
-
-	int AuthoriseDirectConnection(bdId *srcId, bdId *proxyId, bdId *destId, int mode, int loc);
-	int AuthoriseProxyConnection(bdId *srcId, bdId *proxyId, bdId *destId, int mode, int loc, int bandwidth);
-	int AuthoriseEndConnection(bdId *srcId, bdId *proxyId, bdId *destId, int mode, int loc, int delay);
-
-	int CompleteConnection(bdId *id, bdId *srcConnAddr, bdId *destConnAddr, int bandwidth, int delay);
-
-	int checkForDefaultConnectAddress();
-
-	/* Connection State, and TimeStamp of Update */
-	int mState;
-	time_t mLastEvent;
-
-	/* Addresses of Start/Proxy/End Nodes */
-	bdId mSrcId;
-	bdId mDestId;
-	bdId mProxyId;
-
-	/* Where we are in the connection, 
-	 * and what connection mode.
-	 */
-	int mPoint;
-	int mMode;
-
-	/* must have ip:ports of connection ends (if proxied) */
-	bdId mSrcConnAddr;
-	bdId mDestConnAddr;
-
-	int mBandwidth;
-	int mMaxDelay;
-	time_t mConnectionStartTS;
-
-	/* START/ACK Finishing ****/
-	time_t mLastStart;   /* timer for retries */
-	int mRetryCount;     /* retry counter */
-
-	bool mSrcAck;
-	bool mDestAck;
-
-	// Completion TS.
-	time_t mCompletedTS;
-
-
-};
-
-#define BD_PI_SRC_UNKNOWN					0
-#define BD_PI_SRC_QUERYRESULT				1
-#define BD_PI_SRC_QUERYPROXY				2
-#define BD_PI_SRC_NODESPACE_FRIEND			3
-#define BD_PI_SRC_NODESPACE_SERVER			4
-#define BD_PI_SRC_NODESPACE_ENGINEVERSION	5
-#define BD_PI_SRC_ADDGOODPROXY				6
-
-
-class bdProxyId
-{
-public:
-	bdProxyId(const bdId &in_id, uint32_t in_srctype, uint32_t in_errcode)
-	:id(in_id), srcType(in_srctype), errcode(in_errcode) { return; }
-
-	bdProxyId() :srcType(BD_PI_SRC_UNKNOWN), errcode(0) { return; }
-
-	std::string proxySrcType() const;
-
-	bdId id;
-	uint32_t srcType;
-	uint32_t errcode;
-};
-
-
-class bdConnectionRequest
-{
-public:
-	bdConnectionRequest() : mMode(0), mState(0), mStateTS(0), mPauseTS(0), mErrCode(0), mDelay(0), mRequestTS(0), mRecycled(0), mCurrentSrcType(0)
-	{
-		bdsockaddr_clear(&mLocalAddr);
-	}
-
-public:
-	int setupDirectConnection(struct sockaddr_in *laddr, bdNodeId *target);
-	int setupProxyConnection(struct sockaddr_in *laddr, bdNodeId *target, uint32_t mode, uint32_t delay);
-
-	int addGoodProxy(const bdId *srcId);
-	int checkGoodProxyPeer(const bdId *Id);
-
-	bdNodeId mTarget;
-	struct sockaddr_in mLocalAddr;
-	int mMode;
-
-	int mState;
-	time_t mStateTS;
-
-	time_t mPauseTS;
-	uint32_t mErrCode;
-	
-	int mDelay;
-	time_t mRequestTS;   // reference Time for mDelay.
-
-	std::list<bdProxyId> mGoodProxies;
-	std::list<bdId> mPotentialProxies;
-	//std::list<bdId> mGoodProxies;
-	int mRecycled;
-
-	bdId mCurrentAttempt;
-	uint32_t mCurrentSrcType;
-
-	std::list<bdProxyId> mPeersTried;
-	//std::list<bdId> mPeersTried;
-};
-
-std::ostream &operator<<(std::ostream &out, const bdConnectionRequest &req);
-std::ostream &operator<<(std::ostream &out, const bdConnection &conn);
-
-
-/*********
- * The Connection Management Class.
- * this encapsulates all of the functionality..
- * except for a couple of message in/outs + callback.
- */
-
-class bdConnectManager
-{
-	public:
-
-	bdConnectManager(bdNodeId *ownid, bdSpace *space, bdQueryManager *qmgr, bdDhtFunctions *fns, bdNodePublisher *pub);	
-
-
-	/* connection functions */
-	void requestConnection(bdNodeId *id, uint32_t modes);
-	void allowConnection(bdNodeId *id, uint32_t modes);
-
-
-	/* high level */
-
-        void shutdownConnections();
-        void printConnections();
-
-	/* Connections: Configuration */
-	void defaultConnectionOptions();
-	virtual void setConnectionOptions(uint32_t allowedModes, uint32_t flags);
-
-	/* Connections: Initiation */
-
-	int requestConnection(struct sockaddr_in *laddr, bdNodeId *target, uint32_t mode, uint32_t delay, uint32_t start);
-	int requestConnection_direct(struct sockaddr_in *laddr, bdNodeId *target);	
-	int requestConnection_proxy(struct sockaddr_in *laddr, bdNodeId *target, uint32_t mode, uint32_t delay);
-
-	int killConnectionRequest(struct sockaddr_in *laddr, bdNodeId *target, uint32_t mode);
-
-	int checkExistingConnectionAttempt(bdNodeId *target);
-	void addPotentialConnectionProxy(const bdId *srcId, const bdId *target);
-	void updatePotentialConnectionProxy(const bdId *id, uint32_t mode);
-
-	int checkPeerForFlag(const bdId *id, uint32_t with_flag);
-
-	int tickConnections();
-	void iterateConnectionRequests();
-	int startConnectionAttempt(bdConnectionRequest *req);
-
-	// internal Callback -> normally continues to callbackConnect().
-	void callbackConnectRequest(bdId *srcId, bdId *proxyId, bdId *destId, 
-				int mode, int point, int param, int cbtype, int errcode);
-
-	/* Connections: Outgoing */
-
-	int  startConnectionAttempt(bdId *proxyId, bdId *srcConnAddr, bdId *destConnAddr, int mode, int delay);
-	void AuthConnectionOk(bdId *srcId, bdId *proxyId, bdId *destId, int mode, int loc, int bandwidth, int delay);
-	void AuthConnectionNo(bdId *srcId, bdId *proxyId, bdId *destId, int mode, int loc, int errcode);
-	void iterateConnections();
-
-
-	/* Connections: Utility State */
-
-	bdConnection *findExistingConnection(bdNodeId *srcId, bdNodeId *proxyId, bdNodeId *destId);
-	bdConnection *newConnection(bdNodeId *srcId, bdNodeId *proxyId, bdNodeId *destId);
-	int cleanConnection(bdNodeId *srcId, bdNodeId *proxyId, bdNodeId *destId);
-
-	int determinePosition(bdNodeId *sender, bdNodeId *src, bdNodeId *dest);
-	int determineProxyId(bdNodeId *sender, bdNodeId *src, bdNodeId *dest, bdNodeId *proxyId);
-
-	bdConnection *findSimilarConnection(bdNodeId *srcId, bdNodeId *destId);
-	bdConnection *findExistingConnectionBySender(bdId *sender, bdId *src, bdId *dest);
-	bdConnection *newConnectionBySender(bdId *sender, bdId *src, bdId *dest);
-	int cleanConnectionBySender(bdId *sender, bdId *src, bdId *dest);
-
-	// Overloaded Generalised Connection Callback.
-	virtual void callbackConnect(bdId *srcId, bdId *proxyId, bdId *destId, 
-				int mode, int point, int param, int cbtype, int errcode);
-
-	/* Connections: */
-	int recvedConnectionRequest(bdId *id, bdId *srcConnAddr, bdId *destConnAddr, int mode, int delay);
-	int recvedConnectionReply(bdId *id, bdId *srcConnAddr, bdId *destConnAddr, int mode, int delay, int status);
-	int recvedConnectionStart(bdId *id, bdId *srcConnAddr, bdId *destConnAddr, int mode, int delayOrBandwidth);
-	int recvedConnectionAck(bdId *id, bdId *srcConnAddr, bdId *destConnAddr, int mode);
-
-	/* setup Relay Mode */
-	void setRelayMode(uint32_t mode);
-
-	private:
-
-	std::map<bdProxyTuple, bdConnection> mConnections;
-	std::map<bdNodeId, bdConnectionRequest> mConnectionRequests;
-
-        uint32_t mConfigAllowedModes;
-        bool mConfigAutoProxy;
-
-	uint32_t mRelayMode;
-
-	/****************************** Connection Code (in bdconnection.cc) ****************************/
-
-	private:
-
-	bdNodeId mOwnId;
-	bdSpace *mNodeSpace;
-	bdQueryManager *mQueryMgr;
-	bdDhtFunctions *mFns;
-	bdNodePublisher *mPub;
-};
-
-
-#endif // BITDHT_CONNECTION_H

libbitdht/src/bitdht/bdfilter.cc

@@ -1,318 +0,0 @@
-/*******************************************************************************
- * bitdht/bdfilter.cc                                                          *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#include "bitdht/bdfilter.h"
-#include "bitdht/bdmanager.h"
-#include "util/bdfile.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <iostream>
-#include <time.h>
-
-/**
- * #define DEBUG_FILTER 1
-**/
-#define BDFILTER_ENTRY_DROP_PERIOD	(7 * 24 * 3600)
-
-bdFilter::bdFilter(const std::string &fname, const bdNodeId *ownid,  uint32_t filterFlags, bdDhtFunctions *fns, bdNodeManager *manager)
-{
-	/* */
-    mOwnId = *ownid;
-    mFns = fns;
-    mFilename = fname ;
-
-    loadBannedIpFile() ;
-
-    mFilterFlags = filterFlags;
-    mNodeManager = manager;
-}
-
-void bdFilter::writeBannedIpFile()
-{
-    std::string filetmp = mFilename + ".tmp" ;
-
-    FILE *fd = fopen(filetmp.c_str(), "w");
-
-    if (!fd)
-    {
-        std::cerr << "(EE) bdFilter::writeBannedIpFile() FAILED to Open File " << mFilename << std::endl;
-        return;
-    }
-
-    for( std::map<uint32_t,bdFilteredPeer>::iterator it=mFiltered.begin();it!=mFiltered.end();++it)
-    {
-        fprintf(fd, "%s %u %lu %lu\n", bdnet_inet_ntoa(it->second.mAddr.sin_addr).c_str(), it->second.mFilterFlags, it->second.mFilterTS, it->second.mLastSeen) ;
-#ifdef DEBUG_FILTER
-        fprintf(stderr, "Storing Peer Address: %s \n", bdnet_inet_ntoa(it->second.mAddr.sin_addr).c_str()) ;
-#endif
-
-    }
-    fclose(fd);
-
-    if(!bdFile::renameFile(filetmp,mFilename))
-        std::cerr << "Could not rename file !!" << std::endl;
-#ifdef DEBUG_FILTER
-    else
-        std::cerr << "Successfully renamed file " << filetmp << " to " << mFilename << std::endl;
-#endif
-}
-
-void bdFilter::loadBannedIpFile()
-{
-        char line[10240];
-        char addr_str[10240];
-
-        struct sockaddr_in addr;
-        memset(&addr, 0, sizeof(struct sockaddr_in));
-        addr.sin_family = PF_INET;
-
-    FILE *fd = fopen(mFilename.c_str(),"r") ;
-
-    if(fd == NULL)
-    {
-        std::cerr << "(EE) Cannot load filter file " << mFilename << std::endl;
-        return ;
-    }
-
-        while(line == fgets(line, 10240, fd))
-        {
-        uint32_t filter_flags ;
-        unsigned long long int filter_ts ;
-        unsigned long long int last_seen ;
-
-            if (4 == sscanf(line, "%s %u %llu %llu", addr_str, &filter_flags,&filter_ts,&last_seen))
-            {
-                if (bdnet_inet_aton(addr_str, &(addr.sin_addr)))
-                {
-                    addr.sin_port = 0;
-
-                    bdFilteredPeer peer;
-
-                    peer.mAddr = addr;
-                    peer.mFilterTS = filter_ts;
-                    peer.mLastSeen = last_seen;
-                    peer.mFilterFlags = filter_flags;
-
-            mFiltered[addr.sin_addr.s_addr] = peer ;
-    #ifdef DEBUG_FILTER
-                    std::cerr << "Loaded filtered IP: " << std::string(addr_str) << " last seen: " << last_seen << ", TS=" << filter_ts << std::endl;
-    #endif
-                }
-            }
-        }
-
-        fclose(fd);
-}
-
-//bool bdFilter::filtered(std::list<bdFilteredPeer> &answer)
-//{
-//	answer = mFiltered;
-//	return (answer.size() > 0);
-//}
-
-bool bdFilter::filteredIPs(std::list<struct sockaddr_in> &answer)
-{
-    std::map<uint32_t,bdFilteredPeer>::iterator it;
-	for(it = mFiltered.begin(); it != mFiltered.end(); it++)
-	{
-        answer.push_back(it->second.mAddr);
-	}
-	return (answer.size() > 0);
-}
-
-int bdFilter::checkPeer(const bdId *id, uint32_t mode)
-{
-	bool add = false;
-	uint32_t flags = 0;
-	if ((mFilterFlags & BITDHT_FILTER_REASON_OWNID) && 
-			isOwnIdWithoutBitDhtFlags(id, mode))
-	{
-		add = true;
-		flags |= BITDHT_FILTER_REASON_OWNID;
-	}
-
-	if (add)
-	{
-        bool isNew = addPeerToFilter(id->addr, flags);
-
-		if (isNew)
-		{
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
-int bdFilter::addPeerToFilter(const struct sockaddr_in& addr, uint32_t flags)
-{
-    std::map<uint32_t,bdFilteredPeer>::iterator it = mFiltered.find(addr.sin_addr.s_addr) ;
-
-    if(it != mFiltered.end())
-	{
-            it->second.mLastSeen = time(NULL);
-            it->second.mFilterFlags |= flags;
-    }
-    else
-    {
-        time_t now = time(NULL);
-        bdFilteredPeer fp;
-
-        fp.mAddr = addr;
-        fp.mAddr.sin_port = 0;
-        fp.mFilterFlags = flags;
-        fp.mFilterTS = now;
-        fp.mLastSeen = now;
-
-        uint32_t saddr = addr.sin_addr.s_addr;
-
-        mFiltered[saddr] = fp;
-
-        std::cerr << "Adding New Banned Ip Address: " << bdnet_inet_ntoa(addr.sin_addr);
-        std::cerr << std::endl;
-    }
-    writeBannedIpFile() ;
-
-    return true;
-}
-
-// void bdFilter::loadFilteredPeers(const std::list<bdFilteredPeer>& peers)
-// {
-//     for(std::list<bdFilteredPeer>::iterator it = peers.begin(); it != peers.end();++it)
-//     {
-// #ifdef DEBUG_FILTER
-//         std::cerr << "Loading filtered peer " << inet_ntoa(it->mAddr.sin_addr) << " Flags: " << it->mFilterFlags << " FilterTS: "
-//                   << now - it->mFilterTS << " LastSeen: " << now - it->mLastSeen << std::endl;
-// #endif
-//         uint32_t saddr = it->mAddr.sin_addr.s_addr;
-//         mFiltered[saddr] = *it ;
-//     }
-// }
-void bdFilter::getFilteredPeers(std::list<bdFilteredPeer>& peers)
-{
-    for(std::map<uint32_t,bdFilteredPeer>::iterator it = mFiltered.begin(); it != mFiltered.end();++it)
-        peers.push_back(it->second) ;
-}
-/* fast check if the addr is in the structure */
-int bdFilter::addrOkay(struct sockaddr_in *addr)
-{
-	// first check upper layer
-	bool isAvailable, isBanned;
-	mNodeManager->doIsBannedCallback(addr, &isAvailable, &isBanned);
-
-	if(isAvailable) {
-#ifdef DEBUG_FILTER
-		std::cerr << "bdFilter::addrOkay addr: " << inet_ntoa(addr->sin_addr) << " result from upper layer: " << (isBanned ? "banned" : "ok") << std::endl;
-#endif
-		return !isBanned;
-	} else {
-		// fallback to own ban list
-
-		std::map<uint32_t,bdFilteredPeer>::const_iterator it = mFiltered.find(addr->sin_addr.s_addr);
-		if (it == mFiltered.end())
-			return 1; // Address is Okay
-	}
-
-#ifdef DEBUG_FILTER
-	std::cerr << "Detected Packet From Banned Ip Address: " << inet_ntoa(addr->sin_addr);
-	std::cerr << std::endl;
-#endif
-	return 0;
-}
-
-
-bool bdFilter::isOwnIdWithoutBitDhtFlags(const bdId *id, uint32_t peerFlags)
-{
-	if (peerFlags & BITDHT_PEER_STATUS_RECV_PONG)
-	{
-		if (peerFlags & BITDHT_PEER_STATUS_DHT_ENGINE)
-		{
-			/* okay! */
-			return false;
-		}
-
-		/* now check distance */
-		bdMetric dist;
-		mFns->bdDistance(&mOwnId, &(id->id), &dist);
-		int bucket = mFns->bdBucketDistance(&dist);
-
-		/* if they match us... kill it */
-		if (bucket == 0)
-		{
-			return true;
-		}
-	}
-	return false;
-}
-
-
-/* periodically we want to cleanup the filter....
- * if we haven't had an IP address reported as filtered for several hours.
- * remove it from the list.
- */
-
-bool bdFilter::cleanupFilter()
-{
-#ifdef DEBUG_FILTER
-    std::cerr << "bdFilter: Checking current filter List:" << std::endl;
-#endif
-
-	time_t now = time(NULL);
-	time_t dropTime = now - BDFILTER_ENTRY_DROP_PERIOD;
-
-    for(std::map<uint32_t,bdFilteredPeer>::iterator it = mFiltered.begin(); it != mFiltered.end();)
-    {
-#ifdef DEBUG_FILTER
-        std::cerr << "\t" << bdnet_inet_ntoa(it->second.mAddr.sin_addr);
-        std::cerr << " Flags: " << it->second.mFilterFlags;
-        std::cerr << " FilterTS: " << now - it->second.mFilterTS;
-        std::cerr << " LastSeen: " << now - it->second.mLastSeen;
-#endif
-
-        if (it->second.mLastSeen < dropTime)
-        {
-            /* remove from filter */
-#ifdef DEBUG_FILTER
-            std::cerr << " OLD DROPPING" << std::endl;
-#endif
-            std::map<uint32_t,bdFilteredPeer>::iterator tmp(it) ;
-            ++tmp ;
-
-            mFiltered.erase(it);
-            it = tmp ;
-        }
-        else
-        {
-#ifdef DEBUG_FILTER
-            std::cerr << " OK" << std::endl;
-#endif
-            it++;
-        }
-    }
-
-	return true;
-}
-
-
-

libbitdht/src/bitdht/bdfilter.h

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * bitdht/bdfilter.h                                                           *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#ifndef BITDHT_FILTER_H
-#define BITDHT_FILTER_H
-
-#include "bitdht/bdiface.h"
-#include <set>
-
-/* Query result flags are in bdiface.h */
-
-#define BITDHT_FILTER_REASON_OWNID	0x0001
-
-class bdFilteredPeer
-{
-    public:
-    struct sockaddr_in mAddr;
-    uint32_t mFilterFlags; /* reasons why we are filtering */
-    time_t mFilterTS;
-    time_t mLastSeen;
-};
-
-class bdNodeManager;
-
-class bdFilter
-{
-	public:
-    bdFilter(const std::string& fname, const bdNodeId *ownid, uint32_t filterFlags, bdDhtFunctions *fns, bdNodeManager *manager);
-
-	// get the answer.
-//bool	filtered(std::list<bdFilteredPeer> &answer);
-bool	filteredIPs(std::list<struct sockaddr_in> &answer);
-
-//void    loadFilteredPeers(const std::list<bdFilteredPeer>& peers) ;
-void 	getFilteredPeers(std::list<bdFilteredPeer> &peers);
-
-int 	checkPeer(const bdId *id, uint32_t peerFlags);
-
-int 	addrOkay(struct sockaddr_in *addr);
-int 	addPeerToFilter(const struct sockaddr_in &addr, uint32_t flags);
-
-bool 	cleanupFilter();
-
-void loadBannedIpFile() ;
-void writeBannedIpFile() ;
-
-private:
-
-bool	isOwnIdWithoutBitDhtFlags(const bdId *id, uint32_t peerFlags);
-
-	// searching for
-	bdNodeId mOwnId;
-	uint32_t mFilterFlags;
-
-	std::map<uint32_t,bdFilteredPeer> mFiltered;
-	bdDhtFunctions *mFns;
-	std::string mFilename ;
-
-	// have access to the manager for isBanned callback
-	bdNodeManager* mNodeManager;
-};
-
-
-#endif
-

libbitdht/src/bitdht/bdfriendlist.cc

@@ -1,243 +0,0 @@
-/*******************************************************************************
- * bitdht/bdfriendlist.cc                                                      *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#include "bitdht/bdfriendlist.h"
-#include "bitdht/bdstddht.h"
-#include "bitdht/bdpeer.h"
-
-#include <iostream>
-
-/*****
- * #define DEBUG_FRIENDLIST	1
- ****/
-
-bdFriendEntry::bdFriendEntry()
-{
-	mFlags = 0;
-	mLastSeen = 0;
-}
-
-bool bdFriendEntry::addrKnown(struct sockaddr_in *addr)
-{
-	if (mFlags & BD_FRIEND_ENTRY_ADDR_OK)
-	{
-		if (mFlags & BD_FRIEND_ENTRY_ONLINE)
-		{
-			*addr = mPeerId.addr;
-			return true;
-		}
-
-		
-		if (time(NULL) - mLastSeen < BD_FRIEND_ENTRY_TIMEOUT)
-		{
-			*addr = mPeerId.addr;
-			return true;
-		}
-	}
-	return false;
-}
-
-uint32_t bdFriendEntry::getPeerFlags()
-{
-	return mFlags & BD_FRIEND_ENTRY_MASK_KNOWN;
-}
-
-
-bdFriendList::bdFriendList(const bdNodeId *ownId)
-{
-	bdId tmpId;
-	tmpId.id = *ownId;
-	updatePeer(&tmpId, BD_FRIEND_ENTRY_SELF);
-}
-
-/******
- * Simple logic: timestamp is set with address.
- * if ONLINE, then address will be dropped as soon as OFFLINE.
- * if ADDR_OK, then address will be dropped after XX seconds.
- *
- * ONLINE - will be used with friends.
- * ADDR_OK - will potentially be used for friends of friends (but not for now).
- *****/
-
-	/* catch-all interface function */
-bool	bdFriendList::updatePeer(const bdId *id, uint32_t flags)
-{
-#ifdef DEBUG_FRIENDLIST	
-	std::cerr << "bdFriendList::updatePeer() Peer(";
-	bdStdPrintId(std::cerr, id);
-	std::cerr << ") Flags: " << flags;
-	std::cerr << std::endl;
-#endif
-
-	std::map<bdNodeId, bdFriendEntry>::iterator it;
-	it = mPeers.find(id->id);
-	if (it == mPeers.end())
-	{
-		bdFriendEntry entry;
-		entry.mPeerId.id = id->id;
-		entry.mFlags = 0;
-		entry.mLastSeen = 0;
-
-		mPeers[id->id] = entry;
-		it = mPeers.find(id->id);
-	}
-
-	/* update all */
-	it->second.mFlags = flags;
-	if (it->second.mFlags & (BD_FRIEND_ENTRY_ADDR_OK | BD_FRIEND_ENTRY_ONLINE))
-	{
-		it->second.mFlags |= BD_FRIEND_ENTRY_ADDR_OK;
-
-		it->second.mPeerId.addr = id->addr;
-		it->second.mLastSeen = time(NULL);
-	}
-	return true;
-}
-
-bool	bdFriendList::removePeer(const bdNodeId *id)
-{
-	/* see if it exists... */
-	std::map<bdNodeId, bdFriendEntry>::iterator it;
-	it = mPeers.find(*id);
-	if (it == mPeers.end())
-	{
-#ifdef DEBUG_FRIENDLIST	
-		std::cerr << "bdFriendList::removeFriend() Peer(";
-		bdStdPrintNodeId(std::cerr, id);
-		std::cerr << ") is unknown!";
-		std::cerr << std::endl;
-#endif
-
-		return false;
-	}
-
-	mPeers.erase(*id);
-
-	return true;
-}
-
-bool	bdFriendList::findPeerEntry(const bdNodeId *id, bdFriendEntry &entry)
-{
-	/* see if it exists... */
-	std::map<bdNodeId, bdFriendEntry>::iterator it;
-	it = mPeers.find(*id);
-	if (it == mPeers.end())
-	{
-#ifdef DEBUG_FRIENDLIST
-		std::cerr << "bdFriendList::getPeerEntry() Peer(";
-		bdStdPrintNodeId(std::cerr, id);
-		std::cerr << ") is unknown!";
-		std::cerr << std::endl;
-#endif
-
-		return false;
-	}
-
-	entry = it->second;
-
-
-	return true;
-}
-
-
-bool    bdFriendList::findPeersWithFlags(uint32_t flags, std::list<bdNodeId> &peerList)
-{
-#ifdef DEBUG_FRIENDLIST
-	std::cerr << "bdFriendList::findPeersWithFlags(" << flags << ")";
-	std::cerr << std::endl;
-#endif
-
-	/* see if it exists... */
-	std::map<bdNodeId, bdFriendEntry>::iterator it;
-	for(it = mPeers.begin(); it != mPeers.end(); it++)
-	{
-		/* if they have ALL of the flags we specified */
-		if ((it->second.getPeerFlags() & flags) == flags)
-		{
-#ifdef DEBUG_FRIENDLIST
-			std::cerr << "bdFriendList::findPeersWithFlags() Found: ";
-			bdStdPrintNodeId(std::cerr, id);
-			std::cerr << std::endl;
-#endif
-			peerList.push_back(it->second.mPeerId.id);
-		}
-	}
-	return (peerList.size() > 0);
-}
-
-
-
-bool	bdFriendList::print(std::ostream &out)
-{
-	time_t now = time(NULL);
-
-	out << "bdFriendList::print()";
-	out << std::endl;
-
-	std::map<bdNodeId, bdFriendEntry>::iterator it;
-	for(it = mPeers.begin(); it != mPeers.end(); it++)
-	{
-		bdStdPrintId(out, &(it->second.mPeerId));
-		out << " Flags: " << it->second.mFlags;
-		out << " Seen: " << now - it->second.mLastSeen;
-		out << std::endl;
-	}
-
-	return true;
-}
-
-
-
-
-bdPeerQueue::bdPeerQueue()
-{
-	return;
-}
-
-bool bdPeerQueue::queuePeer(const bdId *id, uint32_t flags)
-{
-	bdFriendEntry entry;
-	entry.mPeerId = *id;
-	entry.mFlags = flags;
-	entry.mLastSeen = time(NULL);
-
-	mPeerQueue.push_back(entry);
-	return true;
-}
-
-bool bdPeerQueue::popPeer(bdId *id, uint32_t &flags)
-{
-	if (mPeerQueue.size() > 0)
-	{
-		bdFriendEntry entry = mPeerQueue.front();
-		mPeerQueue.pop_front();
-		*id = entry.mPeerId;
-		flags = entry.mFlags;
-
-		return true;
-	}
-
-	return false;
-}
-
-
-

libbitdht/src/bitdht/bdfriendlist.h

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * bitdht/bdfriendlist.h                                                       *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#ifndef BITDHT_FRIEND_LIST_H
-#define BITDHT_FRIEND_LIST_H
-
-/* 
- * This class maintains a list of current friends and friends-of-friends.
- * It should also be updated when a peer's address has been identified.
- *
- * It is used for selecting preferential peers for DHT Connections.
- * and for detecting bad peers that are duplicating real RS peers.
- *
- */
-
-
-#include "bitdht/bdiface.h"
-#include <set>
-
-#define BD_FRIEND_ENTRY_TIMEOUT		10
-
-
-//#define BD_FRIEND_ENTRY_ONLINE		0x0001
-//#define BD_FRIEND_ENTRY_ADDR_OK		0x0002
-
-//#define BD_FRIEND_ENTRY_WHITELIST	BITDHT_PEER_STATUS_DHT_WHITELIST
-//#define BD_FRIEND_ENTRY_FOF		BITDHT_PEER_STATUS_DHT_FOF
-//#define BD_FRIEND_ENTRY_FRIEND 	BITDHT_PEER_STATUS_DHT_FRIEND
-//#define BD_FRIEND_ENTRY_RELAY_SERVER	BITDHT_PEER_STATUS_DHT_RELAY_SERVER
-
-//#define BD_FRIEND_ENTRY_SELF		BITDHT_PEER_STATUS_DHT_SELF
-
-//#define BD_FRIEND_ENTRY_MASK_KNOWN	BITDHT_PEER_STATUS_MASK_KNOWN
-
-class bdFriendEntry
-{
-	public:
-	bdFriendEntry();
-
-bool	addrKnown(struct sockaddr_in *addr);
-uint32_t getPeerFlags();
-
-	bdId mPeerId;
-	uint32_t mFlags; 
-	time_t mLastSeen;
-};
-
-class bdFriendList
-{
-
-	public:
-	bdFriendList(const bdNodeId *ownid);
-
-bool	updatePeer(const bdId *id, uint32_t flags);
-bool	removePeer(const bdNodeId *id);
-
-bool	findPeerEntry(const bdNodeId *id, bdFriendEntry &entry);
-bool    findPeersWithFlags(uint32_t flags, std::list<bdNodeId> &peerList);
-
-bool    print(std::ostream &out);
-	private:
-
-	std::map<bdNodeId, bdFriendEntry> mPeers;
-};
-
-class bdPeerQueue
-{
-
-	public:
-	bdPeerQueue();
-
-bool	queuePeer(const bdId *id, uint32_t flags);
-bool	popPeer(bdId *id, uint32_t &flags);
-
-	private:
-
-	std::list<bdFriendEntry> mPeerQueue;
-};
-
-	
-#endif
-

libbitdht/src/bitdht/bdhash.cc

@@ -1,283 +0,0 @@
-/*******************************************************************************
- * bitdht/bdhash.cc                                                            *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#include "bitdht/bdhash.h"
-#include "bitdht/bdstddht.h"
-#include <iostream>
-
-bdHashEntry::bdHashEntry(std::string value, std::string secret, time_t lifetime, time_t store)
-	:mValue(value), mStoreTS(store), mSecret(secret), mLifetime(lifetime)
-{
-	return;
-}
-
-
-/**************************** class bdHashSet ********************************/
-
-bdHashSet::bdHashSet(bdNodeId *id)
-	:mId(*id)
-{
-	return;
-}
-
-int 	bdHashSet::search(std::string key, uint32_t maxAge, std::list<bdHashEntry> &entries)
-{
-	std::multimap<std::string, bdHashEntry>::iterator sit, eit, it;
-        sit = mEntries.lower_bound(key);
-        eit = mEntries.upper_bound(key);
-
-	time_t now = time(NULL);
-
-	for(it = sit; it != eit; it++)
-	{
-		time_t age = now - it->second.mStoreTS;
-		if (age < (int32_t) maxAge)
-		{
-			entries.push_back(it->second);
-		}
-	}
-	return (0 < entries.size());
-}
-
-/*** 
- * With modification.
- * If there is no secret -> it cannot be deleted (must timeout), but can be extended.
- * If there is a secret -> must include it to modify.
- *
- * Therefore if identical entry without secret comes along - what do I do?
- * -> create duplicate?
- */
-
-int 	bdHashSet::modify(std::string key, bdHashEntry *entry, uint32_t modFlags)
-{
-	std::multimap<std::string, bdHashEntry>::iterator sit, eit, it;
-        sit = mEntries.lower_bound(key);
-        eit = mEntries.upper_bound(key);
-
-	time_t now = time(NULL);
-
-	bool updated = false;
-	for(it = sit; it != eit; it++)
-	{
-		/* check it all */
-		if (it->second.mValue == entry->mValue)
-		{
-			bool noSecret = (it->second.mSecret == "");
-			bool sameSecret = (it->second.mSecret == entry->mSecret);
-			bool update = false;
-
-			if (noSecret && sameSecret)
-			{
-				/* only allowed to increase lifetime */
-				if (modFlags == BITDHT_HASH_ENTRY_ADD)
-				{
-					time_t existKillTime = it->second.mLifetime + it->second.mStoreTS;
-					time_t newKillTime = entry->mLifetime + now;
-					if (newKillTime > existKillTime)
-					{
-						update = true;
-					}
-				}
-			}
-			else if (sameSecret)
-			{
-				if (modFlags == BITDHT_HASH_ENTRY_ADD)
-				{
-					update = true;
-				}
-				else if (modFlags == BITDHT_HASH_ENTRY_DELETE)
-				{
-					/* do it here */
-					mEntries.erase(it);
-					return 1;
-				}
-			}
-			
-			if (update)
-			{
-				it->second.mStoreTS = now;
-				it->second.mLifetime = entry->mLifetime;
-				updated = true;
-			}
-		}
-	}
-
-	if ((!updated) && (modFlags == BITDHT_HASH_ENTRY_ADD))
-	{
-		/* create a new entry */
-		bdHashEntry newEntry(entry->mValue, entry->mSecret, entry->mLifetime, now);
-	        mEntries.insert(std::pair<std::string, bdHashEntry>(key, newEntry));
-		updated = true;
-	}
-	return updated;
-}
-
-int	bdHashSet::printHashSet(std::ostream &out)
-{
-	time_t now = time(NULL);
-	std::multimap<std::string, bdHashEntry>::iterator it;
-	out << "Hash: ";
-	bdStdPrintNodeId(out, &mId); // Allowing "Std" as we dont need dht functions everywhere.
-	out << std::endl;
-
-	for(it = mEntries.begin(); it != mEntries.end();it++)
-	{
-		time_t age = now - it->second.mStoreTS;
-		out << "\tK:" << bdStdConvertToPrintable(it->first);
-		out << " V:" << bdStdConvertToPrintable(it->second.mValue);
-		out << " A:" << age << " L:" << it->second.mLifetime;
-		out << " S:" << bdStdConvertToPrintable(it->second.mSecret);
-		out << std::endl;
-	}
-	return 1;
-}
-
-	
-	
-
-int	bdHashSet::cleanupHashSet(uint32_t maxAge)
-{
-	time_t now = time(NULL);
-
-	/* this is nasty... but don't know how to effectively remove from multimaps
-	 * * Must do full repeat for each removal.
-	 */
-
-	std::multimap<std::string, bdHashEntry>::iterator it;
-	for(it = mEntries.begin(); it != mEntries.end();)
-	{
-		time_t age = now - it->second.mStoreTS;
-		if ((age > (int32_t) maxAge) || (age > it->second.mLifetime))
-		{
-			mEntries.erase(it);
-			it = mEntries.begin();
-		}
-		else
-		{
-			it++;
-		}
-	}
-	return 1;
-}
-
-
-	
-
-
-
-/*******************************  class bdHashSpace ***************************/
-
-bdHashSpace::bdHashSpace()
-{
-	return;
-}
-
-	/* accessors */
-int 	bdHashSpace::search(bdNodeId *id, std::string key, uint32_t maxAge, std::list<bdHashEntry> &entries)
-{
-	std::map<bdNodeId, bdHashSet>::iterator it;
-	it = mHashTable.find(*id);
-	if (it == mHashTable.end()) 
-	{
-		/* no entry */
-		return 1;
-	}
-
-	return it->second.search(key, maxAge, entries);
-}
-
-int 	bdHashSpace::modify(bdNodeId *id, std::string key, bdHashEntry *entry, uint32_t modFlags)
-{
-	std::map<bdNodeId, bdHashSet>::iterator it;
-	it = mHashTable.find(*id);
-	if (it == mHashTable.end()) 
-	{
-		if (modFlags == BITDHT_HASH_ENTRY_DELETE)
-		{
-			/* done already */
-			return 1;
-		}
-			
-		//mHashTable[*id] = bdHashSet(id);
-	        mHashTable.insert(std::pair<bdNodeId, bdHashSet>(*id, bdHashSet(id)));
-		it = mHashTable.find(*id);
-	}
-
-	return it->second.modify(key, entry, modFlags);
-}
-
-int     bdHashSpace::printHashSpace(std::ostream &out)
-{
-	std::map<bdNodeId, bdHashSet>::iterator it;
-	out << "bdHashSpace::printHashSpace()" << std::endl;
-	out << "--------------------------------------------" << std::endl;
-	
-	for(it = mHashTable.begin(); it != mHashTable.end(); it++)
-	{
-		it->second.printHashSet(out);
-	}
-	out << "--------------------------------------------" << std::endl;
-	return 1;
-}
-
-int     bdHashSpace::cleanHashSpace(bdNodeId *min, bdNodeId *max, time_t maxAge)
-{
-	std::map<bdNodeId, bdHashSet>::iterator it;
-	std::list<bdNodeId> eraseList;
-	std::list<bdNodeId>::iterator eit;
-
-	for(it = mHashTable.begin(); it != mHashTable.end(); it++)
-	{
-		if ((it->first < *min) ||
-			(*max < it->first))
-		{
-			/* schedule for erasure */
-			eraseList.push_back(it->first);
-		}
-		else
-		{
-			/* clean up Hash Set */
-			it->second.cleanupHashSet(maxAge);	
-		}
-	}
-
-	/* cleanup */
-	while(eraseList.size() > 0)
-	{
-		bdNodeId &eId = eraseList.front();
-		it = mHashTable.find(eId);
-		if (it != mHashTable.end())
-		{
-			mHashTable.erase(it);
-		}
-	}
-	return 1;
-}
-
-
-int     bdHashSpace::clear()
-{
-	mHashTable.clear();
-	return 1;
-}
-
-

libbitdht/src/bitdht/bdhash.h

@@ -1,85 +0,0 @@
-/*******************************************************************************
- * bitdht/bdhash.h                                                             *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#ifndef BITDHT_HASH_SPACE_H
-#define BITDHT_HASH_SPACE_H
-
-#include "bitdht/bdpeer.h"
-
-#include <list>
-#include <string>
-#include <map>
-
-#define BITDHT_HASH_ENTRY_ADD		1
-#define BITDHT_HASH_ENTRY_DELETE	2
-
-class bdHashEntry
-{
-	public:
-
-	bdHashEntry(std::string value, std::string secret, time_t lifetime, time_t store);
-	std::string mValue;
-	time_t mStoreTS;
-
-	/* These are nice features that OpenDHT had */
-	std::string mSecret;
-	time_t mLifetime;
-};
-
-
-class bdHashSet
-{
-	public:
-
-	bdHashSet(bdNodeId *id);
-
-int     search(std::string key, uint32_t maxAge, std::list<bdHashEntry> &entries);
-int     modify(std::string key, bdHashEntry *entry, uint32_t modFlags);
-int     printHashSet(std::ostream &out);
-int     cleanupHashSet(uint32_t maxAge);
-
-	bdNodeId mId;
-	std::multimap<std::string, bdHashEntry> mEntries;
-};
-
-class bdHashSpace
-{
-	public:
-
-	bdHashSpace();
-
-	/* accessors */
-int 	search(bdNodeId *id, std::string key, uint32_t maxAge, std::list<bdHashEntry> &entries);
-int 	modify(bdNodeId *id, std::string key, bdHashEntry *entry, uint32_t modFlags);
-
-int 	printHashSpace(std::ostream&);
-int     cleanHashSpace(bdNodeId *min, bdNodeId *max, time_t maxAge);
-int     clear();
-
-	private:
-
-	std::map<bdNodeId, bdHashSet> mHashTable;
-};
-
-
-#endif
-

libbitdht/src/bitdht/bdhistory.cc

@@ -1,647 +0,0 @@
-/*******************************************************************************
- * bitdht/bdhistory.cc                                                         *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-
-#include "bitdht/bdhistory.h"
-#include "bitdht/bdstddht.h"
-#include "bitdht/bdmsgs.h"
-#include <set>
-
-#define MIN_RESEND_PERIOD  60
-
-bdMsgHistoryList::bdMsgHistoryList()
-:mPeerVersion("Unknown")
-{
-	return;
-}
-
-
-
-void	bdMsgHistoryList::addMsg(time_t ts, uint32_t msgType, bool incoming, const bdNodeId *aboutId)
-{
-//	std::cerr << "bdMsgHistoryList::addMsg()";
-//	std::cerr << std::endl;
-
-	bdMsgHistoryItem msg(msgType, incoming, aboutId);
-	msgHistory.insert(std::make_pair(ts, msg));
-}
-
-void 	bdMsgHistoryList::setPeerType(time_t /* ts */, std::string version)
-{
-	mPeerVersion = version;
-}
-
-int	bdMsgHistoryList::msgCount(time_t start_ts, time_t end_ts)
-{
-	std::multimap<time_t, bdMsgHistoryItem>::iterator sit, eit, it;
-	sit = msgHistory.lower_bound(start_ts);
-	eit = msgHistory.upper_bound(end_ts);
-	int count = 0;
-	for (it = sit; it != eit; it++, count++) ; // empty loop.
-
-	return count;
-}
-
-bool    bdMsgHistoryList::msgClear(time_t before)
-{
-	if (before == 0)
-	{
-		msgHistory.clear();
-		return true;
-	}
-
-	// Delete the old stuff in the list.
-	while((msgHistory.begin() != msgHistory.end()) && (msgHistory.begin()->first < before))
-	{
-		msgHistory.erase(msgHistory.begin());
-	}
-
-	// return true if empty.
-	if (msgHistory.begin() == msgHistory.end())
-	{
-		return true;
-	}
-	return false;
-}
-
-void	bdMsgHistoryList::msgClear()
-{
-	msgHistory.clear();
-}
-
-
-void	bdMsgHistoryList::clearHistory()
-{
-	msgClear();
-}
-
-void	bdMsgHistoryList::printHistory(std::ostream &out, int mode, time_t start_ts, time_t end_ts)
-{
-	//out << "AGE: MSGS  => incoming, <= outgoing"  << std::endl;
-	std::multimap<time_t, bdMsgHistoryItem>::iterator sit, eit, it;
-	sit = msgHistory.lower_bound(start_ts);
-	eit = msgHistory.upper_bound(end_ts);
-	time_t curr_ts = 0;
-	bool time_changed = false;
-	bool first_line = true;
-	
-	for(it = sit; it != eit; it++)
-	{
-		time_changed = false;
-		if (curr_ts != it->first)
-		{
-			curr_ts = it->first;
-			time_changed = true;
-		}
-		switch(mode)
-		{
-			default:
-		{
-			/* print one line per ts */
-			if (time_changed)
-			{
-				if (!first_line)
-				{
-					/* finish existing line */
-					out << " " << std::endl;
-				}
-				else
-				{
-					first_line = false;
-				}
-				out << "\tTS: " << time(NULL) - curr_ts << " ";
-			}
-	
-			std::string name;
-			bitdht_msgtype(it->second.msgType, name);
-
-			if (it->second.incoming)
-			{
-				out << "( =I> ";
-			}
-			else
-			{
-				out << "( <O= ";
-			}
-
-			out << name << " ";
-			if ((it->second.aboutId.data[0] == 0)
-				&& (it->second.aboutId.data[3] == 0)
-				&& (it->second.aboutId.data[3] == 0)
-				&& (it->second.aboutId.data[3] == 0))
-			{
-				/* don't print anything */
-			}
-			else
-			{
-				bdStdPrintNodeId(out, &(it->second.aboutId));
-			}
-			out << " )";
-
-		}
-			break;
-		} // end of switch.
-	}
-
-	/* finish up last line */
-	if (!first_line)
-	{
-		out << " " << std::endl;
-	}
-}
-
-
-bool	bdMsgHistoryList::canSend()
-{
-	std::cerr << "bdMsgHistoryList::canSend()";
-
-	std::multimap<time_t, bdMsgHistoryItem>::reverse_iterator rit;
-
-	rit = msgHistory.rbegin();
-	if (rit != msgHistory.rend())
-	{
-		time_t now = time(NULL);
-		if (now - rit->first > MIN_RESEND_PERIOD)
-		{
-			std::cerr << " OVER RESEND_PERIOD... true";
-			std::cerr << std::endl;
-
-			return true;
-		}
-	}
-
-	if (msgHistory.size() % 2 == 0)
-	{
-		std::cerr << " SIZE: " << msgHistory.size() << " % 2 = 0 ... true";
-		std::cerr << std::endl;
-
-		return true;
-	}
-
-	std::cerr << " false";
-	std::cerr << std::endl;
-
-	return false;
-}
-
-bool	bdMsgHistoryList::validPeer()
-{
-	std::cerr << "bdMsgHistoryList::validPeer()";
-
-	std::multimap<time_t, bdMsgHistoryItem>::iterator it;
-
-	for(it = msgHistory.begin(); it != msgHistory.end(); it++)
-	{
-		if (it->second.incoming)
-		{
-			std::cerr << " Incoming Msg... so validPeer";
-			std::cerr << std::endl;
-
-			return true;
-		}
-	}
-
-	std::cerr << " false";
-	std::cerr << std::endl;
-
-	return false;
-}
-
-
-#define MAX_PING_PER_MINUTE  	2
-#define MAX_QUERY_PER_MINUTE 	2
-
-bool bdMsgHistoryList::analysePeer()
-
-{
-	/* analyse and print out details of the peers messages */
-	bool flagged = false;
-
-	//out << "AGE: MSGS  => incoming, <= outgoing"  << std::endl;
-	std::multimap<time_t, bdMsgHistoryItem>::iterator sit, eit, it;
-	sit = msgHistory.begin();
-	eit = msgHistory.end();
-	if (sit == eit)
-	{
-		// nothing here.
-		return false;
-	}
-
-	time_t start_ts = sit->first;
-	time_t end_ts = msgHistory.rbegin()->first; // must exist.
-
-
-	// don't divide by zero.
-	if (end_ts - start_ts < 60)
-	{
-		end_ts = start_ts + 60;
-	}
-
-
-	/* what do we want to analyse? */
-
-	/* if we have sent / recved too many queries or pings */
-
-	int in_ping = 0;
-	int out_ping = 0;
-	int in_query = 0;
-	int out_query = 0;
-	int in_other = 0;
-	int out_other = 0;
-
-	for(it = sit; it != eit; it++)
-	{
-		if (it->second.incoming)
-		{
-			switch(it->second.msgType)
-			{
-				case BITDHT_MSG_TYPE_PING:
-					in_ping++;
-					break;
-				case BITDHT_MSG_TYPE_FIND_NODE:
-					in_query++;
-					break;
-				default:
-					in_other++;
-					break;
-			}
-		}
-		else
-		{
-			switch(it->second.msgType)
-			{
-				case BITDHT_MSG_TYPE_PING:
-					out_ping++;
-					break;
-				case BITDHT_MSG_TYPE_FIND_NODE:
-					out_query++;
-					break;
-				default:
-					out_other++;
-					break;
-			}
-		}
-
-	}
-
-	float in_ping_per_min = in_ping * 60.0 / (end_ts - start_ts);
-	float out_ping_per_min = out_ping * 60.0 / (end_ts - start_ts);
-	float in_query_per_min = in_query * 60.0 / (end_ts - start_ts);
-	float out_query_per_min = out_query * 60.0 / (end_ts - start_ts);
-
-	if ((in_ping_per_min > MAX_PING_PER_MINUTE) ||
-		(out_ping_per_min > MAX_PING_PER_MINUTE) ||
-		(in_query_per_min > MAX_PING_PER_MINUTE) ||
-		(out_query_per_min > MAX_PING_PER_MINUTE))
-	{
-		flagged = true;
-	}
-
-	if (flagged)
-	{
-		/* print header */
-		std::ostream &out = std::cerr;
-		out << "BdHistoryAnalysis has flagged peer: ";
-		bdStdPrintId(out, &mId);
-		out << std::endl;
-
-		out << "PeerType: " << mPeerVersion;
-		out << std::endl;
-
-		out << "Ping In Per Min  : " << in_ping_per_min << std::endl;
-		out << "Ping Out Per Min : " << out_ping_per_min << std::endl;
-		out << "Query In Per Min : " << in_query_per_min << std::endl;
-		out << "Query Out Per Min: " << out_query_per_min << std::endl;
-
-		out << "Message History: ";
-		out << std::endl;
-
-		printHistory(out, 0, 0, time(NULL));
-	}
-	return true;
-}
-
-bdHistory::bdHistory(time_t store_period)
- :mStorePeriod(store_period) { return; }
-
-void bdHistory::addMsg(const bdId *id, bdToken * /*transId*/, uint32_t msgType, bool incoming, const bdNodeId *aboutId)
-{
-	//std::cerr << "bdHistory::addMsg() ";
-	//bdStdPrintId(std::cerr, id);
-	//std::cerr << std::endl;
-
-	time_t now = time(NULL);
-
-	std::map<bdId, bdMsgHistoryList>::iterator it;
-	bdMsgHistoryList &histRef = mHistory[*id]; /* will instaniate empty */
-	histRef.mId = *id;
-	histRef.addMsg(now, msgType, incoming, aboutId);
-
-	/* add to mMsgTimeline */
-	mMsgTimeline.insert(std::make_pair(now, MsgRegister(id, msgType, incoming, aboutId)));
-}
-
-void bdHistory::setPeerType(const bdId *id, std::string version)
-{
-	std::map<bdId, bdMsgHistoryList>::iterator it;
-	bdMsgHistoryList &histRef = mHistory[*id]; /* will instaniate empty */
-	histRef.setPeerType(time(NULL), version);
-}
-
-void bdHistory::printMsgs()
-{
-	/* print and clear msgs */
-	std::ostream &out = std::cerr;
-
-	std::cerr << "bdHistory::printMsgs()";
-	std::cerr << std::endl;
-
-
-	std::map<bdId, bdMsgHistoryList> ::iterator it;
-	for(it = mHistory.begin(); it != mHistory.end(); it++)
-	{
-		if (it->second.msgCount(0, time(NULL))) // all msg count.
-		{
-			/* print header */
-			out << "Msgs for ";
-			bdStdPrintId(out, &(it->first));
-			out << " v:" << it->second.mPeerVersion;
-			out << std::endl;
-
-			it->second.printHistory(out, 0, 0, time(NULL));
-		}
-	}
-
-	out << "Msg Timeline:";
-	time_t now = time(NULL);
-	std::multimap<time_t, MsgRegister>::iterator hit;
-	for(hit = mMsgTimeline.begin(); hit != mMsgTimeline.end(); hit++)
-	{
-		out << now - hit->first << "   ";
-		bdStdPrintId(out, &(hit->second.id));
-
-		if (hit->second.incoming)
-		{
-			out << " =I> ";
-		}
-		else
-		{
-			out << " <O= ";
-		}
-
-		std::string name;
-		if (bitdht_msgtype(hit->second.msgType, name))
-		{
-			out << name;
-		}
-		else
-		{
-			out << "UNKNOWN MSG";
-		}
-		out << std::endl;
-	}
-}
-
-
-void bdHistory::cleanupOldMsgs()
-{
-	std::cerr << "bdHistory::cleanupOldMsgs()";
-	std::cerr << std::endl;
-
-	if (mStorePeriod == 0)
-	{
-		return; // no cleanup
-	}
-
-	std::set<bdId> to_cleanup;
-	std::set<bdId>::iterator cit;
-
-	time_t before = time(NULL) - mStorePeriod;
-
-	// Delete the old stuff in the list.
-	while((mMsgTimeline.begin() != mMsgTimeline.end()) && (mMsgTimeline.begin()->first < before))
-	{
-		std::multimap<time_t, MsgRegister>::iterator it = mMsgTimeline.begin();
-		to_cleanup.insert(it->second.id);
-		mMsgTimeline.erase(it);
-	}
-
-	// remove old msgs, delete entry if its empty.
-	std::map<bdId, bdMsgHistoryList>::iterator hit;
-	for(cit = to_cleanup.begin(); cit != to_cleanup.end(); cit++)
-	{
-		hit = mHistory.find(*cit);
-		if (hit != mHistory.end())
-		{
-			if (hit->second.msgClear(before))
-			{
-				// don't erase actual entry (so we remember peer type).
-				//mHistory.erase(hit);
-			}
-		}
-	}
-}
-
-
-
-void bdHistory::clearHistory()
-{
-	// Switched to a alternative clear, so we don't drop peers, and remember their type.
-	//mHistory.clear();
-	
-
-	std::map<bdId, bdMsgHistoryList> ::iterator it;
-	for(it = mHistory.begin(); it != mHistory.end(); it++)
-	{
-		it->second.clearHistory();
-	}
-}
-
-bool bdHistory::canSend(const bdId *id)
-{
-
-	std::map<bdId, bdMsgHistoryList> ::iterator it;
-	it = mHistory.find(*id);
-	if (it != mHistory.end())
-	{
-		return (it->second.canSend());
-	}
-
-	/* if not found - then can send */
-	return true;
-}
-
-
-bool bdHistory::validPeer(const bdId *id)
-{
-	std::map<bdId, bdMsgHistoryList> ::iterator it;
-	it = mHistory.find(*id);
-	if (it != mHistory.end())
-	{
-		return (it->second.validPeer());
-	}
-
-	/* if not found - then can send */
-	return false;
-}
-
-bool bdHistory::analysePeers()
-{
-	std::map<bdId, bdMsgHistoryList> ::iterator it;
-	for(it = mHistory.begin(); it != mHistory.end(); it++)
-	{
-		it->second.analysePeer();
-	}
-	return true;
-}
-
-
-
-/* Temp data class. */
-class TypeStats
-{
-	public:
-
-	TypeStats() :nodes(0) { return; }
-
-	std::map<uint32_t, uint32_t> incoming, outgoing;
-	int nodes;
-
-
-void	printStats(std::ostream &out, const TypeStats *refStats)
-{
-	std::map<uint32_t, uint32_t>::iterator it;
-	std::map<uint32_t, uint32_t>::const_iterator rit;
-
-	out << "  Nodes: " << nodes;
-	if (refStats)
-	{
-		out << " (" << 100.0 * nodes / (float) refStats->nodes << " %)";
-	}
-	out << std::endl;
-
-	out << "  Incoming Msgs";
-	out << std::endl;
-	for(it = incoming.begin(); it != incoming.end(); it++)
-	{
-		uint32_t count = 0;
-		if (refStats)
-		{			
-			rit = refStats->incoming.find(it->first);
-			if (rit != refStats->incoming.end())
-			{
-				count = rit->second;
-			}
-		}
-		printStatsLine(out, it->first, it->second, count);
-	}
-
-	out << "  Outgoing Msgs";
-	out << std::endl;
-	for(it = outgoing.begin(); it != outgoing.end(); it++)
-	{
-		uint32_t count = 0;
-		if (refStats)
-		{			
-			rit = refStats->outgoing.find(it->first);
-			if (rit != refStats->outgoing.end())
-			{
-				count = rit->second;
-			}
-		}
-		printStatsLine(out, it->first, it->second, count);
-	}
-}
-
-
-
-void   printStatsLine(std::ostream &out, uint32_t msgType, uint32_t count, uint32_t global)
-{
-	std::string name;
-	bitdht_msgtype(msgType, name);
-	out << "\t" << name << " " << count;
-	if (global != 0)
-	{
-		out << " (" << 100.0 * count / (float) global << " %)";
-	}
-	out << std::endl;
-}
-
-}; /* end of TypeStats */
-
-bool bdHistory::peerTypeAnalysis()
-{
-
-	std::map<std::string, TypeStats> mTypeStats;
-	TypeStats globalStats;
-
-	std::map<bdId, bdMsgHistoryList> ::iterator it;
-	for(it = mHistory.begin(); it != mHistory.end(); it++)
-	{
-		if (it->second.msgHistory.empty())
-		{
-			continue;
-		}
-
-		std::string version = it->second.mPeerVersion;
-		// group be first two bytes.
-		version = it->second.mPeerVersion.substr(0,2);
-		TypeStats &stats = mTypeStats[version];
-
-		stats.nodes++;
-		globalStats.nodes++;
-
-		std::multimap<time_t, bdMsgHistoryItem>::iterator lit;
-		for (lit = it->second.msgHistory.begin(); lit != it->second.msgHistory.end(); lit++)
-		{
-			if (lit->second.incoming)
-			{
-				stats.incoming[lit->second.msgType]++;
-				globalStats.incoming[lit->second.msgType]++;
-			}
-			else
-			{
-				stats.outgoing[lit->second.msgType]++;
-				globalStats.outgoing[lit->second.msgType]++;
-			}
-		}
-	}
-
-
-	std::map<std::string, TypeStats>::iterator tit;
-	for(tit = mTypeStats.begin(); tit != mTypeStats.end(); tit++)
-	{
-		std::cerr << "Stats for Peer Type: " << tit->first;
-		std::cerr << std::endl;
-		tit->second.printStats(std::cerr, &globalStats);	
-	}
-
-	std::cerr << "Global Stats: ";
-	std::cerr << std::endl;
-
-	globalStats.printStats(std::cerr, NULL);
-	return true;
-
-}
-
-
-

libbitdht/src/bitdht/bdhistory.h

@@ -1,147 +0,0 @@
-/*******************************************************************************
- * bitdht/bdhistory.h                                                          *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#ifndef BITDHT_HISTORY_H
-#define BITDHT_HISTORY_H
-
-#include "bitdht/bdpeer.h"
-#include "bitdht/bdobj.h"
-#include "bitdht/bdstddht.h"
-#include <map>
-
-#define MSG_TYPE_DIRECTION_MASK	0x000f0000
-
-#define MSG_DIRECTION_INCOMING  0x00010000
-#define MSG_DIRECTION_OUTGOING  0x00020000
-
-/**** DEBUGGING HISTORY ****/
-
-class MsgRegister
-{
-        public:
-        MsgRegister() { return; }
-        MsgRegister(const bdId *inId, uint32_t inMsgType, bool inIncoming, const bdNodeId *inAboutId)
-          :id(*inId), msgType(inMsgType), incoming(inIncoming) 
-	{ 
-		if (inAboutId)
-		{
-			aboutId = *inAboutId;
-		}
-		else
-		{
-			bdStdZeroNodeId(&aboutId);
-		}
-
-		return; 
-	}
-
-        bdId id;
-        uint32_t msgType;
-        bool incoming;
-	bdNodeId aboutId; // filled in for queries.
-};
-
-
-class bdMsgHistoryItem
-{
-	public:
-	bdMsgHistoryItem() 
-          :msgType(0), incoming(false) 
-	{
-		bdStdZeroNodeId(&aboutId);
-		return;
-	}
-
-        bdMsgHistoryItem(uint32_t inMsgType, bool inIncoming, const bdNodeId *inAboutId)
-          :msgType(inMsgType), incoming(inIncoming) 
-	{ 
-		if (inAboutId)
-		{
-			aboutId = *inAboutId;
-		}
-		else
-		{
-			bdStdZeroNodeId(&aboutId);
-		}
-
-		return; 
-	}
-
-	uint32_t msgType;
-	bool incoming;
-	bdNodeId aboutId; // filled in for queries.
-};
-
-
-class bdMsgHistoryList
-{
-	public:
-	bdMsgHistoryList();
-void	addMsg(time_t ts, uint32_t msgType, bool incoming, const bdNodeId *aboutId);
-void 	setPeerType(time_t ts, std::string version);
-int	msgCount(time_t start_ts, time_t end_ts);
-bool    msgClear(time_t before); // 0 => clear all.
-void	msgClear();
-void	printHistory(std::ostream &out, int mode, time_t start_ts, time_t end_ts);
-bool    analysePeer();
-void    clearHistory();
-
-bool    canSend();
-bool    validPeer();
-
-	std::multimap<time_t, bdMsgHistoryItem> msgHistory;
-	std::string mPeerVersion;
-	bdId mId;
-};
-
-
-
-class bdHistory
-{
-	public:
-	bdHistory(time_t store_period);
-
-void	addMsg(const bdId *id, bdToken *transId, uint32_t msgType, bool incoming, const bdNodeId *aboutId);
-void 	setPeerType(const bdId *id, std::string version);
-void	printMsgs();
-
-void    cleanupOldMsgs();
-void    clearHistory();
-bool    analysePeers();
-bool 	peerTypeAnalysis();
-
-bool    canSend(const bdId *id);
-bool    validPeer(const bdId *id);
-
-	/* recent history */
-	//std::list<bdId> lastMsgs;
-	std::map<bdId, bdMsgHistoryList> mHistory;
-	std::multimap<time_t, MsgRegister> mMsgTimeline;
-
-	int mStorePeriod;
-
-};
-
-
-
-#endif
-

libbitdht/src/bitdht/bdiface.h

@@ -1,413 +0,0 @@
-/*******************************************************************************
- * bitdht/bdiface.h                                                            *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-#ifndef BIT_DHT_INTERFACE_H
-#define BIT_DHT_INTERFACE_H
-
-#include <iosfwd>
-#include <map>
-#include <string>
-#include <list>
-#include <inttypes.h>
-
-#include "util/bdnet.h"
-
-/*
- * Functions and Classes required for Interfacing with the BitDht.
- * This should be the sole header file required to talk to Dht.
- * ... though setting it up will require including udpbitdht.h as well.
- * 
- */
-
-#define BITDHT_KEY_LEN 20
-#define BITDHT_KEY_INTLEN 5
-#define BITDHT_KEY_BITLEN 160
-
-
-
-
-#define BITDHT_MAX_PKTSIZE 1024
-
-#define BITDHT_TTL 64
-
-#define BITDHT_SEARCH_ONE_SHOT 		1
-#define BITDHT_SEARCH_REPEATING		2
-
-class bdNodeId
-{
-        public:
-        unsigned char data[BITDHT_KEY_LEN];
-};
-
-class bdMetric: public bdNodeId {};
-
-class bdId
-{
-        public:
-
-        bdId();
-        bdId(bdNodeId in_id, struct sockaddr_in in_addr);
-
-        struct sockaddr_in addr;
-        bdNodeId id;
-};
-
-#define BITDHT_LIKELY_SAME_NO			0x00000000
-#define BITDHT_LIKELY_SAME_YES			0x00000001
-#define BITDHT_LIKELY_SAME_PORT_CHANGED		0x00000002
-#define BITDHT_LIKELY_SAME_LOC_CHANGED		0x00000004
-#define BITDHT_LIKELY_SAME_IDENTICAL		0x00000008
-
-
-class bdDhtFunctions
-{
-	public:
-
-//	bdDhtFunctions();
-	/* setup variables */
-virtual uint16_t bdNumBuckets() = 0;
-virtual uint16_t bdNodesPerBucket() = 0; /* used for bdspace */
-virtual uint16_t bdNumQueryNodes() = 0; /* used for queries */
-virtual uint16_t bdBucketBitSize() = 0;
-
-virtual int bdDistance(const bdNodeId *n1, const bdNodeId *n2, bdMetric *metric) = 0;
-virtual int bdBucketDistance(const bdNodeId *n1, const bdNodeId *n2) = 0;
-virtual int bdBucketDistance(const bdMetric *metric) = 0;
-
-virtual bool bdSimilarId(const bdId *id1, const bdId *id2) = 0;
-virtual bool bdUpdateSimilarId(bdId *dest, const bdId *src) = 0;
-
-virtual void bdRandomMidId(const bdNodeId *target, const bdNodeId *other, bdNodeId *mid) = 0;
-
-virtual void bdPrintId(std::ostream &out, const bdId *a) = 0;
-virtual void bdPrintNodeId(std::ostream &out, const bdNodeId *a) = 0;
-
-};
-
-
-
-// DHT MODES
-#define BITDHT_MODE_TRAFFIC_MASK	0x00000f00
-#define BITDHT_MODE_RELAYSERVER_MASK  	0x0000f000
-
-// These are not ORd - only one can apply.
-#define BITDHT_MODE_TRAFFIC_HIGH	0x00000100
-#define BITDHT_MODE_TRAFFIC_MED		0x00000200
-#define BITDHT_MODE_TRAFFIC_LOW		0x00000300
-#define BITDHT_MODE_TRAFFIC_TRICKLE	0x00000400
-#define BITDHT_MODE_TRAFFIC_DEFAULT	BITDHT_MODE_TRAFFIC_LOW
-
-// These are not ORd - only one can apply.
-#define BITDHT_MODE_RELAYSERVERS_IGNORED	0x00001000
-#define BITDHT_MODE_RELAYSERVERS_FLAGGED	0x00002000
-#define BITDHT_MODE_RELAYSERVERS_ONLY		0x00003000
-#define BITDHT_MODE_RELAYSERVERS_SERVER		0x00004000
-
-
-/* NODE OPTIONS */
-#define BITDHT_OPTIONS_MAINTAIN_UNSTABLE_PORT		0x00000001
-#define BITDHT_OPTIONS_ENABLE_RELAYS			0x00000002
-
-
-/* peer flags
- * order is important!
- * higher bits = more priority.
- * BITDHT_PEER_STATUS_RECVPING
- * BITDHT_PEER_STATUS_RECVPONG
- * BITDHT_PEER_STATUS_RECVNODES
- * BITDHT_PEER_STATUS_RECVHASHES
- * BITDHT_PEER_STATUS_DHT_ENGINE  (dbXXxx)
- * BITDHT_PEER_STATUS_DHT_APPL    (XXRSxx)
- * BITDHT_PEER_STATUS_DHT_VERSION (XXxx50)
- * 
- */
-
-#define 	BITDHT_PEER_STATUS_MASK_RECVD		0x000000ff
-#define 	BITDHT_PEER_STATUS_MASK_DHT		0x0000ff00
-#define 	BITDHT_PEER_STATUS_MASK_KNOWN		0x00ff0000
-
-#define 	BITDHT_PEER_STATUS_RECV_PING		0x00000001
-#define 	BITDHT_PEER_STATUS_RECV_PONG		0x00000002
-#define 	BITDHT_PEER_STATUS_RECV_NODES		0x00000004
-#define 	BITDHT_PEER_STATUS_RECV_HASHES		0x00000008
-#define 	BITDHT_PEER_STATUS_RECV_CONNECT_MSG	0x00000010
-
-#define 	BITDHT_PEER_STATUS_DHT_ENGINE		0x00000100
-#define 	BITDHT_PEER_STATUS_DHT_ENGINE_VERSION	0x00000200
-#define 	BITDHT_PEER_STATUS_DHT_APPL		0x00000400
-#define 	BITDHT_PEER_STATUS_DHT_APPL_VERSION	0x00000800
-
-#define 	BITDHT_PEER_STATUS_DHT_WHITELIST	0x00010000
-#define 	BITDHT_PEER_STATUS_DHT_FOF		0x00020000
-#define 	BITDHT_PEER_STATUS_DHT_FRIEND		0x00040000
-#define 	BITDHT_PEER_STATUS_DHT_RELAY_SERVER	0x00080000	// (Flag must be enabled)
-#define 	BITDHT_PEER_STATUS_DHT_SELF		0x00100000	
-
-
-// EXTRA FLAGS are our internal thoughts about the peer.
-#define 	BITDHT_PEER_EXFLAG_MASK_BASIC		0x000000ff
-#define 	BITDHT_PEER_EXFLAG_UNSTABLE		0x00000001	// Port changes.
-#define 	BITDHT_PEER_EXFLAG_ATTACHED		0x00000002 	// We will ping in heavily. (if unstable)
-#define 	BITDHT_PEER_EXFLAG_BADPEER		0x00000004 	// For testing, we flag rather than discard.
-
-
-
-
-
-#define 	BITDHT_CONNECT_MODE_DIRECT		0x00000001
-#define 	BITDHT_CONNECT_MODE_PROXY		0x00000002
-#define 	BITDHT_CONNECT_MODE_RELAY		0x00000004
-
-#define 	BITDHT_CONNECT_OPTION_AUTOPROXY		0x00000001
-
-// STATUS CODES. == 0 is okay, != 0 is error.
-#define 	BITDHT_CONNECT_ANSWER_OKAY		0x00000000
-#define 	BITDHT_CONNECT_ERROR_NONE		(BITDHT_CONNECT_ANSWER_OKAY)
-
-#define 	BITDHT_CONNECT_ERROR_MASK_TYPE		0x0000ffff
-#define 	BITDHT_CONNECT_ERROR_MASK_SOURCE	0x00ff0000
-#define 	BITDHT_CONNECT_ERROR_MASK_CRMOVE	0xff000000
-
-#define 	BITDHT_CONNECT_ERROR_SOURCE_START	0x00010000
-#define 	BITDHT_CONNECT_ERROR_SOURCE_MID		0x00020000
-#define 	BITDHT_CONNECT_ERROR_SOURCE_END 	0x00040000
-#define 	BITDHT_CONNECT_ERROR_SOURCE_OTHER 	0x00080000
-
-#define 	BITDHT_CONNECT_ERROR_CRMOVE_FATAL 	0x01000000
-#define 	BITDHT_CONNECT_ERROR_CRMOVE_NOMOREIDS 	0x02000000
-#define 	BITDHT_CONNECT_ERROR_CRMOVE_NEXTID 	0x04000000
-#define 	BITDHT_CONNECT_ERROR_CRMOVE_PAUSED 	0x08000000
-
-// ERROR CODES.
-#define 	BITDHT_CONNECT_ERROR_GENERIC		0x00000001
-#define 	BITDHT_CONNECT_ERROR_PROTOCOL		0x00000002
-#define 	BITDHT_CONNECT_ERROR_TIMEOUT		0x00000003
-#define 	BITDHT_CONNECT_ERROR_TEMPUNAVAIL	0x00000004   // Haven't got ext address yet.
-#define 	BITDHT_CONNECT_ERROR_NOADDRESS		0x00000005   // Can't find the peer in tables.
-#define 	BITDHT_CONNECT_ERROR_UNREACHABLE	0x00000006   // Symmetric NAT
-
-#define 	BITDHT_CONNECT_ERROR_UNSUPPORTED	0x00000007
-#define 	BITDHT_CONNECT_ERROR_OVERLOADED		0x00000008
-#define 	BITDHT_CONNECT_ERROR_AUTH_DENIED	0x00000009
-#define 	BITDHT_CONNECT_ERROR_DUPLICATE		0x0000000a
-
-// These are slightly special ones used for CB_REQUEST
-#define 	BITDHT_CONNECT_ERROR_TOOMANYRETRY	0x0000000b
-#define 	BITDHT_CONNECT_ERROR_OUTOFPROXY		0x0000000c
-#define 	BITDHT_CONNECT_ERROR_USER		0x0000000d
-
-
-/*************/
-// FRIEND_ENTRY_FLAGS... used by updateKnownPeers().
-
-#define BD_FRIEND_ENTRY_ONLINE          0x0001
-#define BD_FRIEND_ENTRY_ADDR_OK         0x0002
-
-#define BD_FRIEND_ENTRY_WHITELIST       BITDHT_PEER_STATUS_DHT_WHITELIST
-#define BD_FRIEND_ENTRY_FOF             BITDHT_PEER_STATUS_DHT_FOF
-#define BD_FRIEND_ENTRY_FRIEND          BITDHT_PEER_STATUS_DHT_FRIEND
-#define BD_FRIEND_ENTRY_RELAY_SERVER    BITDHT_PEER_STATUS_DHT_RELAY_SERVER
-
-#define BD_FRIEND_ENTRY_SELF            BITDHT_PEER_STATUS_DHT_SELF
-
-#define BD_FRIEND_ENTRY_MASK_KNOWN      BITDHT_PEER_STATUS_MASK_KNOWN
-
-
-
-
-/* Definitions of bdSpace Peer and Bucket are publically available, 
- * so we can expose the bucket entries for the gui.
- */
-
-class bdPeer
-{
-	public:
-	bdPeer():mPeerFlags(0), mLastSendTime(0), mLastRecvTime(0), mFoundTime(0), mExtraFlags(0) { return; }
-
-	bdId   mPeerId;
-	uint32_t mPeerFlags;
-	time_t mLastSendTime;
-	time_t mLastRecvTime;
-	time_t mFoundTime;     /* time stamp that peer was found */
-
-	uint32_t mExtraFlags;
-};
-	
-class bdBucket
-{
-	public:
-	
-	bdBucket();
-	/* list so we can queue properly */
-	std::list<bdPeer> entries;
-};
-
-class bdQueryStatus
-{
-        public:
-        uint32_t mStatus;
-        uint32_t mQFlags;
-        std::list<bdId> mResults;
-};
-
-class bdQuerySummary
-{
-        public:
-
-        bdNodeId mId;
-        bdMetric mLimit;
-        uint32_t mState;
-        time_t mQueryTS;
-        uint32_t mQueryFlags;
-        int32_t mSearchTime;
-
-        int32_t mQueryIdlePeerRetryPeriod; // seconds between retries.
-
-        // closest peers
-        std::multimap<bdMetric, bdPeer>  mClosest;
-        std::multimap<bdMetric, bdPeer>  mPotentialPeers;
-        std::list<bdPeer>  mProxiesUnknown;
-        std::list<bdPeer>  mProxiesFlagged;
-};
-
-
-
-
-/* Status options */
-#define BITDHT_QUERY_READY		1
-#define BITDHT_QUERY_QUERYING           2
-#define BITDHT_QUERY_FAILURE            3
-#define BITDHT_QUERY_FOUND_CLOSEST      4
-#define BITDHT_QUERY_PEER_UNREACHABLE   5
-#define BITDHT_QUERY_SUCCESS            6
-
-/* Query Flags */
-#define BITDHT_QFLAGS_NONE		0x0000
-#define BITDHT_QFLAGS_DISGUISE		0x0001  // Don't search directly for target.
-#define BITDHT_QFLAGS_DO_IDLE		0x0002
-#define BITDHT_QFLAGS_INTERNAL		0x0004  // runs through startup. (limited callback)
-#define BITDHT_QFLAGS_UPDATES		0x0008  // Do regular updates.
-
-/* Connect Callback Flags */
-#define BITDHT_CONNECT_CB_AUTH		1
-#define BITDHT_CONNECT_CB_PENDING	2
-#define BITDHT_CONNECT_CB_START		3
-#define BITDHT_CONNECT_CB_PROXY		4
-#define BITDHT_CONNECT_CB_FAILED	5
-#define BITDHT_CONNECT_CB_REQUEST	6
-
-#define BD_PROXY_CONNECTION_UNKNOWN_POINT       0
-#define BD_PROXY_CONNECTION_START_POINT         1
-#define BD_PROXY_CONNECTION_MID_POINT           2
-#define BD_PROXY_CONNECTION_END_POINT           3
-
-#define BITDHT_INFO_CB_TYPE_BADPEER	1
-
-/* Relay Modes */
-#define BITDHT_RELAYS_OFF		0
-#define BITDHT_RELAYS_ON		1
-#define BITDHT_RELAYS_ONLY		2
-#define BITDHT_RELAYS_SERVER		3
-
-
-class BitDhtCallback
-{
-	public:
-//        ~BitDhtCallback();
-
-	// dummy cos not needed for standard dht behaviour;
-	virtual int dhtNodeCallback(const bdId *  /*id*/, uint32_t /*peerflags*/)  { return 0; }
-
-	// must be implemented.
-	virtual int dhtPeerCallback(const bdId *id, uint32_t status) = 0;
-	virtual int dhtValueCallback(const bdNodeId *id, std::string key, uint32_t status) = 0;
-
-	// connection callback. Not required for basic behaviour, but forced for initial development.
-	virtual int dhtConnectCallback(const bdId *srcId, const bdId *proxyId, const bdId *destId,
-	uint32_t mode, uint32_t point, uint32_t param, uint32_t cbtype, uint32_t errcode) = 0; /*  { return 0; }  */
-
-	// Generic Info callback - initially will be used to provide bad peers.
-	virtual int dhtInfoCallback(const bdId *id, uint32_t type, uint32_t flags, std::string info) = 0;
-
-	// ask upper layer whether an IP is banned or not
-	// must not be implemented
-	// when set it will be used instead of the own ban list
-	// return code is used to express availability/absence
-	virtual int dhtIsBannedCallback(const sockaddr_in */*addr*/, bool */*isBanned*/) { return 0;}
-};
-
-
-class BitDhtInterface
-{
-	public:
-
-	/* bad peer notification */
-virtual void addBadPeer(const struct sockaddr_in &addr, uint32_t source, uint32_t reason, uint32_t age) = 0;
-
-	/* Friend Tracking */
-virtual void updateKnownPeer(const bdId *id, uint32_t type, uint32_t flags) = 0;
-
-        /***** Request Lookup (DHT Peer & Keyword) *****/
-virtual void addFindNode(bdNodeId *id, uint32_t mode) = 0;
-virtual void removeFindNode(bdNodeId *id) = 0;
-virtual void findDhtValue(bdNodeId *id, std::string key, uint32_t mode) = 0;
-
-	/***** Connections Requests *****/
-virtual bool ConnectionRequest(struct sockaddr_in *laddr, bdNodeId *target, uint32_t mode, uint32_t delay, uint32_t start) = 0;
-virtual void ConnectionAuth(bdId *srcId, bdId *proxyId, bdId *destId, uint32_t mode, uint32_t loc, 
-						uint32_t bandwidth, uint32_t delay, uint32_t answer) = 0;
-virtual void ConnectionOptions(uint32_t allowedModes, uint32_t flags) = 0;
-
-virtual bool setAttachMode(bool on) = 0;
-
-
-        /***** Add / Remove Callback Clients *****/
-virtual void addCallback(BitDhtCallback *cb) = 0;
-virtual void removeCallback(BitDhtCallback *cb) = 0;
-
-	/***** Get Results Details *****/
-virtual int getDhtPeerAddress(const bdNodeId *id, struct sockaddr_in &from) = 0;
-virtual int getDhtValue(const bdNodeId *id, std::string key, std::string &value) = 0;
-virtual int getDhtBucket(const int idx, bdBucket &bucket) = 0;
-
-virtual int getDhtQueries(std::map<bdNodeId, bdQueryStatus> &queries) = 0;
-virtual int getDhtQueryStatus(const bdNodeId *id, bdQuerySummary &query) = 0;
-
-        /* stats and Dht state */
-virtual int startDht() = 0;
-virtual int stopDht() = 0;
-virtual int stateDht() = 0; /* STOPPED, STARTING, ACTIVE, FAILED */
-virtual uint32_t statsNetworkSize() = 0;
-virtual uint32_t statsBDVersionSize() = 0; /* same version as us! */
-
-virtual uint32_t setDhtMode(uint32_t dhtFlags) = 0;
-};
-
-
-// general helper functions for decoding error messages.
-std::string decodeConnectionError(uint32_t errcode);
-std::string decodeConnectionErrorCRMove(uint32_t errcode);
-std::string decodeConnectionErrorSource(uint32_t errcode);
-std::string decodeConnectionErrorType(uint32_t errcode);
-
-
-#endif
-

libbitdht/src/bitdht/bdmanager.h

@@ -1,209 +0,0 @@
-/*******************************************************************************
- * bitdht/bdmanager.h                                                          *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-#ifndef BITDHT_MANAGER_H
-#define BITDHT_MANAGER_H
-
-/*******
- * Node Manager.
- ******/
-
-/******************************************
- * 1) Maintains a list of ids to search for.
- * 2) Sets up initial search for own node.
- * 3) Checks on status of queries.
- * 4) Callback on successful searches.
- *
- * This is pretty specific to RS requirements.
- ****/
-
-#define BITDHT_PS_MASK_ACTIONS  	(0x000000ff)
-#define BITDHT_PS_MASK_STATE    	(0x0000ff00)
-
-#define BITDHT_PS_ACTION_SEARCHING 	(0x00000001)
-#define BITDHT_PS_ACTION_WAITING	(0x00000002)
-#define BITDHT_PS_ACTION_PINGING	(0x00000004)
-
-#define BITDHT_PS_STATE_UNKNOWN		(0x00000100)
-#define BITDHT_PS_STATE_OFFLINE		(0x00000200)
-#define BITDHT_PS_STATE_ONLINE		(0x00000400)
-#define BITDHT_PS_STATE_CONNECTED	(0x00000800)
-
-#include "bitdht/bdiface.h"
-#include "bitdht/bdnode.h"
-#include "util/bdbloom.h"
-
-
-
-class bdQueryPeer
-{
-	public:
-	bdId mId;
-	uint32_t mStatus;
-	uint32_t mQFlags;
-	//time_t mLastQuery;
-	//time_t mLastFound;
-	struct sockaddr_in mDhtAddr;
-	time_t mCallbackTS;   // for UPDATES flag.
-};
-
-
-#define BITDHT_MGR_STATE_OFF		0
-#define BITDHT_MGR_STATE_STARTUP	1
-#define BITDHT_MGR_STATE_FINDSELF	2
-#define BITDHT_MGR_STATE_ACTIVE 	3
-#define BITDHT_MGR_STATE_REFRESH 	4
-#define BITDHT_MGR_STATE_QUIET		5
-#define BITDHT_MGR_STATE_FAILED		6
-
-#define MAX_STARTUP_TIME 10
-#define MAX_REFRESH_TIME 10
-
-#define BITDHT_MGR_QUERY_FAILURE		1
-#define BITDHT_MGR_QUERY_PEER_OFFLINE		2
-#define BITDHT_MGR_QUERY_PEER_UNREACHABLE	3
-#define BITDHT_MGR_QUERY_PEER_ONLINE		4
-
-
-/*** NB: Nothing in here is protected by mutexes 
- * must be done at a higher level!
- ***/
-
-class bdNodeManager: public bdNode, public BitDhtInterface
-{
-	public:
-		bdNodeManager(bdNodeId *id, std::string dhtVersion, std::string bootfile, std::string bootfilebak, const std::string &filterfile, bdDhtFunctions *fns);
-
-
-void 	iteration();
-
-        /***** Functions to Call down to bdNodeManager ****/
-
-
-        /* Friend Tracking */
-virtual void addBadPeer(const struct sockaddr_in &addr, uint32_t source, uint32_t reason, uint32_t age);
-virtual void updateKnownPeer(const bdId *id, uint32_t type, uint32_t flags);
-
-        /* Request DHT Peer Lookup */
-        /* Request Keyword Lookup */
-virtual void addFindNode(bdNodeId *id, uint32_t mode);
-virtual void removeFindNode(bdNodeId *id);
-virtual void findDhtValue(bdNodeId *id, std::string key, uint32_t mode);
-
-        /***** Add / Remove Callback Clients *****/
-virtual void addCallback(BitDhtCallback *cb);
-virtual void removeCallback(BitDhtCallback *cb);
-
-        /***** Get Results Details *****/
-virtual int getDhtPeerAddress(const bdNodeId *id, struct sockaddr_in &from);
-virtual int getDhtValue(const bdNodeId *id, std::string key, std::string &value);
-virtual int getDhtBucket(const int idx, bdBucket &bucket);
-
-virtual int getDhtQueries(std::map<bdNodeId, bdQueryStatus> &queries);
-virtual int getDhtQueryStatus(const bdNodeId *id, bdQuerySummary &query);
-
-	/***** Connection Interface ****/
-virtual bool ConnectionRequest(struct sockaddr_in *laddr, bdNodeId *target, uint32_t mode, uint32_t delay, uint32_t start);
-virtual void ConnectionAuth(bdId *srcId, bdId *proxyId, bdId *destId, 
-						uint32_t mode, uint32_t loc, uint32_t bandwidth, uint32_t delay, uint32_t answer);
-virtual void ConnectionOptions(uint32_t allowedModes, uint32_t flags);
-
-virtual bool setAttachMode(bool on);
-
-	/* stats and Dht state */
-virtual int startDht();
-virtual int stopDht();
-virtual int stateDht(); /* STOPPED, STARTING, ACTIVE, FAILED */
-virtual uint32_t statsNetworkSize();
-virtual uint32_t statsBDVersionSize(); /* same version as us! */
-
-virtual uint32_t setDhtMode(uint32_t dhtFlags);
-
-        /******************* Internals *************************/
-
-	// Overloaded from bdnode for external node callback.
-virtual void addPeer(const bdId *id, uint32_t peerflags);
-        // Overloaded from bdnode for external node callback.
-virtual void callbackConnect(bdId *srcId, bdId *proxyId, bdId *destId,
-                                        int mode, int point, int param, int cbtype, int errcode); 
-
-int 	isBitDhtPacket(char *data, int size, struct sockaddr_in &from);
-
-	// this function is used by bdFilter (must be public!)
-void	doIsBannedCallback(const sockaddr_in *addr, bool *isAvailable, bool* isBanned);
-
-private:
-
-
-void 	doNodeCallback(const bdId *id, uint32_t peerflags);
-void 	doPeerCallback(const bdId *id, uint32_t status);
-void 	doValueCallback(const bdNodeId *id, std::string key, uint32_t status);
-void    doInfoCallback(const bdId *id, uint32_t type, uint32_t flags, std::string info);
-
-int	status();
-int	checkStatus();
-int 	checkPingStatus();
-int	checkBadPeerStatus();
-int 	SearchOutOfDate();
-void	startQueries();
-
-int     QueryRandomLocalNet();
-void    SearchForLocalNet();
-
-	std::map<bdNodeId, bdQueryPeer>	mActivePeers;
-        std::list<BitDhtCallback *> mCallbacks;
-
-	uint32_t mMode;
-	time_t   mModeTS;
-
-        time_t mStartTS;
-        time_t mSearchTS;
-        bool mSearchingDone;
-
-	bdDhtFunctions *mDhtFns;
-
-	uint32_t mNetworkSize;
-	uint32_t mBdNetworkSize;
-
-	bdBloom mBloomFilter;
-
-        bool mLocalNetEnhancements;
-
-	/* future node functions */
-	//addPeerPing(foundId);
-	//clearPing(it->first);
-	//PingStatus(it->first);
-};
-
-class bdDebugCallback: public BitDhtCallback
-{
-        public:
-        ~bdDebugCallback();
-virtual int dhtPeerCallback(const bdId *id, uint32_t status);
-virtual int dhtValueCallback(const bdNodeId *id, std::string key, uint32_t status);
-virtual int dhtConnectCallback(const bdId *srcId, const bdId *proxyId, const bdId *destId,             
-                         uint32_t mode, uint32_t point, uint32_t param, uint32_t cbtype, uint32_t errcode);
-virtual int dhtInfoCallback(const bdId *id, uint32_t type, uint32_t flags, std::string info);
-
-};
-
-
-#endif

libbitdht/src/bitdht/bdmsgs.h

@@ -1,127 +0,0 @@
-/*******************************************************************************
- * bitdht/bdmsgs.h                                                             *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-#ifndef BITDHT_MSGS_H
-#define BITDHT_MSGS_H
-
-#include <stdio.h>
-#include <inttypes.h>
-#include <list>
-#include "bitdht/bencode.h"
-#include "bitdht/bdobj.h"
-#include "bitdht/bdpeer.h"
-
-#define BITDHT_MSG_TYPE_UNKNOWN         0
-#define BITDHT_MSG_TYPE_PING            1
-#define BITDHT_MSG_TYPE_PONG            2
-#define BITDHT_MSG_TYPE_FIND_NODE       3
-#define BITDHT_MSG_TYPE_REPLY_NODE      4
-#define BITDHT_MSG_TYPE_GET_HASH        5
-#define BITDHT_MSG_TYPE_REPLY_HASH      6
-#define BITDHT_MSG_TYPE_REPLY_NEAR      7
-#define BITDHT_MSG_TYPE_POST_HASH       8
-#define BITDHT_MSG_TYPE_REPLY_POST      9
-
-
-
-// THESE ARE EXTENSIONS
-#define BITDHT_MSG_TYPE_CONNECT     	20
-
-// CONNECTIONS.
-#define BITDHT_MSG_TYPE_CONNECT_REQUEST     	101
-#define BITDHT_MSG_TYPE_CONNECT_REPLY     	102
-#define BITDHT_MSG_TYPE_CONNECT_START     	103
-#define BITDHT_MSG_TYPE_CONNECT_ACK     	104
-
-// FANCY HASHES.
-
-
-#define BITDHT_COMPACTNODEID_LEN 	26
-#define BITDHT_COMPACTPEERID_LEN 	6
-
-#define BE_Y_UNKNOWN    0
-#define BE_Y_R          1
-#define BE_Y_Q          2
-
-
-/****** Known BD Version Strings ******/
-
-#define BITDHT_VID_RS1	1
-#define BITDHT_VID_UT	2
-
-
-int bitdht_create_ping_msg(bdToken *tid, bdNodeId *id, bdToken *vid, char *msg, int avail);
-int bitdht_response_ping_msg(bdToken *tid, bdNodeId *id, bdToken *vid, char *msg, int avail); 
-int bitdht_find_node_msg(bdToken *tid, bdNodeId *id, bdNodeId *target, bool localnet, char *msg, int avail);
-int bitdht_resp_node_msg(bdToken *tid, bdNodeId *id, std::list<bdId> &nodes,
-                                        char *msg, int avail);
-int bitdht_get_peers_msg(bdToken *tid, bdNodeId *id, bdNodeId *info_hash,
-                                        char *msg, int avail);
-int bitdht_peers_reply_hash_msg(bdToken *tid, bdNodeId *id,
-                bdToken *token, std::list<std::string> &values,
-                                        char *msg, int avail);
-int bitdht_peers_reply_closest_msg(bdToken *tid, bdNodeId *id,
-                                bdToken *token, std::list<bdId> &nodes,
-                                        char *msg, int avail);
-int bitdht_announce_peers_msg(bdToken *tid, bdNodeId *id, bdNodeId *info_hash, 
-			uint32_t port, bdToken *token, char *msg, int avail);
-int bitdht_reply_announce_msg(bdToken *tid, bdNodeId *id,         
-                                        char *msg, int avail);
-
-
-// Extensions.
-int bitdht_connect_genmsg(bdToken *tid, bdNodeId *id, int msgtype, bdId *src, bdId *dest, int mode, int param, int status, char *msg, int avail);
-
-
-//int response_peers_message()
-//int response_closestnodes_message()
-
-be_node *beMsgGetDictNode(be_node *node, const char *key);
-int beMsgMatchString(be_node *n, const char *str, int len);
-uint32_t beMsgGetY(be_node *n);
-uint32_t beMsgType(be_node *n);
-
-bool bitdht_msgtype(uint32_t msg_type, std::string &name);
-
-
-uint32_t convertBdVersionToVID(bdVersion *version);
-
-be_node *makeCompactPeerIds(std::list<std::string> &values);
-be_node *makeCompactNodeIdString(std::list<bdId> &nodes);
-
-int beMsgGetToken(be_node *n, bdToken &token);
-int beMsgGetNodeId(be_node *n, bdNodeId &nodeId);
-int beMsgGetBdId(be_node *n, bdId &id);
-int beMsgGetListBdIds(be_node *n, std::list<bdId> &nodes);
-
-int beMsgGetListStrings(be_node *n, std::list<std::string> &values);
-int beMsgGetUInt32(be_node *n, uint32_t *port);
-
-/* Low Level conversion functions */
-int decodeCompactPeerId(struct sockaddr_in *addr, char *enc, int len);
-std::string encodeCompactPeerId(struct sockaddr_in *addr);
-
-int decodeCompactNodeId(bdId *id, char *enc, int len);
-std::string encodeCompactNodeId(bdId *id);
-
-
-
-#endif

libbitdht/src/bitdht/bdnode.h

@@ -1,284 +0,0 @@
-/*******************************************************************************
- * bitdht/bdnode.h                                                             *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-#ifndef BITDHT_NODE_H
-#define BITDHT_NODE_H
-
-#include "bitdht/bdpeer.h"
-#include "bitdht/bdquery.h"
-#include "bitdht/bdstore.h"
-#include "bitdht/bdobj.h"
-#include "bitdht/bdhash.h"
-#include "bitdht/bdhistory.h"
-#include "bitdht/bdfilter.h"
-
-#include "bitdht/bdconnection.h"
-#include "bitdht/bdaccount.h"
-
-#include "bitdht/bdfriendlist.h"
-
-class bdFilter;
-
-
-#define BD_QUERY_NEIGHBOURS		1
-#define BD_QUERY_LOCALNET		2
-#define BD_QUERY_HASH			3
-
-/**********************************
- * Running a node....
- *
- * run().
- * loops through and checks out of date peers.
- * handles searches.
- * prints out dht Table.
- *
-
-The node handles the i/o traffic from peers.
-It 
-
-
-
-ping, return
-peers, return
-hash store, return
-hash get, return
-
-
-
-respond queue.
-
-query queue.
-
-
-
-
-
-input -> call into recvFunction()
-output -> call back to Udp().
-
-
-
-
- *********/
-
-class bdFilteredPeer ;
-class bdNodeManager;
-
-class bdNodeNetMsg
-{
-
-	public:
-	bdNodeNetMsg(char *data, int size, struct sockaddr_in *addr);
-	~bdNodeNetMsg();
-
-	void print(std::ostream &out);
-
-	char *data;
-	int mSize;
-	struct sockaddr_in addr;
-
-};
-
-class bdNodePublisher
-{
-	public:
-	/* simplified outgoing msg functions (for the managers) */
-	virtual void send_ping(bdId *id) = 0; /* message out */
-	virtual void send_query(bdId *id, bdNodeId *targetNodeId, bool localnet) = 0; /* message out */
-	virtual void send_connect_msg(bdId *id, int msgtype, 
-				bdId *srcAddr, bdId *destAddr, int mode, int param, int status) = 0;
-
-        // internal Callback -> normally continues to callbackConnect().
-        virtual void callbackConnect(bdId *srcId, bdId *proxyId, bdId *destId,
-                                int mode, int point, int param, int cbtype, int errcode) = 0;
-
-};
-
-
-class bdNode: public bdNodePublisher
-{
-	public:
-
-	bdNode(bdNodeId *id, std::string dhtVersion, const std::string& bootfile, const std::string& bootfilebak, const std::string& filterfile,
-		bdDhtFunctions *fns, bdNodeManager* manager);
-
-	void init(); /* sets up the self referential classes (mQueryMgr & mConnMgr) */
-
-	void setNodeOptions(uint32_t optFlags);
-	uint32_t setNodeDhtMode(uint32_t dhtFlags);
-
-	/* startup / shutdown node */
-	void restartNode();
-	void shutdownNode();
-
-	void getOwnId(bdNodeId *id);
-
-	// virtual so manager can do callback.
-	// peer flags defined in bdiface.h
-	virtual void addPeer(const bdId *id, uint32_t peerflags);
-
-	void printState();
-	void checkPotentialPeer(bdId *id, bdId *src);
-	void addPotentialPeer(bdId *id, bdId *src);
-
-	void iterationOff();
-	void iteration();
-	void processRemoteQuery();
-	void updateStore();
-
-    bool addressBanned(const sockaddr_in &raddr) ;
-    bool getFilteredPeers(std::list<bdFilteredPeer> &peers);
-    //void loadFilteredPeers(const std::list<bdFilteredPeer> &peers);
-
-	/* simplified outgoing msg functions (for the managers) */
-	virtual void send_ping(bdId *id); /* message out */
-	virtual void send_query(bdId *id, bdNodeId *targetNodeId, bool localnet); /* message out */
-	virtual void send_connect_msg(bdId *id, int msgtype, 
-				bdId *srcAddr, bdId *destAddr, int mode, int param, int status);
-
-// This is implemented in bdManager.
-//        virtual void callbackConnect(bdId *srcId, bdId *proxyId, bdId *destId,
-//                                int mode, int point, int param, int cbtype, int errcode);
-
-	/* interaction with outside world (Accessed by controller to deliver us msgs) */
-int 	outgoingMsg(struct sockaddr_in *addr, char *msg, int *len);
-void 	incomingMsg(struct sockaddr_in *addr, char *msg, int len);
-
-	// For Relay Mode switching.
-void	dropRelayServers();
-void	pingRelayServers();
-
-// Below is internal Management of incoming / outgoing messages.
-
-private:
-
-	/* internal interaction with network */
-void	sendPkt(char *msg, int len, struct sockaddr_in addr);
-void	recvPkt(char *msg, int len, struct sockaddr_in addr);
-
-
-	/* output functions (send msg) */
-	void msgout_ping(bdId *id, bdToken *transId);
-	void msgout_pong(bdId *id, bdToken *transId);
-	void msgout_find_node(bdId *id, bdToken *transId, bdNodeId *query, bool localnet);
-	void msgout_reply_find_node(bdId *id, bdToken *transId, 
-						std::list<bdId> &peers);
-	void msgout_get_hash(bdId *id, bdToken *transId, bdNodeId *info_hash);
-	void msgout_reply_hash(bdId *id, bdToken *transId, 
-				bdToken *token, std::list<std::string> &values);
-	void msgout_reply_nearest(bdId *id, bdToken *transId, 
-				bdToken *token, std::list<bdId> &peers);
-
-	void msgout_post_hash(bdId *id, bdToken *transId, bdNodeId *info_hash, 
-				uint32_t port, bdToken *token);
-	void msgout_reply_post(bdId *id, bdToken *transId);
-
-
-	/* input functions (once mesg is parsed) */
-	uint32_t parseVersion(bdToken *versionId);
-	void msgin_ping(bdId *id, bdToken *token, bdToken *versionId);
-	void msgin_pong(bdId *id, bdToken *transId, bdToken *versionId);
-
-	void msgin_find_node(bdId *id, bdToken *transId, bdNodeId *query, bool localnet);
-	void msgin_reply_find_node(bdId *id, bdToken *transId, 
-						std::list<bdId> &entries);
-
-	void msgin_get_hash(bdId *id, bdToken *transId, bdNodeId *nodeid);
-	void msgin_reply_hash(bdId *id, bdToken *transId, 
-				bdToken *token, std::list<std::string> &values);
-	void msgin_reply_nearest(bdId *id, bdToken *transId, 
-				bdToken *token, std::list<bdId> &nodes);
-
-	void msgin_post_hash(bdId *id,  bdToken *transId,  
-				bdNodeId *info_hash,  uint32_t port, bdToken *token);
-	void msgin_reply_post(bdId *id, bdToken *transId);
-
-	void msgout_connect_genmsg(bdId *id, bdToken *transId, int msgtype, 
-				bdId *srcAddr, bdId *destAddr, int mode, int param, int status);
-	void msgin_connect_genmsg(bdId *id, bdToken *transId, int msgtype,
-                                        bdId *srcAddr, bdId *destAddr, int mode, int param, int status);
-
-
-
-	/* token handling */
-	void genNewToken(bdToken *token);
-	int queueQuery(bdId *id, bdNodeId *query, bdToken *transId, uint32_t query_type);
-
-	/* transId handling */
-	void genNewTransId(bdToken *token);
-	void registerOutgoingMsg(bdId *id, bdToken *transId, uint32_t msgType, bdNodeId *aboutId);
-	uint32_t registerIncomingMsg(bdId *id, bdToken *transId, uint32_t msgType, bdNodeId *aboutId);
-
-	void cleanupTransIdRegister();
-
-
-	void doStats();
-
-	/********** Variables **********/
-	private:
-
-	/**** Some Variables are Protected to allow inherited classes to use *****/
-	protected:
-
-	bdSpace mNodeSpace;
-	bdFilter mFilterPeers;
-
-	bdQueryManager *mQueryMgr;
-	bdConnectManager *mConnMgr;
-
-	bdNodeId mOwnId;
-	bdId 	mLikelyOwnId; // Try to workout own id address.
-	std::string mDhtVersion;
-
-	bdAccount mAccount;
-	bdStore mStore;
-
-	bdDhtFunctions *mFns;
-	bdHashSpace mHashSpace;
-
-	bdFriendList mFriendList;
-	bdPeerQueue  mBadPeerQueue;
-
-	bdHistory mHistory; /* for understanding the DHT */
-
-	bdQueryHistory mQueryHistory; /* for determining old peers */
-
-	private:
-
-	uint32_t mNodeOptionFlags;	
-	uint32_t mNodeDhtMode;
-
-	uint32_t mMaxAllowedMsgs;
-	uint32_t mRelayMode;
-
-
-	std::list<bdRemoteQuery> mRemoteQueries;
-
-	std::list<bdId> mPotentialPeers;
-
-	std::list<bdNodeNetMsg *> mOutgoingMsgs;
-	std::list<bdNodeNetMsg *> mIncomingMsgs;
-
-};
-
-
-
-#endif // BITDHT_NODE_H

libbitdht/src/bitdht/bdobj.cc

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * bitdht/bdobj.cc                                                             *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-
-#include "bitdht/bdobj.h"
-
-
-void bdPrintTransId(std::ostream &out, bdToken *transId)
-{
-	//out << transId->data;
-	bdPrintToken(out, transId);
-	return;
-}
-
-
-void bdPrintToken(std::ostream &out, bdToken *token)
-{
-	for(unsigned int i = 0; i < token->len; i++)
-	{
-		out << std::hex << (uint32_t) token->data[i];
-	}
-	out << std::dec;
-}
-
-void bdPrintCompactPeerId(std::ostream &out, std::string /*cpi*/ )
-{
-	out << "DummyCompactPeerId";
-}
-
-

libbitdht/src/bitdht/bdobj.h

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * bitdht/bdobj.h                                                              *
- *                                                                             *
- * BitDHT: An Flexible DHT library.                                            *
- *                                                                             *
- * Copyright 2010 by Robert Fernie <bitdht@lunamutt.com>                       *
- *                                                                             *
- * This program is free software: you can redistribute it and/or modify        *
- * it under the terms of the GNU Affero 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 Affero General Public License for more details.                         *
- *                                                                             *
- * You should have received a copy of the GNU Affero General Public License    *
- * along with this program. If not, see <https://www.gnu.org/licenses/>.       *
- *                                                                             *
- *******************************************************************************/
-#ifndef BITDHT_OBJECTS_H
-#define BITDHT_OBJECTS_H
-
-#define BITDHT_TOKEN_MAX_LEN 20
-
-#include <iostream>
-#include <inttypes.h>
-
-class bdToken
-{
-	public:
-	bdToken() :len(0) { return; }
-	uint32_t len;
-	unsigned char data[BITDHT_TOKEN_MAX_LEN];
-};
-
-class bdCompactIds
-{
-	public:
-	bdCompactIds() :len(0) { return; }
-	uint32_t len;
-	unsigned char data[BITDHT_TOKEN_MAX_LEN];
-};
-
-class bdVersion
-{
-	public:
-	bdVersion() :len(0) { return; }
-	uint32_t len;
-	unsigned char data[BITDHT_TOKEN_MAX_LEN];
-};
-
-void bdPrintTransId(std::ostream &out, bdToken *transId);
-void bdPrintToken(std::ostream &out, bdToken *transId);
-void bdPrintCompactPeerId(std::ostream &out, std::string cpi);
-
-#endif
-