mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-04-20 07:56:36 +02:00
Compare commits
No commits in common. "openssl" and "2.39.0" have entirely different histories.
279 changed files with 16843 additions and 31912 deletions
|
|
@ -1,39 +0,0 @@
|
||||||
# editorconfig.org
|
|
||||||
|
|
||||||
root = true
|
|
||||||
|
|
||||||
[*]
|
|
||||||
# Unix style files
|
|
||||||
end_of_line = lf
|
|
||||||
charset = utf-8
|
|
||||||
trim_trailing_whitespace = true
|
|
||||||
insert_final_newline = true
|
|
||||||
|
|
||||||
[Makefile,Makefile.*]
|
|
||||||
indent_style = tab
|
|
||||||
indent_size = 4
|
|
||||||
|
|
||||||
[*.cmd]
|
|
||||||
indent_style = space
|
|
||||||
indent_size = 2
|
|
||||||
end_of_line = crlf
|
|
||||||
|
|
||||||
[*.{h,cpp}]
|
|
||||||
indent_style = tab
|
|
||||||
indent_size = 4
|
|
||||||
|
|
||||||
[*.rc]
|
|
||||||
indent_style = space
|
|
||||||
indent_size = 4
|
|
||||||
|
|
||||||
[*.{md,markdown}]
|
|
||||||
indent_style = space
|
|
||||||
indent_size = 2
|
|
||||||
trim_trailing_whitespace = false
|
|
||||||
|
|
||||||
[*.yml]
|
|
||||||
indent_style = space
|
|
||||||
indent_size = 2
|
|
||||||
|
|
||||||
[*.patch]
|
|
||||||
trim_trailing_whitespace = false
|
|
||||||
1
.gitattributes
vendored
1
.gitattributes
vendored
|
|
@ -1 +0,0 @@
|
||||||
/build/build_mingw.cmd eol=crlf
|
|
||||||
61
.github/workflows/build-deb.yml
vendored
61
.github/workflows/build-deb.yml
vendored
|
|
@ -1,61 +0,0 @@
|
||||||
name: Build Debian packages
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- '*'
|
|
||||||
paths:
|
|
||||||
- .github/workflows/build-deb.yml
|
|
||||||
- contrib/**
|
|
||||||
- daemon/**
|
|
||||||
- debian/**
|
|
||||||
- i18n/**
|
|
||||||
- libi2pd/**
|
|
||||||
- libi2pd_client/**
|
|
||||||
- Makefile
|
|
||||||
- Makefile.linux
|
|
||||||
tags:
|
|
||||||
- '*'
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- '*'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
name: ${{ matrix.dist }}
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
dist: ['buster', 'bullseye', 'bookworm']
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Commit Hash
|
|
||||||
id: commit
|
|
||||||
uses: prompt/actions-commit-hash@v3.0.0
|
|
||||||
|
|
||||||
- name: Build package
|
|
||||||
uses: jtdor/build-deb-action@v1
|
|
||||||
with:
|
|
||||||
docker-image: debian:${{ matrix.dist }}-slim
|
|
||||||
buildpackage-opts: --build=binary --no-sign
|
|
||||||
before-build-hook: debchange --controlmaint --local "+${{ steps.commit.outputs.short }}~${{ matrix.dist }}" -b --distribution ${{ matrix.dist }} "CI build"
|
|
||||||
extra-build-deps: devscripts git
|
|
||||||
|
|
||||||
- name: Upload package
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: i2pd_${{ matrix.dist }}
|
|
||||||
path: debian/artifacts/i2pd_*.deb
|
|
||||||
|
|
||||||
- name: Upload debugging symbols
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: i2pd-dbgsym_${{ matrix.dist }}
|
|
||||||
path: debian/artifacts/i2pd-dbgsym_*.deb
|
|
||||||
40
.github/workflows/build-freebsd.yml
vendored
40
.github/workflows/build-freebsd.yml
vendored
|
|
@ -1,50 +1,20 @@
|
||||||
name: Build on FreeBSD
|
name: Build on FreeBSD
|
||||||
|
|
||||||
on:
|
on: [push, pull_request]
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- '*'
|
|
||||||
paths:
|
|
||||||
- .github/workflows/build-freebsd.yml
|
|
||||||
- build/CMakeLists.txt
|
|
||||||
- build/cmake_modules/**
|
|
||||||
- daemon/**
|
|
||||||
- i18n/**
|
|
||||||
- libi2pd/**
|
|
||||||
- libi2pd_client/**
|
|
||||||
- Makefile
|
|
||||||
- Makefile.bsd
|
|
||||||
tags:
|
|
||||||
- '*'
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- '*'
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: macos-latest
|
||||||
name: with UPnP
|
name: with UPnP
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- uses: actions/checkout@v2
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Test in FreeBSD
|
- name: Test in FreeBSD
|
||||||
id: test
|
id: test
|
||||||
uses: vmactions/freebsd-vm@v1
|
uses: vmactions/freebsd-vm@v0.1.4
|
||||||
with:
|
with:
|
||||||
usesh: true
|
usesh: true
|
||||||
mem: 2048
|
prepare: pkg install -y devel/cmake devel/gmake devel/boost-libs security/openssl net/miniupnpc
|
||||||
sync: rsync
|
|
||||||
copyback: true
|
|
||||||
prepare: pkg install -y devel/cmake devel/gmake devel/boost-libs security/openssl net/miniupnpc
|
|
||||||
run: |
|
run: |
|
||||||
cd build
|
cd build
|
||||||
cmake -DWITH_UPNP=ON -DCMAKE_BUILD_TYPE=Release .
|
cmake -DWITH_UPNP=ON -DCMAKE_BUILD_TYPE=Release .
|
||||||
gmake -j2
|
gmake -j2
|
||||||
|
|
||||||
- name: Upload artifacts
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: i2pd-freebsd
|
|
||||||
path: build/i2pd
|
|
||||||
|
|
|
||||||
33
.github/workflows/build-osx.yml
vendored
33
.github/workflows/build-osx.yml
vendored
|
|
@ -1,45 +1,20 @@
|
||||||
name: Build on OSX
|
name: Build on OSX
|
||||||
|
|
||||||
on:
|
on: [push, pull_request]
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- '*'
|
|
||||||
paths:
|
|
||||||
- .github/workflows/build-osx.yml
|
|
||||||
- daemon/**
|
|
||||||
- i18n/**
|
|
||||||
- libi2pd/**
|
|
||||||
- libi2pd_client/**
|
|
||||||
- Makefile
|
|
||||||
- Makefile.homebrew
|
|
||||||
tags:
|
|
||||||
- '*'
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- '*'
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: With USE_UPNP=${{ matrix.with_upnp }}
|
name: With USE_UPNP=${{ matrix.with_upnp }}
|
||||||
runs-on: macOS-latest
|
runs-on: macOS-latest
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: true
|
fail-fast: true
|
||||||
matrix:
|
matrix:
|
||||||
with_upnp: ['yes', 'no']
|
with_upnp: ['yes', 'no']
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- uses: actions/checkout@v2
|
||||||
uses: actions/checkout@v4
|
- name: install packages
|
||||||
|
|
||||||
- name: Install required formulae
|
|
||||||
run: |
|
run: |
|
||||||
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
|
|
||||||
brew update
|
brew update
|
||||||
brew install boost miniupnpc openssl@1.1
|
brew install boost miniupnpc openssl@1.1
|
||||||
|
- name: build application
|
||||||
- name: List installed formulae
|
|
||||||
run: brew list
|
|
||||||
|
|
||||||
- name: Build application
|
|
||||||
run: make HOMEBREW=1 USE_UPNP=${{ matrix.with_upnp }} PREFIX=$GITHUB_WORKSPACE/output -j3
|
run: make HOMEBREW=1 USE_UPNP=${{ matrix.with_upnp }} PREFIX=$GITHUB_WORKSPACE/output -j3
|
||||||
|
|
|
||||||
|
|
@ -1,80 +0,0 @@
|
||||||
name: Build on Windows with MSVC
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- '*'
|
|
||||||
paths:
|
|
||||||
- .github/workflows/build-windows-msvc.yml
|
|
||||||
- build/CMakeLists.txt
|
|
||||||
- build/cmake_modules/**
|
|
||||||
- daemon/**
|
|
||||||
- i18n/**
|
|
||||||
- libi2pd/**
|
|
||||||
- libi2pd_client/**
|
|
||||||
- Win32/**
|
|
||||||
tags:
|
|
||||||
- '*'
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- '*'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
name: Build
|
|
||||||
runs-on: windows-latest
|
|
||||||
env:
|
|
||||||
boost_path: ${{ github.workspace }}\boost_1_83_0
|
|
||||||
openssl_path: ${{ github.workspace }}\openssl_3_2_1
|
|
||||||
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Build and install zlib
|
|
||||||
run: |
|
|
||||||
powershell -Command "(Invoke-WebRequest -Uri https://raw.githubusercontent.com/r4sas/zlib.install/master/install.bat -OutFile install_zlib.bat)"
|
|
||||||
powershell -Command "(Get-Content install_zlib.bat) | Set-Content install_zlib.bat" # fixing line endings
|
|
||||||
set BUILD_TYPE=Debug
|
|
||||||
./install_zlib.bat
|
|
||||||
set BUILD_TYPE=Release
|
|
||||||
./install_zlib.bat
|
|
||||||
del install_zlib.bat
|
|
||||||
|
|
||||||
- name: Install Boost
|
|
||||||
run: |
|
|
||||||
powershell -Command "(Start-BitsTransfer -Source https://sourceforge.net/projects/boost/files/boost-binaries/1.83.0/boost_1_83_0-msvc-14.3-64.exe/download -Destination boost_1_83_0-msvc-14.3-64.exe)"
|
|
||||||
./boost_1_83_0-msvc-14.3-64.exe /DIR="${{env.boost_path}}" /VERYSILENT /SUPPRESSMSGBOXES /SP-
|
|
||||||
|
|
||||||
- name: Install OpenSSL
|
|
||||||
run: |
|
|
||||||
powershell -Command "(Start-BitsTransfer -Source https://slproweb.com/download/Win64OpenSSL-3_2_1.exe -Destination Win64OpenSSL-3_2_1.exe)"
|
|
||||||
./Win64OpenSSL-3_2_1.exe /DIR="${{env.openssl_path}}" /TASKS="copytobin" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
|
|
||||||
|
|
||||||
- name: Make copy of the OpenSSL libraries for CMake
|
|
||||||
run: |
|
|
||||||
dir ${{ github.workspace }}
|
|
||||||
dir ${{env.openssl_path}}\lib\VC
|
|
||||||
dir ${{env.openssl_path}}\lib\VC\x64\
|
|
||||||
dir ${{env.openssl_path}}\lib\VC\x64\MTd\
|
|
||||||
xcopy /s /y "${{env.openssl_path}}\lib\VC\x64\MTd" "${{env.openssl_path}}\lib"
|
|
||||||
|
|
||||||
- name: Configure
|
|
||||||
working-directory: build
|
|
||||||
run: cmake -DBoost_ROOT="${{env.boost_path}}" -DOPENSSL_ROOT_DIR="${{env.openssl_path}}" -DWITH_STATIC=ON .
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
working-directory: build
|
|
||||||
run: cmake --build . --config Debug -- -m
|
|
||||||
|
|
||||||
- name: Upload artifacts
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: i2pd-msvc
|
|
||||||
path: build/Debug/i2pd.*
|
|
||||||
|
|
||||||
235
.github/workflows/build-windows.yml
vendored
235
.github/workflows/build-windows.yml
vendored
|
|
@ -1,25 +1,6 @@
|
||||||
name: Build on Windows
|
name: Build on Windows
|
||||||
|
|
||||||
on:
|
on: [push, pull_request]
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- '*'
|
|
||||||
paths:
|
|
||||||
- .github/workflows/build-windows.yml
|
|
||||||
- build/CMakeLists.txt
|
|
||||||
- build/cmake_modules/**
|
|
||||||
- daemon/**
|
|
||||||
- i18n/**
|
|
||||||
- libi2pd/**
|
|
||||||
- libi2pd_client/**
|
|
||||||
- Win32/**
|
|
||||||
- Makefile
|
|
||||||
- Makefile.mingw
|
|
||||||
tags:
|
|
||||||
- '*'
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- '*'
|
|
||||||
|
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
|
|
@ -27,224 +8,28 @@ defaults:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: ${{ matrix.arch }}
|
name: Building for ${{ matrix.arch }}
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: true
|
||||||
matrix:
|
matrix:
|
||||||
include: [
|
include: [
|
||||||
{ msystem: UCRT64, arch: ucrt-x86_64, arch_short: x64-ucrt, compiler: gcc },
|
{ msystem: MINGW64, arch: x86_64 },
|
||||||
{ msystem: CLANG64, arch: clang-x86_64, arch_short: x64-clang, compiler: clang },
|
{ msystem: MINGW32, arch: i686 }
|
||||||
{ msystem: MINGW64, arch: x86_64, arch_short: x64, compiler: gcc },
|
|
||||||
{ msystem: MINGW32, arch: i686, arch_short: x86, compiler: gcc }
|
|
||||||
]
|
]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- uses: actions/checkout@v2
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Setup MSYS2
|
- name: Setup MSYS2
|
||||||
uses: msys2/setup-msys2@v2
|
uses: msys2/setup-msys2@v2
|
||||||
with:
|
with:
|
||||||
msystem: ${{ matrix.msystem }}
|
msystem: ${{ matrix.msystem }}
|
||||||
install: base-devel git mingw-w64-${{ matrix.arch }}-${{ matrix.compiler }} mingw-w64-${{ matrix.arch }}-boost mingw-w64-${{ matrix.arch }}-openssl mingw-w64-${{ matrix.arch }}-miniupnpc
|
install: base-devel mingw-w64-${{ matrix.arch }}-gcc mingw-w64-${{ matrix.arch }}-boost mingw-w64-${{ matrix.arch }}-openssl mingw-w64-${{ matrix.arch }}-miniupnpc
|
||||||
update: true
|
update: true
|
||||||
|
- name: build application
|
||||||
- name: Install additional clang packages
|
|
||||||
if: ${{ matrix.msystem == 'CLANG64' }}
|
|
||||||
run: pacman --noconfirm -S mingw-w64-${{ matrix.arch }}-gcc-compat
|
|
||||||
|
|
||||||
- name: Build application
|
|
||||||
run: |
|
run: |
|
||||||
mkdir -p obj/Win32 obj/libi2pd obj/libi2pd_client obj/daemon
|
mkdir -p obj/Win32 obj/libi2pd obj/libi2pd_client obj/daemon
|
||||||
make USE_UPNP=yes DEBUG=no USE_GIT_VERSION=yes -j3
|
make USE_UPNP=yes DEBUG=no -j3
|
||||||
|
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
name: i2pd-${{ matrix.arch_short }}.exe
|
|
||||||
path: i2pd.exe
|
|
||||||
|
|
||||||
build-cmake:
|
|
||||||
name: CMake ${{ matrix.arch }}
|
|
||||||
runs-on: windows-latest
|
|
||||||
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
include: [
|
|
||||||
{ msystem: UCRT64, arch: ucrt-x86_64, arch_short: x64-ucrt, compiler: gcc },
|
|
||||||
{ msystem: CLANG64, arch: clang-x86_64, arch_short: x64-clang, compiler: clang },
|
|
||||||
{ msystem: MINGW64, arch: x86_64, arch_short: x64, compiler: gcc },
|
|
||||||
{ msystem: MINGW32, arch: i686, arch_short: x86, compiler: gcc }
|
|
||||||
]
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Setup MSYS2
|
|
||||||
uses: msys2/setup-msys2@v2
|
|
||||||
with:
|
|
||||||
msystem: ${{ matrix.msystem }}
|
|
||||||
install: base-devel git mingw-w64-${{ matrix.arch }}-cmake mingw-w64-${{ matrix.arch }}-ninja mingw-w64-${{ matrix.arch }}-${{ matrix.compiler }} mingw-w64-${{ matrix.arch }}-boost mingw-w64-${{ matrix.arch }}-openssl mingw-w64-${{ matrix.arch }}-miniupnpc
|
|
||||||
update: true
|
|
||||||
|
|
||||||
- name: Build application
|
|
||||||
run: |
|
|
||||||
cd build
|
|
||||||
cmake -DWITH_GIT_VERSION=ON -DWITH_STATIC=ON -DWITH_UPNP=ON -DCMAKE_BUILD_TYPE=Release .
|
|
||||||
cmake --build . -- -j3
|
|
||||||
|
|
||||||
- name: Upload artifacts
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: i2pd-cmake-${{ matrix.arch_short }}.exe
|
|
||||||
path: build/i2pd.exe
|
|
||||||
|
|
||||||
build-xp:
|
|
||||||
name: XP
|
|
||||||
runs-on: windows-latest
|
|
||||||
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Setup MSYS2
|
|
||||||
uses: msys2/setup-msys2@v2
|
|
||||||
with:
|
|
||||||
msystem: MINGW32
|
|
||||||
install: base-devel git mingw-w64-i686-gcc mingw-w64-i686-boost mingw-w64-i686-openssl mingw-w64-i686-miniupnpc
|
|
||||||
cache: true
|
|
||||||
update: true
|
|
||||||
|
|
||||||
- name: Clone MinGW packages repository and revert boost to 1.85.0
|
|
||||||
run: |
|
|
||||||
git clone https://github.com/msys2/MINGW-packages
|
|
||||||
cd MINGW-packages
|
|
||||||
git checkout 4cbb366edf2f268ac3146174b40ce38604646fc5 mingw-w64-boost
|
|
||||||
cd mingw-w64-boost
|
|
||||||
sed -i 's/boostorg.jfrog.io\/artifactory\/main/archives.boost.io/' PKGBUILD
|
|
||||||
|
|
||||||
# headers
|
|
||||||
- name: Get headers package version
|
|
||||||
id: version-headers
|
|
||||||
run: |
|
|
||||||
echo "version=$(pacman -Si mingw-w64-i686-headers-git | grep -Po '^Version\s*: \K.+')" >> $GITHUB_OUTPUT
|
|
||||||
- name: Cache headers package
|
|
||||||
uses: actions/cache@v4
|
|
||||||
id: cache-headers
|
|
||||||
with:
|
|
||||||
path: MINGW-packages/mingw-w64-headers-git/*.zst
|
|
||||||
key: winxp-headers-${{ steps.version-headers.outputs.version }}
|
|
||||||
- name: Build WinXP-capable headers package
|
|
||||||
if: steps.cache-headers.outputs.cache-hit != 'true'
|
|
||||||
run: |
|
|
||||||
cd MINGW-packages/mingw-w64-headers-git
|
|
||||||
sed -i 's/0x601/0x501/' PKGBUILD
|
|
||||||
MINGW_ARCH=mingw32 makepkg-mingw -sCLf --noconfirm --nocheck
|
|
||||||
- name: Install headers package
|
|
||||||
run: pacman --noconfirm -U MINGW-packages/mingw-w64-headers-git/mingw-w64-i686-*-any.pkg.tar.zst
|
|
||||||
|
|
||||||
# CRT
|
|
||||||
- name: Get crt package version
|
|
||||||
id: version-crt
|
|
||||||
run: |
|
|
||||||
echo "version=$(pacman -Si mingw-w64-i686-crt-git | grep -Po '^Version\s*: \K.+')" >> $GITHUB_OUTPUT
|
|
||||||
- name: Cache crt package
|
|
||||||
uses: actions/cache@v4
|
|
||||||
id: cache-crt
|
|
||||||
with:
|
|
||||||
path: MINGW-packages/mingw-w64-crt-git/*.zst
|
|
||||||
key: winxp-crt-${{ steps.version-crt.outputs.version }}
|
|
||||||
- name: Build WinXP-capable crt package
|
|
||||||
if: steps.cache-crt.outputs.cache-hit != 'true'
|
|
||||||
run: |
|
|
||||||
cd MINGW-packages/mingw-w64-crt-git
|
|
||||||
MINGW_ARCH=mingw32 makepkg-mingw -sCLf --noconfirm --nocheck
|
|
||||||
- name: Install crt package
|
|
||||||
run: pacman --noconfirm -U MINGW-packages/mingw-w64-crt-git/mingw-w64-i686-*-any.pkg.tar.zst
|
|
||||||
|
|
||||||
# winpthreads
|
|
||||||
- name: Get winpthreads package version
|
|
||||||
id: version-winpthreads
|
|
||||||
run: |
|
|
||||||
echo "version=$(pacman -Si mingw-w64-i686-winpthreads-git | grep -Po '^Version\s*: \K.+')" >> $GITHUB_OUTPUT
|
|
||||||
- name: Cache winpthreads package
|
|
||||||
uses: actions/cache@v4
|
|
||||||
id: cache-winpthreads
|
|
||||||
with:
|
|
||||||
path: MINGW-packages/mingw-w64-winpthreads-git/*.zst
|
|
||||||
key: winxp-winpthreads-${{ steps.version-winpthreads.outputs.version }}
|
|
||||||
- name: Build WinXP-capable winpthreads package
|
|
||||||
if: steps.cache-winpthreads.outputs.cache-hit != 'true'
|
|
||||||
run: |
|
|
||||||
cd MINGW-packages/mingw-w64-winpthreads-git
|
|
||||||
MINGW_ARCH=mingw32 makepkg-mingw -sCLf --noconfirm --nocheck
|
|
||||||
- name: Install winpthreads package
|
|
||||||
run: pacman --noconfirm -U MINGW-packages/mingw-w64-winpthreads-git/mingw-w64-i686-*-any.pkg.tar.zst
|
|
||||||
|
|
||||||
# OpenSSL
|
|
||||||
- name: Get openssl package version
|
|
||||||
id: version-openssl
|
|
||||||
run: |
|
|
||||||
echo "version=$(pacman -Si mingw-w64-i686-openssl | grep -Po '^Version\s*: \K.+')" >> $GITHUB_OUTPUT
|
|
||||||
- name: Cache openssl package
|
|
||||||
uses: actions/cache@v4
|
|
||||||
id: cache-openssl
|
|
||||||
with:
|
|
||||||
path: MINGW-packages/mingw-w64-openssl/*.zst
|
|
||||||
key: winxp-openssl-${{ steps.version-openssl.outputs.version }}
|
|
||||||
- name: Build WinXP-capable openssl package
|
|
||||||
if: steps.cache-openssl.outputs.cache-hit != 'true'
|
|
||||||
run: |
|
|
||||||
cd MINGW-packages/mingw-w64-openssl
|
|
||||||
gpg --recv-keys D894E2CE8B3D79F5
|
|
||||||
gpg --recv-keys 216094DFD0CB81EF
|
|
||||||
MINGW_ARCH=mingw32 makepkg-mingw -sCLf --noconfirm --nocheck
|
|
||||||
- name: Install openssl package
|
|
||||||
run: pacman --noconfirm -U MINGW-packages/mingw-w64-openssl/mingw-w64-i686-*-any.pkg.tar.zst
|
|
||||||
|
|
||||||
# Boost
|
|
||||||
#- name: Get boost package version
|
|
||||||
# id: version-boost
|
|
||||||
# run: |
|
|
||||||
# echo "version=$(pacman -Si mingw-w64-i686-boost | grep -Po '^Version\s*: \K.+')" >> $GITHUB_OUTPUT
|
|
||||||
- name: Cache boost package
|
|
||||||
uses: actions/cache@v4
|
|
||||||
id: cache-boost
|
|
||||||
with:
|
|
||||||
path: MINGW-packages/mingw-w64-boost/*.zst
|
|
||||||
key: winxp-boost-1.85.0+crt-${{ steps.version-headers.outputs.version }}+ossl-${{ steps.version-openssl.outputs.version }}
|
|
||||||
# Rebuild package if packages above has changed
|
|
||||||
- name: Build WinXP-capable boost package
|
|
||||||
if: steps.cache-boost.outputs.cache-hit != 'true'
|
|
||||||
run: |
|
|
||||||
cd MINGW-packages/mingw-w64-boost
|
|
||||||
MINGW_ARCH=mingw32 makepkg-mingw -sCLf --noconfirm --nocheck
|
|
||||||
- name: Remove boost packages
|
|
||||||
run: pacman --noconfirm -R mingw-w64-i686-boost mingw-w64-i686-boost-libs
|
|
||||||
- name: Install boost package
|
|
||||||
run: pacman --noconfirm -U MINGW-packages/mingw-w64-boost/mingw-w64-i686-*-any.pkg.tar.zst
|
|
||||||
|
|
||||||
# Building i2pd
|
|
||||||
- name: Build application
|
|
||||||
run: |
|
|
||||||
mkdir -p obj/Win32 obj/libi2pd obj/libi2pd_client obj/daemon
|
|
||||||
make USE_UPNP=yes DEBUG=no USE_GIT_VERSION=yes USE_WINXP_FLAGS=yes -j3
|
|
||||||
|
|
||||||
- name: Upload artifacts
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: i2pd-xp.exe
|
|
||||||
path: i2pd.exe
|
path: i2pd.exe
|
||||||
|
|
|
||||||
93
.github/workflows/build.yml
vendored
93
.github/workflows/build.yml
vendored
|
|
@ -1,67 +1,88 @@
|
||||||
name: Build on Ubuntu
|
name: Build on Ubuntu
|
||||||
|
|
||||||
on:
|
on: [push, pull_request]
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- '*'
|
|
||||||
paths:
|
|
||||||
- .github/workflows/build.yml
|
|
||||||
- build/CMakeLists.txt
|
|
||||||
- build/cmake_modules/**
|
|
||||||
- daemon/**
|
|
||||||
- i18n/**
|
|
||||||
- libi2pd/**
|
|
||||||
- libi2pd_client/**
|
|
||||||
- Makefile
|
|
||||||
- Makefile.linux
|
|
||||||
tags:
|
|
||||||
- '*'
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- '*'
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-make:
|
build-make:
|
||||||
name: Make with USE_UPNP=${{ matrix.with_upnp }}
|
name: Make with USE_UPNP=${{ matrix.with_upnp }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-18.04
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: true
|
fail-fast: true
|
||||||
matrix:
|
matrix:
|
||||||
with_upnp: ['yes', 'no']
|
with_upnp: ['yes', 'no']
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- uses: actions/checkout@v2
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: install packages
|
- name: install packages
|
||||||
run: |
|
run: |
|
||||||
|
sudo add-apt-repository ppa:mhier/libboost-latest
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install build-essential libboost-all-dev libminiupnpc-dev libssl-dev zlib1g-dev
|
sudo apt-get install build-essential libboost1.74-dev libminiupnpc-dev libssl-dev zlib1g-dev
|
||||||
|
|
||||||
- name: build application
|
- name: build application
|
||||||
run: make USE_UPNP=${{ matrix.with_upnp }} -j3
|
run: make USE_UPNP=${{ matrix.with_upnp }} -j3
|
||||||
|
|
||||||
build-cmake:
|
build-cmake:
|
||||||
name: CMake with -DWITH_UPNP=${{ matrix.with_upnp }}
|
name: CMake with -DWITH_UPNP=${{ matrix.with_upnp }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-18.04
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: true
|
fail-fast: true
|
||||||
matrix:
|
matrix:
|
||||||
with_upnp: ['ON', 'OFF']
|
with_upnp: ['ON', 'OFF']
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- uses: actions/checkout@v2
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: install packages
|
- name: install packages
|
||||||
run: |
|
run: |
|
||||||
|
sudo add-apt-repository ppa:mhier/libboost-latest
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install build-essential cmake libboost-all-dev libminiupnpc-dev libssl-dev zlib1g-dev
|
sudo apt-get install build-essential cmake libboost1.74-dev libminiupnpc-dev libssl-dev zlib1g-dev
|
||||||
|
|
||||||
- name: build application
|
- name: build application
|
||||||
run: |
|
run: |
|
||||||
cd build
|
cd build
|
||||||
cmake -DWITH_UPNP=${{ matrix.with_upnp }} .
|
cmake -DWITH_UPNP=${{ matrix.with_upnp }} .
|
||||||
make -j3
|
make -j3
|
||||||
|
build-deb-stretch:
|
||||||
|
name: Build package for stretch
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: change debian changelog
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install devscripts
|
||||||
|
debchange -v "`git describe --tags`-stretch" -M --distribution stretch "trunk build"
|
||||||
|
- uses: singingwolfboy/build-dpkg-stretch@v1
|
||||||
|
id: build
|
||||||
|
with:
|
||||||
|
args: --unsigned-source --unsigned-changes -b
|
||||||
|
- uses: actions/upload-artifact@v1
|
||||||
|
with:
|
||||||
|
name: ${{ steps.build.outputs.filename }}
|
||||||
|
path: ${{ steps.build.outputs.filename }}
|
||||||
|
- uses: actions/upload-artifact@v1
|
||||||
|
with:
|
||||||
|
name: ${{ steps.build.outputs.filename-dbgsym }}
|
||||||
|
path: ${{ steps.build.outputs.filename-dbgsym }}
|
||||||
|
build-deb-buster:
|
||||||
|
name: Build package for buster
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: change debian changelog
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install devscripts
|
||||||
|
debchange -v "`git describe --tags`-buster" -M --distribution buster "trunk build"
|
||||||
|
- uses: singingwolfboy/build-dpkg-buster@v1
|
||||||
|
id: build
|
||||||
|
with:
|
||||||
|
args: --unsigned-source --unsigned-changes -b
|
||||||
|
- uses: actions/upload-artifact@v1
|
||||||
|
with:
|
||||||
|
name: ${{ steps.build.outputs.filename }}
|
||||||
|
path: ${{ steps.build.outputs.filename }}
|
||||||
|
- uses: actions/upload-artifact@v1
|
||||||
|
with:
|
||||||
|
name: ${{ steps.build.outputs.filename-dbgsym }}
|
||||||
|
path: ${{ steps.build.outputs.filename-dbgsym }}
|
||||||
|
|
|
||||||
169
.github/workflows/docker.yml
vendored
169
.github/workflows/docker.yml
vendored
|
|
@ -1,140 +1,63 @@
|
||||||
name: Build containers
|
name: Build containers
|
||||||
|
|
||||||
on:
|
on: [push]
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- openssl
|
|
||||||
- docker
|
|
||||||
paths:
|
|
||||||
- .github/workflows/docker.yml
|
|
||||||
- contrib/docker/**
|
|
||||||
- contrib/certificates/**
|
|
||||||
- daemon/**
|
|
||||||
- i18n/**
|
|
||||||
- libi2pd/**
|
|
||||||
- libi2pd_client/**
|
|
||||||
- Makefile
|
|
||||||
- Makefile.linux
|
|
||||||
tags:
|
|
||||||
- '*'
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
docker:
|
||||||
name: Building container for ${{ matrix.platform }}
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
permissions:
|
||||||
packages: write
|
packages: write
|
||||||
contents: read
|
contents: read
|
||||||
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
include: [
|
|
||||||
{ platform: 'linux/amd64', archname: 'amd64' },
|
|
||||||
{ platform: 'linux/386', archname: 'i386' },
|
|
||||||
{ platform: 'linux/arm64', archname: 'arm64' },
|
|
||||||
{ platform: 'linux/arm/v7', archname: 'armv7' },
|
|
||||||
]
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v1
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v1
|
||||||
|
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v1
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Login to GitHub Container registry
|
- name: Login to GitHub Container registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v1
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Build container for ${{ matrix.archname }}
|
- name: Build and push trunk container
|
||||||
uses: docker/build-push-action@v5
|
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
||||||
with:
|
uses: docker/build-push-action@v2
|
||||||
context: ./contrib/docker
|
with:
|
||||||
file: ./contrib/docker/Dockerfile
|
context: ./contrib/docker
|
||||||
platforms: ${{ matrix.platform }}
|
file: ./contrib/docker/Dockerfile
|
||||||
push: true
|
platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
|
||||||
tags: |
|
push: true
|
||||||
purplei2p/i2pd:latest-${{ matrix.archname }}
|
tags: |
|
||||||
ghcr.io/purplei2p/i2pd:latest-${{ matrix.archname }}
|
purplei2p/i2pd:latest
|
||||||
provenance: false
|
ghcr.io/purplei2p/i2pd:latest
|
||||||
|
|
||||||
push:
|
- name: Set env
|
||||||
name: Pushing merged manifest
|
if: ${{ startsWith(github.ref, 'refs/tags/') }}
|
||||||
runs-on: ubuntu-latest
|
run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
|
||||||
|
|
||||||
permissions:
|
- name: Build and push release container
|
||||||
packages: write
|
if: ${{ startsWith(github.ref, 'refs/tags/') }}
|
||||||
contents: read
|
uses: docker/build-push-action@v2
|
||||||
|
with:
|
||||||
needs: build
|
context: ./contrib/docker
|
||||||
|
file: ./contrib/docker/Dockerfile
|
||||||
steps:
|
platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
|
||||||
- name: Checkout
|
push: true
|
||||||
uses: actions/checkout@v4
|
tags: |
|
||||||
|
purplei2p/i2pd:latest
|
||||||
- name: Set up QEMU
|
purplei2p/i2pd:release-${{ env.RELEASE_VERSION }}
|
||||||
uses: docker/setup-qemu-action@v3
|
ghcr.io/purplei2p/i2pd:latest
|
||||||
|
ghcr.io/purplei2p/i2pd:release-${{ env.RELEASE_VERSION }}
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
|
|
||||||
- name: Login to DockerHub
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Login to GitHub Container registry
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
registry: ghcr.io
|
|
||||||
username: ${{ github.actor }}
|
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Create and push latest manifest image to Docker Hub
|
|
||||||
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
|
||||||
uses: Noelware/docker-manifest-action@master
|
|
||||||
with:
|
|
||||||
inputs: purplei2p/i2pd:latest
|
|
||||||
tags: purplei2p/i2pd:latest-amd64,purplei2p/i2pd:latest-i386,purplei2p/i2pd:latest-arm64,purplei2p/i2pd:latest-armv7
|
|
||||||
push: true
|
|
||||||
|
|
||||||
- name: Create and push latest manifest image to GHCR
|
|
||||||
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
|
|
||||||
uses: Noelware/docker-manifest-action@master
|
|
||||||
with:
|
|
||||||
inputs: ghcr.io/purplei2p/i2pd:latest
|
|
||||||
tags: ghcr.io/purplei2p/i2pd:latest-amd64,ghcr.io/purplei2p/i2pd:latest-i386,ghcr.io/purplei2p/i2pd:latest-arm64,ghcr.io/purplei2p/i2pd:latest-armv7
|
|
||||||
push: true
|
|
||||||
|
|
||||||
- name: Store release version to env
|
|
||||||
if: ${{ startsWith(github.ref, 'refs/tags/') }}
|
|
||||||
run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Create and push release manifest to Docker Hub
|
|
||||||
if: ${{ startsWith(github.ref, 'refs/tags/') }}
|
|
||||||
uses: Noelware/docker-manifest-action@master
|
|
||||||
with:
|
|
||||||
inputs: purplei2p/i2pd:latest,purplei2p/i2pd:latest-release,purplei2p/i2pd:release-${{ env.RELEASE_VERSION }}
|
|
||||||
tags: purplei2p/i2pd:latest-amd64,purplei2p/i2pd:latest-i386,purplei2p/i2pd:latest-arm64,purplei2p/i2pd:latest-armv7
|
|
||||||
push: true
|
|
||||||
|
|
||||||
- name: Create and push release manifest to GHCR
|
|
||||||
if: ${{ startsWith(github.ref, 'refs/tags/') }}
|
|
||||||
uses: Noelware/docker-manifest-action@master
|
|
||||||
with:
|
|
||||||
inputs: ghcr.io/purplei2p/i2pd:latest,ghcr.io/purplei2p/i2pd:latest-release,ghcr.io/purplei2p/i2pd:release-${{ env.RELEASE_VERSION }}
|
|
||||||
tags: ghcr.io/purplei2p/i2pd:latest-amd64,ghcr.io/purplei2p/i2pd:latest-i386,ghcr.io/purplei2p/i2pd:latest-arm64,ghcr.io/purplei2p/i2pd:latest-armv7
|
|
||||||
push: true
|
|
||||||
|
|
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -260,7 +260,6 @@ docs/generated
|
||||||
build/Makefile
|
build/Makefile
|
||||||
|
|
||||||
# debian stuff
|
# debian stuff
|
||||||
debian/i2pd.1.gz
|
|
||||||
.pc/
|
.pc/
|
||||||
|
|
||||||
# qt
|
# qt
|
||||||
|
|
|
||||||
584
ChangeLog
584
ChangeLog
|
|
@ -1,554 +1,6 @@
|
||||||
# for this file format description,
|
# for this file format description,
|
||||||
# see https://github.com/olivierlacan/keep-a-changelog
|
# see https://github.com/olivierlacan/keep-a-changelog
|
||||||
|
|
||||||
## [2.56.0] - 2025-02-11
|
|
||||||
### Added
|
|
||||||
- Config params for shared local destination
|
|
||||||
- AddressBook full addresses cache
|
|
||||||
- Decline transit tunnel to duplicated router
|
|
||||||
- Recreate tunnels in random order
|
|
||||||
### Changed
|
|
||||||
- Exclude disk operations from SSU2 and NTCP2 threads
|
|
||||||
- Set minimal version for peer test to 0.9.62
|
|
||||||
- Send ack requested flag after second SSU2 resend attempt
|
|
||||||
- Shorter ECIESx25519 ack request interval for datagram and I2CP sessions
|
|
||||||
- Don't change datagram routing path too often if unidirectional data stream
|
|
||||||
- Reduce LeaseSet and local RouterInfo publishing confirmation intervals
|
|
||||||
- Don't delete buffer of connected routers or if an update received
|
|
||||||
- Smaller RouterInfo request timeout if sent directly
|
|
||||||
- Persist local RouterInfo in separate thread
|
|
||||||
- Don't recalculate and process ranges for every SSU2 Ack block
|
|
||||||
- Reseeds list
|
|
||||||
### Fixed
|
|
||||||
- Termination deadlock if SAM session is active
|
|
||||||
- Race condition at tunnel endpoint
|
|
||||||
- Inbound tunnel build encryption
|
|
||||||
|
|
||||||
## [2.55.0] - 2024-12-30
|
|
||||||
### Added
|
|
||||||
- Support boost 1.87
|
|
||||||
- "i2p.streaming.maxConcurrentStreams" tunnel's param to limit number of simultaneous streams
|
|
||||||
- Separate thread for tunnel build requests
|
|
||||||
- Show next peer and connectivity on "Transit tunnels" page
|
|
||||||
- Tunnel name for local destination thread
|
|
||||||
- Throttle incoming ECIESx25519 sessions
|
|
||||||
- Send tunnel data to transport session directly if possible
|
|
||||||
- Publish 'R' cap for yggdrasil-only routers, and 'U' cap for routers through proxy
|
|
||||||
- Random tunnel rejection when medium congestion
|
|
||||||
- Save unreachable router's endpoint to use it next time without introducers
|
|
||||||
- Recognize symmetric NAT from peer test message 7
|
|
||||||
- Resend HolePunch and RelayResponse messages
|
|
||||||
### Changed
|
|
||||||
- Removed own implementation of AESNI and always use one from openssl
|
|
||||||
- Renamed main thread to i2pd-daemon
|
|
||||||
- Set i2p.streaming.profile=2 for shared local destination
|
|
||||||
- Reduced LeaseSet and RouterInfo lookup timeouts
|
|
||||||
- Cleanup ECIES sessions and tags more often
|
|
||||||
- Check LeaseSet expiration time
|
|
||||||
- Handle NTCP2 session handshakes in separate thread
|
|
||||||
- Limit last decline time by 1.5 hours in router's profile
|
|
||||||
- Don't handle RelayRequest and RelayIntro with same nonce twice
|
|
||||||
- Increased hole punch expiration interval
|
|
||||||
- Send peer test message 6 with delay if message 4 was received before message 5
|
|
||||||
- Pre-calculate more x25519 keys for transports in runtime
|
|
||||||
- Don't request LeaseSet for incoming stream
|
|
||||||
- Terminate incoming stream right away if no remote LeaseSet
|
|
||||||
- Handle choked, new RTO and window size calculation and resetting algorithm for streams
|
|
||||||
### Fixed
|
|
||||||
- Empty string in addressbook subscriptions
|
|
||||||
- ECIESx25519 sessions without destination
|
|
||||||
- Missing RouterInfo buffer in NetDb
|
|
||||||
- Invalid I2PControl certificate
|
|
||||||
- Routers disappear from NetDb when offline
|
|
||||||
- Peer test message 6 sent to unknown endpoint
|
|
||||||
- Race condition with LeaseSet update
|
|
||||||
- Excessive CPU usage by streams
|
|
||||||
- Crash on shutdown
|
|
||||||
|
|
||||||
## [2.54.0] - 2024-10-06
|
|
||||||
### Added
|
|
||||||
- Maintain recently connected routers list to avoid false-positive peer test
|
|
||||||
- Limited connectivity mode(through proxy)
|
|
||||||
- "i2p.streaming.profile" tunnel's param to let tunnel select also low-bandwidth routers
|
|
||||||
- Limit stream's inbound speed
|
|
||||||
- Periodic ack requests in ratchets session
|
|
||||||
- Set congestion cap G immediately if through proxy
|
|
||||||
- Show tunnel's routers bandwidth caps in web console
|
|
||||||
- Handle immediate ack requested flag in SSU2 data packets
|
|
||||||
- Resend and ack peer test and relay messages
|
|
||||||
- "senduseragent" HTTP proxy's param to pass through user's User-Agent
|
|
||||||
### Changed
|
|
||||||
- Exclude 'N' routers from high-bandwidth routers for client tunnels
|
|
||||||
- C++11 support has been dropped, the minimal requirement is C++17 now, C++20 for some compilers
|
|
||||||
- Removed dependency from boost::date_time and boost::filesystem
|
|
||||||
- Set default i2cp.leaseSetEncType to 0,4 and to 4 for server tunnels
|
|
||||||
- Handle i2cp.inboundlimit and i2cp.outboundlimit params in I2CP
|
|
||||||
- Publish LeaseSet with new timestamp update if tunnel was replaced in the same second
|
|
||||||
- Increase max number of generated tags to 800 per tagset
|
|
||||||
- Routing path expiration by time instead num attempts
|
|
||||||
- Save timestamp from epoch instead local time to profiles
|
|
||||||
- Update introducer's iTag if session to introducer was replaced to new one
|
|
||||||
- RTT, window size and number of NACKs calculation for streaming
|
|
||||||
- Don't select same peer for tunnel too often
|
|
||||||
- Use WinApi for data path UTF-8 conversion for Windows
|
|
||||||
### Fixed
|
|
||||||
- Jump link crash if address book is disabled
|
|
||||||
- Race condition if connect through an introducer
|
|
||||||
- "Date" header in I2PControl response
|
|
||||||
- Incomplete response from web console
|
|
||||||
- AEAD verification with LibreSSL
|
|
||||||
- Number of generated tags and new keys for follow-on tagsets
|
|
||||||
- Expired leases in LeaseSet
|
|
||||||
- Attempts to send HolePunch to 0.0.0.0
|
|
||||||
- Incorrect options size in quick ack streaming packet
|
|
||||||
- Low bandwidth router appeared as first peer in high-bandwidth client tunnel
|
|
||||||
|
|
||||||
## [2.53.1] - 2024-07-29
|
|
||||||
### Changed
|
|
||||||
- I2CP performance improvement
|
|
||||||
### Fixed
|
|
||||||
- 100% CPU usage after I2CP/SAM/BOB session termination
|
|
||||||
- Incorrect client limits returned through I2CP
|
|
||||||
- Build with LibreSSL
|
|
||||||
|
|
||||||
## [2.53.0] - 2024-07-19
|
|
||||||
### Added
|
|
||||||
- New congestion control algorithm for streaming
|
|
||||||
- Support miniupnp-2.2.8
|
|
||||||
- Limit stream's outbound speed
|
|
||||||
- Flood to next day closest floodfills before UTC midnight
|
|
||||||
- Recognize duplicated routers and bypass them
|
|
||||||
- Random SSU2 resend interval
|
|
||||||
### Changed
|
|
||||||
- Set minimal version to 0.9.69 for floodfills and 0.9.58 for client tunnels
|
|
||||||
- Removed openssl 1.0.2 support
|
|
||||||
- Move unsent I2NP messages to the new session if replaced
|
|
||||||
- Use mt19937 RNG instead rand()
|
|
||||||
- Update router's congestion caps before initial publishing
|
|
||||||
- Don't try introducer with invalid address
|
|
||||||
- Select newest introducers to publish
|
|
||||||
- Don't request relay tag for every session if we have enough introducers
|
|
||||||
- Update timestamp for non-reachable or hidden router
|
|
||||||
- Reset streaming routing path if duplicated SYN received
|
|
||||||
- Update LeaseSet if inbound tunnel failed
|
|
||||||
- Reseeds list
|
|
||||||
### Fixed
|
|
||||||
- Crash when a destination gets terminated
|
|
||||||
- Expired offline signature upon destination creation
|
|
||||||
- Race condition between local RouterInfo buffer creation and sending it through the transports
|
|
||||||
|
|
||||||
## [2.52.0] - 2024-05-12
|
|
||||||
### Added
|
|
||||||
- Separate threads for persisting RouterInfos and profiles to disk
|
|
||||||
- Give preference to address with direct connection
|
|
||||||
- Exclude addresses with incorrect static or intro key
|
|
||||||
- Avoid two firewalled routers in the row in tunnel
|
|
||||||
- Drop unsolicited database search replies
|
|
||||||
### Changed
|
|
||||||
- Increase number of hashes to 16 in exploratory lookup reply
|
|
||||||
- Reduce number of a RouterInfo lookup attempts to 5
|
|
||||||
- Reset stream RTO if outbound tunnel was changed
|
|
||||||
- Insert previously excluded floodfill back when successfully connected
|
|
||||||
- Increase maximum stream resend attempts to 9
|
|
||||||
- Reply to exploratory lookups with only confirmed routers if low tunnel build rate
|
|
||||||
- Don't accept too old RouterInfo
|
|
||||||
- Build client tunnels through confirmed routers only if low tunnel build rate
|
|
||||||
- Manage netDb requests more frequently
|
|
||||||
- Don't reply with closer than us only floodfills for lookup
|
|
||||||
### Fixed
|
|
||||||
- Crash on router lookup if exploratory pool is not ready
|
|
||||||
- Race condition in excluded peers for next lookup
|
|
||||||
- Excessive number of lookups for same destination
|
|
||||||
- Race condition with transport peers during shutdown
|
|
||||||
- Corrupted RouterInfo files
|
|
||||||
|
|
||||||
## [2.51.0] - 2024-04-06
|
|
||||||
### Added
|
|
||||||
- Non-blocking mode for UDP sockets
|
|
||||||
- Set SSU2 socket buffer size based on bandwidth limit
|
|
||||||
- Encrypted tunnel tests
|
|
||||||
- Support for multiple UDP server tunnels on one destination
|
|
||||||
- Publish medium congestion indication
|
|
||||||
- Local domain sockets for SOCKS proxy upstream
|
|
||||||
- Tunnel status "declined" in web console
|
|
||||||
- SAM error reply "Incompatible crypto" if remote destination has incompatible crypto
|
|
||||||
- Reduce amount of traffic by handling local message drops
|
|
||||||
- Keep SSU2 socket open even if it fails to bind
|
|
||||||
- Lower SSU2 resend traffic spikes
|
|
||||||
- Expiration for messages in SSU2 send queue
|
|
||||||
- Use EWMA for stream RTT estimation
|
|
||||||
- Request choking delay if too many NACKs in stream
|
|
||||||
- Allow 0ms latency for tunnel
|
|
||||||
- Randomize tunnels selection for tests
|
|
||||||
### Changed
|
|
||||||
- Upstream SOCKS proxy from SOCKS4 to SOCKS5
|
|
||||||
- Transit tunnels limit to 4 bytes. Default value to 10K
|
|
||||||
- Reply CANT_REACH_PEER if connect to ourselves in SAM
|
|
||||||
- Don't send already expired I2NP messages
|
|
||||||
- Use monotonic timer to measure tunnel test latency
|
|
||||||
- Standard NTCP2 frame doesn't exceed 16K
|
|
||||||
- Always send request through tunnels in case of restricted routes
|
|
||||||
- Don't delete connected routers from NetDb
|
|
||||||
- Send lookup reply directly to reply tunnel gateway if possible
|
|
||||||
- Reduce unreachable router ban interval to 8 minutes
|
|
||||||
- Don't request banned routers / don't try to connect to unreachable router
|
|
||||||
- Consider 'M' routers as low bandwidth
|
|
||||||
- Limit minimal received SSU2 packet size to 40 bytes
|
|
||||||
- Bob picks peer test session only if Charlie's address supports peer testing
|
|
||||||
- Reject peer test msg 2 if peer testing is not supported
|
|
||||||
- Don't request termination if SSU2 session was not established
|
|
||||||
- Set maximum SSU2 queue size depending on RTT value
|
|
||||||
- New streaming RTT calculation algorithm
|
|
||||||
- Don't double initial RTO for streams when changing tunnels
|
|
||||||
- Restore failed tunnel if test or data for inbound tunnel received
|
|
||||||
- Don't fail last remaining tunnel in pool
|
|
||||||
- Publish LeasetSet again if local destination was not ready or no tunnels
|
|
||||||
- Make more attempts to pick high bandwidth hop for client tunnel
|
|
||||||
- Reduced SSU2 session termination timeout to 165 seconds
|
|
||||||
- Reseeds list
|
|
||||||
### Fixed
|
|
||||||
- ECIESx25519 symmetric key tagset early expiration
|
|
||||||
- Encrypted LeaseSet lookup
|
|
||||||
- Outbound tunnel build fails if it's endpoint is the same as reply tunnel gateway
|
|
||||||
- I2PControl RouterManager returns invalid JSON when unknown params are passed
|
|
||||||
- Mix of data between different UDP sessions on the same server
|
|
||||||
- TARGET_OS_SIMULATOR check
|
|
||||||
- Handling of "reservedrange" param
|
|
||||||
- New NTCP2 session gets teminated upon termination of old one
|
|
||||||
- New SSU2 session gets teminated upon termination of old one
|
|
||||||
- Peer test to non-supporting router
|
|
||||||
- Streaming ackThrough off 1 if number of NACKs exceeds 255
|
|
||||||
- Race condition in ECIESx25519 tags table
|
|
||||||
- Good tunnel becomes failed
|
|
||||||
- Crash when packet comes to terminated stream
|
|
||||||
- Stream hangs during LeaseSet update
|
|
||||||
|
|
||||||
## [2.50.2] - 2024-01-06
|
|
||||||
###Fixed
|
|
||||||
- Crash with OpenSSL 3.2.0
|
|
||||||
- False positive clock skew detection
|
|
||||||
|
|
||||||
## [2.50.1] - 2023-12-23
|
|
||||||
###Fixed
|
|
||||||
- Support for new EdDSA usage behavior in OpenSSL 3.2.0
|
|
||||||
|
|
||||||
## [2.50.0] - 2023-12-18
|
|
||||||
### Added
|
|
||||||
- Support of concurrent ACCEPTs on SAM 3.1
|
|
||||||
- Haiku OS support
|
|
||||||
- Low bandwidth and far routers can expire before 1 hour
|
|
||||||
### Changed
|
|
||||||
- Don't pick too active peer for first hop
|
|
||||||
- Try peer test again if status is Unknown
|
|
||||||
- Send peer tests with random delay
|
|
||||||
- Reseeds list
|
|
||||||
### Fixed
|
|
||||||
- XSS vulnerability in addresshelper
|
|
||||||
- Publishing NAT64 ipv6 addresses
|
|
||||||
- Deadlock in AsyncSend callback
|
|
||||||
|
|
||||||
## [2.49.0] - 2023-09-18
|
|
||||||
### Added
|
|
||||||
- Handle SOCK5 authorization with empty user/password
|
|
||||||
- Drop incoming transport sessions from too old or from future routers
|
|
||||||
- Memory pool for router profiles
|
|
||||||
- Allow 0 hops in explicitPeers
|
|
||||||
### Changed
|
|
||||||
- Separate network and testing status
|
|
||||||
- Remove AVX code
|
|
||||||
- Improve NTCP2 transport session logging
|
|
||||||
- Select router with ipv4 for tunnel endpoint
|
|
||||||
- Consider all addresses non-published for U and H routers even if they have host/port
|
|
||||||
- Don't pick completely unreachable routers for tunnels
|
|
||||||
- Exclude SSU1 introducers from SSU2 addresses
|
|
||||||
- Don't create paired inbound tunnel if length is different
|
|
||||||
- Remove introducer from RouterInfo after 60 minutes
|
|
||||||
- Reduce SSU2 keep alive interval and add keep alive interval variance
|
|
||||||
- Don't pick too old sessions for introducer
|
|
||||||
### Fixed
|
|
||||||
- Version of the subnegotiation in user/password SOCKS5 response
|
|
||||||
- Send keepalive for existing session with introducer
|
|
||||||
- Buffer offset for EVP_EncryptFinal_ex() to include outlen
|
|
||||||
- Termination block size processing for transport sessions
|
|
||||||
- Crash if deleted BOB destination was shared between few BOB sessions
|
|
||||||
- Introducers with zero tag
|
|
||||||
- Padding for SSU2 path response
|
|
||||||
|
|
||||||
## [2.48.0] - 2023-06-12
|
|
||||||
### Added
|
|
||||||
- Allow user/password authentication method for SOCK5 proxy
|
|
||||||
- Publish reject all congestion cap 'G' if transit is not accepted
|
|
||||||
- 'critical' log level
|
|
||||||
- Print b32 on webconsole destination page
|
|
||||||
- Webconsole button to drop a remote LeaseSet
|
|
||||||
- limits.zombies param - minimum percentage of successfully created tunnels for routers cleanup
|
|
||||||
- Recognize real routers if successfully connected or responded to tunnel build request
|
|
||||||
### Changed
|
|
||||||
- Bypass slow transport sessions for first hop selection
|
|
||||||
- Limit AESNI inline asm to x86/x64
|
|
||||||
- Create smaller I2NP packets if possible
|
|
||||||
- Make router unreachable if AEAD tag verification fails in SessionCreated
|
|
||||||
- Don't include a router to floodfills list until it's confirmed as real
|
|
||||||
- Drop LeaseSet store request if not floodfill
|
|
||||||
- Bypass medium congestion('D') routers for client tunnels
|
|
||||||
- Publish encrypted RouterInfo through tunnels
|
|
||||||
- Check if s is valid x25519 public key
|
|
||||||
- Check if socket is open before sending data in SSU2
|
|
||||||
### Fixed
|
|
||||||
- Webconsole empty page if destination is not found
|
|
||||||
- i2p.streaming.answerPings param
|
|
||||||
- Reload tunnels
|
|
||||||
- Address caps for unspecified ipv6 address
|
|
||||||
- Incomplete HTTP headers in I2P tunnels
|
|
||||||
- SSU2 socket network exceptions on Windows
|
|
||||||
- Use of 'server' type tunnel port as inport (#1936)
|
|
||||||
|
|
||||||
## [2.47.0] - 2023-03-11
|
|
||||||
### Added
|
|
||||||
- Congestion caps
|
|
||||||
- SAM UDP port parameter
|
|
||||||
- Support domain addresses for yggdrasil reseeds
|
|
||||||
### Changed
|
|
||||||
- DHT for floodfills instead plain list
|
|
||||||
- Process router's messages in separate thread
|
|
||||||
- Don't publish non-reachable router
|
|
||||||
- Send and check target destination in first streaming SYN packet
|
|
||||||
- Reseeds list
|
|
||||||
### Fixed
|
|
||||||
- Memory leak in windows network state detection
|
|
||||||
- Reseed attempts from invalid address
|
|
||||||
|
|
||||||
## [2.46.1] - 2023-02-20
|
|
||||||
### Fixed
|
|
||||||
- Race condition while getting router's peer profile
|
|
||||||
- Creation of new router.info
|
|
||||||
- Displaying LeaseSets in the webconsole
|
|
||||||
- Crash when processing ACK request
|
|
||||||
|
|
||||||
## [2.46.0] - 2023-02-15
|
|
||||||
### Added
|
|
||||||
- Limit number of acked SSU2 packets to 511
|
|
||||||
- Localization to Swedish, Portuguese, Turkish, Polish
|
|
||||||
- Periodically send Datetime block in NTCP2 and SSU2
|
|
||||||
- Don't select random port from reserved
|
|
||||||
- In memory table for peer profiles
|
|
||||||
- Store if router was unreachable in it's peer profile
|
|
||||||
- Show IPv6 addresses in square brackets in webconsole
|
|
||||||
- Check referer when processing Addresshelper
|
|
||||||
### Changed
|
|
||||||
- Algorithm for tunnel creation success rate calculation
|
|
||||||
- Drop incoming NTCP2 and SSU2 connection if published IP doesn't match actual endpoint
|
|
||||||
- Exclude actually unreachable router from netdb for 2 hours
|
|
||||||
- Select first hop from high bandwidth peers for client tunnels
|
|
||||||
- Drop too long or too short LeaseSet
|
|
||||||
- Delete router from netdb if became invalid after update
|
|
||||||
- Terminate existing session if clock skew detected
|
|
||||||
- Close previous UDP socket if open before reopening
|
|
||||||
- Minimal version for floodfill is 0.9.51
|
|
||||||
- Sort transports by endpoints in webconsole
|
|
||||||
### Fixed
|
|
||||||
- Deadlock during processing I2NP block with Garlic in ECIES encrypted message to router
|
|
||||||
- Race condition with encrypted LeaseSets
|
|
||||||
- HTTP query detection
|
|
||||||
- Connection attempts to IPs from invalid ranges
|
|
||||||
- Publish "0.0.0.0" in RouterInfo
|
|
||||||
- Crash upon receiving PeerTest 7
|
|
||||||
- Tunnels for closed SAM session socket
|
|
||||||
- Missing NTCP2 address in RouterInfo if enabled back
|
|
||||||
|
|
||||||
## [2.45.1] - 2023-01-11
|
|
||||||
### Added
|
|
||||||
- Full Cone NAT status error
|
|
||||||
### Changed
|
|
||||||
- Drop duplicated I2NP messages in SSU2
|
|
||||||
- Set rejection code 30 if tunnel with id already exists
|
|
||||||
- Network status is always OK if peer test msg 5 received
|
|
||||||
### Fixed
|
|
||||||
- UPnP crash if SSU2 or NTCP2 is disabled
|
|
||||||
- Crash on termination for some platforms
|
|
||||||
|
|
||||||
## [2.45.0] - 2023-01-03
|
|
||||||
### Added
|
|
||||||
- Test for Symmetric NAT with peer test msgs 6 and 7
|
|
||||||
- Webconsole "No Descriptors" router error state
|
|
||||||
- 1 and 15 seconds bandwidth calculation for i2pcontrol
|
|
||||||
- Show non-zero send queue size for transports in web console
|
|
||||||
- Compressible padding for I2P addresses
|
|
||||||
- Localization to Czech
|
|
||||||
- Don't accept incoming session from invalid/reserved addresses for NTCP2 and SSU2
|
|
||||||
- Limit simultaneous tunnel build requests by 4 per pool
|
|
||||||
### Changed
|
|
||||||
- Removed SSU support
|
|
||||||
- Reduced bandwidth calculation interval from 60 to 15 seconds
|
|
||||||
- Increased default max transit tunnels number from 2500 to 5000 or 10000 for floodfill
|
|
||||||
- Transit tunnels limit is doubled if floodfill mode is enabled
|
|
||||||
- NTCP2 and SSU2 timestamps are rounded to seconds
|
|
||||||
- Drop RouterInfos and LeaseSets with timestamp from future
|
|
||||||
- Don't delete unreachable routers if tunnel creation success rate is too low
|
|
||||||
- Refuse duplicated incoming pending NTCP2 session from same IP
|
|
||||||
- Don't send SSU2 termination again if termination received block received
|
|
||||||
- Handle standard network error for SSU2 without throwing an exception
|
|
||||||
- Don't select overloaded peer for next tunnel
|
|
||||||
- Remove "X-Requested-With" in HTTP Proxy for non-AJAX requests
|
|
||||||
### Fixed
|
|
||||||
- File descriptors leak
|
|
||||||
- Random crash on AddressBook update
|
|
||||||
- Crash if incorrect LeaseSet size
|
|
||||||
- Spamming to log if no descriptors
|
|
||||||
- ::1 address in RouterInfo
|
|
||||||
- SSU2 network error handling (especially for Windows)
|
|
||||||
- Race condition with pending outgoing SSU2 sessions
|
|
||||||
- RTT self-reduction for long-live streams
|
|
||||||
|
|
||||||
## [2.44.0] - 2022-11-20
|
|
||||||
### Added
|
|
||||||
- SSL connection for server I2P tunnels
|
|
||||||
- Localization to Italian and Spanish
|
|
||||||
- SSU2 through SOCKS5 UDP proxy
|
|
||||||
- Reload tunnels through web console
|
|
||||||
- SSU2 send immediate ack request flag
|
|
||||||
- SSU2 send and verify path challenge
|
|
||||||
- Configurable ssu2.mtu4 and ssu2.mtu6
|
|
||||||
### Changed
|
|
||||||
- SSU2 is enabled and SSU is disabled by default
|
|
||||||
- Separate network status and error
|
|
||||||
- Random selection between NTCP2 and SSU2 priority
|
|
||||||
- Added notbob.i2p to jump services
|
|
||||||
- Remove DoNotTrack flag from HTTP Request header
|
|
||||||
- Skip addresshelper page if destination was not changed
|
|
||||||
- SSU2 allow different ports from RelayReponse and HolePunch
|
|
||||||
- SSU2 resend PeerTest msg 1 and msg 2
|
|
||||||
- SSU2 Send Retry instead SessionCreated if clock skew detected
|
|
||||||
### Fixed
|
|
||||||
- Long HTTP headers for HTTP proxy and HTTP server tunnel
|
|
||||||
- SSU2 resends and resend limits
|
|
||||||
- Crash at startup if addressbook is disabled
|
|
||||||
- NTCP2 ipv6 connection through SOCKS5 proxy
|
|
||||||
- SSU2 SessionRequest with zero token
|
|
||||||
- SSU2 MTU less than 1280
|
|
||||||
- SSU2 port=1
|
|
||||||
- Incorrect addresses from network interfaces
|
|
||||||
- Definitions for Darwin PPC; do not use pthread_setname_np
|
|
||||||
|
|
||||||
## [2.43.0] - 2022-08-22
|
|
||||||
### Added
|
|
||||||
- Complete SSU2 implementation
|
|
||||||
- Localization to Chinese
|
|
||||||
- Send RouterInfo update for long live sessions
|
|
||||||
- Explicit ipv6 ranges of known tunnel brokers for MTU detection
|
|
||||||
- Always send "Connection: close" and strip out Keep-Alive for server HTTP tunnel
|
|
||||||
- Show ports for all transports in web console
|
|
||||||
- Translation of webconsole site title
|
|
||||||
- Support for Windows ProgramData path when running as service
|
|
||||||
- Ability to turn off address book
|
|
||||||
- Handle signals TSTP and CONT to stop and resume network
|
|
||||||
### Changed
|
|
||||||
- Case insensitive headers for server HTTP tunnel
|
|
||||||
- Do not show 'Address registration' line if LeaseSet is encrypted
|
|
||||||
- SSU2 transports have higher priority than SSU
|
|
||||||
- Disable ElGamal precalculated table if no SSU
|
|
||||||
- Deprecate limits.ntcpsoft, limits.ntcphard and limits.ntcpthreads config options
|
|
||||||
- SSU2 is enabled and SSU is disabled by default for new installations
|
|
||||||
### Fixed
|
|
||||||
- Typo with Referer header name in HTTP proxy
|
|
||||||
- Can't handle garlic message from an exploratory tunnel
|
|
||||||
- Incorrect encryption key for exploratory lookup reply
|
|
||||||
- Bound checks issues in LeaseSets code
|
|
||||||
- MTU detection on Windows
|
|
||||||
- Crash on stop of active server tunnel
|
|
||||||
- Send datagram to wrong destination in SAM
|
|
||||||
- Incorrect static key in RouterInfo if the keys were regenerated
|
|
||||||
- Duplicated sessions in BOB
|
|
||||||
|
|
||||||
## [2.42.1] - 2022-05-24
|
|
||||||
### Fixed
|
|
||||||
- Incorrect jump link in HTTP Proxy
|
|
||||||
|
|
||||||
## [2.42.0] - 2022-05-22
|
|
||||||
### Added
|
|
||||||
- Preliminary SSU2 implementation
|
|
||||||
- Tunnel length variance
|
|
||||||
- Localization to French
|
|
||||||
- Daily cleanup of obsolete peer profiles
|
|
||||||
- Ordered jump services list in HTTP proxy
|
|
||||||
- Win32 service
|
|
||||||
- Show port for local non-published SSU addresses in web console
|
|
||||||
### Changed
|
|
||||||
- Maximum RouterInfo length increased to 3K
|
|
||||||
- Skip unknown addresses in RouterInfo
|
|
||||||
- Don't pick own router for peer test
|
|
||||||
- Reseeds list
|
|
||||||
- Internal numeric id for families
|
|
||||||
- Use ipv6 preference only when netinet headers not used
|
|
||||||
- Close stream if delete requested
|
|
||||||
- Remove version from title in web console
|
|
||||||
- Drop MESHNET build option
|
|
||||||
- Set data path before initialization
|
|
||||||
- Don't show registration block in web console if token is not provided
|
|
||||||
### Fixed
|
|
||||||
- Encrypted LeaseSet for EdDSA signature
|
|
||||||
- Clients tunnels are not built if clock is not synced on start
|
|
||||||
- Incorrect processing of i2cp.dontPublishLeaseSet param
|
|
||||||
- UDP tunnels reload
|
|
||||||
- Build for LibreSSL 3.5.2
|
|
||||||
- Race condition in short tunnel build message
|
|
||||||
- Race condition in local RouterInfo buffer allocation
|
|
||||||
|
|
||||||
## [2.41.0] - 2022-02-20
|
|
||||||
### Added
|
|
||||||
- Clock syncronization through SSU
|
|
||||||
- Drop routers older than 6 months on start
|
|
||||||
- Localization to German
|
|
||||||
- Don't send streaming ack too frequently
|
|
||||||
- Select compatible outbound tunnel for I2CP messages
|
|
||||||
- Restart webconsole's acceptor in case of exception
|
|
||||||
### Changed
|
|
||||||
- Use builtin bitswap for endian on windows
|
|
||||||
- Send SessionCreated before connection close if clock skew
|
|
||||||
- Try another floodfill for publishing if no compatible tunnels found
|
|
||||||
- Reduce memory usage for RouterInfo structures
|
|
||||||
- Avoid duplicated addresses in RouterInfo. Check presence of netId and version
|
|
||||||
- Use TCP/IP sockets for I2CP on Android instead local sockets
|
|
||||||
- Return uptime as integer in I2PControl
|
|
||||||
- Reseed servers list/cerificates
|
|
||||||
- Webconsole's dark style colors
|
|
||||||
### Fixed
|
|
||||||
- Attempt to use Yggdrasil on start on Android
|
|
||||||
- Attempts to send peer tests to itself
|
|
||||||
- Severe packets drop in SSU
|
|
||||||
- Crash on tunnel tests
|
|
||||||
- Loading addressbook subscriptions from config
|
|
||||||
- Multiple I2CP session to the same destination
|
|
||||||
- Build on Apple Silicon
|
|
||||||
|
|
||||||
## [2.40.0] - 2021-11-29
|
|
||||||
### Added
|
|
||||||
- Keep alive parameter for client tunnels
|
|
||||||
- Support openssl 3.0.0
|
|
||||||
- Localization to Armenian
|
|
||||||
- Show git commit info in version
|
|
||||||
- Windows menu item for opening datadir
|
|
||||||
- Reseed if too few floodfills
|
|
||||||
- Don't publish old and replacing tunnel in LeaseSet
|
|
||||||
- Webconsole light/dark theme depending on system settings (via CSS)
|
|
||||||
### Changed
|
|
||||||
- Set gzip compression to false by default
|
|
||||||
- Build tunnel through ECIES routers only
|
|
||||||
- Removed ElGamal support for tunnels
|
|
||||||
- Moved webconsole resources to separate file
|
|
||||||
- Pick tunnels with compatible transport with another tunnel of floodfill
|
|
||||||
- Use common cleanup timer for all SSU sessions
|
|
||||||
- Reduced memory usage
|
|
||||||
- Reseed servers list
|
|
||||||
- i18n code called from ClientContext
|
|
||||||
### Fixed
|
|
||||||
- Tunnels reload
|
|
||||||
- Some typos in log messages
|
|
||||||
- Cleanup relay requests table
|
|
||||||
- Server tunnel is not published
|
|
||||||
- Build on GNU/Hurd. Disable pthread_setname_np
|
|
||||||
- Crash when incorrect sigtype used with blinding
|
|
||||||
|
|
||||||
## [2.39.0] - 2021-08-23
|
## [2.39.0] - 2021-08-23
|
||||||
### Added
|
### Added
|
||||||
- Short tunnel build messages
|
- Short tunnel build messages
|
||||||
|
|
@ -566,11 +18,11 @@
|
||||||
- Better distribution for random tunnel's peer selection
|
- Better distribution for random tunnel's peer selection
|
||||||
- Yggdrasil reseed for v0.4, added two more
|
- Yggdrasil reseed for v0.4, added two more
|
||||||
- Encryption type 0,4 by default for server tunnels
|
- Encryption type 0,4 by default for server tunnels
|
||||||
- Handle i2cp.dontPublishLeaseSet param for all destinations
|
- Handle i2cp.dontPublishLeaseSet param for all destinations
|
||||||
- reg.i2p for subscriptions
|
- reg.i2p for subscriptions
|
||||||
- LeaseSet type 3 by default
|
- LeaseSet type 3 by default
|
||||||
- Don't allocate payload buffer for every single ECIESx25519 message
|
- Don't allocate payload buffer for every single ECIESx25519 message
|
||||||
- Prefer public ipv6 instead rfc4941
|
- Prefer public ipv6 instead rfc4941
|
||||||
- Optimal padding for one-time ECIESx25519 message
|
- Optimal padding for one-time ECIESx25519 message
|
||||||
- Don't send datetime block for one-time ECIESx25519 message with one-time key
|
- Don't send datetime block for one-time ECIESx25519 message with one-time key
|
||||||
- Router with expired introducer is still valid
|
- Router with expired introducer is still valid
|
||||||
|
|
@ -594,7 +46,7 @@
|
||||||
## [2.38.0] - 2021-05-17
|
## [2.38.0] - 2021-05-17
|
||||||
### Added
|
### Added
|
||||||
- Publish ipv6 introducers
|
- Publish ipv6 introducers
|
||||||
- Bind ipv6 or yggdrasil NTCP2 acceptor to specified address
|
- Bind ipv6 or yggdrasil NTCP2 acceptor to specified address
|
||||||
- Support .b32.i2p addresses and hostnames for SAM STREAM CREATE
|
- Support .b32.i2p addresses and hostnames for SAM STREAM CREATE
|
||||||
- ipv6 peer tests
|
- ipv6 peer tests
|
||||||
- Publish iexp param for introducers
|
- Publish iexp param for introducers
|
||||||
|
|
@ -630,12 +82,12 @@
|
||||||
- Symmetric NAT network status error
|
- Symmetric NAT network status error
|
||||||
- Bind server tunnel connection to specified address
|
- Bind server tunnel connection to specified address
|
||||||
- lookuplocal BOB extended command
|
- lookuplocal BOB extended command
|
||||||
- address4 and address6 parameters to bind outgoing connections to
|
- address4 and address6 parameters to bind outgoing connections to
|
||||||
- Rekey of low-bandwidth routers to ECIES
|
- Rekey of low-bandwidth routers to ECIES
|
||||||
- Popup notification windows when unable to parse config for Windows
|
- Popup notification windows when unable to parse config for Windows
|
||||||
### Changed
|
### Changed
|
||||||
- Floodfills with "U" cap are not ignored anymore
|
- Floodfills with "U" cap are not ignored anymore
|
||||||
- Check transports reachability between tunnel peers and between router and floodfill
|
- Check transports reachability between tunnel peers and between router and floodfill
|
||||||
- NTCP2 and reseed HTTP proxy support authorization now
|
- NTCP2 and reseed HTTP proxy support authorization now
|
||||||
- Show actual IP addresses for proxy connections
|
- Show actual IP addresses for proxy connections
|
||||||
- Publish and handle SSU addreses without host
|
- Publish and handle SSU addreses without host
|
||||||
|
|
@ -657,22 +109,22 @@
|
||||||
- Dump addressbook in hosts.txt format
|
- Dump addressbook in hosts.txt format
|
||||||
- Request RouterInfo through exploratory tunnels if direct connection to fllodfill is not possible
|
- Request RouterInfo through exploratory tunnels if direct connection to fllodfill is not possible
|
||||||
- Threads naming
|
- Threads naming
|
||||||
- Check if public x25519 key is valid
|
- Check if public x25519 key is valid
|
||||||
- ECIES-X25519-AEAD-Ratchet for shared local destination
|
- ECIES-X25519-AEAD-Ratchet for shared local destination
|
||||||
- LeaseSet creation timeout for I2CP session
|
- LeaseSet creation timeout for I2CP session
|
||||||
- Resend RouterInfo after some interval for longer NTCP2 sessions
|
- Resend RouterInfo after some interval for longer NTCP2 sessions
|
||||||
- Select reachable router of inbound tunnel gateway
|
- Select reachable router of inbound tunnel gateway
|
||||||
- Reseed if no compatible routers in netdb
|
- Reseed if no compatible routers in netdb
|
||||||
- Refresh on swipe in Android webconsole
|
- Refresh on swipe in Android webconsole
|
||||||
### Changed
|
### Changed
|
||||||
- reg.i2p for default addressbook instead inr.i2p
|
- reg.i2p for default addressbook instead inr.i2p
|
||||||
- ECIES-x25519 (crypto type 4) for new routers
|
- ECIES-x25519 (crypto type 4) for new routers
|
||||||
- Try to connect to all compatible addresses from peer's RouterInfo
|
- Try to connect to all compatible addresses from peer's RouterInfo
|
||||||
- Replace LeaseSet completely if store type changes
|
- Replace LeaseSet completely if store type changes
|
||||||
- Try ECIES-X25519-AEAD-Ratchet tag before ElGamal
|
- Try ECIES-X25519-AEAD-Ratchet tag before ElGamal
|
||||||
- Don't detach ECIES-X25519-AEAD-Ratchet session from destination immediately
|
- Don't detach ECIES-X25519-AEAD-Ratchet session from destination immediately
|
||||||
- Viewport and styles on error in HTTP proxy
|
- Viewport and styles on error in HTTP proxy
|
||||||
- Don't create notification when Windows taskbar restarted
|
- Don't create notification when Windows taskbar restarted
|
||||||
- Cumulative SSU ACK bitfields
|
- Cumulative SSU ACK bitfields
|
||||||
- limit tunnel length to 8 hops
|
- limit tunnel length to 8 hops
|
||||||
- Limit tunnels quantity to 16
|
- Limit tunnels quantity to 16
|
||||||
|
|
@ -705,7 +157,7 @@
|
||||||
- Transient signature length, if different from identity
|
- Transient signature length, if different from identity
|
||||||
- Terminate I2CP session if destroyed
|
- Terminate I2CP session if destroyed
|
||||||
- RouterInfo publishing confirmation
|
- RouterInfo publishing confirmation
|
||||||
- Check if ECIES-X25519-AEAD-Ratchet session expired before generating more tags
|
- Check if ECIES-X25519-AEAD-Ratchet session expired before generating more tags
|
||||||
- Correct block size for delivery type local for ECIES-X25519-AEAD-Ratchet
|
- Correct block size for delivery type local for ECIES-X25519-AEAD-Ratchet
|
||||||
|
|
||||||
## [2.34.0] - 2020-10-27
|
## [2.34.0] - 2020-10-27
|
||||||
|
|
@ -716,7 +168,7 @@
|
||||||
- Single thread for I2CP
|
- Single thread for I2CP
|
||||||
- Shared transient destination between proxies
|
- Shared transient destination between proxies
|
||||||
- Database lookups from ECIES destinations with ratchets response
|
- Database lookups from ECIES destinations with ratchets response
|
||||||
- Handle WebDAV HTTP methods
|
- Handle WebDAV HTTP methods
|
||||||
- Don't try to connect or build tunnels if offline
|
- Don't try to connect or build tunnels if offline
|
||||||
- Validate IP when trying connect to remote peer
|
- Validate IP when trying connect to remote peer
|
||||||
- Handle ICMP responses and WinAPI errors for SSU
|
- Handle ICMP responses and WinAPI errors for SSU
|
||||||
|
|
@ -733,7 +185,7 @@
|
||||||
- Random crashes on I2CP session disconnect
|
- Random crashes on I2CP session disconnect
|
||||||
- Stream through racthets hangs if first SYN was not acked
|
- Stream through racthets hangs if first SYN was not acked
|
||||||
- Check "Last-Modified" instead "If-Modified-Since" for addressbook reponse
|
- Check "Last-Modified" instead "If-Modified-Since" for addressbook reponse
|
||||||
- Trim behind ECIESx25519 tags
|
- Trim behind ECIESx25519 tags
|
||||||
- Few bugs with Android main activity
|
- Few bugs with Android main activity
|
||||||
- QT visual and layout issues
|
- QT visual and layout issues
|
||||||
|
|
||||||
|
|
@ -744,11 +196,11 @@
|
||||||
- Multiple encryption keys through I2CP
|
- Multiple encryption keys through I2CP
|
||||||
- Pre-calculated x25519 ephemeral keys
|
- Pre-calculated x25519 ephemeral keys
|
||||||
- Change datagram routing path if nothing comes back in 10 seconds
|
- Change datagram routing path if nothing comes back in 10 seconds
|
||||||
- Shared routing path for datagram session
|
- Shared routing path for datagram session
|
||||||
### Changed
|
### Changed
|
||||||
- UDP tunnels send mix of repliable and raw datagrams in bulk
|
- UDP tunnels send mix of repliable and raw datagrams in bulk
|
||||||
- Encrypt SSU packet again upon resend
|
- Encrypt SSU packet again upon resend
|
||||||
- Start new tunnel message if remaining buffer is too small
|
- Start new tunnel message if remaining buffer is too small
|
||||||
- Use LeaseSet2 for ECIES-X25519-AEAD-Ratchet automatically
|
- Use LeaseSet2 for ECIES-X25519-AEAD-Ratchet automatically
|
||||||
- Save new ECIES-X25519-AEAD-Ratchet session with NSR tagset
|
- Save new ECIES-X25519-AEAD-Ratchet session with NSR tagset
|
||||||
- Generate random padding lengths for ECIES-X25519-AEAD-Ratchet in bulk
|
- Generate random padding lengths for ECIES-X25519-AEAD-Ratchet in bulk
|
||||||
|
|
@ -756,11 +208,11 @@
|
||||||
- Reseed servers list
|
- Reseed servers list
|
||||||
### Fixed
|
### Fixed
|
||||||
- Don't connect through terminated SAM destination
|
- Don't connect through terminated SAM destination
|
||||||
- Differentiate UDP server sessions by port
|
- Differentiate UDP server sessions by port
|
||||||
- ECIES-X25519-AEAD-Ratchet through I2CP
|
- ECIES-X25519-AEAD-Ratchet through I2CP
|
||||||
- Don't save invalid address to AddressBook
|
- Don't save invalid address to AddressBook
|
||||||
- ECDSA signatures names in SAM
|
- ECDSA signatures names in SAM
|
||||||
- AppArmor profile
|
- AppArmor profile
|
||||||
|
|
||||||
## [2.32.1] - 2020-06-02
|
## [2.32.1] - 2020-06-02
|
||||||
### Added
|
### Added
|
||||||
|
|
@ -840,7 +292,7 @@
|
||||||
### Added
|
### Added
|
||||||
- Client auth flag for b33 address
|
- Client auth flag for b33 address
|
||||||
### Changed
|
### Changed
|
||||||
- Remove incoming NTCP2 session from pending list when established
|
- Remove incoming NTCP2 session from pending list when established
|
||||||
- Handle errors for NTCP2 SessionConfrimed send
|
- Handle errors for NTCP2 SessionConfrimed send
|
||||||
### Fixed
|
### Fixed
|
||||||
- Failure to start on Windows XP
|
- Failure to start on Windows XP
|
||||||
|
|
@ -1144,7 +596,7 @@
|
||||||
### Added
|
### Added
|
||||||
- Datagram i2p tunnels
|
- Datagram i2p tunnels
|
||||||
- Unique local addresses for server tunnels
|
- Unique local addresses for server tunnels
|
||||||
- Configurable list of reseed servers and initial addressbook
|
- Configurable list of reseed servers and initial addressbook
|
||||||
- Configurable netid
|
- Configurable netid
|
||||||
- Initial iOS support
|
- Initial iOS support
|
||||||
|
|
||||||
|
|
|
||||||
2
LICENSE
2
LICENSE
|
|
@ -1,4 +1,4 @@
|
||||||
Copyright (c) 2013-2025, The PurpleI2P Project
|
Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
|
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
|
|
|
||||||
53
Makefile
53
Makefile
|
|
@ -1,10 +1,8 @@
|
||||||
.DEFAULT_GOAL := all
|
|
||||||
|
|
||||||
SYS := $(shell $(CXX) -dumpmachine)
|
SYS := $(shell $(CXX) -dumpmachine)
|
||||||
|
|
||||||
ifneq (, $(findstring darwin, $(SYS)))
|
ifneq (, $(findstring darwin, $(SYS)))
|
||||||
SHARED_SUFFIX = dylib
|
SHARED_SUFFIX = dylib
|
||||||
else ifneq (, $(findstring mingw, $(SYS))$(findstring windows-gnu, $(SYS))$(findstring cygwin, $(SYS)))
|
else ifneq (, $(findstring mingw, $(SYS))$(findstring cygwin, $(SYS)))
|
||||||
SHARED_SUFFIX = dll
|
SHARED_SUFFIX = dll
|
||||||
else
|
else
|
||||||
SHARED_SUFFIX = so
|
SHARED_SUFFIX = so
|
||||||
|
|
@ -29,15 +27,11 @@ DAEMON_SRC_DIR := daemon
|
||||||
# import source files lists
|
# import source files lists
|
||||||
include filelist.mk
|
include filelist.mk
|
||||||
|
|
||||||
USE_STATIC := $(or $(USE_STATIC),no)
|
USE_AESNI := $(or $(USE_AESNI),yes)
|
||||||
USE_UPNP := $(or $(USE_UPNP),no)
|
USE_STATIC := $(or $(USE_STATIC),no)
|
||||||
DEBUG := $(or $(DEBUG),yes)
|
USE_MESHNET := $(or $(USE_MESHNET),no)
|
||||||
|
USE_UPNP := $(or $(USE_UPNP),no)
|
||||||
# for debugging purposes only, when commit hash needed in trunk builds in i2pd version string
|
DEBUG := $(or $(DEBUG),yes)
|
||||||
USE_GIT_VERSION := $(or $(USE_GIT_VERSION),no)
|
|
||||||
|
|
||||||
# for MacOS only, waiting for "1", not "yes"
|
|
||||||
HOMEBREW := $(or $(HOMEBREW),0)
|
|
||||||
|
|
||||||
ifeq ($(DEBUG),yes)
|
ifeq ($(DEBUG),yes)
|
||||||
CXX_DEBUG = -g
|
CXX_DEBUG = -g
|
||||||
|
|
@ -46,10 +40,6 @@ else
|
||||||
LD_DEBUG = -s
|
LD_DEBUG = -s
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (, $(DESTDIR))
|
|
||||||
PREFIX = $(DESTDIR)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq (, $(findstring darwin, $(SYS)))
|
ifneq (, $(findstring darwin, $(SYS)))
|
||||||
DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
|
DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
|
||||||
ifeq ($(HOMEBREW),1)
|
ifeq ($(HOMEBREW),1)
|
||||||
|
|
@ -57,34 +47,25 @@ ifneq (, $(findstring darwin, $(SYS)))
|
||||||
else
|
else
|
||||||
include Makefile.osx
|
include Makefile.osx
|
||||||
endif
|
endif
|
||||||
else ifneq (, $(findstring mingw, $(SYS))$(findstring windows-gnu, $(SYS))$(findstring cygwin, $(SYS)))
|
|
||||||
DAEMON_SRC += Win32/DaemonWin32.cpp Win32/Win32App.cpp Win32/Win32Service.cpp Win32/Win32NetState.cpp
|
|
||||||
include Makefile.mingw
|
|
||||||
else ifneq (, $(findstring linux, $(SYS))$(findstring gnu, $(SYS)))
|
else ifneq (, $(findstring linux, $(SYS))$(findstring gnu, $(SYS)))
|
||||||
DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
|
DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
|
||||||
include Makefile.linux
|
include Makefile.linux
|
||||||
else ifneq (, $(findstring freebsd, $(SYS))$(findstring openbsd, $(SYS)))
|
else ifneq (, $(findstring freebsd, $(SYS))$(findstring openbsd, $(SYS)))
|
||||||
DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
|
DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
|
||||||
include Makefile.bsd
|
include Makefile.bsd
|
||||||
else ifneq (, $(findstring haiku, $(SYS)))
|
else ifneq (, $(findstring mingw, $(SYS))$(findstring cygwin, $(SYS)))
|
||||||
DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
|
DAEMON_SRC += Win32/DaemonWin32.cpp Win32/Win32App.cpp Win32/Win32NetState.cpp
|
||||||
include Makefile.haiku
|
include Makefile.mingw
|
||||||
else ifneq (, $(findstring solaris, $(SYS)))
|
|
||||||
DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
|
|
||||||
include Makefile.solaris
|
|
||||||
else # not supported
|
else # not supported
|
||||||
$(error Not supported platform)
|
$(error Not supported platform)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
INCFLAGS += -I$(LIB_SRC_DIR) -I$(LIB_CLIENT_SRC_DIR) -I$(LANG_SRC_DIR)
|
ifeq ($(USE_MESHNET),yes)
|
||||||
DEFINES += -DOPENSSL_SUPPRESS_DEPRECATED
|
NEEDED_CXXFLAGS += -DMESHNET
|
||||||
NEEDED_CXXFLAGS += -MMD -MP
|
|
||||||
|
|
||||||
ifeq ($(USE_GIT_VERSION),yes)
|
|
||||||
GIT_VERSION := $(shell git describe --tags)
|
|
||||||
DEFINES += -DGITVER=$(GIT_VERSION)
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
NEEDED_CXXFLAGS += -MMD -MP -I$(LIB_SRC_DIR) -I$(LIB_CLIENT_SRC_DIR) -I$(LANG_SRC_DIR)
|
||||||
|
|
||||||
LIB_OBJS += $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
|
LIB_OBJS += $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
|
||||||
LIB_CLIENT_OBJS += $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC))
|
LIB_CLIENT_OBJS += $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC))
|
||||||
LANG_OBJS += $(patsubst %.cpp,obj/%.o,$(LANG_SRC))
|
LANG_OBJS += $(patsubst %.cpp,obj/%.o,$(LANG_SRC))
|
||||||
|
|
@ -117,17 +98,17 @@ wrapper: api_client $(SHLIB_WRAP) $(ARLIB_WRAP)
|
||||||
## custom FLAGS to work at build-time.
|
## custom FLAGS to work at build-time.
|
||||||
|
|
||||||
obj/%.o: %.cpp | mk_obj_dir
|
obj/%.o: %.cpp | mk_obj_dir
|
||||||
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(DEFINES) $(INCFLAGS) -c -o $@ $<
|
$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -c -o $@ $<
|
||||||
|
|
||||||
# '-' is 'ignore if missing' on first run
|
# '-' is 'ignore if missing' on first run
|
||||||
-include $(DEPS)
|
-include $(DEPS)
|
||||||
|
|
||||||
$(I2PD): $(DAEMON_OBJS) $(ARLIB) $(ARLIB_CLIENT) $(ARLIB_LANG)
|
$(I2PD): $(DAEMON_OBJS) $(ARLIB) $(ARLIB_CLIENT) $(ARLIB_LANG)
|
||||||
$(CXX) $(DEFINES) $(LDFLAGS) -o $@ $^ $(LDLIBS)
|
$(CXX) -o $@ $(LDFLAGS) $^ $(LDLIBS)
|
||||||
|
|
||||||
$(SHLIB): $(LIB_OBJS)
|
$(SHLIB): $(LIB_OBJS) $(SHLIB_LANG)
|
||||||
ifneq ($(USE_STATIC),yes)
|
ifneq ($(USE_STATIC),yes)
|
||||||
$(CXX) $(LDFLAGS) -shared -o $@ $^ $(LDLIBS)
|
$(CXX) $(LDFLAGS) -shared -o $@ $^ $(LDLIBS) $(SHLIB_LANG)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(SHLIB_CLIENT): $(LIB_CLIENT_OBJS) $(SHLIB) $(SHLIB_LANG)
|
$(SHLIB_CLIENT): $(LIB_CLIENT_OBJS) $(SHLIB) $(SHLIB_LANG)
|
||||||
|
|
|
||||||
18
Makefile.bsd
18
Makefile.bsd
|
|
@ -1,22 +1,12 @@
|
||||||
CXX = clang++
|
CXX = clang++
|
||||||
CXXFLAGS ?= ${CXX_DEBUG} -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-misleading-indentation
|
CXXFLAGS ?= ${CXX_DEBUG} -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-misleading-indentation
|
||||||
DEFINES = -D_GLIBCXX_USE_NANOSLEEP=1
|
|
||||||
INCFLAGS = -I/usr/include/ -I/usr/local/include/
|
|
||||||
LDFLAGS = ${LD_DEBUG} -Wl,-rpath,/usr/local/lib -L/usr/local/lib
|
|
||||||
LDLIBS = -lssl -lcrypto -lz -lpthread -lboost_system -lboost_program_options
|
|
||||||
|
|
||||||
## NOTE: NEEDED_CXXFLAGS is here so that custom CXXFLAGS can be specified at build time
|
## NOTE: NEEDED_CXXFLAGS is here so that custom CXXFLAGS can be specified at build time
|
||||||
## **without** overwriting the CXXFLAGS which we need in order to build.
|
## **without** overwriting the CXXFLAGS which we need in order to build.
|
||||||
## For example, when adding 'hardening flags' to the build
|
## For example, when adding 'hardening flags' to the build
|
||||||
## (e.g. -fstack-protector-strong -Wformat -Werror=format-security), we do not want to remove
|
## (e.g. -fstack-protector-strong -Wformat -Werror=format-security), we do not want to remove
|
||||||
## -std=c++11. If you want to remove this variable please do so in a way that allows setting
|
## -std=c++11. If you want to remove this variable please do so in a way that allows setting
|
||||||
## custom FLAGS to work at build-time.
|
## custom FLAGS to work at build-time.
|
||||||
CXXVER := $(shell $(CXX) -dumpversion|cut -c 1-2)
|
NEEDED_CXXFLAGS = -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1
|
||||||
ifeq (${CXXVER}, "4.") # older clang always returned 4.2.1
|
INCFLAGS = -I/usr/include/ -I/usr/local/include/
|
||||||
$(error Compiler too old)
|
LDFLAGS = ${LD_DEBUG} -Wl,-rpath,/usr/local/lib -L/usr/local/lib
|
||||||
else ifeq (${CXXVER}, ${filter ${CXXVER},16 17 18 19}) # clang 16 - 19
|
LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
|
||||||
NEEDED_CXXFLAGS = -std=c++20
|
|
||||||
else
|
|
||||||
NEEDED_CXXFLAGS = -std=c++17
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
ifeq ($(shell $(CXX) -dumpmachine | cut -c 1-4), i586)
|
|
||||||
CXX = g++-x86
|
|
||||||
else
|
|
||||||
CXX = g++
|
|
||||||
endif
|
|
||||||
CXXFLAGS := -Wall -std=c++20
|
|
||||||
INCFLAGS = -I/system/develop/headers
|
|
||||||
DEFINES = -D_DEFAULT_SOURCE -D_GNU_SOURCE
|
|
||||||
LDLIBS = -lbe -lbsd -lnetwork -lz -lssl -lcrypto -lboost_program_options -lpthread
|
|
||||||
|
|
||||||
ifeq ($(USE_UPNP),yes)
|
|
||||||
DEFINES += -DUSE_UPNP
|
|
||||||
LDLIBS += -lminiupnpc
|
|
||||||
endif
|
|
||||||
|
|
@ -1,49 +1,51 @@
|
||||||
# root directory holding homebrew
|
# root directory holding homebrew
|
||||||
BREWROOT = /opt/homebrew
|
BREWROOT = /usr/local
|
||||||
BOOSTROOT = ${BREWROOT}/opt/boost
|
BOOSTROOT = ${BREWROOT}/opt/boost
|
||||||
SSLROOT = ${BREWROOT}/opt/openssl@1.1
|
SSLROOT = ${BREWROOT}/opt/openssl@1.1
|
||||||
UPNPROOT = ${BREWROOT}/opt/miniupnpc
|
UPNPROOT = ${BREWROOT}/opt/miniupnpc
|
||||||
|
CXXFLAGS = ${CXX_DEBUG} -Wall -std=c++11 -DMAC_OSX -Wno-overloaded-virtual
|
||||||
|
INCFLAGS = -I${SSLROOT}/include -I${BOOSTROOT}/include
|
||||||
|
LDFLAGS = ${LD_DEBUG}
|
||||||
|
|
||||||
CXXFLAGS ?= ${CXX_DEBUG} -Wall -Wno-overloaded-virtual
|
ifndef TRAVIS
|
||||||
NEEDED_CXXFLAGS ?= -std=c++17
|
CXX = clang++
|
||||||
INCFLAGS ?= -I${SSLROOT}/include -I${BOOSTROOT}/include
|
endif
|
||||||
LDFLAGS ?= ${LD_DEBUG}
|
|
||||||
DEFINES += -DMAC_OSX
|
|
||||||
|
|
||||||
ifeq ($(USE_STATIC),yes)
|
ifeq ($(USE_STATIC),yes)
|
||||||
LDLIBS = -lz ${SSLROOT}/lib/libcrypto.a ${SSLROOT}/lib/libssl.a ${BOOSTROOT}/lib/libboost_system.a ${BOOSTROOT}/lib/libboost_filesystem.a ${BOOSTROOT}/lib/libboost_program_options.a
|
LDLIBS = -lz ${SSLROOT}/lib/libcrypto.a ${SSLROOT}/lib/libssl.a ${BOOSTROOT}/lib/libboost_system.a ${BOOSTROOT}/lib/libboost_date_time.a ${BOOSTROOT}/lib/libboost_filesystem.a ${BOOSTROOT}/lib/libboost_program_options.a -lpthread
|
||||||
ifeq ($(USE_UPNP),yes)
|
|
||||||
LDLIBS += ${UPNPROOT}/lib/libminiupnpc.a
|
|
||||||
endif
|
|
||||||
LDLIBS += -lpthread -ldl
|
|
||||||
else
|
else
|
||||||
LDFLAGS += -L${SSLROOT}/lib -L${BOOSTROOT}/lib
|
LDFLAGS += -L${SSLROOT}/lib -L${BOOSTROOT}/lib
|
||||||
LDLIBS = -lz -lssl -lcrypto -lboost_system -lboost_filesystem -lboost_program_options -lpthread
|
LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
|
||||||
ifeq ($(USE_UPNP),yes)
|
|
||||||
LDFLAGS += -L${UPNPROOT}/lib
|
|
||||||
LDLIBS += -lminiupnpc
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_UPNP),yes)
|
ifeq ($(USE_UPNP),yes)
|
||||||
DEFINES += -DUSE_UPNP
|
LDFLAGS += -ldl
|
||||||
|
CXXFLAGS += -DUSE_UPNP
|
||||||
INCFLAGS += -I${UPNPROOT}/include
|
INCFLAGS += -I${UPNPROOT}/include
|
||||||
|
ifeq ($(USE_STATIC),yes)
|
||||||
|
LDLIBS += ${UPNPROOT}/lib/libminiupnpc.a
|
||||||
|
else
|
||||||
|
LDFLAGS += -L${UPNPROOT}/lib
|
||||||
|
LDLIBS += -lminiupnpc
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
# OSX Notes
|
||||||
|
# http://www.hutsby.net/2011/08/macs-with-aes-ni.html
|
||||||
|
# Seems like all recent Mac's have AES-NI, after firmware upgrade 2.2
|
||||||
|
# Found no good way to detect it from command line. TODO: Might be some osx sysinfo magic
|
||||||
|
ifeq ($(USE_AESNI),yes)
|
||||||
|
CXXFLAGS += -D__AES__ -maes
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
install -d ${PREFIX}/bin
|
install -d ${PREFIX}/bin ${PREFIX}/etc/i2pd ${PREFIX}/share/doc/i2pd ${PREFIX}/share/i2pd ${PREFIX}/share/man/man1 ${PREFIX}/var/lib/i2pd
|
||||||
install -m 755 ${I2PD} ${PREFIX}/bin
|
install -m 755 ${I2PD} ${PREFIX}/bin/
|
||||||
install -d ${PREFIX}/etc ${PREFIX}/etc/i2pd ${PREFIX}/etc/i2pd/tunnels.conf.d
|
|
||||||
install -m 644 contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf ${PREFIX}/etc/i2pd
|
install -m 644 contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf ${PREFIX}/etc/i2pd
|
||||||
install -d ${PREFIX}/share ${PREFIX}/share/doc ${PREFIX}/share/doc/i2pd
|
|
||||||
install -m 644 ChangeLog LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf ${PREFIX}/share/doc/i2pd
|
|
||||||
install -d ${PREFIX}/share/i2pd
|
|
||||||
@cp -R contrib/certificates ${PREFIX}/share/i2pd/
|
@cp -R contrib/certificates ${PREFIX}/share/i2pd/
|
||||||
install -d ${PREFIX}/share/man ${PREFIX}/share/man/man1
|
install -m 644 ChangeLog LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf ${PREFIX}/share/doc/i2pd
|
||||||
@gzip -kf debian/i2pd.1 && install debian/i2pd.1.gz ${PREFIX}/share/man/man1
|
@gzip debian/i2pd.1 && install debian/i2pd.1.gz ${PREFIX}/share/man/man1
|
||||||
install -d ${PREFIX}/var ${PREFIX}/var/lib ${PREFIX}/var/lib/i2pd
|
@ln -sf ${PREFIX}/share/i2pd/certificates ${PREFIX}/var/lib/i2pd/
|
||||||
@ln -sf ${PREFIX}/share/i2pd/certificates ${PREFIX}/var/lib/i2pd/certificates
|
|
||||||
@ln -sf ${PREFIX}/etc/i2pd/tunnels.conf.d ${PREFIX}/var/lib/i2pd/tunnels.d
|
|
||||||
@ln -sf ${PREFIX}/etc/i2pd/i2pd.conf ${PREFIX}/var/lib/i2pd/i2pd.conf
|
@ln -sf ${PREFIX}/etc/i2pd/i2pd.conf ${PREFIX}/var/lib/i2pd/i2pd.conf
|
||||||
@ln -sf ${PREFIX}/etc/i2pd/subscriptions.txt ${PREFIX}/var/lib/i2pd/subscriptions.txt
|
@ln -sf ${PREFIX}/etc/i2pd/subscriptions.txt ${PREFIX}/var/lib/i2pd/subscriptions.txt
|
||||||
@ln -sf ${PREFIX}/etc/i2pd/tunnels.conf ${PREFIX}/var/lib/i2pd/tunnels.conf
|
@ln -sf ${PREFIX}/etc/i2pd/tunnels.conf ${PREFIX}/var/lib/i2pd/tunnels.conf
|
||||||
|
|
|
||||||
|
|
@ -9,17 +9,20 @@ LDFLAGS ?= ${LD_DEBUG}
|
||||||
## -std=c++11. If you want to remove this variable please do so in a way that allows setting
|
## -std=c++11. If you want to remove this variable please do so in a way that allows setting
|
||||||
## custom FDLAGS to work at build-time.
|
## custom FDLAGS to work at build-time.
|
||||||
|
|
||||||
# detect proper flag for c++17 support by compilers
|
# detect proper flag for c++11 support by compilers
|
||||||
CXXVER := $(shell $(CXX) -dumpversion)
|
CXXVER := $(shell $(CXX) -dumpversion)
|
||||||
ifeq ($(shell expr match $(CXX) 'clang'),5)
|
ifeq ($(shell expr match $(CXX) 'clang'),5)
|
||||||
|
NEEDED_CXXFLAGS += -std=c++11
|
||||||
|
else ifeq ($(shell expr match ${CXXVER} "4\.[0-9][0-9]"),4) # gcc >= 4.10
|
||||||
|
NEEDED_CXXFLAGS += -std=c++11
|
||||||
|
else ifeq ($(shell expr match ${CXXVER} "4\.[8-9]"),3) # gcc 4.8 - 4.9
|
||||||
|
NEEDED_CXXFLAGS += -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1
|
||||||
|
else ifeq ($(shell expr match ${CXXVER} "[5-6]"),1) # gcc 5 - 6
|
||||||
|
NEEDED_CXXFLAGS += -std=c++11
|
||||||
|
LDLIBS = -latomic
|
||||||
|
else ifeq ($(shell expr match ${CXXVER} "[1,7-9]"),1) # gcc >= 7
|
||||||
NEEDED_CXXFLAGS += -std=c++17
|
NEEDED_CXXFLAGS += -std=c++17
|
||||||
else ifeq ($(shell expr match ${CXXVER} "[8-9]"),1) # gcc 8 - 9
|
LDLIBS = -latomic
|
||||||
NEEDED_CXXFLAGS += -std=c++17
|
|
||||||
LDLIBS = -lboost_system -lstdc++fs
|
|
||||||
else ifeq ($(shell expr match ${CXXVER} "1[0-2]"),2) # gcc 10 - 12
|
|
||||||
NEEDED_CXXFLAGS += -std=c++17
|
|
||||||
else ifeq ($(shell expr match ${CXXVER} "1[3-9]"),2) # gcc 13+
|
|
||||||
NEEDED_CXXFLAGS += -std=c++20
|
|
||||||
else # not supported
|
else # not supported
|
||||||
$(error Compiler too old)
|
$(error Compiler too old)
|
||||||
endif
|
endif
|
||||||
|
|
@ -31,6 +34,9 @@ ifeq ($(USE_STATIC),yes)
|
||||||
# Using 'getaddrinfo' in statically linked applications requires at runtime
|
# Using 'getaddrinfo' in statically linked applications requires at runtime
|
||||||
# the shared libraries from the glibc version used for linking
|
# the shared libraries from the glibc version used for linking
|
||||||
LIBDIR := /usr/lib/$(SYS)
|
LIBDIR := /usr/lib/$(SYS)
|
||||||
|
LDLIBS += $(LIBDIR)/libboost_system.a
|
||||||
|
LDLIBS += $(LIBDIR)/libboost_date_time.a
|
||||||
|
LDLIBS += $(LIBDIR)/libboost_filesystem.a
|
||||||
LDLIBS += $(LIBDIR)/libboost_program_options.a
|
LDLIBS += $(LIBDIR)/libboost_program_options.a
|
||||||
LDLIBS += $(LIBDIR)/libssl.a
|
LDLIBS += $(LIBDIR)/libssl.a
|
||||||
LDLIBS += $(LIBDIR)/libcrypto.a
|
LDLIBS += $(LIBDIR)/libcrypto.a
|
||||||
|
|
@ -40,7 +46,7 @@ ifeq ($(USE_UPNP),yes)
|
||||||
endif
|
endif
|
||||||
LDLIBS += -lpthread -ldl
|
LDLIBS += -lpthread -ldl
|
||||||
else
|
else
|
||||||
LDLIBS += -lssl -lcrypto -lz -lboost_program_options -lpthread -latomic
|
LDLIBS += -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
|
||||||
ifeq ($(USE_UPNP),yes)
|
ifeq ($(USE_UPNP),yes)
|
||||||
LDLIBS += -lminiupnpc
|
LDLIBS += -lminiupnpc
|
||||||
endif
|
endif
|
||||||
|
|
@ -48,23 +54,11 @@ endif
|
||||||
|
|
||||||
# UPNP Support (miniupnpc 1.5 and higher)
|
# UPNP Support (miniupnpc 1.5 and higher)
|
||||||
ifeq ($(USE_UPNP),yes)
|
ifeq ($(USE_UPNP),yes)
|
||||||
DEFINES += -DUSE_UPNP
|
NEEDED_CXXFLAGS += -DUSE_UPNP
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install: all
|
ifeq ($(USE_AESNI),yes)
|
||||||
install -d ${PREFIX}/bin
|
ifneq (, $(findstring i386, $(SYS))$(findstring i686, $(SYS))$(findstring x86_64, $(SYS))) # only x86-based CPU supports that
|
||||||
install -m 755 ${I2PD} ${PREFIX}/bin
|
NEEDED_CXXFLAGS += -D__AES__ -maes
|
||||||
install -d ${PREFIX}/etc ${PREFIX}/etc/i2pd ${PREFIX}/etc/i2pd/tunnels.conf.d
|
endif
|
||||||
install -m 644 contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf ${PREFIX}/etc/i2pd
|
endif
|
||||||
install -d ${PREFIX}/share ${PREFIX}/share/doc ${PREFIX}/share/doc/i2pd
|
|
||||||
install -m 644 ChangeLog LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf ${PREFIX}/share/doc/i2pd
|
|
||||||
install -d ${PREFIX}/share/i2pd
|
|
||||||
@cp -R contrib/certificates ${PREFIX}/share/i2pd/
|
|
||||||
install -d ${PREFIX}/share/man ${PREFIX}/share/man/man1
|
|
||||||
@gzip -kf debian/i2pd.1 && install debian/i2pd.1.gz ${PREFIX}/share/man/man1
|
|
||||||
install -d ${PREFIX}/var ${PREFIX}/var/lib ${PREFIX}/var/lib/i2pd
|
|
||||||
@ln -sf ${PREFIX}/share/i2pd/certificates ${PREFIX}/var/lib/i2pd/certificates
|
|
||||||
@ln -sf ${PREFIX}/etc/i2pd/tunnels.conf.d ${PREFIX}/var/lib/i2pd/tunnels.d
|
|
||||||
@ln -sf ${PREFIX}/etc/i2pd/i2pd.conf ${PREFIX}/var/lib/i2pd/i2pd.conf
|
|
||||||
@ln -sf ${PREFIX}/etc/i2pd/subscriptions.txt ${PREFIX}/var/lib/i2pd/subscriptions.txt
|
|
||||||
@ln -sf ${PREFIX}/etc/i2pd/tunnels.conf ${PREFIX}/var/lib/i2pd/tunnels.conf
|
|
||||||
|
|
|
||||||
|
|
@ -3,48 +3,63 @@ USE_WIN32_APP := yes
|
||||||
|
|
||||||
WINDRES = windres
|
WINDRES = windres
|
||||||
|
|
||||||
CXXFLAGS := $(CXX_DEBUG) -fPIC -msse
|
CXXFLAGS := $(CXX_DEBUG) -DWIN32_LEAN_AND_MEAN -fPIC -msse
|
||||||
INCFLAGS := -I$(DAEMON_SRC_DIR) -IWin32
|
INCFLAGS = -I$(DAEMON_SRC_DIR) -IWin32
|
||||||
LDFLAGS := ${LD_DEBUG} -static -fPIC -msse
|
LDFLAGS := ${LD_DEBUG} -static
|
||||||
|
|
||||||
NEEDED_CXXFLAGS += -std=c++20
|
# detect proper flag for c++11 support by compilers
|
||||||
DEFINES += -DWIN32_LEAN_AND_MEAN
|
CXXVER := $(shell $(CXX) -dumpversion)
|
||||||
|
ifeq ($(shell expr match ${CXXVER} "[4]\.[7-9]\|4\.1[0-9]\|[5-6]"),4) # gcc 4.7 - 6
|
||||||
|
NEEDED_CXXFLAGS += -std=c++11
|
||||||
|
else ifeq ($(shell expr match ${CXXVER} "[1,7-9]"),1) # gcc >= 7
|
||||||
|
NEEDED_CXXFLAGS += -std=c++17
|
||||||
|
else # not supported
|
||||||
|
$(error Compiler too old)
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Boost libraries suffix
|
||||||
|
BOOST_SUFFIX = -mt
|
||||||
|
|
||||||
# UPNP Support
|
# UPNP Support
|
||||||
ifeq ($(USE_UPNP),yes)
|
ifeq ($(USE_UPNP),yes)
|
||||||
DEFINES += -DUSE_UPNP -DMINIUPNP_STATICLIB
|
CXXFLAGS += -DUSE_UPNP -DMINIUPNP_STATICLIB
|
||||||
LDLIBS = -lminiupnpc
|
LDLIBS = -lminiupnpc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_WINXP_FLAGS), yes)
|
|
||||||
DEFINES += -DWINVER=0x0501 -D_WIN32_WINNT=0x0501
|
|
||||||
endif
|
|
||||||
|
|
||||||
LDLIBS += \
|
LDLIBS += \
|
||||||
$(MINGW_PREFIX)/lib/libboost_filesystem-mt.a \
|
-lboost_system$(BOOST_SUFFIX) \
|
||||||
$(MINGW_PREFIX)/lib/libboost_program_options-mt.a \
|
-lboost_date_time$(BOOST_SUFFIX) \
|
||||||
$(MINGW_PREFIX)/lib/libssl.a \
|
-lboost_filesystem$(BOOST_SUFFIX) \
|
||||||
$(MINGW_PREFIX)/lib/libcrypto.a \
|
-lboost_program_options$(BOOST_SUFFIX) \
|
||||||
$(MINGW_PREFIX)/lib/libz.a \
|
-lssl \
|
||||||
|
-lcrypto \
|
||||||
|
-lz \
|
||||||
-lwsock32 \
|
-lwsock32 \
|
||||||
-lws2_32 \
|
-lws2_32 \
|
||||||
-liphlpapi \
|
|
||||||
-lcrypt32 \
|
|
||||||
-lgdi32 \
|
-lgdi32 \
|
||||||
|
-liphlpapi \
|
||||||
-lole32 \
|
-lole32 \
|
||||||
-luuid \
|
-luuid \
|
||||||
-lpthread
|
-lpthread
|
||||||
|
|
||||||
ifeq ($(USE_WIN32_APP), yes)
|
ifeq ($(USE_WIN32_APP), yes)
|
||||||
DEFINES += -DWIN32_APP
|
NEEDED_CXXFLAGS += -DWIN32_APP
|
||||||
LDFLAGS += -mwindows
|
LDFLAGS += -mwindows
|
||||||
DAEMON_RC += Win32/Resource.rc
|
DAEMON_RC += Win32/Resource.rc
|
||||||
DAEMON_OBJS += $(patsubst %.rc,obj/%.o,$(DAEMON_RC))
|
DAEMON_OBJS += $(patsubst %.rc,obj/%.o,$(DAEMON_RC))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(USE_WINXP_FLAGS), yes)
|
||||||
|
NEEDED_CXXFLAGS += -DWINVER=0x0501 -D_WIN32_WINNT=0x0501
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(USE_AESNI),yes)
|
||||||
|
NEEDED_CXXFLAGS += -D__AES__ -maes
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_ASLR),yes)
|
ifeq ($(USE_ASLR),yes)
|
||||||
LDFLAGS += -Wl,--nxcompat -Wl,--high-entropy-va -Wl,--dynamicbase,--export-all-symbols
|
LDFLAGS += -Wl,--nxcompat -Wl,--high-entropy-va -Wl,--dynamicbase,--export-all-symbols
|
||||||
endif
|
endif
|
||||||
|
|
||||||
obj/%.o : %.rc | mk_obj_dir
|
obj/%.o : %.rc | mk_obj_dir
|
||||||
$(WINDRES) $(DEFINES) $(INCFLAGS) --preprocessor-arg=-MMD --preprocessor-arg=-MP --preprocessor-arg=-MF$@.d -i $< -o $@
|
$(WINDRES) -i $< -o $@
|
||||||
|
|
|
||||||
16
Makefile.osx
16
Makefile.osx
|
|
@ -1,20 +1,20 @@
|
||||||
CXX = clang++
|
CXX = clang++
|
||||||
CXXFLAGS := ${CXX_DEBUG} -Wall -std=c++17
|
CXXFLAGS := ${CXX_DEBUG} -Wall -std=c++11 -DMAC_OSX
|
||||||
INCFLAGS = -I/usr/local/include
|
INCFLAGS = -I/usr/local/include
|
||||||
DEFINES := -DMAC_OSX
|
|
||||||
LDFLAGS := -Wl,-rpath,/usr/local/lib -L/usr/local/lib
|
LDFLAGS := -Wl,-rpath,/usr/local/lib -L/usr/local/lib
|
||||||
LDFLAGS += -Wl,-dead_strip
|
LDFLAGS += -Wl,-dead_strip
|
||||||
LDFLAGS += -Wl,-dead_strip_dylibs
|
LDFLAGS += -Wl,-dead_strip_dylibs
|
||||||
|
LDFLAGS += -Wl,-bind_at_load
|
||||||
|
|
||||||
ifeq ($(USE_STATIC),yes)
|
ifeq ($(USE_STATIC),yes)
|
||||||
LDLIBS = -lz /usr/local/lib/libssl.a /usr/local/lib/libcrypto.a /usr/local/lib/libboost_system.a /usr/local/lib/libboost_filesystem.a /usr/local/lib/libboost_program_options.a -lpthread
|
LDLIBS = -lz /usr/local/lib/libcrypto.a /usr/local/lib/libssl.a /usr/local/lib/libboost_system.a /usr/local/lib/libboost_date_time.a /usr/local/lib/libboost_filesystem.a /usr/local/lib/libboost_program_options.a -lpthread
|
||||||
else
|
else
|
||||||
LDLIBS = -lz -lssl -lcrypto -lboost_system -lboost_filesystem -lboost_program_options -lpthread
|
LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_UPNP),yes)
|
ifeq ($(USE_UPNP),yes)
|
||||||
LDFLAGS += -ldl
|
LDFLAGS += -ldl
|
||||||
DEFINES += -DUSE_UPNP
|
CXXFLAGS += -DUSE_UPNP
|
||||||
ifeq ($(USE_STATIC),yes)
|
ifeq ($(USE_STATIC),yes)
|
||||||
LDLIBS += /usr/local/lib/libminiupnpc.a
|
LDLIBS += /usr/local/lib/libminiupnpc.a
|
||||||
else
|
else
|
||||||
|
|
@ -22,8 +22,8 @@ ifeq ($(USE_UPNP),yes)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
OSARCH = $(shell uname -p)
|
ifeq ($(USE_AESNI),yes)
|
||||||
|
CXXFLAGS += -D__AES__ -maes
|
||||||
ifneq ($(OSARCH),powerpc)
|
else
|
||||||
CXXFLAGS += -msse
|
CXXFLAGS += -msse
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
CXX = g++
|
|
||||||
INCFLAGS = -I/usr/openssl/3/include
|
|
||||||
CXXFLAGS := -Wall -std=c++20
|
|
||||||
LDLIBS = -L/usr/openssl/3/lib/64 -lssl -lcrypto -lboost_program_options -lz -lpthread -lsocket
|
|
||||||
|
|
||||||
ifeq ($(USE_UPNP),yes)
|
|
||||||
DEFINES += -DUSE_UPNP
|
|
||||||
LDLIBS += -lminiupnpc
|
|
||||||
endif
|
|
||||||
34
README.md
34
README.md
|
|
@ -69,12 +69,12 @@ Build instructions:
|
||||||
|
|
||||||
**Supported systems:**
|
**Supported systems:**
|
||||||
|
|
||||||
* GNU/Linux (Debian, Ubuntu, etc) - [](https://github.com/PurpleI2P/i2pd/actions/workflows/build.yml)
|
* GNU/Linux - [](https://github.com/PurpleI2P/i2pd/actions/workflows/build.yml)
|
||||||
* CentOS, Fedora, Mageia - [](https://copr.fedorainfracloud.org/coprs/supervillain/i2pd/package/i2pd-git/)
|
* CentOS / Fedora / Mageia - [](https://copr.fedorainfracloud.org/coprs/supervillain/i2pd/package/i2pd-git/)
|
||||||
* Alpine, ArchLinux, openSUSE, Gentoo, etc.
|
* Alpine, ArchLinux, openSUSE, Gentoo, Debian, Ubuntu, etc.
|
||||||
* Windows - [](https://github.com/PurpleI2P/i2pd/actions/workflows/build-windows.yml)
|
* Windows - [](https://github.com/PurpleI2P/i2pd/actions/workflows/build-windows.yml)
|
||||||
* Mac OS - [](https://github.com/PurpleI2P/i2pd/actions/workflows/build-osx.yml)
|
* Mac OS X - [](https://github.com/PurpleI2P/i2pd/actions/workflows/build-osx.yml)
|
||||||
* Docker image - [](https://github.com/PurpleI2P/i2pd/actions/workflows/docker.yml)
|
* Docker image - [](https://hub.docker.com/r/purplei2p/i2pd/builds/) [](https://github.com/PurpleI2P/i2pd/actions/workflows/docker.yml)
|
||||||
* Snap - [](https://snapcraft.io/i2pd) [](https://snapcraft.io/i2pd)
|
* Snap - [](https://snapcraft.io/i2pd) [](https://snapcraft.io/i2pd)
|
||||||
* FreeBSD - [](https://github.com/PurpleI2P/i2pd/actions/workflows/build-freebsd.yml)
|
* FreeBSD - [](https://github.com/PurpleI2P/i2pd/actions/workflows/build-freebsd.yml)
|
||||||
* Android - [](https://github.com/PurpleI2P/i2pd-android/actions/workflows/android.yml)
|
* Android - [](https://github.com/PurpleI2P/i2pd-android/actions/workflows/android.yml)
|
||||||
|
|
@ -99,23 +99,13 @@ Current status: [](http
|
||||||
Donations
|
Donations
|
||||||
---------
|
---------
|
||||||
|
|
||||||
**E-Mail**: ```i2porignal at yandex.com```
|
BTC: 3MDoGJW9TLMTCDGrR9bLgWXfm6sjmgy86f
|
||||||
|
LTC: LKQirrYrDeTuAPnpYq5y7LVKtywfkkHi59
|
||||||
**BTC**: ```3MDoGJW9TLMTCDGrR9bLgWXfm6sjmgy86f```
|
ETH: 0x9e5bac70d20d1079ceaa111127f4fb3bccce379d
|
||||||
|
DASH: Xw8YUrQpYzP9tZBmbjqxS3M97Q7v3vJKUF
|
||||||
**LTC**: ```LKQirrYrDeTuAPnpYq5y7LVKtywfkkHi59```
|
ZEC: t1cTckLuXsr1dwVrK4NDzfhehss4NvMadAJ
|
||||||
|
GST: GbD2JSQHBHCKLa9WTHmigJRpyFgmBj4woG
|
||||||
**ETH**: ```0x9e5bac70d20d1079ceaa111127f4fb3bccce379d```
|
XMR: 497pJc7X4xqKvcLBLpSUtRgWqMMyo24u4btCos3cak6gbMkpobgSU6492ztUcUBghyeHpYeczB55s38NpuHoH5WGNSPDRMH
|
||||||
|
|
||||||
**GST**: ```GbD2JSQHBHCKLa9WTHmigJRpyFgmBj4woG```
|
|
||||||
|
|
||||||
**DASH**: ```Xw8YUrQpYzP9tZBmbjqxS3M97Q7v3vJKUF```
|
|
||||||
|
|
||||||
**ZEC**: ```t1cTckLuXsr1dwVrK4NDzfhehss4NvMadAJ```
|
|
||||||
|
|
||||||
**ANC**: ```AQJYweYYUqM1nVfLqfoSMpUMfzxvS4Xd7z```
|
|
||||||
|
|
||||||
**XMR**: ```497pJc7X4xqKvcLBLpSUtRgWqMMyo24u4btCos3cak6gbMkpobgSU6492ztUcUBghyeHpYeczB55s38NpuHoH5WGNSPDRMH```
|
|
||||||
|
|
||||||
License
|
License
|
||||||
-------
|
-------
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013-2023, The PurpleI2P Project
|
* Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
*
|
*
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
* This file is part of Purple i2pd project and licensed under BSD3
|
||||||
*
|
*
|
||||||
|
|
@ -14,7 +14,6 @@
|
||||||
#include "Log.h"
|
#include "Log.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include "Win32Service.h"
|
|
||||||
#ifdef WIN32_APP
|
#ifdef WIN32_APP
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include "Win32App.h"
|
#include "Win32App.h"
|
||||||
|
|
@ -29,7 +28,7 @@ namespace util
|
||||||
setlocale(LC_CTYPE, "");
|
setlocale(LC_CTYPE, "");
|
||||||
SetConsoleCP(1251);
|
SetConsoleCP(1251);
|
||||||
SetConsoleOutputCP(1251);
|
SetConsoleOutputCP(1251);
|
||||||
//setlocale(LC_ALL, "Russian");
|
setlocale(LC_ALL, "Russian");
|
||||||
setlocale(LC_TIME, "C");
|
setlocale(LC_TIME, "C");
|
||||||
|
|
||||||
i2p::log::SetThrowFunction ([](const std::string& s)
|
i2p::log::SetThrowFunction ([](const std::string& s)
|
||||||
|
|
@ -40,19 +39,6 @@ namespace util
|
||||||
|
|
||||||
if (!Daemon_Singleton::init(argc, argv))
|
if (!Daemon_Singleton::init(argc, argv))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (isDaemon)
|
|
||||||
{
|
|
||||||
LogPrint(eLogDebug, "Daemon: running as service");
|
|
||||||
I2PService service((PSTR)SERVICE_NAME);
|
|
||||||
if (!I2PService::Run(service))
|
|
||||||
{
|
|
||||||
LogPrint(eLogCritical, "Daemon: Service failed to run w/err 0x%08lx\n", GetLastError());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -61,10 +47,10 @@ namespace util
|
||||||
setlocale(LC_CTYPE, "");
|
setlocale(LC_CTYPE, "");
|
||||||
SetConsoleCP(1251);
|
SetConsoleCP(1251);
|
||||||
SetConsoleOutputCP(1251);
|
SetConsoleOutputCP(1251);
|
||||||
//setlocale(LC_ALL, "Russian");
|
setlocale(LC_ALL, "Russian");
|
||||||
setlocale(LC_TIME, "C");
|
setlocale(LC_TIME, "C");
|
||||||
#ifdef WIN32_APP
|
#ifdef WIN32_APP
|
||||||
if (!i2p::win32::StartWin32App (isDaemon)) return false;
|
if (!i2p::win32::StartWin32App ()) return false;
|
||||||
#endif
|
#endif
|
||||||
bool ret = Daemon_Singleton::start();
|
bool ret = Daemon_Singleton::start();
|
||||||
if (ret && i2p::log::Logger().GetLogType() == eLogFile)
|
if (ret && i2p::log::Logger().GetLogType() == eLogFile)
|
||||||
|
|
|
||||||
|
|
@ -1,36 +1,36 @@
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
|
||||||
#define APSTUDIO_READONLY_SYMBOLS
|
#define APSTUDIO_READONLY_SYMBOLS
|
||||||
#include "winres.h"
|
#include "winres.h"
|
||||||
#undef APSTUDIO_READONLY_SYMBOLS
|
#undef APSTUDIO_READONLY_SYMBOLS
|
||||||
|
|
||||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||||
#pragma code_page(1252)
|
#pragma code_page(1252)
|
||||||
|
|
||||||
#ifdef APSTUDIO_INVOKED
|
#ifdef APSTUDIO_INVOKED
|
||||||
1 TEXTINCLUDE
|
1 TEXTINCLUDE
|
||||||
BEGIN
|
BEGIN
|
||||||
"resource.h\0"
|
"resource.h\0"
|
||||||
END
|
END
|
||||||
|
|
||||||
2 TEXTINCLUDE
|
2 TEXTINCLUDE
|
||||||
BEGIN
|
BEGIN
|
||||||
"#include ""winres.h""\r\n"
|
"#include ""winres.h""\r\n"
|
||||||
"\0"
|
"\0"
|
||||||
END
|
END
|
||||||
|
|
||||||
3 TEXTINCLUDE
|
3 TEXTINCLUDE
|
||||||
BEGIN
|
BEGIN
|
||||||
"\r\n"
|
"\r\n"
|
||||||
"\0"
|
"\0"
|
||||||
END
|
END
|
||||||
#endif // APSTUDIO_INVOKED
|
#endif // APSTUDIO_INVOKED
|
||||||
|
|
||||||
MAINICON ICON "mask.ico"
|
MAINICON ICON "mask.ico"
|
||||||
#endif // English (United States) resources
|
#endif // English (United States) resources
|
||||||
|
|
||||||
#ifndef APSTUDIO_INVOKED
|
#ifndef APSTUDIO_INVOKED
|
||||||
#include "Resource.rc2"
|
#include "Resource.rc2"
|
||||||
#endif // not APSTUDIO_INVOKED
|
#endif // not APSTUDIO_INVOKED
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
#error this file is not editable by Microsoft Visual C++
|
#error this file is not editable by Microsoft Visual C++
|
||||||
#endif //APSTUDIO_INVOKED
|
#endif //APSTUDIO_INVOKED
|
||||||
|
|
||||||
#include "version.h"
|
#include "../libi2pd/version.h"
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION I2PD_VERSION_MAJOR,I2PD_VERSION_MINOR,I2PD_VERSION_MICRO,I2PD_VERSION_PATCH
|
FILEVERSION I2PD_VERSION_MAJOR,I2PD_VERSION_MINOR,I2PD_VERSION_MICRO,I2PD_VERSION_PATCH
|
||||||
|
|
@ -25,7 +25,7 @@ BEGIN
|
||||||
VALUE "FileDescription", "C++ I2P daemon"
|
VALUE "FileDescription", "C++ I2P daemon"
|
||||||
VALUE "FileVersion", I2PD_VERSION
|
VALUE "FileVersion", I2PD_VERSION
|
||||||
VALUE "InternalName", CODENAME
|
VALUE "InternalName", CODENAME
|
||||||
VALUE "LegalCopyright", "Copyright (C) 2013-2023, The PurpleI2P Project"
|
VALUE "LegalCopyright", "Copyright (C) 2013-2020, The PurpleI2P Project"
|
||||||
VALUE "OriginalFilename", "i2pd"
|
VALUE "OriginalFilename", "i2pd"
|
||||||
VALUE "ProductName", "Purple I2P"
|
VALUE "ProductName", "Purple I2P"
|
||||||
VALUE "ProductVersion", I2P_VERSION
|
VALUE "ProductVersion", I2P_VERSION
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013-2024, The PurpleI2P Project
|
* Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
*
|
*
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
* This file is part of Purple i2pd project and licensed under BSD3
|
||||||
*
|
*
|
||||||
|
|
@ -31,7 +31,6 @@
|
||||||
#define ID_RELOAD 2006
|
#define ID_RELOAD 2006
|
||||||
#define ID_ACCEPT_TRANSIT 2007
|
#define ID_ACCEPT_TRANSIT 2007
|
||||||
#define ID_DECLINE_TRANSIT 2008
|
#define ID_DECLINE_TRANSIT 2008
|
||||||
#define ID_DATADIR 2009
|
|
||||||
|
|
||||||
#define ID_TRAY_ICON 2050
|
#define ID_TRAY_ICON 2050
|
||||||
#define WM_TRAYICON (WM_USER + 1)
|
#define WM_TRAYICON (WM_USER + 1)
|
||||||
|
|
@ -45,14 +44,12 @@ namespace i2p
|
||||||
namespace win32
|
namespace win32
|
||||||
{
|
{
|
||||||
DWORD g_GracefulShutdownEndtime = 0;
|
DWORD g_GracefulShutdownEndtime = 0;
|
||||||
bool g_isWinService;
|
|
||||||
|
|
||||||
static void ShowPopupMenu (HWND hWnd, POINT *curpos, int wDefaultItem)
|
static void ShowPopupMenu (HWND hWnd, POINT *curpos, int wDefaultItem)
|
||||||
{
|
{
|
||||||
HMENU hPopup = CreatePopupMenu();
|
HMENU hPopup = CreatePopupMenu();
|
||||||
InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_CONSOLE, "Open &console");
|
InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_CONSOLE, "Open &console");
|
||||||
InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_DATADIR, "Open &datadir");
|
InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_APP, "Show app");
|
||||||
InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_APP, "&Show app");
|
|
||||||
InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_ABOUT, "&About...");
|
InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_ABOUT, "&About...");
|
||||||
InsertMenu (hPopup, -1, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
|
InsertMenu (hPopup, -1, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
|
||||||
if(!i2p::context.AcceptsTunnels())
|
if(!i2p::context.AcceptsTunnels())
|
||||||
|
|
@ -145,40 +142,35 @@ namespace win32
|
||||||
s << bytes << " Bytes\n";
|
s << bytes << " Bytes\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ShowNetworkStatus (std::stringstream& s, RouterStatus status, bool testing, RouterError error)
|
static void ShowNetworkStatus (std::stringstream& s, RouterStatus status)
|
||||||
{
|
{
|
||||||
switch (status)
|
switch (status)
|
||||||
{
|
{
|
||||||
case eRouterStatusOK: s << "OK"; break;
|
case eRouterStatusOK: s << "OK"; break;
|
||||||
|
case eRouterStatusTesting: s << "Test"; break;
|
||||||
case eRouterStatusFirewalled: s << "FW"; break;
|
case eRouterStatusFirewalled: s << "FW"; break;
|
||||||
case eRouterStatusUnknown: s << "Unk"; break;
|
case eRouterStatusUnknown: s << "Unk"; break;
|
||||||
case eRouterStatusProxy: s << "Proxy"; break;
|
case eRouterStatusProxy: s << "Proxy"; break;
|
||||||
case eRouterStatusMesh: s << "Mesh"; break;
|
case eRouterStatusMesh: s << "Mesh"; break;
|
||||||
default: s << "Unk";
|
case eRouterStatusError:
|
||||||
};
|
|
||||||
if (testing)
|
|
||||||
s << " (Test)";
|
|
||||||
if (error != eRouterErrorNone)
|
|
||||||
{
|
|
||||||
switch (error)
|
|
||||||
{
|
{
|
||||||
case eRouterErrorClockSkew:
|
s << "Err";
|
||||||
s << " - " << tr("Clock skew");
|
switch (i2p::context.GetError ())
|
||||||
|
{
|
||||||
|
case eRouterErrorClockSkew:
|
||||||
|
s << " - Clock skew";
|
||||||
|
break;
|
||||||
|
case eRouterErrorOffline:
|
||||||
|
s << " - Offline";
|
||||||
|
break;
|
||||||
|
case eRouterErrorSymmetricNAT:
|
||||||
|
s << " - Symmetric NAT";
|
||||||
|
break;
|
||||||
|
default: ;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case eRouterErrorOffline:
|
|
||||||
s << " - " << tr("Offline");
|
|
||||||
break;
|
|
||||||
case eRouterErrorSymmetricNAT:
|
|
||||||
s << " - " << tr("Symmetric NAT");
|
|
||||||
break;
|
|
||||||
case eRouterErrorFullConeNAT:
|
|
||||||
s << " - " << tr("Full cone NAT");
|
|
||||||
break;
|
|
||||||
case eRouterErrorNoDescriptors:
|
|
||||||
s << " - " << tr("No Descriptors");
|
|
||||||
break;
|
|
||||||
default: ;
|
|
||||||
}
|
}
|
||||||
|
default: s << "Unk";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -186,11 +178,11 @@ namespace win32
|
||||||
{
|
{
|
||||||
s << "\n";
|
s << "\n";
|
||||||
s << "Status: ";
|
s << "Status: ";
|
||||||
ShowNetworkStatus (s, i2p::context.GetStatus (), i2p::context.GetTesting(), i2p::context.GetError ());
|
ShowNetworkStatus (s, i2p::context.GetStatus ());
|
||||||
if (i2p::context.SupportsV6 ())
|
if (i2p::context.SupportsV6 ())
|
||||||
{
|
{
|
||||||
s << " / ";
|
s << " / ";
|
||||||
ShowNetworkStatus (s, i2p::context.GetStatusV6 (), i2p::context.GetTestingV6(), i2p::context.GetErrorV6 ());
|
ShowNetworkStatus (s, i2p::context.GetStatusV6 ());
|
||||||
}
|
}
|
||||||
s << "; ";
|
s << "; ";
|
||||||
s << "Success Rate: " << i2p::tunnel::tunnels.GetTunnelCreationSuccessRate() << "%\n";
|
s << "Success Rate: " << i2p::tunnel::tunnels.GetTunnelCreationSuccessRate() << "%\n";
|
||||||
|
|
@ -311,12 +303,6 @@ namespace win32
|
||||||
SetTimer(hWnd, FRAME_UPDATE_TIMER, 3000, NULL);
|
SetTimer(hWnd, FRAME_UPDATE_TIMER, 3000, NULL);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
case ID_DATADIR:
|
|
||||||
{
|
|
||||||
std::string datadir(i2p::fs::GetDataDir());
|
|
||||||
ShellExecute(NULL, "explore", datadir.c_str(), NULL, NULL, SW_SHOWNORMAL);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -355,7 +341,6 @@ namespace win32
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
[[fallthrough]];
|
|
||||||
}
|
}
|
||||||
case WM_TRAYICON:
|
case WM_TRAYICON:
|
||||||
{
|
{
|
||||||
|
|
@ -425,9 +410,8 @@ namespace win32
|
||||||
return DefWindowProc( hWnd, uMsg, wParam, lParam);
|
return DefWindowProc( hWnd, uMsg, wParam, lParam);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool StartWin32App (bool isWinService)
|
bool StartWin32App ()
|
||||||
{
|
{
|
||||||
g_isWinService = isWinService;
|
|
||||||
if (FindWindow (I2PD_WIN32_CLASSNAME, TEXT("i2pd")))
|
if (FindWindow (I2PD_WIN32_CLASSNAME, TEXT("i2pd")))
|
||||||
{
|
{
|
||||||
MessageBox(NULL, TEXT("I2Pd is running already"), TEXT("Warning"), MB_OK);
|
MessageBox(NULL, TEXT("I2Pd is running already"), TEXT("Warning"), MB_OK);
|
||||||
|
|
@ -456,9 +440,7 @@ namespace win32
|
||||||
MessageBox(NULL, "Failed to create main window", TEXT("Warning!"), MB_ICONERROR | MB_OK | MB_TOPMOST);
|
MessageBox(NULL, "Failed to create main window", TEXT("Warning!"), MB_ICONERROR | MB_OK | MB_TOPMOST);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// COM requires message loop to work, which is not implemented in service mode
|
SubscribeToEvents();
|
||||||
if (!g_isWinService)
|
|
||||||
SubscribeToEvents();
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -478,8 +460,7 @@ namespace win32
|
||||||
HWND hWnd = FindWindow (I2PD_WIN32_CLASSNAME, TEXT("i2pd"));
|
HWND hWnd = FindWindow (I2PD_WIN32_CLASSNAME, TEXT("i2pd"));
|
||||||
if (hWnd)
|
if (hWnd)
|
||||||
PostMessage (hWnd, WM_COMMAND, MAKEWPARAM(ID_EXIT, 0), 0);
|
PostMessage (hWnd, WM_COMMAND, MAKEWPARAM(ID_EXIT, 0), 0);
|
||||||
else if(!g_isWinService)
|
// UnSubscribeFromEvents(); // TODO: understand why unsubscribing crashes app
|
||||||
UnSubscribeFromEvents();
|
|
||||||
UnregisterClass (I2PD_WIN32_CLASSNAME, GetModuleHandle(NULL));
|
UnregisterClass (I2PD_WIN32_CLASSNAME, GetModuleHandle(NULL));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ namespace win32
|
||||||
{
|
{
|
||||||
extern DWORD g_GracefulShutdownEndtime;
|
extern DWORD g_GracefulShutdownEndtime;
|
||||||
|
|
||||||
bool StartWin32App (bool isWinService);
|
bool StartWin32App ();
|
||||||
void StopWin32App ();
|
void StopWin32App ();
|
||||||
int RunWin32App ();
|
int RunWin32App ();
|
||||||
bool GracefulShutdown ();
|
bool GracefulShutdown ();
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013-2024, The PurpleI2P Project
|
* Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
*
|
*
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
* This file is part of Purple i2pd project and licensed under BSD3
|
||||||
*
|
*
|
||||||
|
|
@ -15,7 +15,6 @@ IUnknown *pUnknown = nullptr;
|
||||||
INetworkListManager *pNetworkListManager = nullptr;
|
INetworkListManager *pNetworkListManager = nullptr;
|
||||||
IConnectionPointContainer *pCPContainer = nullptr;
|
IConnectionPointContainer *pCPContainer = nullptr;
|
||||||
IConnectionPoint *pConnectPoint = nullptr;
|
IConnectionPoint *pConnectPoint = nullptr;
|
||||||
CNetworkListManagerEvent *pNetEvent = nullptr;
|
|
||||||
DWORD Cookie = 0;
|
DWORD Cookie = 0;
|
||||||
|
|
||||||
void SubscribeToEvents()
|
void SubscribeToEvents()
|
||||||
|
|
@ -30,14 +29,10 @@ void SubscribeToEvents()
|
||||||
if (SUCCEEDED(Result))
|
if (SUCCEEDED(Result))
|
||||||
{
|
{
|
||||||
VARIANT_BOOL IsConnect = VARIANT_FALSE;
|
VARIANT_BOOL IsConnect = VARIANT_FALSE;
|
||||||
#if defined(_MSC_VER)
|
|
||||||
Result = pNetworkListManager->get_IsConnectedToInternet(&IsConnect);
|
|
||||||
#else
|
|
||||||
Result = pNetworkListManager->IsConnectedToInternet(&IsConnect);
|
Result = pNetworkListManager->IsConnectedToInternet(&IsConnect);
|
||||||
#endif
|
|
||||||
if (SUCCEEDED(Result)) {
|
if (SUCCEEDED(Result)) {
|
||||||
i2p::transport::transports.SetOnline (true);
|
i2p::transport::transports.SetOnline (true);
|
||||||
LogPrint(eLogInfo, "NetState: Current state: ", IsConnect == VARIANT_TRUE ? "connected" : "disconnected");
|
LogPrint(eLogInfo, "NetState: current state: ", IsConnect == VARIANT_TRUE ? "connected" : "disconnected");
|
||||||
}
|
}
|
||||||
|
|
||||||
Result = pNetworkListManager->QueryInterface(IID_IConnectionPointContainer, (void **)&pCPContainer);
|
Result = pNetworkListManager->QueryInterface(IID_IConnectionPointContainer, (void **)&pCPContainer);
|
||||||
|
|
@ -46,8 +41,8 @@ void SubscribeToEvents()
|
||||||
Result = pCPContainer->FindConnectionPoint(IID_INetworkListManagerEvents, &pConnectPoint);
|
Result = pCPContainer->FindConnectionPoint(IID_INetworkListManagerEvents, &pConnectPoint);
|
||||||
if(SUCCEEDED(Result))
|
if(SUCCEEDED(Result))
|
||||||
{
|
{
|
||||||
pNetEvent = new CNetworkListManagerEvent;
|
CNetworkListManagerEvent *NetEvent = new CNetworkListManagerEvent;
|
||||||
Result = pConnectPoint->Advise((IUnknown *)pNetEvent, &Cookie);
|
Result = pConnectPoint->Advise((IUnknown *)NetEvent, &Cookie);
|
||||||
if (SUCCEEDED(Result))
|
if (SUCCEEDED(Result))
|
||||||
LogPrint(eLogInfo, "NetState: Successfully subscribed to NetworkListManagerEvent messages");
|
LogPrint(eLogInfo, "NetState: Successfully subscribed to NetworkListManagerEvent messages");
|
||||||
else
|
else
|
||||||
|
|
@ -64,7 +59,6 @@ void SubscribeToEvents()
|
||||||
|
|
||||||
void UnSubscribeFromEvents()
|
void UnSubscribeFromEvents()
|
||||||
{
|
{
|
||||||
LogPrint(eLogInfo, "NetState: Unsubscribing from NetworkListManagerEvents");
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (pConnectPoint) {
|
if (pConnectPoint) {
|
||||||
|
|
@ -72,31 +66,20 @@ void UnSubscribeFromEvents()
|
||||||
pConnectPoint->Release();
|
pConnectPoint->Release();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pNetEvent)
|
|
||||||
{
|
|
||||||
pNetEvent->Release();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (pCPContainer)
|
if (pCPContainer)
|
||||||
{
|
|
||||||
pCPContainer->Release();
|
pCPContainer->Release();
|
||||||
}
|
|
||||||
|
|
||||||
if (pNetworkListManager)
|
if (pNetworkListManager)
|
||||||
{
|
|
||||||
pNetworkListManager->Release();
|
pNetworkListManager->Release();
|
||||||
}
|
|
||||||
|
|
||||||
if (pUnknown)
|
if (pUnknown)
|
||||||
{
|
|
||||||
pUnknown->Release();
|
pUnknown->Release();
|
||||||
}
|
|
||||||
|
|
||||||
CoUninitialize();
|
CoUninitialize();
|
||||||
}
|
}
|
||||||
catch (std::exception& ex)
|
catch (std::exception& ex)
|
||||||
{
|
{
|
||||||
LogPrint (eLogError, "NetState: Received exception: ", ex.what ());
|
LogPrint (eLogError, "NetState: received exception: ", ex.what ());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013-2024, The PurpleI2P Project
|
* Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
*
|
*
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
* This file is part of Purple i2pd project and licensed under BSD3
|
||||||
*
|
*
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
#include "Log.h"
|
#include "Log.h"
|
||||||
#include "Transports.h"
|
#include "Transports.h"
|
||||||
|
|
||||||
class CNetworkListManagerEvent final : public INetworkListManagerEvents
|
class CNetworkListManagerEvent : public INetworkListManagerEvents
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CNetworkListManagerEvent() : m_ref(1) { }
|
CNetworkListManagerEvent() : m_ref(1) { }
|
||||||
|
|
@ -23,15 +23,17 @@ public:
|
||||||
|
|
||||||
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject)
|
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject)
|
||||||
{
|
{
|
||||||
|
HRESULT Result = S_OK;
|
||||||
if (IsEqualIID(riid, IID_IUnknown)) {
|
if (IsEqualIID(riid, IID_IUnknown)) {
|
||||||
*ppvObject = (IUnknown *)this;
|
*ppvObject = (IUnknown *)this;
|
||||||
} else if (IsEqualIID(riid ,IID_INetworkListManagerEvents)) {
|
} else if (IsEqualIID(riid ,IID_INetworkListManagerEvents)) {
|
||||||
*ppvObject = (INetworkListManagerEvents *)this;
|
*ppvObject = (INetworkListManagerEvents *)this;
|
||||||
} else {
|
} else {
|
||||||
return E_NOINTERFACE;
|
Result = E_NOINTERFACE;
|
||||||
}
|
}
|
||||||
AddRef();
|
AddRef();
|
||||||
return S_OK;
|
|
||||||
|
return Result;
|
||||||
}
|
}
|
||||||
|
|
||||||
ULONG STDMETHODCALLTYPE AddRef()
|
ULONG STDMETHODCALLTYPE AddRef()
|
||||||
|
|
|
||||||
|
|
@ -1,283 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2013-2022, The PurpleI2P Project
|
|
||||||
*
|
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
|
||||||
*
|
|
||||||
* See full license text in LICENSE file at top of project tree
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "Win32Service.h"
|
|
||||||
#include <assert.h>
|
|
||||||
#include <windows.h>
|
|
||||||
|
|
||||||
#include "Daemon.h"
|
|
||||||
#include "Log.h"
|
|
||||||
|
|
||||||
I2PService *I2PService::s_service = NULL;
|
|
||||||
|
|
||||||
BOOL I2PService::isService()
|
|
||||||
{
|
|
||||||
BOOL bIsService = FALSE;
|
|
||||||
HWINSTA hWinStation = GetProcessWindowStation();
|
|
||||||
if (hWinStation != NULL)
|
|
||||||
{
|
|
||||||
USEROBJECTFLAGS uof = { FALSE, FALSE, 0 };
|
|
||||||
if (GetUserObjectInformation(hWinStation, UOI_FLAGS, &uof, sizeof(USEROBJECTFLAGS), NULL) && ((uof.dwFlags & WSF_VISIBLE) == 0))
|
|
||||||
{
|
|
||||||
bIsService = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return bIsService;
|
|
||||||
}
|
|
||||||
|
|
||||||
BOOL I2PService::Run(I2PService &service)
|
|
||||||
{
|
|
||||||
s_service = &service;
|
|
||||||
SERVICE_TABLE_ENTRY serviceTable[] =
|
|
||||||
{
|
|
||||||
{ service.m_name, ServiceMain },
|
|
||||||
{ NULL, NULL }
|
|
||||||
};
|
|
||||||
return StartServiceCtrlDispatcher(serviceTable);
|
|
||||||
}
|
|
||||||
|
|
||||||
void WINAPI I2PService::ServiceMain(DWORD dwArgc, PSTR *pszArgv)
|
|
||||||
{
|
|
||||||
assert(s_service != NULL);
|
|
||||||
s_service->m_statusHandle = RegisterServiceCtrlHandler(
|
|
||||||
s_service->m_name, ServiceCtrlHandler);
|
|
||||||
if (s_service->m_statusHandle == NULL)
|
|
||||||
{
|
|
||||||
throw GetLastError();
|
|
||||||
}
|
|
||||||
s_service->Start(dwArgc, pszArgv);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void WINAPI I2PService::ServiceCtrlHandler(DWORD dwCtrl)
|
|
||||||
{
|
|
||||||
switch (dwCtrl)
|
|
||||||
{
|
|
||||||
case SERVICE_CONTROL_STOP: s_service->Stop(); break;
|
|
||||||
case SERVICE_CONTROL_PAUSE: s_service->Pause(); break;
|
|
||||||
case SERVICE_CONTROL_CONTINUE: s_service->Continue(); break;
|
|
||||||
case SERVICE_CONTROL_SHUTDOWN: s_service->Shutdown(); break;
|
|
||||||
case SERVICE_CONTROL_INTERROGATE: break;
|
|
||||||
default: break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
I2PService::I2PService(PSTR pszServiceName,
|
|
||||||
BOOL fCanStop,
|
|
||||||
BOOL fCanShutdown,
|
|
||||||
BOOL fCanPauseContinue)
|
|
||||||
{
|
|
||||||
m_name = (pszServiceName == NULL) ? (PSTR)"" : pszServiceName;
|
|
||||||
m_statusHandle = NULL;
|
|
||||||
m_status.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
|
|
||||||
m_status.dwCurrentState = SERVICE_START_PENDING;
|
|
||||||
|
|
||||||
DWORD dwControlsAccepted = 0;
|
|
||||||
if (fCanStop)
|
|
||||||
dwControlsAccepted |= SERVICE_ACCEPT_STOP;
|
|
||||||
if (fCanShutdown)
|
|
||||||
dwControlsAccepted |= SERVICE_ACCEPT_SHUTDOWN;
|
|
||||||
if (fCanPauseContinue)
|
|
||||||
dwControlsAccepted |= SERVICE_ACCEPT_PAUSE_CONTINUE;
|
|
||||||
|
|
||||||
m_status.dwControlsAccepted = dwControlsAccepted;
|
|
||||||
m_status.dwWin32ExitCode = NO_ERROR;
|
|
||||||
m_status.dwServiceSpecificExitCode = 0;
|
|
||||||
m_status.dwCheckPoint = 0;
|
|
||||||
m_status.dwWaitHint = 0;
|
|
||||||
m_fStopping = FALSE;
|
|
||||||
// Create a manual-reset event that is not signaled at first to indicate
|
|
||||||
// the stopped signal of the service.
|
|
||||||
m_hStoppedEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
|
|
||||||
if (m_hStoppedEvent == NULL)
|
|
||||||
{
|
|
||||||
throw GetLastError();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
I2PService::~I2PService(void)
|
|
||||||
{
|
|
||||||
if (m_hStoppedEvent)
|
|
||||||
{
|
|
||||||
CloseHandle(m_hStoppedEvent);
|
|
||||||
m_hStoppedEvent = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PService::Start(DWORD dwArgc, PSTR *pszArgv)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
SetServiceStatus(SERVICE_START_PENDING);
|
|
||||||
OnStart(dwArgc, pszArgv);
|
|
||||||
SetServiceStatus(SERVICE_RUNNING);
|
|
||||||
}
|
|
||||||
catch (DWORD dwError)
|
|
||||||
{
|
|
||||||
LogPrint(eLogCritical, "Win32Service: Start error: ", dwError);
|
|
||||||
SetServiceStatus(SERVICE_STOPPED, dwError);
|
|
||||||
}
|
|
||||||
catch (...)
|
|
||||||
{
|
|
||||||
LogPrint(eLogCritical, "Win32Service: failed to start: ", EVENTLOG_ERROR_TYPE);
|
|
||||||
SetServiceStatus(SERVICE_STOPPED);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PService::OnStart(DWORD dwArgc, PSTR *pszArgv)
|
|
||||||
{
|
|
||||||
LogPrint(eLogInfo, "Win32Service: in OnStart (", EVENTLOG_INFORMATION_TYPE, ")");
|
|
||||||
Daemon.start();
|
|
||||||
_worker = new std::thread(std::bind(&I2PService::WorkerThread, this));
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PService::WorkerThread()
|
|
||||||
{
|
|
||||||
while (!m_fStopping)
|
|
||||||
{
|
|
||||||
::Sleep(1000); // Simulate some lengthy operations.
|
|
||||||
}
|
|
||||||
// Signal the stopped event.
|
|
||||||
SetEvent(m_hStoppedEvent);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PService::Stop()
|
|
||||||
{
|
|
||||||
DWORD dwOriginalState = m_status.dwCurrentState;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
SetServiceStatus(SERVICE_STOP_PENDING);
|
|
||||||
OnStop();
|
|
||||||
SetServiceStatus(SERVICE_STOPPED);
|
|
||||||
}
|
|
||||||
catch (DWORD dwError)
|
|
||||||
{
|
|
||||||
LogPrint(eLogInfo, "Win32Service: Stop error: ", dwError);
|
|
||||||
SetServiceStatus(dwOriginalState);
|
|
||||||
}
|
|
||||||
catch (...)
|
|
||||||
{
|
|
||||||
LogPrint(eLogCritical, "Win32Service: Failed to stop: ", EVENTLOG_ERROR_TYPE);
|
|
||||||
SetServiceStatus(dwOriginalState);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PService::OnStop()
|
|
||||||
{
|
|
||||||
// Log a service stop message to the Application log.
|
|
||||||
LogPrint(eLogInfo, "Win32Service: in OnStop (", EVENTLOG_INFORMATION_TYPE, ")");
|
|
||||||
Daemon.stop();
|
|
||||||
m_fStopping = TRUE;
|
|
||||||
if (WaitForSingleObject(m_hStoppedEvent, INFINITE) != WAIT_OBJECT_0)
|
|
||||||
{
|
|
||||||
throw GetLastError();
|
|
||||||
}
|
|
||||||
_worker->join();
|
|
||||||
delete _worker;
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PService::Pause()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
SetServiceStatus(SERVICE_PAUSE_PENDING);
|
|
||||||
OnPause();
|
|
||||||
SetServiceStatus(SERVICE_PAUSED);
|
|
||||||
}
|
|
||||||
catch (DWORD dwError)
|
|
||||||
{
|
|
||||||
LogPrint(eLogCritical, "Win32Service: Pause error: ", dwError);
|
|
||||||
SetServiceStatus(SERVICE_RUNNING);
|
|
||||||
}
|
|
||||||
catch (...)
|
|
||||||
{
|
|
||||||
LogPrint(eLogCritical, "Win32Service: Failed to pause: ", EVENTLOG_ERROR_TYPE);
|
|
||||||
SetServiceStatus(SERVICE_RUNNING);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PService::OnPause()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PService::Continue()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
SetServiceStatus(SERVICE_CONTINUE_PENDING);
|
|
||||||
OnContinue();
|
|
||||||
SetServiceStatus(SERVICE_RUNNING);
|
|
||||||
}
|
|
||||||
catch (DWORD dwError)
|
|
||||||
{
|
|
||||||
LogPrint(eLogCritical, "Win32Service: Continue error: ", dwError);
|
|
||||||
SetServiceStatus(SERVICE_PAUSED);
|
|
||||||
}
|
|
||||||
catch (...)
|
|
||||||
{
|
|
||||||
LogPrint(eLogCritical, "Win32Service: Failed to resume: ", EVENTLOG_ERROR_TYPE);
|
|
||||||
SetServiceStatus(SERVICE_PAUSED);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PService::OnContinue()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PService::Shutdown()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
OnShutdown();
|
|
||||||
SetServiceStatus(SERVICE_STOPPED);
|
|
||||||
}
|
|
||||||
catch (DWORD dwError)
|
|
||||||
{
|
|
||||||
LogPrint(eLogCritical, "Win32Service: Shutdown error: ", dwError);
|
|
||||||
}
|
|
||||||
catch (...)
|
|
||||||
{
|
|
||||||
LogPrint(eLogCritical, "Win32Service: Failed to shut down: ", EVENTLOG_ERROR_TYPE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PService::OnShutdown()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PService::SetServiceStatus(DWORD dwCurrentState,
|
|
||||||
DWORD dwWin32ExitCode,
|
|
||||||
DWORD dwWaitHint)
|
|
||||||
{
|
|
||||||
static DWORD dwCheckPoint = 1;
|
|
||||||
m_status.dwCurrentState = dwCurrentState;
|
|
||||||
m_status.dwWin32ExitCode = dwWin32ExitCode;
|
|
||||||
m_status.dwWaitHint = dwWaitHint;
|
|
||||||
m_status.dwCheckPoint =
|
|
||||||
((dwCurrentState == SERVICE_RUNNING) ||
|
|
||||||
(dwCurrentState == SERVICE_STOPPED)) ?
|
|
||||||
0 : dwCheckPoint++;
|
|
||||||
|
|
||||||
::SetServiceStatus(m_statusHandle, &m_status);
|
|
||||||
}
|
|
||||||
|
|
||||||
//*****************************************************************************
|
|
||||||
|
|
||||||
void FreeHandles(SC_HANDLE schSCManager, SC_HANDLE schService)
|
|
||||||
{
|
|
||||||
if (schSCManager)
|
|
||||||
{
|
|
||||||
CloseServiceHandle(schSCManager);
|
|
||||||
schSCManager = NULL;
|
|
||||||
}
|
|
||||||
if (schService)
|
|
||||||
{
|
|
||||||
CloseServiceHandle(schService);
|
|
||||||
schService = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,63 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2013-2022, The PurpleI2P Project
|
|
||||||
*
|
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
|
||||||
*
|
|
||||||
* See full license text in LICENSE file at top of project tree
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef WIN_32_SERVICE_H__
|
|
||||||
#define WIN_32_SERVICE_H__
|
|
||||||
|
|
||||||
#include <thread>
|
|
||||||
#include <windows.h>
|
|
||||||
|
|
||||||
#define SERVICE_NAME "i2pdService"
|
|
||||||
|
|
||||||
class I2PService
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
I2PService(PSTR pszServiceName,
|
|
||||||
BOOL fCanStop = TRUE,
|
|
||||||
BOOL fCanShutdown = TRUE,
|
|
||||||
BOOL fCanPauseContinue = FALSE);
|
|
||||||
|
|
||||||
virtual ~I2PService(void);
|
|
||||||
|
|
||||||
static BOOL isService();
|
|
||||||
static BOOL Run(I2PService &service);
|
|
||||||
void Stop();
|
|
||||||
|
|
||||||
protected:
|
|
||||||
|
|
||||||
virtual void OnStart(DWORD dwArgc, PSTR *pszArgv);
|
|
||||||
virtual void OnStop();
|
|
||||||
virtual void OnPause();
|
|
||||||
virtual void OnContinue();
|
|
||||||
virtual void OnShutdown();
|
|
||||||
void SetServiceStatus(DWORD dwCurrentState,
|
|
||||||
DWORD dwWin32ExitCode = NO_ERROR,
|
|
||||||
DWORD dwWaitHint = 0);
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
static void WINAPI ServiceMain(DWORD dwArgc, LPSTR *lpszArgv);
|
|
||||||
static void WINAPI ServiceCtrlHandler(DWORD dwCtrl);
|
|
||||||
void WorkerThread();
|
|
||||||
void Start(DWORD dwArgc, PSTR *pszArgv);
|
|
||||||
void Pause();
|
|
||||||
void Continue();
|
|
||||||
void Shutdown();
|
|
||||||
static I2PService* s_service;
|
|
||||||
PSTR m_name;
|
|
||||||
SERVICE_STATUS m_status;
|
|
||||||
SERVICE_STATUS_HANDLE m_statusHandle;
|
|
||||||
|
|
||||||
BOOL m_fStopping;
|
|
||||||
HANDLE m_hStoppedEvent;
|
|
||||||
|
|
||||||
std::thread* _worker;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // WIN_32_SERVICE_H__
|
|
||||||
BIN
Win32/mask.bmp
Normal file
BIN
Win32/mask.bmp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
14
build/.gitignore
vendored
14
build/.gitignore
vendored
|
|
@ -1,13 +1,6 @@
|
||||||
# Various generated files
|
# Various generated files
|
||||||
/CMakeFiles/
|
/CMakeFiles/
|
||||||
/Testing/
|
|
||||||
/tests/
|
|
||||||
/.ninja_*
|
|
||||||
/arch.c
|
|
||||||
/build.ninja
|
|
||||||
/i2pd
|
/i2pd
|
||||||
/i2pd.exe
|
|
||||||
/i2pd.exe.debug
|
|
||||||
/libi2pd.a
|
/libi2pd.a
|
||||||
/libi2pdclient.a
|
/libi2pdclient.a
|
||||||
/libi2pdlang.a
|
/libi2pdlang.a
|
||||||
|
|
@ -15,13 +8,8 @@
|
||||||
/CMakeCache.txt
|
/CMakeCache.txt
|
||||||
/CPackConfig.cmake
|
/CPackConfig.cmake
|
||||||
/CPackSourceConfig.cmake
|
/CPackSourceConfig.cmake
|
||||||
/CTestTestfile.cmake
|
|
||||||
/install_manifest.txt
|
/install_manifest.txt
|
||||||
/Makefile
|
/arch.c
|
||||||
# windows build script
|
# windows build script
|
||||||
i2pd*.zip
|
i2pd*.zip
|
||||||
build*.log
|
build*.log
|
||||||
# MVS project files
|
|
||||||
*.vcxproj
|
|
||||||
*.vcxproj.filters
|
|
||||||
*.sln
|
|
||||||
|
|
|
||||||
|
|
@ -1,64 +1,49 @@
|
||||||
cmake_minimum_required(VERSION 3.7)
|
cmake_minimum_required(VERSION 2.8.12)
|
||||||
|
# this addresses CMP0059 with CMake > 3.3 for PCH flags
|
||||||
if(${CMAKE_VERSION} VERSION_LESS 3.22)
|
cmake_policy(VERSION 2.8.12)
|
||||||
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
project("i2pd")
|
||||||
else()
|
|
||||||
cmake_policy(VERSION 3.22)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# for debugging
|
# for debugging
|
||||||
#set(CMAKE_VERBOSE_MAKEFILE on)
|
#set(CMAKE_VERBOSE_MAKEFILE on)
|
||||||
|
|
||||||
# paths
|
# Win32 build with cmake is not supported
|
||||||
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
|
if(WIN32 OR MSVC OR MSYS OR MINGW)
|
||||||
set(CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
message(SEND_ERROR "cmake build for windows is not supported. Please use MSYS2 with makefiles in project root.")
|
||||||
|
endif()
|
||||||
set(LIBI2PD_SRC_DIR ${CMAKE_SOURCE_DIR}/libi2pd)
|
|
||||||
set(LIBI2PD_CLIENT_SRC_DIR ${CMAKE_SOURCE_DIR}/libi2pd_client)
|
|
||||||
set(LANG_SRC_DIR ${CMAKE_SOURCE_DIR}/i18n)
|
|
||||||
set(DAEMON_SRC_DIR ${CMAKE_SOURCE_DIR}/daemon)
|
|
||||||
|
|
||||||
include(Version)
|
|
||||||
set_version("${LIBI2PD_SRC_DIR}/version.h" PROJECT_VERSION)
|
|
||||||
|
|
||||||
project(
|
|
||||||
i2pd
|
|
||||||
VERSION ${PROJECT_VERSION}
|
|
||||||
HOMEPAGE_URL "https://i2pd.website/"
|
|
||||||
LANGUAGES C CXX
|
|
||||||
)
|
|
||||||
|
|
||||||
# configurable options
|
# configurable options
|
||||||
|
option(WITH_AESNI "Use AES-NI instructions set" ON)
|
||||||
option(WITH_HARDENING "Use hardening compiler flags" OFF)
|
option(WITH_HARDENING "Use hardening compiler flags" OFF)
|
||||||
option(WITH_LIBRARY "Build library" ON)
|
option(WITH_LIBRARY "Build library" ON)
|
||||||
option(WITH_BINARY "Build binary" ON)
|
option(WITH_BINARY "Build binary" ON)
|
||||||
option(WITH_STATIC "Static build" OFF)
|
option(WITH_STATIC "Static build" OFF)
|
||||||
option(WITH_UPNP "Include support for UPnP client" OFF)
|
option(WITH_UPNP "Include support for UPnP client" OFF)
|
||||||
option(WITH_GIT_VERSION "Use git commit info as version" OFF)
|
option(WITH_PCH "Use precompiled header" OFF)
|
||||||
|
option(WITH_MESHNET "Build for cjdns test network" OFF)
|
||||||
option(WITH_ADDRSANITIZER "Build with address sanitizer unix only" OFF)
|
option(WITH_ADDRSANITIZER "Build with address sanitizer unix only" OFF)
|
||||||
option(WITH_THREADSANITIZER "Build with thread sanitizer unix only" OFF)
|
option(WITH_THREADSANITIZER "Build with thread sanitizer unix only" OFF)
|
||||||
option(BUILD_TESTING "Build tests" OFF)
|
|
||||||
|
|
||||||
IF(BUILD_TESTING)
|
# paths
|
||||||
enable_testing()
|
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
|
||||||
ENDIF()
|
set(CMAKE_SOURCE_DIR "..")
|
||||||
|
|
||||||
# Handle paths nicely
|
#Handle paths nicely
|
||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
# Architecture
|
# architecture
|
||||||
include(TargetArch)
|
include(TargetArch)
|
||||||
target_architecture(ARCHITECTURE)
|
target_architecture(ARCHITECTURE)
|
||||||
|
|
||||||
include(CheckAtomic)
|
set(LIBI2PD_SRC_DIR ../libi2pd)
|
||||||
|
set(LIBI2PD_CLIENT_SRC_DIR ../libi2pd_client)
|
||||||
if(WITH_STATIC)
|
set(LANG_SRC_DIR ../i18n)
|
||||||
if(MSVC)
|
set(DAEMON_SRC_DIR ../daemon)
|
||||||
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
include_directories(${LIBI2PD_SRC_DIR})
|
include_directories(${LIBI2PD_SRC_DIR})
|
||||||
|
include_directories(${LIBI2PD_CLIENT_SRC_DIR})
|
||||||
|
include_directories(${LANG_SRC_DIR})
|
||||||
|
include_directories(${DAEMON_SRC_DIR})
|
||||||
|
|
||||||
FILE(GLOB LIBI2PD_SRC ${LIBI2PD_SRC_DIR}/*.cpp)
|
FILE(GLOB LIBI2PD_SRC ${LIBI2PD_SRC_DIR}/*.cpp)
|
||||||
add_library(libi2pd ${LIBI2PD_SRC})
|
add_library(libi2pd ${LIBI2PD_SRC})
|
||||||
set_target_properties(libi2pd PROPERTIES PREFIX "")
|
set_target_properties(libi2pd PROPERTIES PREFIX "")
|
||||||
|
|
@ -69,9 +54,11 @@ if(WITH_LIBRARY)
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
COMPONENT Libraries)
|
COMPONENT Libraries)
|
||||||
|
# TODO Make libi2pd available to 3rd party projects via CMake as imported target
|
||||||
|
# FIXME This pulls stdafx
|
||||||
|
# install(EXPORT libi2pd DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${LIBI2PD_CLIENT_SRC_DIR})
|
|
||||||
FILE(GLOB CLIENT_SRC ${LIBI2PD_CLIENT_SRC_DIR}/*.cpp)
|
FILE(GLOB CLIENT_SRC ${LIBI2PD_CLIENT_SRC_DIR}/*.cpp)
|
||||||
add_library(libi2pdclient ${CLIENT_SRC})
|
add_library(libi2pdclient ${CLIENT_SRC})
|
||||||
set_target_properties(libi2pdclient PROPERTIES PREFIX "")
|
set_target_properties(libi2pdclient PROPERTIES PREFIX "")
|
||||||
|
|
@ -84,7 +71,6 @@ if(WITH_LIBRARY)
|
||||||
COMPONENT Libraries)
|
COMPONENT Libraries)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${LANG_SRC_DIR})
|
|
||||||
FILE(GLOB LANG_SRC ${LANG_SRC_DIR}/*.cpp)
|
FILE(GLOB LANG_SRC ${LANG_SRC_DIR}/*.cpp)
|
||||||
add_library(libi2pdlang ${LANG_SRC})
|
add_library(libi2pdlang ${LANG_SRC})
|
||||||
set_target_properties(libi2pdlang PROPERTIES PREFIX "")
|
set_target_properties(libi2pdlang PROPERTIES PREFIX "")
|
||||||
|
|
@ -97,64 +83,39 @@ if(WITH_LIBRARY)
|
||||||
COMPONENT Libraries)
|
COMPONENT Libraries)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${DAEMON_SRC_DIR})
|
|
||||||
|
|
||||||
set(DAEMON_SRC
|
set(DAEMON_SRC
|
||||||
"${DAEMON_SRC_DIR}/Daemon.cpp"
|
"${DAEMON_SRC_DIR}/Daemon.cpp"
|
||||||
"${DAEMON_SRC_DIR}/HTTPServer.cpp"
|
"${DAEMON_SRC_DIR}/HTTPServer.cpp"
|
||||||
"${DAEMON_SRC_DIR}/I2PControl.cpp"
|
"${DAEMON_SRC_DIR}/I2PControl.cpp"
|
||||||
"${DAEMON_SRC_DIR}/I2PControlHandlers.cpp"
|
|
||||||
"${DAEMON_SRC_DIR}/i2pd.cpp"
|
"${DAEMON_SRC_DIR}/i2pd.cpp"
|
||||||
"${DAEMON_SRC_DIR}/UPnP.cpp"
|
"${DAEMON_SRC_DIR}/UPnP.cpp"
|
||||||
)
|
)
|
||||||
|
|
||||||
if(WIN32)
|
if(WITH_MESHNET)
|
||||||
set(WIN32_SRC_DIR ${CMAKE_SOURCE_DIR}/Win32)
|
add_definitions(-DMESHNET)
|
||||||
include_directories(${WIN32_SRC_DIR})
|
|
||||||
|
|
||||||
list(APPEND DAEMON_SRC
|
|
||||||
"${WIN32_SRC_DIR}/DaemonWin32.cpp"
|
|
||||||
"${WIN32_SRC_DIR}/Win32App.cpp"
|
|
||||||
"${WIN32_SRC_DIR}/Win32Service.cpp"
|
|
||||||
"${WIN32_SRC_DIR}/Win32NetState.cpp"
|
|
||||||
)
|
|
||||||
|
|
||||||
file(GLOB WIN32_RC ${WIN32_SRC_DIR}/*.rc)
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWIN32_APP -DWIN32_LEAN_AND_MEAN -DNOMINMAX")
|
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_UPNP)
|
if(WITH_UPNP)
|
||||||
add_definitions(-DUSE_UPNP)
|
add_definitions(-DUSE_UPNP)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_GIT_VERSION)
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Winvalid-pch -Wno-unused-parameter")
|
||||||
include(GetGitRevisionDescription)
|
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -pedantic")
|
||||||
git_describe(GIT_VERSION)
|
# TODO: The following is incompatible with static build and enabled hardening for OpenWRT.
|
||||||
add_definitions(-DGITVER=${GIT_VERSION})
|
# Multiple definitions of __stack_chk_fail(libssp & libc)
|
||||||
endif()
|
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -flto -s -ffunction-sections -fdata-sections")
|
||||||
|
set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "-Wl,--gc-sections") # -flto is added from above
|
||||||
|
|
||||||
if(APPLE)
|
# check for c++17 & c++11 support
|
||||||
add_definitions(-DMAC_OSX)
|
include(CheckCXXCompilerFlag)
|
||||||
endif()
|
CHECK_CXX_COMPILER_FLAG("-std=c++17" CXX17_SUPPORTED)
|
||||||
|
CHECK_CXX_COMPILER_FLAG("-std=c++11" CXX11_SUPPORTED)
|
||||||
if(HAIKU)
|
if(CXX17_SUPPORTED)
|
||||||
add_definitions(-D_DEFAULT_SOURCE -D_GNU_SOURCE)
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
|
||||||
endif()
|
elseif(CXX11_SUPPORTED)
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||||
if(MSVC)
|
|
||||||
add_definitions(-DWINVER=0x0600)
|
|
||||||
add_definitions(-D_WIN32_WINNT=0x0600)
|
|
||||||
else()
|
else()
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Winvalid-pch -Wno-unused-parameter -Wno-uninitialized")
|
message(SEND_ERROR "C++17 nor C++11 standard not seems to be supported by compiler. Too old version?")
|
||||||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -pedantic")
|
|
||||||
# TODO: The following is incompatible with static build and enabled hardening for OpenWRT.
|
|
||||||
# Multiple definitions of __stack_chk_fail(libssp & libc)
|
|
||||||
if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
|
||||||
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -flto -s")
|
|
||||||
endif()
|
|
||||||
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -ffunction-sections -fdata-sections")
|
|
||||||
set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "-Wl,--gc-sections") # -flto is added from above
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||||
|
|
@ -184,6 +145,13 @@ if(UNIX)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Note: AES-NI and AVX is available on x86-based CPU's.
|
||||||
|
# Here also ARM64 implementation, but currently we don't support it.
|
||||||
|
if(WITH_AESNI AND (ARCHITECTURE MATCHES "x86_64" OR ARCHITECTURE MATCHES "i386"))
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
|
||||||
|
add_definitions(-D__AES__)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(WITH_ADDRSANITIZER)
|
if(WITH_ADDRSANITIZER)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
|
||||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
|
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
|
||||||
|
|
@ -198,52 +166,27 @@ if(WITH_THREADSANITIZER)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) # gcc 8-9
|
|
||||||
list(APPEND CMAKE_REQUIRED_LIBRARIES "stdc++fs")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Use std::atomic instead of GCC builtins on macOS PowerPC:
|
|
||||||
# For more information refer to: https://github.com/PurpleI2P/i2pd/issues/1726#issuecomment-1306335111
|
|
||||||
# This has been fixed in Boost 1.81, nevertheless we retain the setting for the sake of compatibility.
|
|
||||||
if(APPLE AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
|
|
||||||
add_definitions(-DBOOST_SP_USE_STD_ATOMIC)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# libraries
|
# libraries
|
||||||
|
# TODO: once CMake 3.1+ becomes mainstream, see e.g. http://stackoverflow.com/a/29871891/673826
|
||||||
|
# use imported Threads::Threads instead
|
||||||
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||||
find_package(Threads REQUIRED)
|
if(IOS)
|
||||||
|
set(CMAKE_THREAD_LIBS_INIT "-lpthread")
|
||||||
|
set(CMAKE_HAVE_THREADS_LIBRARY 1)
|
||||||
|
set(CMAKE_USE_WIN32_THREADS_INIT 0)
|
||||||
|
set(CMAKE_USE_PTHREADS_INIT 1)
|
||||||
|
else()
|
||||||
|
find_package(Threads REQUIRED)
|
||||||
|
endif()
|
||||||
|
if(THREADS_HAVE_PTHREAD_ARG) # compile time flag
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
|
||||||
|
endif()
|
||||||
|
|
||||||
if(WITH_STATIC)
|
if(WITH_STATIC)
|
||||||
if(NOT MSVC)
|
|
||||||
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(Boost_USE_STATIC_LIBS ON)
|
set(Boost_USE_STATIC_LIBS ON)
|
||||||
if(MSVC)
|
set(Boost_USE_STATIC_RUNTIME ON)
|
||||||
set(Boost_USE_STATIC_RUNTIME ON)
|
|
||||||
else()
|
|
||||||
set(Boost_USE_STATIC_RUNTIME OFF)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(MSVC)
|
|
||||||
set(OPENSSL_MSVC_STATIC_RT ON)
|
|
||||||
endif()
|
|
||||||
set(OPENSSL_USE_STATIC_LIBS ON)
|
|
||||||
|
|
||||||
set(ZLIB_USE_STATIC_LIBS ON)
|
|
||||||
if(MSVC)
|
|
||||||
set(ZLIB_NAMES zlibstatic zlibstat)
|
|
||||||
else()
|
|
||||||
set(ZLIB_NAMES libz zlibstatic zlibstat zlib z)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WITH_UPNP)
|
|
||||||
set(MINIUPNPC_USE_STATIC_LIBS ON)
|
|
||||||
add_definitions(-DMINIUPNP_STATICLIB)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(BUILD_SHARED_LIBS OFF)
|
set(BUILD_SHARED_LIBS OFF)
|
||||||
|
|
||||||
if(${CMAKE_CXX_COMPILER} MATCHES ".*-openwrt-.*")
|
if(${CMAKE_CXX_COMPILER} MATCHES ".*-openwrt-.*")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
|
||||||
# set(CMAKE_THREAD_LIBS_INIT "gcc_eh -Wl,--whole-archive -lpthread -Wl,--no-whole-archive")
|
# set(CMAKE_THREAD_LIBS_INIT "gcc_eh -Wl,--whole-archive -lpthread -Wl,--no-whole-archive")
|
||||||
|
|
@ -253,30 +196,37 @@ else()
|
||||||
# TODO: Consider separate compilation for LIBI2PD_SRC for library.
|
# TODO: Consider separate compilation for LIBI2PD_SRC for library.
|
||||||
# No need in -fPIC overhead for binary if not interested in library
|
# No need in -fPIC overhead for binary if not interested in library
|
||||||
# HINT: revert c266cff CMakeLists.txt: compilation speed up
|
# HINT: revert c266cff CMakeLists.txt: compilation speed up
|
||||||
if(NOT MSVC)
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
add_definitions(-DBOOST_SYSTEM_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_DATE_TIME_DYN_LINK -DBOOST_REGEX_DYN_LINK)
|
||||||
endif()
|
|
||||||
add_definitions(-DBOOST_ATOMIC_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK)
|
|
||||||
if(WIN32)
|
|
||||||
set(Boost_USE_STATIC_LIBS OFF)
|
|
||||||
set(Boost_USE_STATIC_RUNTIME OFF)
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(Boost REQUIRED COMPONENTS system filesystem program_options)
|
if(WITH_PCH)
|
||||||
if(NOT DEFINED Boost_FOUND)
|
include_directories(BEFORE ${CMAKE_BINARY_DIR})
|
||||||
|
add_library(stdafx STATIC "${LIBI2PD_SRC_DIR}/stdafx.cpp")
|
||||||
|
string(TOUPPER ${CMAKE_BUILD_TYPE} BTU)
|
||||||
|
get_directory_property(DEFS DEFINITIONS)
|
||||||
|
string(REPLACE " " ";" FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BTU}} ${DEFS}")
|
||||||
|
add_custom_command(TARGET stdafx PRE_BUILD
|
||||||
|
COMMAND ${CMAKE_CXX_COMPILER} ${FLAGS} -c ${CMAKE_CURRENT_SOURCE_DIR}/../libi2pd/stdafx.h -o ${CMAKE_BINARY_DIR}/stdafx.h.gch
|
||||||
|
)
|
||||||
|
target_compile_options(libi2pd PRIVATE -include libi2pd/stdafx.h)
|
||||||
|
target_compile_options(libi2pdclient PRIVATE -include libi2pd/stdafx.h)
|
||||||
|
target_compile_options(libi2pdlang PRIVATE -include libi2pd/stdafx.h)
|
||||||
|
target_link_libraries(libi2pd stdafx)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
target_link_libraries(libi2pdclient libi2pd libi2pdlang)
|
||||||
|
|
||||||
|
find_package(Boost COMPONENTS system filesystem program_options date_time REQUIRED)
|
||||||
|
if(NOT DEFINED Boost_INCLUDE_DIRS)
|
||||||
message(SEND_ERROR "Boost is not found, or your boost version was below 1.46. Please download Boost!")
|
message(SEND_ERROR "Boost is not found, or your boost version was below 1.46. Please download Boost!")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
find_package(OpenSSL REQUIRED)
|
find_package(OpenSSL REQUIRED)
|
||||||
if(NOT DEFINED OPENSSL_FOUND)
|
if(NOT DEFINED OPENSSL_INCLUDE_DIR)
|
||||||
message(SEND_ERROR "Could not find OpenSSL. Please download and install it first!")
|
message(SEND_ERROR "Could not find OpenSSL. Please download and install it first!")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(OPENSSL_VERSION VERSION_GREATER_EQUAL "3.0.0")
|
|
||||||
add_definitions(-DOPENSSL_SUPPRESS_DEPRECATED)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WITH_UPNP)
|
if(WITH_UPNP)
|
||||||
find_package(MiniUPnPc REQUIRED)
|
find_package(MiniUPnPc REQUIRED)
|
||||||
if(NOT MINIUPNPC_FOUND)
|
if(NOT MINIUPNPC_FOUND)
|
||||||
|
|
@ -291,29 +241,19 @@ if(ZLIB_FOUND)
|
||||||
link_directories(${ZLIB_ROOT}/lib)
|
link_directories(${ZLIB_ROOT}/lib)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# C++ standard to use, based on compiler and version of boost
|
|
||||||
if(NOT MSVC)
|
|
||||||
# check for c++20 & c++17 support
|
|
||||||
include(CheckCXXCompilerFlag)
|
|
||||||
|
|
||||||
if(Boost_VERSION VERSION_GREATER_EQUAL "1.83") # min boost version for c++20
|
|
||||||
CHECK_CXX_COMPILER_FLAG("-std=c++20" CXX20_SUPPORTED)
|
|
||||||
endif()
|
|
||||||
CHECK_CXX_COMPILER_FLAG("-std=c++17" CXX17_SUPPORTED)
|
|
||||||
|
|
||||||
|
|
||||||
if(CXX20_SUPPORTED)
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
|
|
||||||
elseif(CXX17_SUPPORTED)
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
|
|
||||||
else()
|
|
||||||
message(SEND_ERROR "C++20 nor C++17 standard not seems to be supported by compiler. Too old version?")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# load includes
|
# load includes
|
||||||
include_directories(SYSTEM ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
|
include_directories(SYSTEM ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
|
||||||
|
|
||||||
|
# warn if for meshnet
|
||||||
|
if(WITH_MESHNET)
|
||||||
|
message(STATUS "Building for testnet")
|
||||||
|
message(WARNING "This build will NOT work on mainline i2p")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(NOT MSYS)
|
||||||
|
include(CheckAtomic)
|
||||||
|
endif()
|
||||||
|
|
||||||
# show summary
|
# show summary
|
||||||
message(STATUS "---------------------------------------")
|
message(STATUS "---------------------------------------")
|
||||||
message(STATUS "Build type : ${CMAKE_BUILD_TYPE}")
|
message(STATUS "Build type : ${CMAKE_BUILD_TYPE}")
|
||||||
|
|
@ -321,72 +261,54 @@ message(STATUS "Compiler vendor : ${CMAKE_CXX_COMPILER_ID}")
|
||||||
message(STATUS "Compiler version : ${CMAKE_CXX_COMPILER_VERSION}")
|
message(STATUS "Compiler version : ${CMAKE_CXX_COMPILER_VERSION}")
|
||||||
message(STATUS "Compiler path : ${CMAKE_CXX_COMPILER}")
|
message(STATUS "Compiler path : ${CMAKE_CXX_COMPILER}")
|
||||||
message(STATUS "Architecture : ${ARCHITECTURE}")
|
message(STATUS "Architecture : ${ARCHITECTURE}")
|
||||||
message(STATUS "Compiler flags : ${CMAKE_CXX_FLAGS}")
|
|
||||||
message(STATUS "Install prefix: : ${CMAKE_INSTALL_PREFIX}")
|
message(STATUS "Install prefix: : ${CMAKE_INSTALL_PREFIX}")
|
||||||
message(STATUS "Options:")
|
message(STATUS "Options:")
|
||||||
|
message(STATUS " AESNI : ${WITH_AESNI}")
|
||||||
message(STATUS " HARDENING : ${WITH_HARDENING}")
|
message(STATUS " HARDENING : ${WITH_HARDENING}")
|
||||||
message(STATUS " LIBRARY : ${WITH_LIBRARY}")
|
message(STATUS " LIBRARY : ${WITH_LIBRARY}")
|
||||||
message(STATUS " BINARY : ${WITH_BINARY}")
|
message(STATUS " BINARY : ${WITH_BINARY}")
|
||||||
message(STATUS " STATIC BUILD : ${WITH_STATIC}")
|
message(STATUS " STATIC BUILD : ${WITH_STATIC}")
|
||||||
message(STATUS " UPnP : ${WITH_UPNP}")
|
message(STATUS " UPnP : ${WITH_UPNP}")
|
||||||
if(WITH_GIT_VERSION)
|
message(STATUS " PCH : ${WITH_PCH}")
|
||||||
message(STATUS " GIT VERSION : ${WITH_GIT_VERSION} (${GIT_VERSION})")
|
message(STATUS " MESHNET : ${WITH_MESHNET}")
|
||||||
else()
|
|
||||||
message(STATUS " GIT VERSION : ${WITH_GIT_VERSION}")
|
|
||||||
endif()
|
|
||||||
message(STATUS " ADDRSANITIZER : ${WITH_ADDRSANITIZER}")
|
message(STATUS " ADDRSANITIZER : ${WITH_ADDRSANITIZER}")
|
||||||
message(STATUS " THREADSANITIZER : ${WITH_THREADSANITIZER}")
|
message(STATUS " THREADSANITIZER : ${WITH_THREADSANITIZER}")
|
||||||
message(STATUS "---------------------------------------")
|
message(STATUS "---------------------------------------")
|
||||||
|
|
||||||
if(WITH_BINARY)
|
if(WITH_BINARY)
|
||||||
if(WIN32)
|
add_executable("${PROJECT_NAME}" ${DAEMON_SRC})
|
||||||
add_executable("${PROJECT_NAME}" WIN32 ${DAEMON_SRC} ${WIN32_RC})
|
|
||||||
else()
|
|
||||||
add_executable("${PROJECT_NAME}" ${DAEMON_SRC})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WIN32)
|
|
||||||
list(APPEND MINGW_EXTRA "wsock32" "ws2_32" "iphlpapi")
|
|
||||||
# OpenSSL may require Crypt32 library on MSVC build, which is not added by CMake lesser than 3.21
|
|
||||||
if(MSVC AND ${CMAKE_VERSION} VERSION_LESS 3.21)
|
|
||||||
list(APPEND MINGW_EXTRA "crypt32")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WITH_STATIC)
|
if(WITH_STATIC)
|
||||||
if(NOT MSVC)
|
set_target_properties("${PROJECT_NAME}" PROPERTIES LINK_FLAGS "-static")
|
||||||
set_target_properties("${PROJECT_NAME}" PROPERTIES LINK_FLAGS "-static")
|
endif()
|
||||||
endif()
|
|
||||||
|
if(WITH_PCH)
|
||||||
|
target_compile_options("${PROJECT_NAME}" PRIVATE -include libi2pd/stdafx.h)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WITH_HARDENING AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
if(WITH_HARDENING AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||||
set_target_properties("${PROJECT_NAME}" PROPERTIES LINK_FLAGS "-z relro -z now")
|
set_target_properties("${PROJECT_NAME}" PROPERTIES LINK_FLAGS "-z relro -z now")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(WITH_UPNP)
|
||||||
|
set(UPNP_LIB ${MINIUPNPC_LIBRARY})
|
||||||
|
endif()
|
||||||
|
|
||||||
# FindBoost pulls pthread for thread which is broken for static linking at least on Ubuntu 15.04
|
# FindBoost pulls pthread for thread which is broken for static linking at least on Ubuntu 15.04
|
||||||
list(GET Boost_LIBRARIES -1 LAST_Boost_LIBRARIES)
|
list(GET Boost_LIBRARIES -1 LAST_Boost_LIBRARIES)
|
||||||
if(${LAST_Boost_LIBRARIES} MATCHES ".*pthread.*")
|
if(${LAST_Boost_LIBRARIES} MATCHES ".*pthread.*")
|
||||||
list(REMOVE_AT Boost_LIBRARIES -1)
|
list(REMOVE_AT Boost_LIBRARIES -1)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# synchronization library is incompatible with Windows 7
|
|
||||||
if(WIN32)
|
|
||||||
get_target_property(BOOSTFSLIBS Boost::filesystem INTERFACE_LINK_LIBRARIES)
|
|
||||||
list(REMOVE_ITEM BOOSTFSLIBS synchronization)
|
|
||||||
set_target_properties(Boost::filesystem PROPERTIES INTERFACE_LINK_LIBRARIES "${BOOSTFSLIBS}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WITH_STATIC)
|
if(WITH_STATIC)
|
||||||
set(DL_LIB ${CMAKE_DL_LIBS})
|
set(DL_LIB ${CMAKE_DL_LIBS})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries("${PROJECT_NAME}" libi2pd libi2pdclient libi2pdlang ${Boost_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto ${MINIUPNPC_LIBRARY} ZLIB::ZLIB Threads::Threads ${MINGW_EXTRA} ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES})
|
target_link_libraries(libi2pd ${Boost_LIBRARIES} ${ZLIB_LIBRARY})
|
||||||
|
target_link_libraries("${PROJECT_NAME}" libi2pd libi2pdclient libi2pdlang ${DL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${UPNP_LIB} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_EXTRA} ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES})
|
||||||
|
|
||||||
install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime)
|
install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime)
|
||||||
set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
|
set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
|
||||||
set(DIRS "${Boost_LIBRARY_DIR};${OPENSSL_INCLUDE_DIR}/../bin;${ZLIB_INCLUDE_DIR}/../bin;/mingw32/bin")
|
set(DIRS "${Boost_LIBRARY_DIR};${OPENSSL_INCLUDE_DIR}/../bin;${ZLIB_INCLUDE_DIR}/../bin;/mingw32/bin")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(BUILD_TESTING)
|
|
||||||
add_subdirectory(${CMAKE_SOURCE_DIR}/tests ${CMAKE_CURRENT_BINARY_DIR}/tests)
|
|
||||||
endif()
|
|
||||||
|
|
|
||||||
|
|
@ -2,25 +2,26 @@
|
||||||
setlocal enableextensions enabledelayedexpansion
|
setlocal enableextensions enabledelayedexpansion
|
||||||
title Building i2pd
|
title Building i2pd
|
||||||
|
|
||||||
REM Copyright (c) 2013-2022, The PurpleI2P Project
|
REM Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
REM This file is part of Purple i2pd project and licensed under BSD3
|
REM This file is part of Purple i2pd project and licensed under BSD3
|
||||||
REM See full license text in LICENSE file at top of project tree
|
REM See full license text in LICENSE file at top of project tree
|
||||||
|
|
||||||
REM To use that script, you must have installed in your MSYS installation these packages:
|
REM To use that script, you must have installed in your MSYS installation these packages:
|
||||||
REM Base: git make zip
|
REM Base: git make zip
|
||||||
REM UCRT64: mingw-w64-ucrt-x86_64-boost mingw-w64-ucrt-x86_64-openssl mingw-w64-ucrt-x86_64-gcc
|
REM x86_64: mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-gcc
|
||||||
REM MINGW32: mingw-w64-i686-boost mingw-w64-i686-openssl mingw-w64-i686-gcc
|
REM i686: mingw-w64-i686-boost mingw-w64-i686-openssl mingw-w64-i686-gcc
|
||||||
|
|
||||||
REM setting up variables for MSYS
|
REM setting up variables for MSYS
|
||||||
REM Note: if you installed MSYS64 to different path, edit WD variable (only C:\msys64 needed to edit)
|
REM Note: if you installed MSYS64 to different path, edit WD variable (only C:\msys64 needed to edit)!
|
||||||
|
set "WD=C:\msys64\usr\bin\"
|
||||||
set MSYS2_PATH_TYPE=inherit
|
set MSYS2_PATH_TYPE=inherit
|
||||||
set CHERE_INVOKING=enabled_from_arguments
|
set CHERE_INVOKING=enabled_from_arguments
|
||||||
|
REM set MSYSTEM=MSYS
|
||||||
set MSYSTEM=MINGW32
|
set MSYSTEM=MINGW32
|
||||||
|
|
||||||
set "WD=C:\msys64\usr\bin\"
|
|
||||||
set "xSH=%WD%bash -lc"
|
set "xSH=%WD%bash -lc"
|
||||||
|
|
||||||
set "FILELIST=i2pd.exe README.txt contrib/i2pd.conf contrib/tunnels.conf contrib/certificates contrib/tunnels.d contrib/webconsole"
|
set "FILELIST=i2pd.exe README.txt contrib/i2pd.conf contrib/tunnels.conf contrib/certificates contrib/tunnels.d"
|
||||||
|
|
||||||
REM detecting number of processors
|
REM detecting number of processors
|
||||||
set /a threads=%NUMBER_OF_PROCESSORS%
|
set /a threads=%NUMBER_OF_PROCESSORS%
|
||||||
|
|
@ -33,73 +34,38 @@ del /S build_*.log >> nul 2>&1
|
||||||
|
|
||||||
echo Receiving latest commit and cleaning up...
|
echo Receiving latest commit and cleaning up...
|
||||||
%xSH% "git checkout contrib/* && git pull && make clean" > build\build.log 2>&1
|
%xSH% "git checkout contrib/* && git pull && make clean" > build\build.log 2>&1
|
||||||
|
echo.
|
||||||
|
|
||||||
REM set to variable current commit hash
|
REM set to variable current commit hash
|
||||||
for /F "usebackq" %%a in (`%xSH% "git describe --tags"`) DO (
|
FOR /F "usebackq" %%a IN (`%xSH% 'git describe --tags'`) DO (
|
||||||
set tag=%%a
|
set tag=%%a
|
||||||
)
|
)
|
||||||
|
|
||||||
REM set to variable latest released tag
|
|
||||||
for /F "usebackq" %%b in (`%xSH% "git describe --abbrev=0"`) DO (
|
|
||||||
set reltag=%%b
|
|
||||||
)
|
|
||||||
|
|
||||||
echo Preparing configuration files and README for packaging...
|
|
||||||
|
|
||||||
%xSH% "echo To use configs and certificates, move all files and certificates folder from contrib directory here. > README.txt" >> nul
|
%xSH% "echo To use configs and certificates, move all files and certificates folder from contrib directory here. > README.txt" >> nul
|
||||||
|
|
||||||
REM converting configuration files to DOS format (make usable in Windows Notepad)
|
REM converting configuration files to DOS format (usable in default notepad)
|
||||||
%xSH% "unix2dos contrib/i2pd.conf contrib/tunnels.conf contrib/tunnels.d/* contrib/webconsole/style.css" >> build\build.log 2>&1
|
%xSH% "unix2dos contrib/i2pd.conf contrib/tunnels.conf contrib/tunnels.d/*" >> build\build.log 2>&1
|
||||||
|
|
||||||
REM Prepare binary signing command if signing key and password provided
|
|
||||||
if defined SIGN (
|
|
||||||
echo Signing enabled
|
|
||||||
|
|
||||||
for %%X in (signtool.exe) do (set xSIGNTOOL=%%~$PATH:X)
|
|
||||||
if not defined xSIGNTOOL (
|
|
||||||
if not defined SIGNTOOL (
|
|
||||||
echo Error: Can't find signtool. Please provide path to binary using SIGNTOOL variable.
|
|
||||||
exit /b 1
|
|
||||||
) else (
|
|
||||||
set "xSIGNTOOL=%SIGNTOOL%"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
if defined SIGNKEY (
|
|
||||||
set "xSIGNKEYOPTS=/f ^"%SIGNKEY%^""
|
|
||||||
)
|
|
||||||
|
|
||||||
if defined SIGNPASS (
|
|
||||||
set "xSIGNPASSOPTS=/p ^"%SIGNPASS%^""
|
|
||||||
)
|
|
||||||
|
|
||||||
set "xSIGNOPTS=sign /tr http://timestamp.digicert.com /td sha256 /fd sha256 %xSIGNKEYOPTS% %xSIGNPASSOPTS%"
|
|
||||||
)
|
|
||||||
|
|
||||||
REM starting building
|
REM starting building
|
||||||
set MSYSTEM=MINGW32
|
set MSYSTEM=MINGW32
|
||||||
set bitness=32
|
set bitness=32
|
||||||
call :BUILDING
|
call :BUILDING
|
||||||
|
|
||||||
set MSYSTEM=UCRT64
|
set MSYSTEM=MINGW64
|
||||||
set bitness=64
|
set bitness=64
|
||||||
call :BUILDING
|
call :BUILDING
|
||||||
|
|
||||||
REM build for Windows XP
|
REM building for WinXP
|
||||||
if exist C:\msys64-xp\ ( call :BUILDING_XP )
|
set "WD=C:\msys64-xp\usr\bin\"
|
||||||
|
set MSYSTEM=MINGW32
|
||||||
|
set bitness=32
|
||||||
|
set "xSH=%WD%bash -lc"
|
||||||
|
call :BUILDING_XP
|
||||||
echo.
|
echo.
|
||||||
|
|
||||||
REM compile installer
|
REM compile installer
|
||||||
echo Building installer...
|
C:\PROGRA~2\INNOSE~1\ISCC.exe /dI2Pd_TextVer="%tag%" /dI2Pd_Ver="%tag%.0" build\win_installer.iss >> build\build.log 2>&1
|
||||||
C:\PROGRA~2\INNOSE~1\ISCC.exe /dI2Pd_TextVer="%tag%" /dI2Pd_Ver="%reltag%.0" build\win_installer.iss >> build\build.log 2>&1
|
|
||||||
|
|
||||||
REM Sign binary
|
|
||||||
if defined xSIGNOPTS (
|
|
||||||
"%xSIGNTOOL%" %xSIGNOPTS% build\setup_i2pd_v%tag%.exe
|
|
||||||
)
|
|
||||||
|
|
||||||
%xSH% "git checkout contrib/*" >> build\build.log 2>&1
|
|
||||||
del README.txt i2pd_x32.exe i2pd_x64.exe i2pd_xp.exe >> nul
|
del README.txt i2pd_x32.exe i2pd_x64.exe i2pd_xp.exe >> nul
|
||||||
|
|
||||||
echo Build complete...
|
echo Build complete...
|
||||||
|
|
@ -108,42 +74,13 @@ exit /b 0
|
||||||
|
|
||||||
:BUILDING
|
:BUILDING
|
||||||
%xSH% "make clean" >> nul
|
%xSH% "make clean" >> nul
|
||||||
echo Building i2pd %tag% for win%bitness%...
|
echo Building i2pd %tag% for win%bitness%
|
||||||
REM Build i2pd
|
%xSH% "make DEBUG=no USE_UPNP=yes -j%threads% && cp i2pd.exe i2pd_x%bitness%.exe && zip -r9 build/i2pd_%tag%_win%bitness%_mingw.zip %FILELIST% && make clean" > build\build_win%bitness%_%tag%.log 2>&1
|
||||||
%xSH% "make DEBUG=no USE_UPNP=yes -j%threads%" > build\build_win%bitness%_%tag%.log 2>&1
|
|
||||||
|
|
||||||
REM Sign binary
|
|
||||||
if defined xSIGNOPTS (
|
|
||||||
"%xSIGNTOOL%" %xSIGNOPTS% i2pd.exe
|
|
||||||
)
|
|
||||||
|
|
||||||
REM Copy binary for installer and create distribution archive
|
|
||||||
%xSH% "cp i2pd.exe i2pd_x%bitness%.exe && zip -r9 build/i2pd_%tag%_win%bitness%_mingw.zip %FILELIST%" >> build\build_win%bitness%_%tag%.log 2>&1
|
|
||||||
|
|
||||||
REM Clean work directory
|
|
||||||
%xSH% "make clean" >> build\build_win%bitness%_%tag%.log 2>&1
|
|
||||||
goto EOF
|
goto EOF
|
||||||
|
|
||||||
:BUILDING_XP
|
:BUILDING_XP
|
||||||
set MSYSTEM=MINGW32
|
|
||||||
set bitness=32
|
|
||||||
set "WD=C:\msys64-xp\usr\bin\"
|
|
||||||
set "xSH=%WD%bash -lc"
|
|
||||||
|
|
||||||
%xSH% "make clean" >> nul
|
%xSH% "make clean" >> nul
|
||||||
echo Building i2pd %tag% for winxp...
|
echo Building i2pd %tag% for winxp
|
||||||
%xSH% "make DEBUG=no USE_UPNP=yes USE_WINXP_FLAGS=yes -j%threads%" > build\build_winxp_%tag%.log 2>&1
|
%xSH% "make DEBUG=no USE_UPNP=yes USE_WINXP_FLAGS=yes -j%threads% && cp i2pd.exe i2pd_xp.exe && zip -r9 build/i2pd_%tag%_winxp_mingw.zip %FILELIST% && make clean" > build\build_winxp_%tag%.log 2>&1
|
||||||
|
|
||||||
REM Sign binary
|
:EOF
|
||||||
if defined xSIGNOPTS (
|
|
||||||
"%xSIGNTOOL%" %xSIGNOPTS% i2pd.exe
|
|
||||||
)
|
|
||||||
|
|
||||||
REM Copy binary for installer and create distribution archive
|
|
||||||
%xSH% "cp i2pd.exe i2pd_xp.exe && zip -r9 build/i2pd_%tag%_winxp_mingw.zip %FILELIST%" >> build\build_winxp_%tag%.log 2>&1
|
|
||||||
|
|
||||||
REM Clean work directory
|
|
||||||
%xSH% "make clean" >> build\build_winxp_%tag%.log 2>&1
|
|
||||||
goto EOF
|
|
||||||
|
|
||||||
:EOF
|
|
||||||
|
|
@ -1,23 +1,18 @@
|
||||||
# atomic builtins are required for threading support.
|
# atomic builtins are required for threading support.
|
||||||
|
|
||||||
INCLUDE(CheckCXXSourceCompiles)
|
INCLUDE(CheckCXXSourceCompiles)
|
||||||
INCLUDE(CheckLibraryExists)
|
|
||||||
|
|
||||||
# Sometimes linking against libatomic is required for atomic ops, if
|
# Sometimes linking against libatomic is required for atomic ops, if
|
||||||
# the platform doesn't support lock-free atomics.
|
# the platform doesn't support lock-free atomics.
|
||||||
|
|
||||||
function(check_working_cxx_atomics varname)
|
function(check_working_cxx_atomics varname)
|
||||||
set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
|
set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
|
||||||
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++17")
|
set(CMAKE_REQUIRED_FLAGS "-std=c++11")
|
||||||
CHECK_CXX_SOURCE_COMPILES("
|
CHECK_CXX_SOURCE_COMPILES("
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
std::atomic<int> x;
|
std::atomic<int> x;
|
||||||
std::atomic<short> y;
|
|
||||||
std::atomic<char> z;
|
|
||||||
int main() {
|
int main() {
|
||||||
++z;
|
return x;
|
||||||
++y;
|
|
||||||
return ++x;
|
|
||||||
}
|
}
|
||||||
" ${varname})
|
" ${varname})
|
||||||
set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
|
set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
|
||||||
|
|
@ -25,14 +20,13 @@ endfunction(check_working_cxx_atomics)
|
||||||
|
|
||||||
function(check_working_cxx_atomics64 varname)
|
function(check_working_cxx_atomics64 varname)
|
||||||
set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
|
set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
|
||||||
set(CMAKE_REQUIRED_FLAGS "-std=c++17 ${CMAKE_REQUIRED_FLAGS}")
|
set(CMAKE_REQUIRED_FLAGS "-std=c++11 ${CMAKE_REQUIRED_FLAGS}")
|
||||||
CHECK_CXX_SOURCE_COMPILES("
|
CHECK_CXX_SOURCE_COMPILES("
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
std::atomic<uint64_t> x (0);
|
std::atomic<uint64_t> x (0);
|
||||||
int main() {
|
int main() {
|
||||||
uint64_t i = x.load(std::memory_order_relaxed);
|
uint64_t i = x.load(std::memory_order_relaxed);
|
||||||
(void)i;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
" ${varname})
|
" ${varname})
|
||||||
|
|
@ -40,16 +34,15 @@ int main() {
|
||||||
endfunction(check_working_cxx_atomics64)
|
endfunction(check_working_cxx_atomics64)
|
||||||
|
|
||||||
|
|
||||||
# Check for (non-64-bit) atomic operations.
|
# This isn't necessary on MSVC, so avoid command-line switch annoyance
|
||||||
if(MSVC)
|
# by only running on GCC-like hosts.
|
||||||
set(HAVE_CXX_ATOMICS_WITHOUT_LIB True)
|
if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
|
||||||
else()
|
|
||||||
# First check if atomics work without the library.
|
# First check if atomics work without the library.
|
||||||
check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB)
|
check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB)
|
||||||
# If not, check if the library exists, and atomics work with it.
|
# If not, check if the library exists, and atomics work with it.
|
||||||
if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
|
if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
|
||||||
check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC)
|
check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC)
|
||||||
if(HAVE_LIBATOMIC)
|
if( HAVE_LIBATOMIC )
|
||||||
list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
|
list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
|
||||||
check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB)
|
check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB)
|
||||||
if (NOT HAVE_CXX_ATOMICS_WITH_LIB)
|
if (NOT HAVE_CXX_ATOMICS_WITH_LIB)
|
||||||
|
|
@ -65,20 +58,20 @@ endif()
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
set(HAVE_CXX_ATOMICS64_WITHOUT_LIB True)
|
set(HAVE_CXX_ATOMICS64_WITHOUT_LIB True)
|
||||||
else()
|
else()
|
||||||
# First check if atomics work without the library.
|
|
||||||
check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
|
check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
|
||||||
# If not, check if the library exists, and atomics work with it.
|
endif()
|
||||||
if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
|
|
||||||
check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
|
# If not, check if the library exists, and atomics work with it.
|
||||||
if(HAVE_CXX_LIBATOMICS64)
|
if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
|
||||||
list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
|
check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
|
||||||
check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
|
if(HAVE_CXX_LIBATOMICS64)
|
||||||
if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
|
list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
|
||||||
message(FATAL_ERROR "Host compiler must support 64-bit std::atomic!")
|
check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
|
||||||
endif()
|
if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
|
||||||
else()
|
message(FATAL_ERROR "Host compiler must support std::atomic!")
|
||||||
message(FATAL_ERROR "Host compiler appears to require libatomic for 64-bit operations, but cannot find it.")
|
|
||||||
endif()
|
endif()
|
||||||
|
else()
|
||||||
|
message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -87,6 +80,7 @@ endif()
|
||||||
## assumes C++11 <atomic> works.
|
## assumes C++11 <atomic> works.
|
||||||
CHECK_CXX_SOURCE_COMPILES("
|
CHECK_CXX_SOURCE_COMPILES("
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
#include <Intrin.h> /* Workaround for PR19898. */
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif
|
#endif
|
||||||
int main() {
|
int main() {
|
||||||
|
|
|
||||||
|
|
@ -1,55 +0,0 @@
|
||||||
# - Try to find the CHECK libraries
|
|
||||||
# Once done this will define
|
|
||||||
#
|
|
||||||
# CHECK_FOUND - system has check
|
|
||||||
# CHECK_INCLUDE_DIRS - the check include directory
|
|
||||||
# CHECK_LIBRARIES - check library
|
|
||||||
#
|
|
||||||
# Copyright (c) 2007 Daniel Gollub <gollub@b1-systems.de>
|
|
||||||
# Copyright (c) 2007-2009 Bjoern Ricks <bjoern.ricks@gmail.com>
|
|
||||||
#
|
|
||||||
# Redistribution and use is allowed according to the terms of the New
|
|
||||||
# BSD license.
|
|
||||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
|
||||||
|
|
||||||
|
|
||||||
INCLUDE( FindPkgConfig )
|
|
||||||
|
|
||||||
IF ( Check_FIND_REQUIRED )
|
|
||||||
SET( _pkgconfig_REQUIRED "REQUIRED" )
|
|
||||||
ELSE( Check_FIND_REQUIRED )
|
|
||||||
SET( _pkgconfig_REQUIRED "" )
|
|
||||||
ENDIF ( Check_FIND_REQUIRED )
|
|
||||||
|
|
||||||
IF ( CHECK_MIN_VERSION )
|
|
||||||
PKG_SEARCH_MODULE( CHECK ${_pkgconfig_REQUIRED} check>=${CHECK_MIN_VERSION} )
|
|
||||||
ELSE ( CHECK_MIN_VERSION )
|
|
||||||
PKG_SEARCH_MODULE( CHECK ${_pkgconfig_REQUIRED} check )
|
|
||||||
ENDIF ( CHECK_MIN_VERSION )
|
|
||||||
|
|
||||||
# Look for CHECK include dir and libraries
|
|
||||||
IF( NOT CHECK_FOUND AND NOT PKG_CONFIG_FOUND )
|
|
||||||
|
|
||||||
FIND_PATH( CHECK_INCLUDE_DIRS check.h )
|
|
||||||
|
|
||||||
FIND_LIBRARY( CHECK_LIBRARIES NAMES check )
|
|
||||||
|
|
||||||
IF ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES )
|
|
||||||
SET( CHECK_FOUND 1 )
|
|
||||||
IF ( NOT Check_FIND_QUIETLY )
|
|
||||||
MESSAGE ( STATUS "Found CHECK: ${CHECK_LIBRARIES}" )
|
|
||||||
ENDIF ( NOT Check_FIND_QUIETLY )
|
|
||||||
ELSE ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES )
|
|
||||||
IF ( Check_FIND_REQUIRED )
|
|
||||||
MESSAGE( FATAL_ERROR "Could NOT find CHECK" )
|
|
||||||
ELSE ( Check_FIND_REQUIRED )
|
|
||||||
IF ( NOT Check_FIND_QUIETLY )
|
|
||||||
MESSAGE( STATUS "Could NOT find CHECK" )
|
|
||||||
ENDIF ( NOT Check_FIND_QUIETLY )
|
|
||||||
ENDIF ( Check_FIND_REQUIRED )
|
|
||||||
ENDIF ( CHECK_INCLUDE_DIRS AND CHECK_LIBRARIES )
|
|
||||||
ENDIF( NOT CHECK_FOUND AND NOT PKG_CONFIG_FOUND )
|
|
||||||
|
|
||||||
# Hide advanced variables from CMake GUIs
|
|
||||||
MARK_AS_ADVANCED( CHECK_INCLUDE_DIRS CHECK_LIBRARIES )
|
|
||||||
|
|
||||||
|
|
@ -1,284 +0,0 @@
|
||||||
# - Returns a version string from Git
|
|
||||||
#
|
|
||||||
# These functions force a re-configure on each git commit so that you can
|
|
||||||
# trust the values of the variables in your build system.
|
|
||||||
#
|
|
||||||
# get_git_head_revision(<refspecvar> <hashvar> [ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR])
|
|
||||||
#
|
|
||||||
# Returns the refspec and sha hash of the current head revision
|
|
||||||
#
|
|
||||||
# git_describe(<var> [<additional arguments to git describe> ...])
|
|
||||||
#
|
|
||||||
# Returns the results of git describe on the source tree, and adjusting
|
|
||||||
# the output so that it tests false if an error occurs.
|
|
||||||
#
|
|
||||||
# git_describe_working_tree(<var> [<additional arguments to git describe> ...])
|
|
||||||
#
|
|
||||||
# Returns the results of git describe on the working tree (--dirty option),
|
|
||||||
# and adjusting the output so that it tests false if an error occurs.
|
|
||||||
#
|
|
||||||
# git_get_exact_tag(<var> [<additional arguments to git describe> ...])
|
|
||||||
#
|
|
||||||
# Returns the results of git describe --exact-match on the source tree,
|
|
||||||
# and adjusting the output so that it tests false if there was no exact
|
|
||||||
# matching tag.
|
|
||||||
#
|
|
||||||
# git_local_changes(<var>)
|
|
||||||
#
|
|
||||||
# Returns either "CLEAN" or "DIRTY" with respect to uncommitted changes.
|
|
||||||
# Uses the return code of "git diff-index --quiet HEAD --".
|
|
||||||
# Does not regard untracked files.
|
|
||||||
#
|
|
||||||
# Requires CMake 2.6 or newer (uses the 'function' command)
|
|
||||||
#
|
|
||||||
# Original Author:
|
|
||||||
# 2009-2020 Ryan Pavlik <ryan.pavlik@gmail.com> <abiryan@ryand.net>
|
|
||||||
# http://academic.cleardefinition.com
|
|
||||||
#
|
|
||||||
# Copyright 2009-2013, Iowa State University.
|
|
||||||
# Copyright 2013-2020, Ryan Pavlik
|
|
||||||
# Copyright 2013-2020, Contributors
|
|
||||||
# SPDX-License-Identifier: BSL-1.0
|
|
||||||
# Distributed under the Boost Software License, Version 1.0.
|
|
||||||
# (See accompanying file LICENSE_1_0.txt or copy at
|
|
||||||
# http://www.boost.org/LICENSE_1_0.txt)
|
|
||||||
|
|
||||||
if(__get_git_revision_description)
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
set(__get_git_revision_description YES)
|
|
||||||
|
|
||||||
# We must run the following at "include" time, not at function call time,
|
|
||||||
# to find the path to this module rather than the path to a calling list file
|
|
||||||
get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
|
|
||||||
|
|
||||||
# Function _git_find_closest_git_dir finds the next closest .git directory
|
|
||||||
# that is part of any directory in the path defined by _start_dir.
|
|
||||||
# The result is returned in the parent scope variable whose name is passed
|
|
||||||
# as variable _git_dir_var. If no .git directory can be found, the
|
|
||||||
# function returns an empty string via _git_dir_var.
|
|
||||||
#
|
|
||||||
# Example: Given a path C:/bla/foo/bar and assuming C:/bla/.git exists and
|
|
||||||
# neither foo nor bar contain a file/directory .git. This will return
|
|
||||||
# C:/bla/.git
|
|
||||||
#
|
|
||||||
function(_git_find_closest_git_dir _start_dir _git_dir_var)
|
|
||||||
set(cur_dir "${_start_dir}")
|
|
||||||
set(git_dir "${_start_dir}/.git")
|
|
||||||
while(NOT EXISTS "${git_dir}")
|
|
||||||
# .git dir not found, search parent directories
|
|
||||||
set(git_previous_parent "${cur_dir}")
|
|
||||||
get_filename_component(cur_dir "${cur_dir}" DIRECTORY)
|
|
||||||
if(cur_dir STREQUAL git_previous_parent)
|
|
||||||
# We have reached the root directory, we are not in git
|
|
||||||
set(${_git_dir_var}
|
|
||||||
""
|
|
||||||
PARENT_SCOPE)
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
set(git_dir "${cur_dir}/.git")
|
|
||||||
endwhile()
|
|
||||||
set(${_git_dir_var}
|
|
||||||
"${git_dir}"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(get_git_head_revision _refspecvar _hashvar)
|
|
||||||
_git_find_closest_git_dir("${CMAKE_CURRENT_SOURCE_DIR}" GIT_DIR)
|
|
||||||
|
|
||||||
if("${ARGN}" STREQUAL "ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR")
|
|
||||||
set(ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR TRUE)
|
|
||||||
else()
|
|
||||||
set(ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR FALSE)
|
|
||||||
endif()
|
|
||||||
if(NOT "${GIT_DIR}" STREQUAL "")
|
|
||||||
file(RELATIVE_PATH _relative_to_source_dir "${CMAKE_SOURCE_DIR}"
|
|
||||||
"${GIT_DIR}")
|
|
||||||
if("${_relative_to_source_dir}" MATCHES "[.][.]" AND NOT ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR)
|
|
||||||
# We've gone above the CMake root dir.
|
|
||||||
set(GIT_DIR "")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
if("${GIT_DIR}" STREQUAL "")
|
|
||||||
set(${_refspecvar}
|
|
||||||
"GITDIR-NOTFOUND"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
set(${_hashvar}
|
|
||||||
"GITDIR-NOTFOUND"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Check if the current source dir is a git submodule or a worktree.
|
|
||||||
# In both cases .git is a file instead of a directory.
|
|
||||||
#
|
|
||||||
if(NOT IS_DIRECTORY ${GIT_DIR})
|
|
||||||
# The following git command will return a non empty string that
|
|
||||||
# points to the super project working tree if the current
|
|
||||||
# source dir is inside a git submodule.
|
|
||||||
# Otherwise the command will return an empty string.
|
|
||||||
#
|
|
||||||
execute_process(
|
|
||||||
COMMAND "${GIT_EXECUTABLE}" rev-parse
|
|
||||||
--show-superproject-working-tree
|
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
|
||||||
OUTPUT_VARIABLE out
|
|
||||||
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
||||||
if(NOT "${out}" STREQUAL "")
|
|
||||||
# If out is empty, GIT_DIR/CMAKE_CURRENT_SOURCE_DIR is in a submodule
|
|
||||||
file(READ ${GIT_DIR} submodule)
|
|
||||||
string(REGEX REPLACE "gitdir: (.*)$" "\\1" GIT_DIR_RELATIVE
|
|
||||||
${submodule})
|
|
||||||
string(STRIP ${GIT_DIR_RELATIVE} GIT_DIR_RELATIVE)
|
|
||||||
get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
|
|
||||||
get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE}
|
|
||||||
ABSOLUTE)
|
|
||||||
set(HEAD_SOURCE_FILE "${GIT_DIR}/HEAD")
|
|
||||||
else()
|
|
||||||
# GIT_DIR/CMAKE_CURRENT_SOURCE_DIR is in a worktree
|
|
||||||
file(READ ${GIT_DIR} worktree_ref)
|
|
||||||
# The .git directory contains a path to the worktree information directory
|
|
||||||
# inside the parent git repo of the worktree.
|
|
||||||
#
|
|
||||||
string(REGEX REPLACE "gitdir: (.*)$" "\\1" git_worktree_dir
|
|
||||||
${worktree_ref})
|
|
||||||
string(STRIP ${git_worktree_dir} git_worktree_dir)
|
|
||||||
_git_find_closest_git_dir("${git_worktree_dir}" GIT_DIR)
|
|
||||||
set(HEAD_SOURCE_FILE "${git_worktree_dir}/HEAD")
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
set(HEAD_SOURCE_FILE "${GIT_DIR}/HEAD")
|
|
||||||
endif()
|
|
||||||
set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
|
|
||||||
if(NOT EXISTS "${GIT_DATA}")
|
|
||||||
file(MAKE_DIRECTORY "${GIT_DATA}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT EXISTS "${HEAD_SOURCE_FILE}")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
set(HEAD_FILE "${GIT_DATA}/HEAD")
|
|
||||||
configure_file("${HEAD_SOURCE_FILE}" "${HEAD_FILE}" COPYONLY)
|
|
||||||
|
|
||||||
configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
|
|
||||||
"${GIT_DATA}/grabRef.cmake" @ONLY)
|
|
||||||
include("${GIT_DATA}/grabRef.cmake")
|
|
||||||
|
|
||||||
set(${_refspecvar}
|
|
||||||
"${HEAD_REF}"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
set(${_hashvar}
|
|
||||||
"${HEAD_HASH}"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(git_describe _var)
|
|
||||||
if(NOT GIT_FOUND)
|
|
||||||
find_package(Git QUIET)
|
|
||||||
endif()
|
|
||||||
get_git_head_revision(refspec hash)
|
|
||||||
if(NOT GIT_FOUND)
|
|
||||||
set(${_var}
|
|
||||||
"GIT-NOTFOUND"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
if(NOT hash)
|
|
||||||
set(${_var}
|
|
||||||
"HEAD-HASH-NOTFOUND"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# TODO sanitize
|
|
||||||
#if((${ARGN}" MATCHES "&&") OR
|
|
||||||
# (ARGN MATCHES "||") OR
|
|
||||||
# (ARGN MATCHES "\\;"))
|
|
||||||
# message("Please report the following error to the project!")
|
|
||||||
# message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
|
|
||||||
#endif()
|
|
||||||
|
|
||||||
#message(STATUS "Arguments to execute_process: ${ARGN}")
|
|
||||||
|
|
||||||
execute_process(
|
|
||||||
COMMAND "${GIT_EXECUTABLE}" describe --tags --always ${hash} ${ARGN}
|
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
|
||||||
RESULT_VARIABLE res
|
|
||||||
OUTPUT_VARIABLE out
|
|
||||||
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
||||||
if(NOT res EQUAL 0)
|
|
||||||
set(out "${out}-${res}-NOTFOUND")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(${_var}
|
|
||||||
"${out}"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(git_describe_working_tree _var)
|
|
||||||
if(NOT GIT_FOUND)
|
|
||||||
find_package(Git QUIET)
|
|
||||||
endif()
|
|
||||||
if(NOT GIT_FOUND)
|
|
||||||
set(${_var}
|
|
||||||
"GIT-NOTFOUND"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
execute_process(
|
|
||||||
COMMAND "${GIT_EXECUTABLE}" describe --dirty ${ARGN}
|
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
|
||||||
RESULT_VARIABLE res
|
|
||||||
OUTPUT_VARIABLE out
|
|
||||||
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
||||||
if(NOT res EQUAL 0)
|
|
||||||
set(out "${out}-${res}-NOTFOUND")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(${_var}
|
|
||||||
"${out}"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(git_get_exact_tag _var)
|
|
||||||
git_describe(out --exact-match ${ARGN})
|
|
||||||
set(${_var}
|
|
||||||
"${out}"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(git_local_changes _var)
|
|
||||||
if(NOT GIT_FOUND)
|
|
||||||
find_package(Git QUIET)
|
|
||||||
endif()
|
|
||||||
get_git_head_revision(refspec hash)
|
|
||||||
if(NOT GIT_FOUND)
|
|
||||||
set(${_var}
|
|
||||||
"GIT-NOTFOUND"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
if(NOT hash)
|
|
||||||
set(${_var}
|
|
||||||
"HEAD-HASH-NOTFOUND"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
execute_process(
|
|
||||||
COMMAND "${GIT_EXECUTABLE}" diff-index --quiet HEAD --
|
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
|
||||||
RESULT_VARIABLE res
|
|
||||||
OUTPUT_VARIABLE out
|
|
||||||
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
||||||
if(res EQUAL 0)
|
|
||||||
set(${_var}
|
|
||||||
"CLEAN"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
else()
|
|
||||||
set(${_var}
|
|
||||||
"DIRTY"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
endif()
|
|
||||||
endfunction()
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
#
|
|
||||||
# Internal file for GetGitRevisionDescription.cmake
|
|
||||||
#
|
|
||||||
# Requires CMake 2.6 or newer (uses the 'function' command)
|
|
||||||
#
|
|
||||||
# Original Author:
|
|
||||||
# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
|
|
||||||
# http://academic.cleardefinition.com
|
|
||||||
# Iowa State University HCI Graduate Program/VRAC
|
|
||||||
#
|
|
||||||
# Copyright 2009-2012, Iowa State University
|
|
||||||
# Copyright 2011-2015, Contributors
|
|
||||||
# Distributed under the Boost Software License, Version 1.0.
|
|
||||||
# (See accompanying file LICENSE_1_0.txt or copy at
|
|
||||||
# http://www.boost.org/LICENSE_1_0.txt)
|
|
||||||
# SPDX-License-Identifier: BSL-1.0
|
|
||||||
|
|
||||||
set(HEAD_HASH)
|
|
||||||
|
|
||||||
file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
|
|
||||||
|
|
||||||
string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
|
|
||||||
if(HEAD_CONTENTS MATCHES "ref")
|
|
||||||
# named branch
|
|
||||||
string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
|
|
||||||
if(EXISTS "@GIT_DIR@/${HEAD_REF}")
|
|
||||||
configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
|
|
||||||
else()
|
|
||||||
configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
|
|
||||||
file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
|
|
||||||
if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
|
|
||||||
set(HEAD_HASH "${CMAKE_MATCH_1}")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
# detached HEAD
|
|
||||||
configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT HEAD_HASH)
|
|
||||||
file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
|
|
||||||
string(STRIP "${HEAD_HASH}" HEAD_HASH)
|
|
||||||
endif()
|
|
||||||
|
|
@ -1,30 +1,16 @@
|
||||||
# Copyright (c) 2017-2023, The PurpleI2P Project
|
|
||||||
# This file is part of Purple i2pd project and licensed under BSD3
|
|
||||||
# See full license text in LICENSE file at top of project tree
|
|
||||||
|
|
||||||
# Based on the Qt 5 processor detection code, so should be very accurate
|
# Based on the Qt 5 processor detection code, so should be very accurate
|
||||||
# https://github.com/qt/qtbase/blob/dev/src/corelib/global/qprocessordetection.h
|
# https://qt.gitorious.org/qt/qtbase/blobs/master/src/corelib/global/qprocessordetection.h
|
||||||
# Currently handles arm (v5, v6, v7, v8), x86 (32/64), ia64, mips (32/64, mipsel, mips64el) and ppc (32/64)
|
# Currently handles arm (v5, v6, v7), x86 (32/64), ia64, and ppc (32/64)
|
||||||
|
|
||||||
# Regarding POWER/PowerPC, just as is noted in the Qt source,
|
# Regarding POWER/PowerPC, just as is noted in the Qt source,
|
||||||
# "There are many more known variants/revisions that we do not handle/detect."
|
# "There are many more known variants/revisions that we do not handle/detect."
|
||||||
|
|
||||||
set(archdetect_c_code "
|
set(archdetect_c_code "
|
||||||
#if defined(__arm__) || defined(__TARGET_ARCH_ARM)|| defined(_M_ARM) || defined(_M_ARM64) || defined(__aarch64__) || defined(__ARM64__)
|
#if defined(__arm__) || defined(__TARGET_ARCH_ARM)
|
||||||
#if defined(__ARM64_ARCH_8__) \\
|
#if defined(__ARM_ARCH_7__) \\
|
||||||
|| defined(__aarch64__) \\
|
|
||||||
|| defined(__ARMv8__) \\
|
|
||||||
|| defined(__ARMv8_A__) \\
|
|
||||||
|| defined(_M_ARM64) \\
|
|
||||||
|| (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 8)
|
|
||||||
#error cmake_ARCH arm64
|
|
||||||
#elif defined(__ARM_ARCH_7__) \\
|
|
||||||
|| defined(__ARM_ARCH_7A__) \\
|
|| defined(__ARM_ARCH_7A__) \\
|
||||||
|| defined(__ARM_ARCH_7R__) \\
|
|| defined(__ARM_ARCH_7R__) \\
|
||||||
|| defined(__ARM_ARCH_7M__) \\
|
|| defined(__ARM_ARCH_7M__) \\
|
||||||
|| defined(__ARM_ARCH_7S__) \\
|
|
||||||
|| defined(_ARM_ARCH_7) \\
|
|
||||||
|| defined(__CORE_CORTEXA__) \\
|
|
||||||
|| (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 7)
|
|| (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 7)
|
||||||
#error cmake_ARCH armv7
|
#error cmake_ARCH armv7
|
||||||
#elif defined(__ARM_ARCH_6__) \\
|
#elif defined(__ARM_ARCH_6__) \\
|
||||||
|
|
@ -37,7 +23,6 @@ set(archdetect_c_code "
|
||||||
|| (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 6)
|
|| (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 6)
|
||||||
#error cmake_ARCH armv6
|
#error cmake_ARCH armv6
|
||||||
#elif defined(__ARM_ARCH_5TEJ__) \\
|
#elif defined(__ARM_ARCH_5TEJ__) \\
|
||||||
|| defined(__ARM_ARCH_5TE__) \\
|
|
||||||
|| (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 5)
|
|| (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 5)
|
||||||
#error cmake_ARCH armv5
|
#error cmake_ARCH armv5
|
||||||
#else
|
#else
|
||||||
|
|
@ -49,19 +34,7 @@ set(archdetect_c_code "
|
||||||
#error cmake_ARCH x86_64
|
#error cmake_ARCH x86_64
|
||||||
#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
|
#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
|
||||||
#error cmake_ARCH ia64
|
#error cmake_ARCH ia64
|
||||||
#elif defined(__mips) || defined(__mips__) || defined(_M_MRX000)
|
#elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__) \\
|
||||||
#if defined(_MIPS_ARCH_MIPS64) || defined(__mips64)
|
|
||||||
#if defined(__MIPSEL__)
|
|
||||||
#error cmake_ARCH mips64el
|
|
||||||
#else
|
|
||||||
#error cmake_ARCH mips64
|
|
||||||
#endif
|
|
||||||
#elif defined(__MIPSEL__)
|
|
||||||
#error cmake_ARCH mipsel
|
|
||||||
#else
|
|
||||||
#error cmake_ARCH mips
|
|
||||||
#endif
|
|
||||||
#elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__) || defined(__POWERPC__) \\
|
|
||||||
|| defined(_ARCH_COM) || defined(_ARCH_PWR) || defined(_ARCH_PPC) \\
|
|| defined(_ARCH_COM) || defined(_ARCH_PWR) || defined(_ARCH_PPC) \\
|
||||||
|| defined(_M_MPPC) || defined(_M_PPC)
|
|| defined(_M_MPPC) || defined(_M_PPC)
|
||||||
#if defined(__ppc64__) || defined(__powerpc64__) || defined(__64BIT__)
|
#if defined(__ppc64__) || defined(__powerpc64__) || defined(__64BIT__)
|
||||||
|
|
@ -74,7 +47,7 @@ set(archdetect_c_code "
|
||||||
#error cmake_ARCH unknown
|
#error cmake_ARCH unknown
|
||||||
")
|
")
|
||||||
|
|
||||||
# Set ppc_support to TRUE before including this file on ppc and ppc64
|
# Set ppc_support to TRUE before including this file or ppc and ppc64
|
||||||
# will be treated as invalid architectures since they are no longer supported by Apple
|
# will be treated as invalid architectures since they are no longer supported by Apple
|
||||||
|
|
||||||
function(target_architecture output_var)
|
function(target_architecture output_var)
|
||||||
|
|
@ -83,25 +56,23 @@ function(target_architecture output_var)
|
||||||
# First let's normalize the order of the values
|
# First let's normalize the order of the values
|
||||||
|
|
||||||
# Note that it's not possible to compile PowerPC applications if you are using
|
# Note that it's not possible to compile PowerPC applications if you are using
|
||||||
# the OS X SDK version 10.7 or later - you'll need 10.4/10.5/10.6 for that, so we
|
# the OS X SDK version 10.6 or later - you'll need 10.4/10.5 for that, so we
|
||||||
# disable it by default. Also, ppc64 is not supported in 10.6.
|
# disable it by default
|
||||||
# See this page for more information:
|
# See this page for more information:
|
||||||
# http://stackoverflow.com/questions/5333490/how-can-we-restore-ppc-ppc64-as-well-as-full-10-4-10-5-sdk-support-to-xcode-4
|
# http://stackoverflow.com/questions/5333490/how-can-we-restore-ppc-ppc64-as-well-as-full-10-4-10-5-sdk-support-to-xcode-4
|
||||||
|
|
||||||
# Architecture defaults to i386 or ppc on OS X 10.5 and earlier, depending on the CPU type detected at runtime.
|
# Architecture defaults to i386 or ppc on OS X 10.5 and earlier, depending on the CPU type detected at runtime.
|
||||||
# On OS X 10.6+ the default is x86_64 if the CPU supports it, i386 otherwise; 10.6 also supports ppc.
|
# On OS X 10.6+ the default is x86_64 if the CPU supports it, i386 otherwise.
|
||||||
|
|
||||||
foreach(osx_arch ${CMAKE_OSX_ARCHITECTURES})
|
foreach(osx_arch ${CMAKE_OSX_ARCHITECTURES})
|
||||||
if("${osx_arch}" STREQUAL "ppc" AND ppc_support)
|
if("${osx_arch}" STREQUAL "ppc" AND ppc_support)
|
||||||
set(osx_arch_ppc TRUE)
|
set(osx_arch_ppc TRUE)
|
||||||
elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support)
|
|
||||||
set(osx_arch_ppc64 TRUE)
|
|
||||||
elseif("${osx_arch}" STREQUAL "i386")
|
elseif("${osx_arch}" STREQUAL "i386")
|
||||||
set(osx_arch_i386 TRUE)
|
set(osx_arch_i386 TRUE)
|
||||||
elseif("${osx_arch}" STREQUAL "x86_64")
|
elseif("${osx_arch}" STREQUAL "x86_64")
|
||||||
set(osx_arch_x86_64 TRUE)
|
set(osx_arch_x86_64 TRUE)
|
||||||
elseif("${osx_arch}" STREQUAL "arm64")
|
elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support)
|
||||||
set(osx_arch_arm64 TRUE)
|
set(osx_arch_ppc64 TRUE)
|
||||||
else()
|
else()
|
||||||
message(FATAL_ERROR "Invalid OS X arch name: ${osx_arch}")
|
message(FATAL_ERROR "Invalid OS X arch name: ${osx_arch}")
|
||||||
endif()
|
endif()
|
||||||
|
|
@ -112,10 +83,6 @@ function(target_architecture output_var)
|
||||||
list(APPEND ARCH ppc)
|
list(APPEND ARCH ppc)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(osx_arch_ppc64)
|
|
||||||
list(APPEND ARCH ppc64)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(osx_arch_i386)
|
if(osx_arch_i386)
|
||||||
list(APPEND ARCH i386)
|
list(APPEND ARCH i386)
|
||||||
endif()
|
endif()
|
||||||
|
|
@ -124,8 +91,8 @@ function(target_architecture output_var)
|
||||||
list(APPEND ARCH x86_64)
|
list(APPEND ARCH x86_64)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(osx_arch_arm64)
|
if(osx_arch_ppc64)
|
||||||
list(APPEND ARCH arm64)
|
list(APPEND ARCH ppc64)
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
file(WRITE "${CMAKE_BINARY_DIR}/arch.c" "${archdetect_c_code}")
|
file(WRITE "${CMAKE_BINARY_DIR}/arch.c" "${archdetect_c_code}")
|
||||||
|
|
@ -133,11 +100,11 @@ function(target_architecture output_var)
|
||||||
enable_language(C)
|
enable_language(C)
|
||||||
|
|
||||||
# Detect the architecture in a rather creative way...
|
# Detect the architecture in a rather creative way...
|
||||||
# This compiles a small C program which is a series of ifdefs that selects
|
# This compiles a small C program which is a series of ifdefs that selects a
|
||||||
# a particular #error preprocessor directive whose message string contains
|
# particular #error preprocessor directive whose message string contains the
|
||||||
# the target architecture. The program will always fail to compile (both because
|
# target architecture. The program will always fail to compile (both because
|
||||||
# file is not a valid C program, and obviously because of the presence of
|
# file is not a valid C program, and obviously because of the presence of the
|
||||||
# the #error preprocessor directives... but by exploiting the preprocessor in this
|
# #error preprocessor directives... but by exploiting the preprocessor in this
|
||||||
# way, we can detect the correct target architecture even when cross-compiling,
|
# way, we can detect the correct target architecture even when cross-compiling,
|
||||||
# since the program itself never needs to be run (only the compiler/preprocessor)
|
# since the program itself never needs to be run (only the compiler/preprocessor)
|
||||||
try_run(
|
try_run(
|
||||||
|
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
# read version
|
|
||||||
|
|
||||||
function(set_version version_file output_var)
|
|
||||||
file(READ "${version_file}" version_data)
|
|
||||||
|
|
||||||
string(REGEX MATCH "I2PD_VERSION_MAJOR ([0-9]*)" _ ${version_data})
|
|
||||||
set(version_major ${CMAKE_MATCH_1})
|
|
||||||
|
|
||||||
string(REGEX MATCH "I2PD_VERSION_MINOR ([0-9]*)" _ ${version_data})
|
|
||||||
set(version_minor ${CMAKE_MATCH_1})
|
|
||||||
|
|
||||||
string(REGEX MATCH "I2PD_VERSION_MICRO ([0-9]*)" _ ${version_data})
|
|
||||||
set(version_micro ${CMAKE_MATCH_1})
|
|
||||||
|
|
||||||
set(${output_var} "${version_major}.${version_minor}.${version_micro}" PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
#define I2Pd_AppName "i2pd"
|
#define I2Pd_AppName "i2pd"
|
||||||
#define I2Pd_Publisher "PurpleI2P"
|
#define I2Pd_Publisher "PurpleI2P"
|
||||||
|
; Get application version from compiled binary
|
||||||
|
; Disabled to use definition from command line
|
||||||
|
;#define I2Pd_ver GetFileVersionString(AddBackslash(SourcePath) + "..\i2pd_x64.exe")
|
||||||
|
|
||||||
[Setup]
|
[Setup]
|
||||||
AppName={#I2Pd_AppName}
|
AppName={#I2Pd_AppName}
|
||||||
|
|
@ -24,7 +27,7 @@ ExtraDiskSpaceRequired=15
|
||||||
|
|
||||||
AppID={{621A23E0-3CF4-4BD6-97BC-4835EA5206A2}
|
AppID={{621A23E0-3CF4-4BD6-97BC-4835EA5206A2}
|
||||||
AppVerName={#I2Pd_AppName}
|
AppVerName={#I2Pd_AppName}
|
||||||
AppCopyright=Copyright (c) 2013-2024, The PurpleI2P Project
|
AppCopyright=Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
AppPublisherURL=http://i2pd.website/
|
AppPublisherURL=http://i2pd.website/
|
||||||
AppSupportURL=https://github.com/PurpleI2P/i2pd/issues
|
AppSupportURL=https://github.com/PurpleI2P/i2pd/issues
|
||||||
AppUpdatesURL=https://github.com/PurpleI2P/i2pd/releases
|
AppUpdatesURL=https://github.com/PurpleI2P/i2pd/releases
|
||||||
|
|
@ -44,7 +47,6 @@ Source: ..\contrib\subscriptions.txt; DestDir: {userappdata}\i2pd; Flags: onlyif
|
||||||
Source: ..\contrib\tunnels.conf; DestDir: {userappdata}\i2pd; Flags: onlyifdoesntexist
|
Source: ..\contrib\tunnels.conf; DestDir: {userappdata}\i2pd; Flags: onlyifdoesntexist
|
||||||
Source: ..\contrib\certificates\*; DestDir: {userappdata}\i2pd\certificates; Flags: onlyifdoesntexist recursesubdirs createallsubdirs
|
Source: ..\contrib\certificates\*; DestDir: {userappdata}\i2pd\certificates; Flags: onlyifdoesntexist recursesubdirs createallsubdirs
|
||||||
Source: ..\contrib\tunnels.d\*; DestDir: {userappdata}\i2pd\tunnels.d; Flags: onlyifdoesntexist recursesubdirs createallsubdirs
|
Source: ..\contrib\tunnels.d\*; DestDir: {userappdata}\i2pd\tunnels.d; Flags: onlyifdoesntexist recursesubdirs createallsubdirs
|
||||||
Source: ..\contrib\webconsole\*; DestDir: {userappdata}\i2pd\webconsole; Flags: onlyifdoesntexist recursesubdirs createallsubdirs
|
|
||||||
|
|
||||||
[Icons]
|
[Icons]
|
||||||
Name: {group}\I2Pd; Filename: {app}\i2pd.exe
|
Name: {group}\I2Pd; Filename: {app}\i2pd.exe
|
||||||
|
|
|
||||||
18
contrib/android_binary_only/.gitignore
vendored
Normal file
18
contrib/android_binary_only/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
gen
|
||||||
|
tests
|
||||||
|
bin
|
||||||
|
libs
|
||||||
|
log*
|
||||||
|
obj
|
||||||
|
.gradle
|
||||||
|
.idea
|
||||||
|
.externalNativeBuild
|
||||||
|
ant.properties
|
||||||
|
local.properties
|
||||||
|
build.sh
|
||||||
|
android.iml
|
||||||
|
build
|
||||||
|
gradle
|
||||||
|
gradlew
|
||||||
|
gradlew.bat
|
||||||
|
|
||||||
74
contrib/android_binary_only/jni/Android.mk
Normal file
74
contrib/android_binary_only/jni/Android.mk
Normal file
|
|
@ -0,0 +1,74 @@
|
||||||
|
LOCAL_PATH := $(call my-dir)
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
LOCAL_MODULE := i2pd
|
||||||
|
LOCAL_CPP_FEATURES := rtti exceptions
|
||||||
|
LOCAL_C_INCLUDES += $(IFADDRS_PATH) $(LIB_SRC_PATH) $(LIB_CLIENT_SRC_PATH) $(DAEMON_SRC_PATH)
|
||||||
|
LOCAL_STATIC_LIBRARIES := \
|
||||||
|
boost_system \
|
||||||
|
boost_date_time \
|
||||||
|
boost_filesystem \
|
||||||
|
boost_program_options \
|
||||||
|
crypto ssl \
|
||||||
|
miniupnpc
|
||||||
|
LOCAL_LDLIBS := -lz
|
||||||
|
|
||||||
|
LOCAL_SRC_FILES := $(IFADDRS_PATH)/ifaddrs.c \
|
||||||
|
$(wildcard $(LIB_SRC_PATH)/*.cpp)\
|
||||||
|
$(wildcard $(LIB_CLIENT_SRC_PATH)/*.cpp)\
|
||||||
|
$(DAEMON_SRC_PATH)/UnixDaemon.cpp \
|
||||||
|
$(DAEMON_SRC_PATH)/Daemon.cpp \
|
||||||
|
$(DAEMON_SRC_PATH)/UPnP.cpp \
|
||||||
|
$(DAEMON_SRC_PATH)/HTTPServer.cpp \
|
||||||
|
$(DAEMON_SRC_PATH)/I2PControl.cpp \
|
||||||
|
$(DAEMON_SRC_PATH)/i2pd.cpp
|
||||||
|
include $(BUILD_EXECUTABLE)
|
||||||
|
|
||||||
|
LOCAL_PATH := $(call my-dir)
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
LOCAL_MODULE := boost_system
|
||||||
|
LOCAL_SRC_FILES := $(BOOST_PATH)/boost-1_72_0/$(TARGET_ARCH_ABI)/lib/libboost_system.a
|
||||||
|
LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost-1_72_0/include
|
||||||
|
include $(PREBUILT_STATIC_LIBRARY)
|
||||||
|
|
||||||
|
LOCAL_PATH := $(call my-dir)
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
LOCAL_MODULE := boost_date_time
|
||||||
|
LOCAL_SRC_FILES := $(BOOST_PATH)/boost-1_72_0/$(TARGET_ARCH_ABI)/lib/libboost_date_time.a
|
||||||
|
LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost-1_72_0/include
|
||||||
|
include $(PREBUILT_STATIC_LIBRARY)
|
||||||
|
|
||||||
|
LOCAL_PATH := $(call my-dir)
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
LOCAL_MODULE := boost_filesystem
|
||||||
|
LOCAL_SRC_FILES := $(BOOST_PATH)/boost-1_72_0/$(TARGET_ARCH_ABI)/lib/libboost_filesystem.a
|
||||||
|
LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost-1_72_0/include
|
||||||
|
include $(PREBUILT_STATIC_LIBRARY)
|
||||||
|
|
||||||
|
LOCAL_PATH := $(call my-dir)
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
LOCAL_MODULE := boost_program_options
|
||||||
|
LOCAL_SRC_FILES := $(BOOST_PATH)/boost-1_72_0/$(TARGET_ARCH_ABI)/lib/libboost_program_options.a
|
||||||
|
LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost-1_72_0/include
|
||||||
|
include $(PREBUILT_STATIC_LIBRARY)
|
||||||
|
|
||||||
|
LOCAL_PATH := $(call my-dir)
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
LOCAL_MODULE := crypto
|
||||||
|
LOCAL_SRC_FILES := $(OPENSSL_PATH)/openssl-1.1.1a-clang/$(TARGET_ARCH_ABI)/lib/libcrypto.a
|
||||||
|
LOCAL_EXPORT_C_INCLUDES := $(OPENSSL_PATH)/openssl-1.1.1a-clang/include
|
||||||
|
include $(PREBUILT_STATIC_LIBRARY)
|
||||||
|
|
||||||
|
LOCAL_PATH := $(call my-dir)
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
LOCAL_MODULE := ssl
|
||||||
|
LOCAL_SRC_FILES := $(OPENSSL_PATH)/openssl-1.1.1a-clang/$(TARGET_ARCH_ABI)/lib/libssl.a
|
||||||
|
LOCAL_EXPORT_C_INCLUDES := $(OPENSSL_PATH)/openssl-1.1.1a-clang/include
|
||||||
|
LOCAL_STATIC_LIBRARIES := crypto
|
||||||
|
include $(PREBUILT_STATIC_LIBRARY)
|
||||||
|
|
||||||
|
LOCAL_PATH := $(call my-dir)
|
||||||
|
include $(CLEAR_VARS)
|
||||||
|
LOCAL_MODULE := miniupnpc
|
||||||
|
LOCAL_SRC_FILES := $(MINIUPNP_PATH)/miniupnpc-2.1/$(TARGET_ARCH_ABI)/lib/libminiupnpc.a
|
||||||
|
LOCAL_EXPORT_C_INCLUDES := $(MINIUPNP_PATH)/miniupnpc-2.1/include
|
||||||
|
include $(PREBUILT_STATIC_LIBRARY)
|
||||||
40
contrib/android_binary_only/jni/Application.mk
Normal file
40
contrib/android_binary_only/jni/Application.mk
Normal file
|
|
@ -0,0 +1,40 @@
|
||||||
|
APP_ABI := all
|
||||||
|
#APP_ABI += x86
|
||||||
|
#APP_ABI += x86_64
|
||||||
|
#APP_ABI += armeabi-v7a
|
||||||
|
#APP_ABI += arm64-v8a
|
||||||
|
#can be android-3 but will fail for x86 since arch-x86 is not present at ndkroot/platforms/android-3/ . libz is taken from there.
|
||||||
|
APP_PLATFORM := android-14
|
||||||
|
|
||||||
|
NDK_TOOLCHAIN_VERSION := clang
|
||||||
|
APP_STL := c++_static
|
||||||
|
|
||||||
|
# Enable c++17 extensions in source code
|
||||||
|
APP_CPPFLAGS += -std=c++17 -fvisibility=default -fPIE
|
||||||
|
|
||||||
|
APP_CPPFLAGS += -DANDROID_BINARY -DANDROID -D__ANDROID__ -DUSE_UPNP
|
||||||
|
APP_LDFLAGS += -rdynamic -fPIE -pie
|
||||||
|
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
|
||||||
|
APP_CPPFLAGS += -DANDROID_ARM7A
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Forcing debug optimization. Use `ndk-build NDK_DEBUG=1` instead.
|
||||||
|
#APP_OPTIM := debug
|
||||||
|
|
||||||
|
# git clone https://github.com/PurpleI2P/Boost-for-Android-Prebuilt.git -b boost-1_72_0
|
||||||
|
# git clone https://github.com/PurpleI2P/OpenSSL-for-Android-Prebuilt.git
|
||||||
|
# git clone https://github.com/PurpleI2P/MiniUPnP-for-Android-Prebuilt.git
|
||||||
|
# git clone https://github.com/PurpleI2P/android-ifaddrs.git
|
||||||
|
# change to your own
|
||||||
|
I2PD_LIBS_PATH = /path/to/libraries
|
||||||
|
BOOST_PATH = $(I2PD_LIBS_PATH)/Boost-for-Android-Prebuilt
|
||||||
|
OPENSSL_PATH = $(I2PD_LIBS_PATH)/OpenSSL-for-Android-Prebuilt
|
||||||
|
MINIUPNP_PATH = $(I2PD_LIBS_PATH)/MiniUPnP-for-Android-Prebuilt
|
||||||
|
IFADDRS_PATH = $(I2PD_LIBS_PATH)/android-ifaddrs
|
||||||
|
|
||||||
|
# don't change me
|
||||||
|
I2PD_SRC_PATH = $(PWD)/../..
|
||||||
|
|
||||||
|
LIB_SRC_PATH = $(I2PD_SRC_PATH)/libi2pd
|
||||||
|
LIB_CLIENT_SRC_PATH = $(I2PD_SRC_PATH)/libi2pd_client
|
||||||
|
DAEMON_SRC_PATH = $(I2PD_SRC_PATH)/daemon
|
||||||
2
contrib/android_binary_pack/.gitignore
vendored
Normal file
2
contrib/android_binary_pack/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
archive
|
||||||
|
i2pd_*_android_binary.zip
|
||||||
48
contrib/android_binary_pack/build-archive
Executable file
48
contrib/android_binary_pack/build-archive
Executable file
|
|
@ -0,0 +1,48 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
|
#
|
||||||
|
# This file is part of Purple i2pd project and licensed under BSD3
|
||||||
|
#
|
||||||
|
# See full license text in LICENSE file at top of project tree
|
||||||
|
|
||||||
|
GITDESC=$(git describe --tags)
|
||||||
|
|
||||||
|
declare -A ABILIST=(
|
||||||
|
["armeabi-v7a"]="armv7l"
|
||||||
|
["arm64-v8a"]="aarch64"
|
||||||
|
["x86"]="x86"
|
||||||
|
["x86_64"]="x86_64"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Remove old files and archives
|
||||||
|
if [ -d archive ]; then
|
||||||
|
rm -r archive
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f ../i2pd_*_android_binary.zip ]; then
|
||||||
|
rm i2pd_*_android_binary.zip
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Prepare files for package
|
||||||
|
mkdir archive
|
||||||
|
|
||||||
|
for ABI in "${!ABILIST[@]}"; do
|
||||||
|
if [ -f ../android_binary_only/libs/${ABI}/i2pd ]; then
|
||||||
|
cp ../android_binary_only/libs/${ABI}/i2pd archive/i2pd-${ABILIST[$ABI]}
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
cp i2pd archive/i2pd
|
||||||
|
cp -rH ../android/assets/certificates archive/
|
||||||
|
cp -rH ../android/assets/tunnels.conf.d archive/
|
||||||
|
cp -H ../android/assets/i2pd.conf archive/
|
||||||
|
cp -H ../android/assets/tunnels.conf archive/
|
||||||
|
|
||||||
|
# Compress files
|
||||||
|
cd archive
|
||||||
|
zip -r6 ../i2pd_${GITDESC}_android_binary.zip .
|
||||||
|
|
||||||
|
# Remove temporary folder
|
||||||
|
cd ..
|
||||||
|
rm -r archive
|
||||||
33
contrib/android_binary_pack/i2pd
Executable file
33
contrib/android_binary_pack/i2pd
Executable file
|
|
@ -0,0 +1,33 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
|
#
|
||||||
|
# This file is part of Purple i2pd project and licensed under BSD3
|
||||||
|
#
|
||||||
|
# See full license text in LICENSE file at top of project tree
|
||||||
|
#
|
||||||
|
# That script written for use with Termux.
|
||||||
|
|
||||||
|
# https://stackoverflow.com/a/246128
|
||||||
|
SOURCE="${0}"
|
||||||
|
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
|
||||||
|
DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
|
||||||
|
SOURCE="$(readlink "$SOURCE")"
|
||||||
|
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
|
||||||
|
done
|
||||||
|
DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
|
||||||
|
|
||||||
|
arch=$(uname -m)
|
||||||
|
|
||||||
|
screenfind=$(which screen)
|
||||||
|
if [ -z $screenfind ]; then
|
||||||
|
echo "Can't find 'screen' installed. That script needs it!";
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z i2pd-$arch ]; then
|
||||||
|
echo "Can't find i2pd binary for your archtecture.";
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
screen -AmdS i2pd ./i2pd-$arch --datadir=$DIR
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
# _________________________________________
|
|
||||||
# / Copy this file to the right location \
|
|
||||||
# | then load with: |
|
|
||||||
# | |
|
|
||||||
# | apparmor_parser -r -W |
|
|
||||||
# | /etc/apparmor.d/docker-i2pd |
|
|
||||||
# | |
|
|
||||||
# | docker run --security-opt |
|
|
||||||
# | "apparmor=docker-i2pd" ... |
|
|
||||||
# | purplei2p/i2pd |
|
|
||||||
# | |
|
|
||||||
# \ And "aa-status" to verify it's loaded. /
|
|
||||||
# -----------------------------------------
|
|
||||||
# \ ^__^
|
|
||||||
# \ (oo)\_______
|
|
||||||
# (__)\ )\/\
|
|
||||||
# ||----w |
|
|
||||||
# || ||
|
|
||||||
|
|
||||||
#include <tunables/global>
|
|
||||||
|
|
||||||
profile docker-i2pd flags=(attach_disconnected,mediate_deleted) {
|
|
||||||
#include <abstractions/base>
|
|
||||||
#include <abstractions/openssl>
|
|
||||||
#include <abstractions/nameservice>
|
|
||||||
|
|
||||||
/bin/busybox ix,
|
|
||||||
/usr/local/bin/i2pd ix,
|
|
||||||
/entrypoint.sh ixr,
|
|
||||||
|
|
||||||
/i2pd_certificates/** r,
|
|
||||||
|
|
||||||
/home/i2pd/data/** rw,
|
|
||||||
|
|
||||||
/home/i2pd/data/i2pd.pid k,
|
|
||||||
|
|
||||||
deny /home/i2pd/data/i2pd.conf w,
|
|
||||||
deny /home/i2pd/data/tunnels.conf w,
|
|
||||||
deny /home/i2pd/data/tunnels.d/** w,
|
|
||||||
deny /home/i2pd/data/certificates/** w,
|
|
||||||
deny /home/i2pd/data/i2pd.log r,
|
|
||||||
}
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
#
|
#
|
||||||
#include <tunables/global>
|
#include <tunables/global>
|
||||||
|
|
||||||
profile i2pd /{usr/,}bin/i2pd {
|
profile i2pd /{usr/,}sbin/i2pd {
|
||||||
#include <abstractions/base>
|
#include <abstractions/base>
|
||||||
#include <abstractions/openssl>
|
#include <abstractions/openssl>
|
||||||
#include <abstractions/nameservice>
|
#include <abstractions/nameservice>
|
||||||
|
|
@ -14,12 +14,12 @@ profile i2pd /{usr/,}bin/i2pd {
|
||||||
/var/lib/i2pd/** rw,
|
/var/lib/i2pd/** rw,
|
||||||
/var/log/i2pd/i2pd.log w,
|
/var/log/i2pd/i2pd.log w,
|
||||||
/{var/,}run/i2pd/i2pd.pid rwk,
|
/{var/,}run/i2pd/i2pd.pid rwk,
|
||||||
/{usr/,}bin/i2pd mr,
|
/{usr/,}sbin/i2pd mr,
|
||||||
@{system_share_dirs}/i2pd/** r,
|
@{system_share_dirs}/i2pd/** r,
|
||||||
|
|
||||||
# user homedir (if started not by init.d or systemd)
|
# user homedir (if started not by init.d or systemd)
|
||||||
owner @{HOME}/.i2pd/ rw,
|
owner @{HOME}/.i2pd/ rw,
|
||||||
owner @{HOME}/.i2pd/** rwk,
|
owner @{HOME}/.i2pd/** rwk,
|
||||||
|
|
||||||
#include if exists <local/usr.bin.i2pd>
|
#include if exists <local/usr.sbin.i2pd>
|
||||||
}
|
}
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
MIICKDCCAc6gAwIBAgIUcPHZXtYSqGNRCD6z8gp79WUFtI0wCgYIKoZIzj0EAwIw
|
|
||||||
gZMxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEPMA0GA1UEBwwGQXVzdGlu
|
|
||||||
MRgwFgYDVQQKDA9TdG9ybXlDbG91ZCBJbmMxIzAhBgNVBAMMGnN0b3JteWNsb3Vk
|
|
||||||
LmZhbWlseS5pMnAubmV0MSQwIgYJKoZIhvcNAQkBFhVhZG1pbkBzdG9ybXljbG91
|
|
||||||
ZC5vcmcwHhcNMjIwMzE5MTU1MjU2WhcNMzIwMzE2MTU1MjU2WjCBkzELMAkGA1UE
|
|
||||||
BhMCVVMxDjAMBgNVBAgMBVRleGFzMQ8wDQYDVQQHDAZBdXN0aW4xGDAWBgNVBAoM
|
|
||||||
D1N0b3JteUNsb3VkIEluYzEjMCEGA1UEAwwac3Rvcm15Y2xvdWQuZmFtaWx5Lmky
|
|
||||||
cC5uZXQxJDAiBgkqhkiG9w0BCQEWFWFkbWluQHN0b3JteWNsb3VkLm9yZzBZMBMG
|
|
||||||
ByqGSM49AgEGCCqGSM49AwEHA0IABFUli0hvJEmowNjJVjbKEIWBJhqe973S4VdL
|
|
||||||
cJuA5yY3dC4Y998abWEox7/Y1BhnBbpJuiodA341bXKkLMXQy/kwCgYIKoZIzj0E
|
|
||||||
AwIDSAAwRQIgD12F/TfY3iV1/WDF7BSKgbD5g2MfELUIy1dtUlJQuJUCIQD69mZw
|
|
||||||
V1Z9j2x0ZsuirS3i6AMfVyTDj0RFS3U1jeHzIQ==
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
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
|
|
||||||
LAj3/Ojbi1xkWhI=
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
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
|
|
||||||
+XBgkaYA4iEwYKqlCQ==
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
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
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
32
contrib/certificates/reseed/echelon_at_mail.i2p.crt
Normal file
32
contrib/certificates/reseed/echelon_at_mail.i2p.crt
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
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
|
||||||
|
JNJOWTH/Vas1W6XlwGcOOAARTQ==
|
||||||
|
-----END CERTIFICATE-----
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
MIIFzTCCA7WgAwIBAgIQeUqFi0fHNQopg6BZlBLhVzANBgkqhkiG9w0BAQsFADBy
|
|
||||||
MQswCQYDVQQGEwJYWDELMAkGA1UEBxMCWFgxCzAJBgNVBAkTAlhYMR4wHAYDVQQK
|
|
||||||
ExVJMlAgQW5vbnltb3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEbMBkGA1UEAwwS
|
|
||||||
aTJwLXJlc2VlZEBtazE2LmRlMB4XDTIyMDIwNTE3MzkzM1oXDTMyMDIwNTE3Mzkz
|
|
||||||
M1owcjELMAkGA1UEBhMCWFgxCzAJBgNVBAcTAlhYMQswCQYDVQQJEwJYWDEeMBwG
|
|
||||||
A1UEChMVSTJQIEFub255bW91cyBOZXR3b3JrMQwwCgYDVQQLEwNJMlAxGzAZBgNV
|
|
||||||
BAMMEmkycC1yZXNlZWRAbWsxNi5kZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
|
|
||||||
AgoCggIBAMYxs2D2xpN/8blGawvAlU9DemHIxApOEwaLNfh8aAvqEdB41NTqcx4U
|
|
||||||
H8VchSormCfkCvezuMHO+K2HX7ihEZ1v6tbr6aX6hY9UZUyDDYsKmJoB1oKEhddv
|
|
||||||
5UYfcWPE2eSykdFsWgTQD6Z+cRQWHEoCzb7qc+Jrw6KcnHMD0VrmBrEQPzTBxMHW
|
|
||||||
4HC97PVkSLJTDArnS6ZiX4IbWRPw/mbpJT6EoVZo8J/it0pdn/X4KodEXDcnEMSe
|
|
||||||
VRulfZH/nSmOOvKhoHPckmgz/u66BlnuSYXEIB0KfDIcAlSYiPDxGnAemTozJYXA
|
|
||||||
UVMeFMs+YE5wiPgzzu+vpC31xtZLq0gyaCfgEi1P9j2ES/8pH3Gw6W2OH4kBx+jO
|
|
||||||
TBsfI+ph6qFZ3WWT23MRVyl3ATuI/GHdczTxD9JaOn74lLI+Hnu8wXnyztVWkTMB
|
|
||||||
4sAnzjdeHkvNDyQ10vSaN0HnGfg6zuAuUSqFQujFF8Vg8ZCcsh8GouWfzYDvi9mj
|
|
||||||
9pfxx8v6UCC719I4J9CgFjWnn2Hqez3fO8fFulY61VPyCCZp4gKWbI2SIQP/n5gz
|
|
||||||
ecYJRrJoem+rYfEQ/fwxROsvm3fCO4D6dt7ILRuX286GDIw2qSvP1zZVAioMwSj3
|
|
||||||
9CAjKLwD/BhTRiMOlpaVv6IWqjtevbiaIKvbHTnoxvkGsDqe3gJhAgMBAAGjXzBd
|
|
||||||
MA4GA1UdDwEB/wQEAwIChDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
|
|
||||||
DwYDVR0TAQH/BAUwAwEB/zAbBgNVHQ4EFAQSaTJwLXJlc2VlZEBtazE2LmRlMA0G
|
|
||||||
CSqGSIb3DQEBCwUAA4ICAQAb+x6XpJdjpVYw2bvWIUbatQJwq0YaEW5W61xGLgIG
|
|
||||||
a37oll3YZbSY9Vk+N1cE0f61L3ya4Ioz6zlH/MO2zUG/dEk8vqdgIPUYJvyF7wwF
|
|
||||||
w3/G4VMaDKOJx4bAZNmaiRFGYNhCOhCnZx6uZGrLNIJ2Dc+mflrGmGwYphtXVV3e
|
|
||||||
Iv+ki3gSRgfXuMfKi4B5bLPnz7XDe4TSmwZZSRac4ly4KqmZUyntqbilRxaGTej3
|
|
||||||
VYJ1tac8yppyk5N3VopMQNmBarNZG16wSOTD7CtKgn382jgRW8cR7BMeqhORivp0
|
|
||||||
ZnPJFhzh4uthdlPdXXo6lxfvZjfiwlDPytvEu2QBz3urTgopGqRLcTBnLucWg9li
|
|
||||||
OSy9z7hNEnIN3iIJJAwI1wBdDa7K0h3PFBbIUa7X2ybn81VeNSfO25Lo8YTZEKsc
|
|
||||||
wcThJrNV6qOQv8rM/7aXugi6+VzPlCR+18iKRbebCnlqGR2dT1zFtj3negtOkrjo
|
|
||||||
LH4H6VUr3q2Ie56IubS2hUKiUkDm0ckP3Vum35GGntyEAzl6uyog0hJFOJb3aq30
|
|
||||||
YQLzyVEOz8NnA+32oMRzJJdDxQ7pqG5fgq7EF4d++YSgEfdVXxvfgXQ6m3jAyC7Z
|
|
||||||
p/gX4rlxNsjeGU3Ds51wkmhH4IB1aSQr52PE6RaBhhh3SmADEv6S/3eGvE4F4MN5
|
|
||||||
2Q==
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
|
|
@ -1,33 +1,33 @@
|
||||||
-----BEGIN CERTIFICATE-----
|
-----BEGIN CERTIFICATE-----
|
||||||
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
|
||||||
-----END CERTIFICATE-----
|
-----END CERTIFICATE-----
|
||||||
|
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
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
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
|
|
@ -1,5 +1,2 @@
|
||||||
This forder contain files required for building debian packages.
|
This forder contain systemd unit files.
|
||||||
|
To use systemd daemon control, place files from this directory to debian folder before building package.
|
||||||
The trunk repository is contains the packaging files for the latest stable version of Debian (if we not forgot to update them).
|
|
||||||
|
|
||||||
Files in subdirectories contains fixes to make possible to build package on specific versions of Debian/Ubuntu. They are used when building the release package.
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
11
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
Source: i2pd
|
|
||||||
Section: net
|
|
||||||
Priority: optional
|
|
||||||
Maintainer: r4sas <r4sas@i2pmail.org>
|
|
||||||
Build-Depends: debhelper (>= 11~), libboost-system-dev (>= 1.46), libboost-date-time-dev (>= 1.46), libboost-filesystem-dev (>= 1.46), libboost-program-options-dev (>= 1.46), libminiupnpc-dev, libssl-dev, zlib1g-dev
|
|
||||||
Standards-Version: 4.2.0
|
|
||||||
Homepage: http://i2pd.website/
|
|
||||||
Vcs-Git: git://github.com/PurpleI2P/i2pd.git
|
|
||||||
Vcs-Browser: https://github.com/PurpleI2P/i2pd
|
|
||||||
|
|
||||||
Package: i2pd
|
|
||||||
Architecture: any
|
|
||||||
Pre-Depends: ${misc:Pre-Depends}, adduser
|
|
||||||
Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base,
|
|
||||||
Description: Full-featured C++ implementation of I2P client.
|
|
||||||
I2P (Invisible Internet Protocol) is a universal anonymous network layer. All
|
|
||||||
communications over I2P are anonymous and end-to-end encrypted, participants
|
|
||||||
don't reveal their real IP addresses.
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
9
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
Source: i2pd
|
|
||||||
Section: net
|
|
||||||
Priority: optional
|
|
||||||
Maintainer: r4sas <r4sas@i2pmail.org>
|
|
||||||
Build-Depends: debhelper (>= 9), libboost-system-dev (>= 1.46), libboost-date-time-dev (>= 1.46), libboost-filesystem-dev (>= 1.46), libboost-program-options-dev (>= 1.46), libminiupnpc-dev, libssl-dev, zlib1g-dev
|
|
||||||
Standards-Version: 3.9.8
|
|
||||||
Homepage: http://i2pd.website/
|
|
||||||
Vcs-Git: git://github.com/PurpleI2P/i2pd.git
|
|
||||||
Vcs-Browser: https://github.com/PurpleI2P/i2pd
|
|
||||||
|
|
||||||
Package: i2pd
|
|
||||||
Architecture: any
|
|
||||||
Pre-Depends: ${misc:Pre-Depends}, adduser
|
|
||||||
Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base,
|
|
||||||
Description: Full-featured C++ implementation of I2P client.
|
|
||||||
I2P (Invisible Internet Protocol) is a universal anonymous network layer. All
|
|
||||||
communications over I2P are anonymous and end-to-end encrypted, participants
|
|
||||||
don't reveal their real IP addresses.
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
Description: Enable UPnP usage in package
|
|
||||||
Author: r4sas <r4sas@i2pmail.org>
|
|
||||||
|
|
||||||
Reviewed-By: r4sas <r4sas@i2pmail.org>
|
|
||||||
Last-Update: 2024-12-30
|
|
||||||
|
|
||||||
--- i2pd.orig/Makefile
|
|
||||||
+++ i2pd/Makefile
|
|
||||||
@@ -31,7 +31,7 @@ # import source files lists
|
|
||||||
include filelist.mk
|
|
||||||
|
|
||||||
USE_STATIC := $(or $(USE_STATIC),no)
|
|
||||||
-USE_UPNP := $(or $(USE_UPNP),no)
|
|
||||||
+USE_UPNP := $(or $(USE_UPNP),yes)
|
|
||||||
DEBUG := $(or $(DEBUG),yes)
|
|
||||||
|
|
||||||
# for debugging purposes only, when commit hash needed in trunk builds in i2pd version string
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
Description: Disable LogsDirectory and LogsDirectoryMode options in service
|
|
||||||
Author: r4sas <r4sas@i2pmail.org>
|
|
||||||
|
|
||||||
Reviewed-By: r4sas <r4sas@i2pmail.org>
|
|
||||||
Last-Update: 2024-07-19
|
|
||||||
|
|
||||||
--- a/contrib/i2pd.service
|
|
||||||
+++ b/contrib/i2pd.service
|
|
||||||
@@ -8,8 +8,8 @@ User=i2pd
|
|
||||||
Group=i2pd
|
|
||||||
RuntimeDirectory=i2pd
|
|
||||||
RuntimeDirectoryMode=0700
|
|
||||||
-LogsDirectory=i2pd
|
|
||||||
-LogsDirectoryMode=0700
|
|
||||||
+#LogsDirectory=i2pd
|
|
||||||
+#LogsDirectoryMode=0700
|
|
||||||
Type=forking
|
|
||||||
ExecStart=/usr/bin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
|
|
||||||
ExecReload=/bin/sh -c "kill -HUP $MAINPID"
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
01-upnp.patch
|
|
||||||
02-service.patch
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
#!/usr/bin/make -f
|
|
||||||
#export DH_VERBOSE=1
|
|
||||||
|
|
||||||
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
|
|
||||||
|
|
||||||
include /usr/share/dpkg/architecture.mk
|
|
||||||
|
|
||||||
ifeq ($(DEB_HOST_ARCH),i386)
|
|
||||||
export DEB_BUILD_OPTIONS=parallel=1
|
|
||||||
endif
|
|
||||||
|
|
||||||
export DEB_CXXFLAGS_MAINT_APPEND=-Wall -pedantic
|
|
||||||
export DEB_LDFLAGS_MAINT_APPEND=
|
|
||||||
|
|
||||||
%:
|
|
||||||
dh $@ --parallel
|
|
||||||
|
|
||||||
override_dh_auto_install:
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
9
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
Source: i2pd
|
|
||||||
Section: net
|
|
||||||
Priority: optional
|
|
||||||
Maintainer: r4sas <r4sas@i2pmail.org>
|
|
||||||
Build-Depends: debhelper (>= 9), libboost-system-dev (>= 1.46), libboost-date-time-dev (>= 1.46), libboost-filesystem-dev (>= 1.46), libboost-program-options-dev (>= 1.46), libminiupnpc-dev, libssl-dev, zlib1g-dev
|
|
||||||
Standards-Version: 3.9.8
|
|
||||||
Homepage: http://i2pd.website/
|
|
||||||
Vcs-Git: git://github.com/PurpleI2P/i2pd.git
|
|
||||||
Vcs-Browser: https://github.com/PurpleI2P/i2pd
|
|
||||||
|
|
||||||
Package: i2pd
|
|
||||||
Architecture: any
|
|
||||||
Pre-Depends: ${misc:Pre-Depends}, adduser
|
|
||||||
Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base,
|
|
||||||
Description: Full-featured C++ implementation of I2P client.
|
|
||||||
I2P (Invisible Internet Protocol) is a universal anonymous network layer. All
|
|
||||||
communications over I2P are anonymous and end-to-end encrypted, participants
|
|
||||||
don't reveal their real IP addresses.
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
Description: Enable UPnP usage in package
|
|
||||||
Author: r4sas <r4sas@i2pmail.org>
|
|
||||||
|
|
||||||
Reviewed-By: r4sas <r4sas@i2pmail.org>
|
|
||||||
Last-Update: 2024-12-30
|
|
||||||
|
|
||||||
--- i2pd.orig/Makefile
|
|
||||||
+++ i2pd/Makefile
|
|
||||||
@@ -31,7 +31,7 @@ # import source files lists
|
|
||||||
include filelist.mk
|
|
||||||
|
|
||||||
USE_STATIC := $(or $(USE_STATIC),no)
|
|
||||||
-USE_UPNP := $(or $(USE_UPNP),no)
|
|
||||||
+USE_UPNP := $(or $(USE_UPNP),yes)
|
|
||||||
DEBUG := $(or $(DEBUG),yes)
|
|
||||||
|
|
||||||
# for debugging purposes only, when commit hash needed in trunk builds in i2pd version string
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
Description: Disable LogsDirectory and LogsDirectoryMode options in service
|
|
||||||
Author: r4sas <r4sas@i2pmail.org>
|
|
||||||
|
|
||||||
Reviewed-By: r4sas <r4sas@i2pmail.org>
|
|
||||||
Last-Update: 2024-07-19
|
|
||||||
|
|
||||||
--- a/contrib/i2pd.service
|
|
||||||
+++ b/contrib/i2pd.service
|
|
||||||
@@ -8,8 +8,8 @@ User=i2pd
|
|
||||||
Group=i2pd
|
|
||||||
RuntimeDirectory=i2pd
|
|
||||||
RuntimeDirectoryMode=0700
|
|
||||||
-LogsDirectory=i2pd
|
|
||||||
-LogsDirectoryMode=0700
|
|
||||||
+#LogsDirectory=i2pd
|
|
||||||
+#LogsDirectoryMode=0700
|
|
||||||
Type=forking
|
|
||||||
ExecStart=/usr/bin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
|
|
||||||
ExecReload=/bin/sh -c "kill -HUP $MAINPID"
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
01-upnp.patch
|
|
||||||
02-service.patch
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
#!/usr/bin/make -f
|
|
||||||
#export DH_VERBOSE=1
|
|
||||||
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
|
||||||
|
|
||||||
include /usr/share/dpkg/architecture.mk
|
|
||||||
|
|
||||||
export DEB_CXXFLAGS_MAINT_APPEND = -Wall -pedantic
|
|
||||||
export DEB_LDFLAGS_MAINT_APPEND =
|
|
||||||
|
|
||||||
%:
|
|
||||||
dh $@ --parallel
|
|
||||||
|
|
||||||
override_dh_auto_install:
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
type = bgprocess
|
|
||||||
run-as = i2pd
|
|
||||||
command = /usr/bin/i2pd --conf=/var/lib/i2pd/i2pd.conf --pidfile=/var/lib/i2pd/i2pd.pid --daemon --service
|
|
||||||
smooth-recovery = true
|
|
||||||
depends-on = ntpd
|
|
||||||
# uncomment if you want to use i2pd with yggdrasil
|
|
||||||
# depends-on = yggdrasil
|
|
||||||
pid-file = /var/lib/i2pd/i2pd.pid
|
|
||||||
|
|
@ -1,18 +1,5 @@
|
||||||
#
|
|
||||||
# Copyright (c) 2017-2022, The PurpleI2P Project
|
|
||||||
#
|
|
||||||
# This file is part of Purple i2pd project and licensed under BSD3
|
|
||||||
#
|
|
||||||
# See full license text in LICENSE file at top of project tree
|
|
||||||
#
|
|
||||||
|
|
||||||
FROM alpine:latest
|
FROM alpine:latest
|
||||||
LABEL authors="Mikal Villa <mikal@sigterm.no>, Darknet Villain <supervillain@riseup.net>"
|
LABEL authors "Mikal Villa <mikal@sigterm.no>, Darknet Villain <supervillain@riseup.net>"
|
||||||
LABEL maintainer="R4SAS <r4sas@i2pmail.org>"
|
|
||||||
|
|
||||||
LABEL org.opencontainers.image.source=https://github.com/PurpleI2P/i2pd
|
|
||||||
LABEL org.opencontainers.image.documentation=https://i2pd.readthedocs.io/en/latest/
|
|
||||||
LABEL org.opencontainers.image.licenses=BSD3
|
|
||||||
|
|
||||||
# Expose git branch, tag and URL variables as arguments
|
# Expose git branch, tag and URL variables as arguments
|
||||||
ARG GIT_BRANCH="openssl"
|
ARG GIT_BRANCH="openssl"
|
||||||
|
|
@ -24,28 +11,27 @@ ENV REPO_URL=${REPO_URL}
|
||||||
|
|
||||||
ENV I2PD_HOME="/home/i2pd"
|
ENV I2PD_HOME="/home/i2pd"
|
||||||
ENV DATA_DIR="${I2PD_HOME}/data"
|
ENV DATA_DIR="${I2PD_HOME}/data"
|
||||||
ENV DEFAULT_ARGS=" --datadir=$DATA_DIR"
|
ENV DEFAULT_ARGS=" --datadir=$DATA_DIR --reseed.verify=true --upnp.enabled=false --http.enabled=true --http.address=0.0.0.0 --httpproxy.enabled=true --httpproxy.address=0.0.0.0 --socksproxy.enabled=true --socksproxy.address=0.0.0.0 --sam.enabled=true --sam.address=0.0.0.0"
|
||||||
|
|
||||||
RUN mkdir -p "$I2PD_HOME" "$DATA_DIR" \
|
RUN mkdir -p "$I2PD_HOME" "$DATA_DIR" \
|
||||||
&& adduser -S -h "$I2PD_HOME" i2pd \
|
&& adduser -S -h "$I2PD_HOME" i2pd \
|
||||||
&& chown -R i2pd:nobody "$I2PD_HOME"
|
&& chown -R i2pd:nobody "$I2PD_HOME"
|
||||||
|
|
||||||
|
|
||||||
# 1. Building binary
|
|
||||||
# Each RUN is a layer, adding the dependencies and building i2pd in one layer takes around 8-900Mb, so to keep the
|
|
||||||
# image under 20mb we need to remove all the build dependencies in the same "RUN" / layer.
|
|
||||||
#
|
#
|
||||||
# 1. install deps, clone and build.
|
# Each RUN is a layer, adding the dependencies and building i2pd in one layer takes around 8-900Mb, so to keep the
|
||||||
# 2. strip binaries.
|
# image under 20mb we need to remove all the build dependencies in the same "RUN" / layer.
|
||||||
# 3. Purge all dependencies and other unrelated packages, including build directory.
|
#
|
||||||
|
|
||||||
|
# 1. install deps, clone and build.
|
||||||
|
# 2. strip binaries.
|
||||||
|
# 3. Purge all dependencies and other unrelated packages, including build directory.
|
||||||
RUN apk update \
|
RUN apk update \
|
||||||
&& apk --no-cache --virtual build-dependendencies add make gcc g++ libtool zlib-dev boost-dev build-base openssl-dev openssl miniupnpc-dev git \
|
&& apk --no-cache --virtual build-dependendencies add make gcc g++ libtool zlib-dev boost-dev build-base openssl-dev openssl miniupnpc-dev git \
|
||||||
&& mkdir -p /tmp/build \
|
&& mkdir -p /tmp/build \
|
||||||
&& cd /tmp/build && git clone -b ${GIT_BRANCH} ${REPO_URL} \
|
&& cd /tmp/build && git clone -b ${GIT_BRANCH} ${REPO_URL} \
|
||||||
&& cd i2pd \
|
&& cd i2pd \
|
||||||
&& if [ -n "${GIT_TAG}" ]; then git checkout tags/${GIT_TAG}; fi \
|
&& if [ -n "${GIT_TAG}" ]; then git checkout tags/${GIT_TAG}; fi \
|
||||||
&& make -j$(nproc) USE_UPNP=yes \
|
&& make USE_UPNP=yes \
|
||||||
&& cp -R contrib/certificates /i2pd_certificates \
|
&& cp -R contrib/certificates /i2pd_certificates \
|
||||||
&& mkdir -p /usr/local/bin \
|
&& mkdir -p /usr/local/bin \
|
||||||
&& mv i2pd /usr/local/bin \
|
&& mv i2pd /usr/local/bin \
|
||||||
|
|
@ -59,9 +45,6 @@ RUN apk update \
|
||||||
# 2. Adding required libraries to run i2pd to ensure it will run.
|
# 2. Adding required libraries to run i2pd to ensure it will run.
|
||||||
RUN apk --no-cache add boost-filesystem boost-system boost-program_options boost-date_time boost-thread boost-iostreams openssl miniupnpc musl-utils libstdc++
|
RUN apk --no-cache add boost-filesystem boost-system boost-program_options boost-date_time boost-thread boost-iostreams openssl miniupnpc musl-utils libstdc++
|
||||||
|
|
||||||
# 3. Copy preconfigured config file and entrypoint
|
|
||||||
COPY i2pd-docker.conf "$DATA_DIR/i2pd.conf"
|
|
||||||
RUN chown i2pd:nobody "$DATA_DIR/i2pd.conf"
|
|
||||||
COPY entrypoint.sh /entrypoint.sh
|
COPY entrypoint.sh /entrypoint.sh
|
||||||
RUN chmod a+x /entrypoint.sh
|
RUN chmod a+x /entrypoint.sh
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,52 +0,0 @@
|
||||||
## Preconfigured i2pd configuration file for a Docker container
|
|
||||||
## See https://i2pd.readthedocs.io/en/latest/user-guide/configuration/
|
|
||||||
## for more options you can use in this file.
|
|
||||||
|
|
||||||
## Note that for exposing ports outside of container you need to bind all services to 0.0.0.0
|
|
||||||
|
|
||||||
log = file
|
|
||||||
loglevel = none
|
|
||||||
|
|
||||||
ipv4 = true
|
|
||||||
ipv6 = false
|
|
||||||
|
|
||||||
# bandwidth = L
|
|
||||||
# notransit = false
|
|
||||||
# floodfill = false
|
|
||||||
|
|
||||||
[ntcp2]
|
|
||||||
enabled = true
|
|
||||||
published = true
|
|
||||||
|
|
||||||
[ssu2]
|
|
||||||
enabled = true
|
|
||||||
published = true
|
|
||||||
|
|
||||||
[http]
|
|
||||||
enabled = true
|
|
||||||
address = 0.0.0.0
|
|
||||||
port = 7070
|
|
||||||
|
|
||||||
[httpproxy]
|
|
||||||
enabled = true
|
|
||||||
address = 0.0.0.0
|
|
||||||
port = 4444
|
|
||||||
|
|
||||||
[socksproxy]
|
|
||||||
enabled = true
|
|
||||||
address = 0.0.0.0
|
|
||||||
port = 4447
|
|
||||||
|
|
||||||
[sam]
|
|
||||||
enabled = true
|
|
||||||
address = 0.0.0.0
|
|
||||||
port = 7656
|
|
||||||
|
|
||||||
[upnp]
|
|
||||||
enabled = false
|
|
||||||
|
|
||||||
[reseed]
|
|
||||||
verify = true
|
|
||||||
|
|
||||||
[limits]
|
|
||||||
# transittunnels = 2500
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,30 +1,29 @@
|
||||||
`xgettext` command for extracting translation
|
`xgettext` command for extracting translation
|
||||||
---
|
---
|
||||||
|
|
||||||
```
|
```
|
||||||
xgettext --omit-header -ctr: -ktr -kntr:1,2 daemon/HTTPServer.cpp libi2pd_client/HTTPProxy.cpp
|
xgettext --omit-header -ctr: -ktr -ktr:1,2 daemon/HTTPServer.cpp libi2pd_client/HTTPProxy.cpp
|
||||||
```
|
```
|
||||||
|
|
||||||
Regex for transforming gettext translations to our format:
|
Regex for transforming gettext translations to our format:
|
||||||
---
|
---
|
||||||
|
|
||||||
```
|
```
|
||||||
in: ^(\"|#[:.,]|msgctxt)(.*)$\n
|
in: msgid\ \"(.*)\"\nmsgid_plural\ \"(.*)\"\nmsgstr\[0\]\ \"(.*)\"\nmsgstr\[1\]\ \"(.*)\"\n(msgstr\[2\]\ \"(.*)\"\n)?(msgstr\[3\]\ \"(.*)\"\n)?(msgstr\[4\]\ \"(.*)\"\n)?(msgstr\[5\]\ \"(.*)\"\n)?
|
||||||
out: <to empty line>
|
out: #{"$2", {"$3", "$4", "$6", "$8", "$10"}},\n
|
||||||
```
|
```
|
||||||
|
|
||||||
```
|
```
|
||||||
in: msgid\ \"(.*)\"\nmsgid_plural\ \"(.*)\"\nmsgstr\[0\]\ \"(.*)\"\n(msgstr\[1\]\ \"(.*)\"\n)?(msgstr\[2\]\ \"(.*)\"\n)?(msgstr\[3\]\ \"(.*)\"\n)?(msgstr\[4\]\ \"(.*)\"\n)?(msgstr\[5\]\ \"(.*)\"\n)?
|
in: msgid\ \"(.*)\"\nmsgstr\ \"(.*)\"\n
|
||||||
out: #{"$2", {"$3", "$5", "$7", "$9", "$11"}},\n
|
out: {"$1", "$2"},\n
|
||||||
```
|
```
|
||||||
|
|
||||||
```
|
```
|
||||||
in: msgid\ \"(.*)\"\nmsgstr\ \"(.*)\"\n
|
in: ^#[:.](.*)$\n
|
||||||
out: {"$1", "$2"},\n
|
out: <to empty line>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```
|
||||||
```
|
in: \n\n
|
||||||
in: \n\n
|
out: \n
|
||||||
out: \n
|
```
|
||||||
```
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
## Default: ~/.i2pd/certificates or /var/lib/i2pd/certificates
|
## Default: ~/.i2pd/certificates or /var/lib/i2pd/certificates
|
||||||
# certsdir = /var/lib/i2pd/certificates
|
# certsdir = /var/lib/i2pd/certificates
|
||||||
|
|
||||||
## Where to write pidfile (default: /run/i2pd.pid, not used in Windows)
|
## Where to write pidfile (default: i2pd.pid, not used in Windows)
|
||||||
# pidfile = /run/i2pd.pid
|
# pidfile = /run/i2pd.pid
|
||||||
|
|
||||||
## Logging configuration section
|
## Logging configuration section
|
||||||
|
|
@ -31,16 +31,15 @@
|
||||||
## * file - log entries to a file
|
## * file - log entries to a file
|
||||||
## * syslog - use syslog, see man 3 syslog
|
## * syslog - use syslog, see man 3 syslog
|
||||||
# log = file
|
# log = file
|
||||||
## Path to logfile (default: autodetect)
|
## Path to logfile (default - autodetect)
|
||||||
# logfile = /var/log/i2pd/i2pd.log
|
# logfile = /var/log/i2pd/i2pd.log
|
||||||
## Log messages above this level (debug, info, *warn, error, critical, none)
|
## Log messages above this level (debug, info, *warn, error, none)
|
||||||
## If you set it to none, logging will be disabled
|
## If you set it to none, logging will be disabled
|
||||||
# loglevel = warn
|
# loglevel = warn
|
||||||
## Write full CLF-formatted date and time to log (default: write only time)
|
## Write full CLF-formatted date and time to log (default: write only time)
|
||||||
# logclftime = true
|
# logclftime = true
|
||||||
|
|
||||||
## Daemon mode. Router will go to background after start. Ignored on Windows
|
## Daemon mode. Router will go to background after start. Ignored on Windows
|
||||||
## (default: true)
|
|
||||||
# daemon = true
|
# daemon = true
|
||||||
|
|
||||||
## Specify a family, router belongs to (default - none)
|
## Specify a family, router belongs to (default - none)
|
||||||
|
|
@ -71,97 +70,71 @@
|
||||||
## don't just uncomment this
|
## don't just uncomment this
|
||||||
# port = 4567
|
# port = 4567
|
||||||
|
|
||||||
## Enable communication through ipv4 (default: true)
|
## Enable communication through ipv4
|
||||||
ipv4 = true
|
ipv4 = true
|
||||||
## Enable communication through ipv6 (default: false)
|
## Enable communication through ipv6
|
||||||
ipv6 = false
|
ipv6 = false
|
||||||
|
|
||||||
|
## Enable SSU transport (default = true)
|
||||||
|
# ssu = true
|
||||||
|
|
||||||
## Bandwidth configuration
|
## Bandwidth configuration
|
||||||
## L limit bandwidth to 32 KB/sec, O - to 256 KB/sec, P - to 2048 KB/sec,
|
## L limit bandwidth to 32KBs/sec, O - to 256KBs/sec, P - to 2048KBs/sec,
|
||||||
## X - unlimited
|
## X - unlimited
|
||||||
## Default is L (regular node) and X if floodfill mode enabled.
|
## Default is X for floodfill, L for regular node
|
||||||
## If you want to share more bandwidth without floodfill mode, uncomment
|
|
||||||
## that line and adjust value to your possibilities. Value can be set to
|
|
||||||
## integer in kilobytes, it will apply that limit and flag will be used
|
|
||||||
## from next upper limit (example: if you set 4096 flag will be X, but real
|
|
||||||
## limit will be 4096 KB/s). Same can be done when floodfill mode is used,
|
|
||||||
## but keep in mind that low values may be negatively evaluated by Java
|
|
||||||
## router algorithms.
|
|
||||||
# bandwidth = L
|
# bandwidth = L
|
||||||
## Max % of bandwidth limit for transit. 0-100 (default: 100)
|
## Max % of bandwidth limit for transit. 0-100. 100 by default
|
||||||
# share = 100
|
# share = 100
|
||||||
|
|
||||||
## Router will not accept transit tunnels, disabling transit traffic completely
|
## Router will not accept transit tunnels, disabling transit traffic completely
|
||||||
## (default: false)
|
## (default = false)
|
||||||
# notransit = true
|
# notransit = true
|
||||||
|
|
||||||
## Router will be floodfill (default: false)
|
## Router will be floodfill
|
||||||
## Note: that mode uses much more network connections and CPU!
|
## Note: that mode uses much more network connections and CPU!
|
||||||
# floodfill = true
|
# floodfill = true
|
||||||
|
|
||||||
[ntcp2]
|
|
||||||
## Enable NTCP2 transport (default: true)
|
|
||||||
# enabled = true
|
|
||||||
## Publish address in RouterInfo (default: true)
|
|
||||||
# published = true
|
|
||||||
## Port for incoming connections (default is global port option value)
|
|
||||||
# port = 4567
|
|
||||||
|
|
||||||
[ssu2]
|
|
||||||
## Enable SSU2 transport (default: true)
|
|
||||||
# enabled = true
|
|
||||||
## Publish address in RouterInfo (default: true)
|
|
||||||
# published = true
|
|
||||||
## Port for incoming connections (default is global port option value)
|
|
||||||
# port = 4567
|
|
||||||
|
|
||||||
[http]
|
[http]
|
||||||
## Web Console settings
|
## Web Console settings
|
||||||
## Enable the Web Console (default: true)
|
## Uncomment and set to 'false' to disable Web Console
|
||||||
# enabled = true
|
# enabled = true
|
||||||
## Address and port service will listen on (default: 127.0.0.1:7070)
|
## Address and port service will listen on
|
||||||
# address = 127.0.0.1
|
address = 127.0.0.1
|
||||||
# port = 7070
|
port = 7070
|
||||||
## Path to web console (default: /)
|
## Path to web console, default "/"
|
||||||
# webroot = /
|
# webroot = /
|
||||||
## Enable Web Console authentication (default: false)
|
## Uncomment following lines to enable Web Console authentication
|
||||||
## You should not use Web Console via public networks without additional encryption.
|
|
||||||
## HTTP authentication is not encryption layer!
|
|
||||||
# auth = true
|
# auth = true
|
||||||
# user = i2pd
|
# user = i2pd
|
||||||
# pass = changeme
|
# pass = changeme
|
||||||
## Select webconsole language
|
## Select webconsole language
|
||||||
## Currently supported english (default), afrikaans, armenian, chinese, czech, french,
|
## Currently supported english (default), afrikaans, russian, turkmen, ukrainian and uzbek languages
|
||||||
## german, italian, polish, portuguese, russian, spanish, turkish, turkmen, ukrainian
|
|
||||||
## and uzbek languages
|
|
||||||
# lang = english
|
# lang = english
|
||||||
|
|
||||||
[httpproxy]
|
[httpproxy]
|
||||||
## Enable the HTTP proxy (default: true)
|
## Uncomment and set to 'false' to disable HTTP Proxy
|
||||||
# enabled = true
|
# enabled = true
|
||||||
## Address and port service will listen on (default: 127.0.0.1:4444)
|
## Address and port service will listen on
|
||||||
# address = 127.0.0.1
|
address = 127.0.0.1
|
||||||
# port = 4444
|
port = 4444
|
||||||
## Optional keys file for proxy local destination (default: http-proxy-keys.dat)
|
## Optional keys file for proxy local destination
|
||||||
# keys = http-proxy-keys.dat
|
# keys = http-proxy-keys.dat
|
||||||
## Enable address helper for adding .i2p domains with "jump URLs" (default: true)
|
## Enable address helper for adding .i2p domains with "jump URLs" (default: true)
|
||||||
## You should disable this feature if your i2pd HTTP Proxy is public,
|
|
||||||
## because anyone could spoof the short domain via addresshelper and forward other users to phishing links
|
|
||||||
# addresshelper = true
|
# addresshelper = true
|
||||||
## Address of a proxy server inside I2P, which is used to visit regular Internet
|
## Address of a proxy server inside I2P, which is used to visit regular Internet
|
||||||
# outproxy = http://false.i2p
|
# outproxy = http://false.i2p
|
||||||
## httpproxy section also accepts I2CP parameters, like "inbound.length" etc.
|
## httpproxy section also accepts I2CP parameters, like "inbound.length" etc.
|
||||||
|
|
||||||
[socksproxy]
|
[socksproxy]
|
||||||
## Enable the SOCKS proxy (default: true)
|
## Uncomment and set to 'false' to disable SOCKS Proxy
|
||||||
# enabled = true
|
# enabled = true
|
||||||
## Address and port service will listen on (default: 127.0.0.1:4447)
|
## Address and port service will listen on
|
||||||
# address = 127.0.0.1
|
address = 127.0.0.1
|
||||||
# port = 4447
|
port = 4447
|
||||||
## Optional keys file for proxy local destination (default: socks-proxy-keys.dat)
|
## Optional keys file for proxy local destination
|
||||||
# keys = socks-proxy-keys.dat
|
# keys = socks-proxy-keys.dat
|
||||||
## Socks outproxy. Example below is set to use Tor for all connections except i2p
|
## Socks outproxy. Example below is set to use Tor for all connections except i2p
|
||||||
## Enable using of SOCKS outproxy (works only with SOCKS4, default: false)
|
## Uncomment and set to 'true' to enable using of SOCKS outproxy
|
||||||
# outproxy.enabled = false
|
# outproxy.enabled = false
|
||||||
## Address and port of outproxy
|
## Address and port of outproxy
|
||||||
# outproxy = 127.0.0.1
|
# outproxy = 127.0.0.1
|
||||||
|
|
@ -169,34 +142,33 @@ ipv6 = false
|
||||||
## socksproxy section also accepts I2CP parameters, like "inbound.length" etc.
|
## socksproxy section also accepts I2CP parameters, like "inbound.length" etc.
|
||||||
|
|
||||||
[sam]
|
[sam]
|
||||||
## Enable the SAM bridge (default: true)
|
## Comment or set to 'false' to disable SAM Bridge
|
||||||
# enabled = false
|
enabled = true
|
||||||
## Address and ports service will listen on (default: 127.0.0.1:7656, udp: 7655)
|
## Address and port service will listen on
|
||||||
# address = 127.0.0.1
|
# address = 127.0.0.1
|
||||||
# port = 7656
|
# port = 7656
|
||||||
# portudp = 7655
|
|
||||||
|
|
||||||
[bob]
|
[bob]
|
||||||
## Enable the BOB command channel (default: false)
|
## Uncomment and set to 'true' to enable BOB command channel
|
||||||
# enabled = false
|
# enabled = false
|
||||||
## Address and port service will listen on (default: 127.0.0.1:2827)
|
## Address and port service will listen on
|
||||||
# address = 127.0.0.1
|
# address = 127.0.0.1
|
||||||
# port = 2827
|
# port = 2827
|
||||||
|
|
||||||
[i2cp]
|
[i2cp]
|
||||||
## Enable the I2CP protocol (default: false)
|
## Uncomment and set to 'true' to enable I2CP protocol
|
||||||
# enabled = false
|
# enabled = false
|
||||||
## Address and port service will listen on (default: 127.0.0.1:7654)
|
## Address and port service will listen on
|
||||||
# address = 127.0.0.1
|
# address = 127.0.0.1
|
||||||
# port = 7654
|
# port = 7654
|
||||||
|
|
||||||
[i2pcontrol]
|
[i2pcontrol]
|
||||||
## Enable the I2PControl protocol (default: false)
|
## Uncomment and set to 'true' to enable I2PControl protocol
|
||||||
# enabled = false
|
# enabled = false
|
||||||
## Address and port service will listen on (default: 127.0.0.1:7650)
|
## Address and port service will listen on
|
||||||
# address = 127.0.0.1
|
# address = 127.0.0.1
|
||||||
# port = 7650
|
# port = 7650
|
||||||
## Authentication password (default: itoopie)
|
## Authentication password. "itoopie" by default
|
||||||
# password = itoopie
|
# password = itoopie
|
||||||
|
|
||||||
[precomputation]
|
[precomputation]
|
||||||
|
|
@ -207,11 +179,11 @@ ipv6 = false
|
||||||
[upnp]
|
[upnp]
|
||||||
## Enable or disable UPnP: automatic port forwarding (enabled by default in WINDOWS, ANDROID)
|
## Enable or disable UPnP: automatic port forwarding (enabled by default in WINDOWS, ANDROID)
|
||||||
# enabled = false
|
# enabled = false
|
||||||
## Name i2pd appears in UPnP forwardings list (default: I2Pd)
|
## Name i2pd appears in UPnP forwardings list (default = I2Pd)
|
||||||
# name = I2Pd
|
# name = I2Pd
|
||||||
|
|
||||||
[meshnets]
|
[meshnets]
|
||||||
## Enable connectivity over the Yggdrasil network (default: false)
|
## Enable connectivity over the Yggdrasil network
|
||||||
# yggdrasil = false
|
# yggdrasil = false
|
||||||
## You can bind address from your Yggdrasil subnet 300::/64
|
## You can bind address from your Yggdrasil subnet 300::/64
|
||||||
## The address must first be added to the network interface
|
## The address must first be added to the network interface
|
||||||
|
|
@ -219,13 +191,13 @@ ipv6 = false
|
||||||
|
|
||||||
[reseed]
|
[reseed]
|
||||||
## Options for bootstrapping into I2P network, aka reseeding
|
## Options for bootstrapping into I2P network, aka reseeding
|
||||||
## Enable reseed data verification (default: true)
|
## Enable or disable reseed data verification.
|
||||||
verify = true
|
verify = true
|
||||||
## URLs to request reseed data from, separated by comma
|
## URLs to request reseed data from, separated by comma
|
||||||
## Default: "mainline" I2P Network reseeds
|
## Default: "mainline" I2P Network reseeds
|
||||||
# urls = https://reseed.i2p-projekt.de/,https://i2p.mooo.com/netDb/,https://netdb.i2p2.no/
|
# urls = https://reseed.i2p-projekt.de/,https://i2p.mooo.com/netDb/,https://netdb.i2p2.no/
|
||||||
## Reseed URLs through the Yggdrasil, separated by comma
|
## Reseed URLs through the Yggdrasil, separated by comma
|
||||||
# yggurls = http://[324:71e:281a:9ed3::ace]:7070/
|
# yggurls = http://[324:9de3:fea4:f6ac::ace]:7070/
|
||||||
## Path to local reseed data file (.su3) for manual reseeding
|
## Path to local reseed data file (.su3) for manual reseeding
|
||||||
# file = /path/to/i2pseeds.su3
|
# file = /path/to/i2pseeds.su3
|
||||||
## or HTTPS URL to reseed from
|
## or HTTPS URL to reseed from
|
||||||
|
|
@ -235,7 +207,7 @@ verify = true
|
||||||
## If you run i2pd behind a proxy server, set proxy server for reseeding here
|
## If you run i2pd behind a proxy server, set proxy server for reseeding here
|
||||||
## Should be http://address:port or socks://address:port
|
## Should be http://address:port or socks://address:port
|
||||||
# proxy = http://127.0.0.1:8118
|
# proxy = http://127.0.0.1:8118
|
||||||
## Minimum number of known routers, below which i2pd triggers reseeding (default: 25)
|
## Minimum number of known routers, below which i2pd triggers reseeding. 25 by default
|
||||||
# threshold = 25
|
# threshold = 25
|
||||||
|
|
||||||
[addressbook]
|
[addressbook]
|
||||||
|
|
@ -243,25 +215,24 @@ verify = true
|
||||||
## Default: reg.i2p at "mainline" I2P Network
|
## Default: reg.i2p at "mainline" I2P Network
|
||||||
# defaulturl = http://shx5vqsw7usdaunyzr2qmes2fq37oumybpudrd4jjj4e4vk4uusa.b32.i2p/hosts.txt
|
# defaulturl = http://shx5vqsw7usdaunyzr2qmes2fq37oumybpudrd4jjj4e4vk4uusa.b32.i2p/hosts.txt
|
||||||
## Optional subscriptions URLs, separated by comma
|
## Optional subscriptions URLs, separated by comma
|
||||||
# subscriptions = http://reg.i2p/hosts.txt,http://identiguy.i2p/hosts.txt,http://stats.i2p/cgi-bin/newhosts.txt
|
# subscriptions = http://reg.i2p/hosts.txt,http://identiguy.i2p/hosts.txt,http://stats.i2p/cgi-bin/newhosts.txt,http://rus.i2p/hosts.txt
|
||||||
|
|
||||||
[limits]
|
[limits]
|
||||||
## Maximum active transit sessions (default: 5000)
|
## Maximum active transit sessions (default:2500)
|
||||||
## This value is doubled if floodfill mode is enabled!
|
# transittunnels = 2500
|
||||||
# transittunnels = 5000
|
|
||||||
## Limit number of open file descriptors (0 - use system limit)
|
## Limit number of open file descriptors (0 - use system limit)
|
||||||
# openfiles = 0
|
# openfiles = 0
|
||||||
## Maximum size of corefile in Kb (0 - use system limit)
|
## Maximum size of corefile in Kb (0 - use system limit)
|
||||||
# coresize = 0
|
# coresize = 0
|
||||||
|
|
||||||
[trust]
|
[trust]
|
||||||
## Enable explicit trust options. (default: false)
|
## Enable explicit trust options. false by default
|
||||||
# enabled = true
|
# enabled = true
|
||||||
## Make direct I2P connections only to routers in specified Family.
|
## Make direct I2P connections only to routers in specified Family.
|
||||||
# family = MyFamily
|
# family = MyFamily
|
||||||
## Make direct I2P connections only to routers specified here. Comma separated list of base64 identities.
|
## Make direct I2P connections only to routers specified here. Comma separated list of base64 identities.
|
||||||
# routers =
|
# routers =
|
||||||
## Should we hide our router from other routers? (default: false)
|
## Should we hide our router from other routers? false by default
|
||||||
# hidden = true
|
# hidden = true
|
||||||
|
|
||||||
[exploratory]
|
[exploratory]
|
||||||
|
|
@ -277,3 +248,11 @@ verify = true
|
||||||
## Save full addresses on disk (default: true)
|
## Save full addresses on disk (default: true)
|
||||||
# addressbook = true
|
# addressbook = true
|
||||||
|
|
||||||
|
[cpuext]
|
||||||
|
## Use CPU AES-NI instructions set when work with cryptography when available (default: true)
|
||||||
|
# aesni = true
|
||||||
|
## Use CPU AVX instructions set when work with cryptography when available (default: true)
|
||||||
|
# avx = true
|
||||||
|
## Force usage of CPU instructions set, even if they not found
|
||||||
|
## DO NOT TOUCH that option if you really don't know what are you doing!
|
||||||
|
# force = false
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=I2P Router written in C++
|
Description=I2P Router written in C++
|
||||||
Documentation=man:i2pd(1) https://i2pd.readthedocs.io/en/latest/
|
Documentation=man:i2pd(1) https://i2pd.readthedocs.io/en/latest/
|
||||||
Wants=network.target
|
After=network.target
|
||||||
After=network.target network-online.target
|
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
User=i2pd
|
User=i2pd
|
||||||
|
|
@ -12,7 +11,7 @@ RuntimeDirectoryMode=0700
|
||||||
LogsDirectory=i2pd
|
LogsDirectory=i2pd
|
||||||
LogsDirectoryMode=0700
|
LogsDirectoryMode=0700
|
||||||
Type=forking
|
Type=forking
|
||||||
ExecStart=/usr/bin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
|
ExecStart=/usr/sbin/i2pd --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf --tunnelsdir=/etc/i2pd/tunnels.conf.d --pidfile=/run/i2pd/i2pd.pid --logfile=/var/log/i2pd/i2pd.log --daemon --service
|
||||||
ExecReload=/bin/sh -c "kill -HUP $MAINPID"
|
ExecReload=/bin/sh -c "kill -HUP $MAINPID"
|
||||||
PIDFile=/run/i2pd/i2pd.pid
|
PIDFile=/run/i2pd/i2pd.pid
|
||||||
### Uncomment, if auto restart needed
|
### Uncomment, if auto restart needed
|
||||||
|
|
@ -30,7 +29,7 @@ SendSIGKILL=yes
|
||||||
#TimeoutStopSec=10m
|
#TimeoutStopSec=10m
|
||||||
|
|
||||||
# If you have problems with hanging i2pd, you can try increase this
|
# If you have problems with hanging i2pd, you can try increase this
|
||||||
LimitNOFILE=8192
|
LimitNOFILE=4096
|
||||||
# To enable write of coredump uncomment this
|
# To enable write of coredump uncomment this
|
||||||
#LimitCORE=infinity
|
#LimitCORE=infinity
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ tunconf="/etc/i2pd/tunnels.conf"
|
||||||
tundir="/etc/i2pd/tunnels.conf.d"
|
tundir="/etc/i2pd/tunnels.conf.d"
|
||||||
|
|
||||||
name="i2pd"
|
name="i2pd"
|
||||||
command="/usr/bin/i2pd"
|
command="/usr/sbin/i2pd"
|
||||||
command_args="--service --daemon --log=file --logfile=$logfile --conf=$mainconf --tunconf=$tunconf --tunnelsdir=$tundir --pidfile=$pidfile"
|
command_args="--service --daemon --log=file --logfile=$logfile --conf=$mainconf --tunconf=$tunconf --tunnelsdir=$tundir --pidfile=$pidfile"
|
||||||
description="i2p router written in C++"
|
description="i2p router written in C++"
|
||||||
required_dirs="/var/lib/i2pd"
|
required_dirs="/var/lib/i2pd"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
%define git_hash %(git rev-parse HEAD | cut -c -7)
|
%define git_hash %(git rev-parse HEAD | cut -c -7)
|
||||||
|
|
||||||
Name: i2pd-git
|
Name: i2pd-git
|
||||||
Version: 2.56.0
|
Version: 2.39.0
|
||||||
Release: git%{git_hash}%{?dist}
|
Release: git%{git_hash}%{?dist}
|
||||||
Summary: I2P router written in C++
|
Summary: I2P router written in C++
|
||||||
Conflicts: i2pd
|
Conflicts: i2pd
|
||||||
|
|
@ -24,91 +24,89 @@ BuildRequires: openssl-devel
|
||||||
BuildRequires: miniupnpc-devel
|
BuildRequires: miniupnpc-devel
|
||||||
BuildRequires: systemd-units
|
BuildRequires: systemd-units
|
||||||
|
|
||||||
%if 0%{?fedora} == 41
|
|
||||||
BuildRequires: openssl-devel-engine
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Requires: logrotate
|
Requires: logrotate
|
||||||
Requires: systemd
|
Requires: systemd
|
||||||
Requires(pre): %{_sbindir}/useradd %{_sbindir}/groupadd
|
Requires(pre): %{_sbindir}/useradd %{_sbindir}/groupadd
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
C++ implementation of I2P.
|
C++ implementation of I2P.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n i2pd-openssl
|
%setup -q
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cd build
|
cd build
|
||||||
%if 0%{?rhel} == 7
|
%if 0%{?rhel} == 7
|
||||||
%cmake3 \
|
%cmake3 \
|
||||||
-DWITH_LIBRARY=OFF \
|
-DWITH_LIBRARY=OFF \
|
||||||
-DWITH_UPNP=ON \
|
-DWITH_UPNP=ON \
|
||||||
-DWITH_HARDENING=ON \
|
-DWITH_HARDENING=ON \
|
||||||
-DBUILD_SHARED_LIBS:BOOL=OFF
|
-DBUILD_SHARED_LIBS:BOOL=OFF
|
||||||
%else
|
%else
|
||||||
%cmake \
|
%cmake \
|
||||||
-DWITH_LIBRARY=OFF \
|
-DWITH_LIBRARY=OFF \
|
||||||
-DWITH_UPNP=ON \
|
-DWITH_UPNP=ON \
|
||||||
-DWITH_HARDENING=ON \
|
-DWITH_HARDENING=ON \
|
||||||
%if 0%{?fedora} > 29
|
%if 0%{?fedora} > 29
|
||||||
-DBUILD_SHARED_LIBS:BOOL=OFF \
|
-DBUILD_SHARED_LIBS:BOOL=OFF \
|
||||||
.
|
.
|
||||||
%else
|
%else
|
||||||
-DBUILD_SHARED_LIBS:BOOL=OFF
|
-DBUILD_SHARED_LIBS:BOOL=OFF
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
|
|
||||||
pushd redhat-linux-build
|
|
||||||
%else
|
|
||||||
%if 0%{?fedora} >= 33
|
|
||||||
pushd %{_target_platform}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?mageia} > 7
|
%if 0%{?fedora} >= 36
|
||||||
pushd build
|
pushd redhat-linux-build
|
||||||
%endif
|
%else
|
||||||
|
%if 0%{?fedora} >= 33
|
||||||
|
pushd %{_target_platform}
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?mageia} > 7
|
||||||
|
pushd build
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%if 0%{?rhel} == 9 || 0%{?fedora} >= 33 || 0%{?mageia} > 7
|
%if 0%{?fedora} >= 33
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?mageia} > 7
|
||||||
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
pushd build
|
pushd build
|
||||||
|
|
||||||
%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
|
%if 0%{?fedora} >= 36
|
||||||
pushd redhat-linux-build
|
pushd redhat-linux-build
|
||||||
%else
|
%else
|
||||||
%if 0%{?fedora} >= 33
|
%if 0%{?fedora} >= 33
|
||||||
pushd %{_target_platform}
|
pushd %{_target_platform}
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?mageia}
|
%if 0%{?mageia}
|
||||||
pushd build
|
pushd build
|
||||||
%endif
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
chrpath -d i2pd
|
chrpath -d i2pd
|
||||||
%{__install} -D -m 755 i2pd %{buildroot}%{_bindir}/i2pd
|
%{__install} -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd
|
||||||
%{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd
|
%{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd
|
||||||
%{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
|
%{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
|
||||||
%{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
|
%{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
|
||||||
%{__install} -D -m 644 %{_builddir}/i2pd-openssl/contrib/i2pd.conf %{buildroot}%{_sysconfdir}/i2pd/i2pd.conf
|
%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}%{_sysconfdir}/i2pd/i2pd.conf
|
||||||
%{__install} -D -m 644 %{_builddir}/i2pd-openssl/contrib/subscriptions.txt %{buildroot}%{_sysconfdir}/i2pd/subscriptions.txt
|
%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/subscriptions.txt %{buildroot}%{_sysconfdir}/i2pd/subscriptions.txt
|
||||||
%{__install} -D -m 644 %{_builddir}/i2pd-openssl/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf
|
%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf
|
||||||
%{__install} -D -m 644 %{_builddir}/i2pd-openssl/contrib/i2pd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/i2pd
|
%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/i2pd
|
||||||
%{__install} -D -m 644 %{_builddir}/i2pd-openssl/contrib/i2pd.service %{buildroot}%{_unitdir}/i2pd.service
|
%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.service %{buildroot}%{_unitdir}/i2pd.service
|
||||||
%{__install} -D -m 644 %{_builddir}/i2pd-openssl/debian/i2pd.1 %{buildroot}%{_mandir}/man1/i2pd.1
|
%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/debian/i2pd.1 %{buildroot}%{_mandir}/man1/i2pd.1
|
||||||
%{__cp} -r %{_builddir}/i2pd-openssl/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates
|
%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates
|
||||||
%{__cp} -r %{_builddir}/i2pd-openssl/contrib/tunnels.d/ %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d
|
%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/tunnels.d/ %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d
|
||||||
ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates
|
ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -133,7 +131,7 @@ getent passwd i2pd >/dev/null || \
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d
|
%doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d
|
||||||
%{_bindir}/i2pd
|
%{_sbindir}/i2pd
|
||||||
%config(noreplace) %{_sysconfdir}/i2pd/*.conf
|
%config(noreplace) %{_sysconfdir}/i2pd/*.conf
|
||||||
%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*.conf
|
%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*.conf
|
||||||
%config %{_sysconfdir}/i2pd/subscriptions.txt
|
%config %{_sysconfdir}/i2pd/subscriptions.txt
|
||||||
|
|
@ -148,79 +146,6 @@ getent passwd i2pd >/dev/null || \
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Feb 11 2025 orignal <orignal@i2pmail.org> - 2.56.0
|
|
||||||
- update to 2.56.0
|
|
||||||
|
|
||||||
* Mon Dec 30 2024 orignal <orignal@i2pmail.org> - 2.55.0
|
|
||||||
- update to 2.55.0
|
|
||||||
|
|
||||||
* Sun Oct 6 2024 orignal <orignal@i2pmail.org> - 2.54.0
|
|
||||||
- update to 2.54.0
|
|
||||||
|
|
||||||
* Tue Jul 30 2024 orignal <orignal@i2pmail.org> - 2.53.1
|
|
||||||
- update to 2.53.1
|
|
||||||
|
|
||||||
* Fri Jul 19 2024 orignal <orignal@i2pmail.org> - 2.53.0
|
|
||||||
- update to 2.53.0
|
|
||||||
|
|
||||||
* Sun May 12 2024 orignal <orignal@i2pmail.org> - 2.52.0
|
|
||||||
- update to 2.52.0
|
|
||||||
|
|
||||||
* Sat Apr 06 2024 orignal <orignal@i2pmail.org> - 2.51.0
|
|
||||||
- update to 2.51.0
|
|
||||||
|
|
||||||
* Sat Jan 06 2024 orignal <orignal@i2pmail.org> - 2.50.2
|
|
||||||
- update to 2.50.2
|
|
||||||
|
|
||||||
* Sat Dec 23 2023 r4sas <r4sas@i2pmail.org> - 2.50.1
|
|
||||||
- update to 2.50.1
|
|
||||||
|
|
||||||
* Mon Dec 18 2023 orignal <orignal@i2pmail.org> - 2.50.0
|
|
||||||
- update to 2.50.0
|
|
||||||
|
|
||||||
* Mon Sep 18 2023 orignal <orignal@i2pmail.org> - 2.49.0
|
|
||||||
- update to 2.49.0
|
|
||||||
|
|
||||||
* Mon Jun 12 2023 orignal <orignal@i2pmail.org> - 2.48.0
|
|
||||||
- update to 2.48.0
|
|
||||||
|
|
||||||
* Sat Mar 11 2023 orignal <orignal@i2pmail.org> - 2.47.0
|
|
||||||
- update to 2.47.0
|
|
||||||
|
|
||||||
* Mon Feb 20 2023 r4sas <r4sas@i2pmail.org> - 2.46.1
|
|
||||||
- update to 2.46.1
|
|
||||||
|
|
||||||
* Wed Feb 15 2023 orignal <orignal@i2pmail.org> - 2.46.0
|
|
||||||
- update to 2.46.0
|
|
||||||
|
|
||||||
* Wed Jan 11 2023 orignal <orignal@i2pmail.org> - 2.45.1
|
|
||||||
- update to 2.45.1
|
|
||||||
|
|
||||||
* Tue Jan 3 2023 orignal <orignal@i2pmail.org> - 2.45.0
|
|
||||||
- update to 2.45.0
|
|
||||||
|
|
||||||
* Sun Nov 20 2022 orignal <orignal@i2pmail.org> - 2.44.0
|
|
||||||
- update to 2.44.0
|
|
||||||
|
|
||||||
* Mon Aug 22 2022 orignal <orignal@i2pmail.org> - 2.43.0
|
|
||||||
- update to 2.43.0
|
|
||||||
|
|
||||||
* Tue May 24 2022 r4sas <r4sas@i2pmail.org> - 2.42.1
|
|
||||||
- update to 2.42.1
|
|
||||||
|
|
||||||
* Sun May 22 2022 orignal <orignal@i2pmail.org> - 2.42.0
|
|
||||||
- update to 2.42.0
|
|
||||||
|
|
||||||
* Sun Feb 20 2022 r4sas <r4sas@i2pmail.org> - 2.41.0
|
|
||||||
- update to 2.41.0
|
|
||||||
- fixed build on Fedora Copr over openssl trunk code
|
|
||||||
|
|
||||||
* Mon Nov 29 2021 orignal <i2porignal@yandex.ru> - 2.40.0
|
|
||||||
- update to 2.40.0
|
|
||||||
|
|
||||||
* Tue Aug 24 2021 r4sas <r4sas@i2pmail.org> - 2.39.0-2
|
|
||||||
- changed if statements to cover fedora 35
|
|
||||||
|
|
||||||
* Mon Aug 23 2021 orignal <i2porignal@yandex.ru> - 2.39.0
|
* Mon Aug 23 2021 orignal <i2porignal@yandex.ru> - 2.39.0
|
||||||
- update to 2.39.0
|
- update to 2.39.0
|
||||||
- fixed build on fedora 36
|
- fixed build on fedora 36
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
Name: i2pd
|
Name: i2pd
|
||||||
Version: 2.56.0
|
Version: 2.39.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: I2P router written in C++
|
Summary: I2P router written in C++
|
||||||
Conflicts: i2pd-git
|
Conflicts: i2pd-git
|
||||||
|
|
@ -22,19 +22,13 @@ BuildRequires: openssl-devel
|
||||||
BuildRequires: miniupnpc-devel
|
BuildRequires: miniupnpc-devel
|
||||||
BuildRequires: systemd-units
|
BuildRequires: systemd-units
|
||||||
|
|
||||||
%if 0%{?fedora} == 41
|
|
||||||
BuildRequires: openssl-devel-engine
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Requires: logrotate
|
Requires: logrotate
|
||||||
Requires: systemd
|
Requires: systemd
|
||||||
Requires(pre): %{_sbindir}/useradd %{_sbindir}/groupadd
|
Requires(pre): %{_sbindir}/useradd %{_sbindir}/groupadd
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
C++ implementation of I2P.
|
C++ implementation of I2P.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
|
|
@ -42,60 +36,63 @@ C++ implementation of I2P.
|
||||||
%build
|
%build
|
||||||
cd build
|
cd build
|
||||||
%if 0%{?rhel} == 7
|
%if 0%{?rhel} == 7
|
||||||
%cmake3 \
|
%cmake3 \
|
||||||
-DWITH_LIBRARY=OFF \
|
-DWITH_LIBRARY=OFF \
|
||||||
-DWITH_UPNP=ON \
|
-DWITH_UPNP=ON \
|
||||||
-DWITH_HARDENING=ON \
|
-DWITH_HARDENING=ON \
|
||||||
-DBUILD_SHARED_LIBS:BOOL=OFF
|
-DBUILD_SHARED_LIBS:BOOL=OFF
|
||||||
%else
|
%else
|
||||||
%cmake \
|
%cmake \
|
||||||
-DWITH_LIBRARY=OFF \
|
-DWITH_LIBRARY=OFF \
|
||||||
-DWITH_UPNP=ON \
|
-DWITH_UPNP=ON \
|
||||||
-DWITH_HARDENING=ON \
|
-DWITH_HARDENING=ON \
|
||||||
%if 0%{?fedora} > 29
|
%if 0%{?fedora} > 29
|
||||||
-DBUILD_SHARED_LIBS:BOOL=OFF \
|
-DBUILD_SHARED_LIBS:BOOL=OFF \
|
||||||
.
|
.
|
||||||
%else
|
%else
|
||||||
-DBUILD_SHARED_LIBS:BOOL=OFF
|
-DBUILD_SHARED_LIBS:BOOL=OFF
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
|
%if 0%{?fedora} >= 36
|
||||||
pushd redhat-linux-build
|
pushd redhat-linux-build
|
||||||
%else
|
%else
|
||||||
%if 0%{?fedora} >= 33
|
%if 0%{?fedora} >= 33
|
||||||
pushd %{_target_platform}
|
pushd %{_target_platform}
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?mageia} > 7
|
%if 0%{?mageia} > 7
|
||||||
pushd build
|
pushd build
|
||||||
%endif
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%if 0%{?rhel} == 9 || 0%{?fedora} >= 33 || 0%{?mageia} > 7
|
%if 0%{?fedora} >= 33
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?mageia} > 7
|
||||||
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
pushd build
|
pushd build
|
||||||
|
|
||||||
%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
|
%if 0%{?fedora} >= 36
|
||||||
pushd redhat-linux-build
|
pushd redhat-linux-build
|
||||||
%else
|
%else
|
||||||
%if 0%{?fedora} >= 33
|
%if 0%{?fedora} >= 33
|
||||||
pushd %{_target_platform}
|
pushd %{_target_platform}
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?mageia}
|
%if 0%{?mageia}
|
||||||
pushd build
|
pushd build
|
||||||
%endif
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
chrpath -d i2pd
|
chrpath -d i2pd
|
||||||
%{__install} -D -m 755 i2pd %{buildroot}%{_bindir}/i2pd
|
%{__install} -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd
|
||||||
%{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd
|
%{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd
|
||||||
%{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
|
%{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
|
||||||
%{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
|
%{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
|
||||||
|
|
@ -131,7 +128,7 @@ getent passwd i2pd >/dev/null || \
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d
|
%doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d
|
||||||
%{_bindir}/i2pd
|
%{_sbindir}/i2pd
|
||||||
%config(noreplace) %{_sysconfdir}/i2pd/*.conf
|
%config(noreplace) %{_sysconfdir}/i2pd/*.conf
|
||||||
%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*.conf
|
%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*.conf
|
||||||
%config %{_sysconfdir}/i2pd/subscriptions.txt
|
%config %{_sysconfdir}/i2pd/subscriptions.txt
|
||||||
|
|
@ -146,78 +143,6 @@ getent passwd i2pd >/dev/null || \
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Feb 11 2025 orignal <orignal@i2pmail.org> - 2.56.0
|
|
||||||
- update to 2.56.0
|
|
||||||
|
|
||||||
* Mon Dec 30 2024 orignal <orignal@i2pmail.org> - 2.55.0
|
|
||||||
- update to 2.55.0
|
|
||||||
|
|
||||||
* Sun Oct 6 2024 orignal <orignal@i2pmail.org> - 2.54.0
|
|
||||||
- update to 2.54.0
|
|
||||||
|
|
||||||
* Tue Jul 30 2024 orignal <orignal@i2pmail.org> - 2.53.1
|
|
||||||
- update to 2.53.1
|
|
||||||
|
|
||||||
* Fri Jul 19 2024 orignal <orignal@i2pmail.org> - 2.53.0
|
|
||||||
- update to 2.53.0
|
|
||||||
|
|
||||||
* Sun May 12 2024 orignal <orignal@i2pmail.org> - 2.52.0
|
|
||||||
- update to 2.52.0
|
|
||||||
|
|
||||||
* Sat Apr 06 2024 orignal <orignal@i2pmail.org> - 2.51.0
|
|
||||||
- update to 2.51.0
|
|
||||||
|
|
||||||
* Sat Jan 06 2024 orignal <orignal@i2pmail.org> - 2.50.2
|
|
||||||
- update to 2.50.2
|
|
||||||
|
|
||||||
* Sat Dec 23 2023 r4sas <r4sas@i2pmail.org> - 2.50.1
|
|
||||||
- update to 2.50.1
|
|
||||||
|
|
||||||
* Mon Dec 18 2023 orignal <orignal@i2pmail.org> - 2.50.0
|
|
||||||
- update to 2.50.0
|
|
||||||
|
|
||||||
* Mon Sep 18 2023 orignal <orignal@i2pmail.org> - 2.49.0
|
|
||||||
- update to 2.49.0
|
|
||||||
|
|
||||||
* Mon Jun 12 2023 orignal <orignal@i2pmail.org> - 2.48.0
|
|
||||||
- update to 2.48.0
|
|
||||||
|
|
||||||
* Sat Mar 11 2023 orignal <orignal@i2pmail.org> - 2.47.0
|
|
||||||
- update to 2.47.0
|
|
||||||
|
|
||||||
* Mon Feb 20 2023 r4sas <r4sas@i2pmail.org> - 2.46.1
|
|
||||||
- update to 2.46.1
|
|
||||||
|
|
||||||
* Wed Feb 15 2023 orignal <orignal@i2pmail.org> - 2.46.0
|
|
||||||
- update to 2.46.0
|
|
||||||
|
|
||||||
* Wed Jan 11 2023 orignal <orignal@i2pmail.org> - 2.45.1
|
|
||||||
- update to 2.45.1
|
|
||||||
|
|
||||||
* Tue Jan 3 2023 orignal <orignal@i2pmail.org> - 2.45.0
|
|
||||||
- update to 2.45.0
|
|
||||||
|
|
||||||
* Sun Nov 20 2022 orignal <orignal@i2pmail.org> - 2.44.0
|
|
||||||
- update to 2.44.0
|
|
||||||
|
|
||||||
* Mon Aug 22 2022 orignal <orignal@i2pmail.org> - 2.43.0
|
|
||||||
- update to 2.43.0
|
|
||||||
|
|
||||||
* Tue May 24 2022 r4sas <r4sas@i2pmail.org> - 2.42.1
|
|
||||||
- update to 2.42.1
|
|
||||||
|
|
||||||
* Sun May 22 2022 orignal <orignal@i2pmail.org> - 2.42.0
|
|
||||||
- update to 2.42.0
|
|
||||||
|
|
||||||
* Sun Feb 20 2022 r4sas <r4sas@i2pmail.org> - 2.41.0
|
|
||||||
- update to 2.41.0
|
|
||||||
|
|
||||||
* Mon Nov 29 2021 orignal <i2porignal@yandex.ru> - 2.40.0
|
|
||||||
- update to 2.40.0
|
|
||||||
|
|
||||||
* Tue Aug 24 2021 r4sas <r4sas@i2pmail.org> - 2.39.0-2
|
|
||||||
- changed if statements to cover fedora 35
|
|
||||||
|
|
||||||
* Mon Aug 23 2021 orignal <i2porignal@yandex.ru> - 2.39.0
|
* Mon Aug 23 2021 orignal <i2porignal@yandex.ru> - 2.39.0
|
||||||
- update to 2.39.0
|
- update to 2.39.0
|
||||||
- fixed build on fedora 36
|
- fixed build on fedora 36
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ port = 6668
|
||||||
destination = irc.ilita.i2p
|
destination = irc.ilita.i2p
|
||||||
destinationport = 6667
|
destinationport = 6667
|
||||||
keys = irc-keys.dat
|
keys = irc-keys.dat
|
||||||
i2p.streaming.profile=2
|
|
||||||
|
|
||||||
#[IRC-IRC2P]
|
#[IRC-IRC2P]
|
||||||
#type = client
|
#type = client
|
||||||
|
|
|
||||||
|
|
@ -8,4 +8,4 @@ env LOGFILE="/var/log/i2pd/i2pd.log"
|
||||||
|
|
||||||
expect fork
|
expect fork
|
||||||
|
|
||||||
exec /usr/bin/i2pd --daemon --service --log=file --logfile=$LOGFILE
|
exec /usr/sbin/i2pd --daemon --service --log=file --logfile=$LOGFILE
|
||||||
|
|
|
||||||
|
|
@ -1,293 +1,243 @@
|
||||||
/*
|
body {
|
||||||
* Copyright (c) 2021-2023, The PurpleI2P Project
|
font: 100%/1.5em sans-serif;
|
||||||
*
|
margin: 0;
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
padding: 1.5em;
|
||||||
*
|
background: #FAFAFA;
|
||||||
* See full license text in LICENSE file at top of project tree
|
color: #103456;
|
||||||
*
|
}
|
||||||
******************************************************************
|
|
||||||
*
|
a, .slide label {
|
||||||
* This is style sheet for webconsole, with @media selectors for adaptive
|
text-decoration: none;
|
||||||
* view on desktop and mobile devices, respecting preferred user's color
|
color: #894C84;
|
||||||
* scheme used in system/browser.
|
}
|
||||||
*
|
|
||||||
* Minified copy of that style sheet is bundled inside i2pd sources.
|
a:hover, .slide label:hover {
|
||||||
*/
|
color: #FAFAFA;
|
||||||
|
background: #894C84;
|
||||||
:root {
|
}
|
||||||
--main-bg-color: #fafafa;
|
|
||||||
--main-text-color: #103456;
|
a.button {
|
||||||
--main-link-color: #894c84;
|
-webkit-appearance: button;
|
||||||
--main-link-hover-color: #fafafa;
|
-moz-appearance: button;
|
||||||
}
|
appearance: button;
|
||||||
|
text-decoration: none;
|
||||||
@media (prefers-color-scheme: dark) {
|
padding: 0 5px;
|
||||||
:root {
|
border: 1px solid #894C84;
|
||||||
--main-bg-color: #242424;
|
}
|
||||||
--main-text-color: #17ab5c;
|
|
||||||
--main-link-color: #bf64b7;
|
.header {
|
||||||
--main-link-hover-color: #000000;
|
font-size: 2.5em;
|
||||||
}
|
text-align: center;
|
||||||
}
|
margin: 1em 0;
|
||||||
|
color: #894C84;
|
||||||
body {
|
}
|
||||||
font: 100%/1.5em sans-serif;
|
|
||||||
margin: 0;
|
.wrapper {
|
||||||
padding: 1.5em;
|
margin: 0 auto;
|
||||||
background: var(--main-bg-color);
|
padding: 1em;
|
||||||
color: var(--main-text-color);
|
max-width: 64em;
|
||||||
}
|
}
|
||||||
|
|
||||||
a, .slide label {
|
.menu {
|
||||||
text-decoration: none;
|
display: block;
|
||||||
color: var(--main-link-color);
|
float: left;
|
||||||
}
|
overflow: hidden;
|
||||||
|
max-width: 12em;
|
||||||
a:hover, a.button.selected, .slide label:hover, button[type=submit]:hover {
|
white-space: nowrap;
|
||||||
color: var(--main-link-hover-color);
|
text-overflow: ellipsis;
|
||||||
background: var(--main-link-color);
|
}
|
||||||
}
|
|
||||||
|
.listitem {
|
||||||
a.button {
|
display: block;
|
||||||
appearance: button;
|
font-family: monospace;
|
||||||
text-decoration: none;
|
font-size: 1.2em;
|
||||||
padding: 0 5px;
|
white-space: nowrap;
|
||||||
border: 1px solid var(--main-link-color);
|
}
|
||||||
}
|
|
||||||
|
.tableitem {
|
||||||
.header {
|
font-family: monospace;
|
||||||
font-size: 2.5em;
|
font-size: 1.2em;
|
||||||
text-align: center;
|
white-space: nowrap;
|
||||||
margin: 1em 0;
|
}
|
||||||
color: var(--main-link-color);
|
|
||||||
}
|
.content {
|
||||||
|
float: left;
|
||||||
.wrapper {
|
font-size: 1em;
|
||||||
margin: 0 auto;
|
margin-left: 4em;
|
||||||
padding: 1em;
|
max-width: 48em;
|
||||||
max-width: 64em;
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu {
|
.tunnel.established {
|
||||||
display: block;
|
color: #56B734;
|
||||||
float: left;
|
}
|
||||||
overflow: hidden;
|
|
||||||
padding: 4px;
|
.tunnel.expiring {
|
||||||
max-width: 12em;
|
color: #D3AE3F;
|
||||||
white-space: nowrap;
|
}
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
.tunnel.failed {
|
||||||
|
color: #D33F3F;
|
||||||
.listitem {
|
}
|
||||||
display: block;
|
|
||||||
font-family: monospace;
|
.tunnel.building {
|
||||||
font-size: 1.2em;
|
color: #434343;
|
||||||
white-space: nowrap;
|
}
|
||||||
}
|
|
||||||
|
caption {
|
||||||
.tableitem {
|
font-size: 1.5em;
|
||||||
font-family: monospace;
|
text-align: center;
|
||||||
font-size: 1.2em;
|
color: #894C84;
|
||||||
white-space: nowrap;
|
}
|
||||||
}
|
|
||||||
|
table {
|
||||||
.content {
|
display: table;
|
||||||
float: left;
|
border-collapse: collapse;
|
||||||
font-size: 1em;
|
text-align: center;
|
||||||
margin-left: 2em;
|
}
|
||||||
padding: 4px;
|
|
||||||
max-width: 50em;
|
table.extaddr {
|
||||||
overflow: auto;
|
text-align: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tunnel.established {
|
table.services {
|
||||||
color: #56B734;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tunnel.expiring {
|
textarea {
|
||||||
color: #D3AE3F;
|
word-break: break-all;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tunnel.failed {
|
.streamdest {
|
||||||
color: #D33F3F;
|
width: 120px;
|
||||||
}
|
max-width: 240px;
|
||||||
|
overflow: hidden;
|
||||||
.tunnel.building {
|
text-overflow: ellipsis;
|
||||||
color: #434343;
|
}
|
||||||
}
|
|
||||||
|
.slide div.slidecontent, .slide [type="checkbox"] {
|
||||||
caption {
|
display: none;
|
||||||
font-size: 1.5em;
|
}
|
||||||
text-align: center;
|
|
||||||
color: var(--main-link-color);
|
.slide [type="checkbox"]:checked ~ div.slidecontent {
|
||||||
}
|
display: block;
|
||||||
|
margin-top: 0;
|
||||||
table {
|
padding: 0;
|
||||||
display: table;
|
}
|
||||||
border-collapse: collapse;
|
|
||||||
text-align: center;
|
.disabled {
|
||||||
}
|
color: #D33F3F;
|
||||||
|
}
|
||||||
table.extaddr {
|
|
||||||
text-align: left;
|
.enabled {
|
||||||
}
|
color: #56B734;
|
||||||
|
}
|
||||||
table.services {
|
|
||||||
width: 100%;
|
@media screen and (max-width: 1150px) { /* adaptive style */
|
||||||
}
|
.wrapper {
|
||||||
|
max-width: 58em;
|
||||||
textarea {
|
}
|
||||||
background-color: var(--main-bg-color);
|
|
||||||
color: var(--main-text-color);
|
.menu {
|
||||||
word-break: break-all;
|
max-width: 10em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.streamdest {
|
.content {
|
||||||
width: 120px;
|
margin-left: 2em;
|
||||||
max-width: 240px;
|
max-width: 42em;
|
||||||
overflow: hidden;
|
}
|
||||||
text-overflow: ellipsis;
|
}
|
||||||
}
|
|
||||||
|
@media screen and (max-width: 980px) {
|
||||||
.slide div.slidecontent, .slide [type="checkbox"] {
|
body {
|
||||||
display: none;
|
padding: 1.5em 0 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.slide [type="checkbox"]:checked ~ div.slidecontent {
|
.menu {
|
||||||
display: block;
|
width: 100%;
|
||||||
margin-top: 0;
|
max-width: unset;
|
||||||
padding: 0;
|
display: block;
|
||||||
}
|
float: none;
|
||||||
|
position: unset;
|
||||||
.disabled {
|
font-size: 16px;
|
||||||
color: #D33F3F;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.enabled {
|
.menu a, .commands a {
|
||||||
color: #56B734;
|
display: inline-block;
|
||||||
}
|
padding: 4px;
|
||||||
|
}
|
||||||
button[type=submit] {
|
|
||||||
background-color: transparent;
|
.content {
|
||||||
color: var(--main-link-color);
|
float: none;
|
||||||
text-decoration: none;
|
margin-left: unset;
|
||||||
padding: 5px;
|
margin-top: 16px;
|
||||||
border: 1px solid var(--main-link-color);
|
max-width: 100%;
|
||||||
font-size: 14px;
|
width: 100%;
|
||||||
}
|
text-align: center;
|
||||||
|
}
|
||||||
input, select, select option {
|
|
||||||
background-color: var(--main-bg-color);
|
a, .slide label {
|
||||||
color: var(--main-link-color);
|
/* margin-right: 10px; */
|
||||||
padding: 5px;
|
display: block;
|
||||||
border: 1px solid var(--main-link-color);
|
/* font-size: 18px; */
|
||||||
font-size: 14px;
|
}
|
||||||
}
|
|
||||||
|
.header {
|
||||||
input:focus, select:focus, select option:focus {
|
margin: unset;
|
||||||
outline: none;
|
font-size: 1.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
input[type=number]::-webkit-inner-spin-button {
|
small {
|
||||||
-webkit-appearance: none;
|
display: block
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: 1150px) { /* adaptive style */
|
a.button {
|
||||||
.wrapper {
|
-webkit-appearance: button;
|
||||||
max-width: 58em;
|
-moz-appearance: button;
|
||||||
}
|
appearance: button;
|
||||||
|
text-decoration: none;
|
||||||
.content {
|
margin-top: 10px;
|
||||||
max-width: 40em;
|
padding: 6px;
|
||||||
}
|
border: 1px solid #894c84;
|
||||||
}
|
width: -webkit-fill-available;
|
||||||
|
}
|
||||||
@media screen and (max-width: 980px) {
|
|
||||||
body {
|
input, select {
|
||||||
font: 100%/1.2em sans-serif;
|
width: 35%;
|
||||||
padding: 1.2em 0 0 0;
|
text-align: center;
|
||||||
}
|
padding: 5px;
|
||||||
|
border: 2px solid #ccc;
|
||||||
.menu {
|
-webkit-border-radius: 5px;
|
||||||
width: 100%;
|
border-radius: 5px;
|
||||||
max-width: unset;
|
font-size: 18px;
|
||||||
display: block;
|
}
|
||||||
float: none;
|
|
||||||
position: unset;
|
table.extaddr {
|
||||||
font-size: 16px;
|
margin: auto;
|
||||||
text-align: center;
|
text-align: unset;
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu a, .commands a {
|
textarea {
|
||||||
display: inline-block;
|
width: -webkit-fill-available;
|
||||||
padding: 4px;
|
height: auto;
|
||||||
}
|
padding:5px;
|
||||||
|
border:2px solid #ccc;
|
||||||
.content {
|
-webkit-border-radius: 5px;
|
||||||
float: none;
|
border-radius: 5px;
|
||||||
margin-left: unset;
|
font-size: 12px;
|
||||||
margin-top: 16px;
|
}
|
||||||
max-width: 100%;
|
|
||||||
width: 100%;
|
button[type=submit] {
|
||||||
text-align: center;
|
padding: 5px 15px;
|
||||||
}
|
background: #ccc;
|
||||||
|
border: 0 none;
|
||||||
a, .slide label {
|
cursor: pointer;
|
||||||
display: block;
|
-webkit-border-radius: 5px;
|
||||||
}
|
border-radius: 5px;
|
||||||
|
position: relative;
|
||||||
.header {
|
height: 36px;
|
||||||
margin: unset;
|
display: -webkit-inline-box;
|
||||||
font-size: 1.5em;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
small {
|
|
||||||
display: block
|
|
||||||
}
|
|
||||||
|
|
||||||
a.button {
|
|
||||||
appearance: button;
|
|
||||||
text-decoration: none;
|
|
||||||
margin-top: 10px;
|
|
||||||
padding: 6px;
|
|
||||||
border: 2px solid var(--main-link-color);
|
|
||||||
border-radius: 5px;
|
|
||||||
width: -webkit-fill-available;
|
|
||||||
}
|
|
||||||
|
|
||||||
input, select {
|
|
||||||
width: 35%;
|
|
||||||
text-align: center;
|
|
||||||
padding: 5px;
|
|
||||||
border: 2px solid var(--main-link-color);
|
|
||||||
border-radius: 5px;
|
|
||||||
font-size: 18px;
|
|
||||||
}
|
|
||||||
|
|
||||||
table.extaddr {
|
|
||||||
margin: auto;
|
|
||||||
text-align: unset;
|
|
||||||
}
|
|
||||||
|
|
||||||
textarea {
|
|
||||||
width: -webkit-fill-available;
|
|
||||||
height: auto;
|
|
||||||
padding: 5px;
|
|
||||||
border: 2px solid var(--main-link-color);
|
|
||||||
border-radius: 5px;
|
|
||||||
font-size: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
button[type=submit] {
|
|
||||||
padding: 5px 15px;
|
|
||||||
background: transparent;
|
|
||||||
border: 2px solid var(--main-link-color);
|
|
||||||
cursor: pointer;
|
|
||||||
-webkit-border-radius: 5px;
|
|
||||||
border-radius: 5px;
|
|
||||||
position: relative;
|
|
||||||
height: 36px;
|
|
||||||
display: -webkit-inline-box;
|
|
||||||
margin-top: 10px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013-2024, The PurpleI2P Project
|
* Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
*
|
*
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
* This file is part of Purple i2pd project and licensed under BSD3
|
||||||
*
|
*
|
||||||
|
|
@ -31,6 +31,7 @@
|
||||||
#include "Crypto.h"
|
#include "Crypto.h"
|
||||||
#include "UPnP.h"
|
#include "UPnP.h"
|
||||||
#include "Timestamp.h"
|
#include "Timestamp.h"
|
||||||
|
#include "util.h"
|
||||||
#include "I18N.h"
|
#include "I18N.h"
|
||||||
|
|
||||||
namespace i2p
|
namespace i2p
|
||||||
|
|
@ -57,16 +58,12 @@ namespace util
|
||||||
bool Daemon_Singleton::IsService () const
|
bool Daemon_Singleton::IsService () const
|
||||||
{
|
{
|
||||||
bool service = false;
|
bool service = false;
|
||||||
|
#ifndef _WIN32
|
||||||
i2p::config::GetOption("service", service);
|
i2p::config::GetOption("service", service);
|
||||||
|
#endif
|
||||||
return service;
|
return service;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Daemon_Singleton::setDataDir(std::string path)
|
|
||||||
{
|
|
||||||
if (path != "")
|
|
||||||
DaemonDataDir = path;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Daemon_Singleton::init(int argc, char* argv[]) {
|
bool Daemon_Singleton::init(int argc, char* argv[]) {
|
||||||
return init(argc, argv, nullptr);
|
return init(argc, argv, nullptr);
|
||||||
}
|
}
|
||||||
|
|
@ -76,14 +73,8 @@ namespace util
|
||||||
i2p::config::Init();
|
i2p::config::Init();
|
||||||
i2p::config::ParseCmdline(argc, argv);
|
i2p::config::ParseCmdline(argc, argv);
|
||||||
|
|
||||||
std::string config; i2p::config::GetOption("conf", config);
|
std::string config; i2p::config::GetOption("conf", config);
|
||||||
std::string datadir;
|
std::string datadir; i2p::config::GetOption("datadir", datadir);
|
||||||
if(DaemonDataDir != "") {
|
|
||||||
datadir = DaemonDataDir;
|
|
||||||
} else {
|
|
||||||
i2p::config::GetOption("datadir", datadir);
|
|
||||||
}
|
|
||||||
|
|
||||||
i2p::fs::DetectDataDir(datadir, IsService());
|
i2p::fs::DetectDataDir(datadir, IsService());
|
||||||
i2p::fs::Init();
|
i2p::fs::Init();
|
||||||
|
|
||||||
|
|
@ -108,9 +99,9 @@ namespace util
|
||||||
|
|
||||||
certsdir = i2p::fs::GetCertsDir();
|
certsdir = i2p::fs::GetCertsDir();
|
||||||
|
|
||||||
std::string logs = ""; i2p::config::GetOption("log", logs);
|
std::string logs = ""; i2p::config::GetOption("log", logs);
|
||||||
std::string logfile = ""; i2p::config::GetOption("logfile", logfile);
|
std::string logfile = ""; i2p::config::GetOption("logfile", logfile);
|
||||||
std::string loglevel = ""; i2p::config::GetOption("loglevel", loglevel);
|
std::string loglevel = ""; i2p::config::GetOption("loglevel", loglevel);
|
||||||
bool logclftime; i2p::config::GetOption("logclftime", logclftime);
|
bool logclftime; i2p::config::GetOption("logclftime", logclftime);
|
||||||
|
|
||||||
/* setup logging */
|
/* setup logging */
|
||||||
|
|
@ -127,69 +118,156 @@ namespace util
|
||||||
|
|
||||||
i2p::log::Logger().SetLogLevel(loglevel);
|
i2p::log::Logger().SetLogLevel(loglevel);
|
||||||
if (logstream) {
|
if (logstream) {
|
||||||
LogPrint(eLogInfo, "Log: Sending messages to std::ostream");
|
LogPrint(eLogInfo, "Log: will send messages to std::ostream");
|
||||||
i2p::log::Logger().SendTo (logstream);
|
i2p::log::Logger().SendTo (logstream);
|
||||||
} else if (logs == "file") {
|
} else if (logs == "file") {
|
||||||
if (logfile == "")
|
if (logfile == "")
|
||||||
logfile = i2p::fs::DataDirPath("i2pd.log");
|
logfile = i2p::fs::DataDirPath("i2pd.log");
|
||||||
LogPrint(eLogInfo, "Log: Sending messages to ", logfile);
|
LogPrint(eLogInfo, "Log: will send messages to ", logfile);
|
||||||
i2p::log::Logger().SendTo (logfile);
|
i2p::log::Logger().SendTo (logfile);
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
} else if (logs == "syslog") {
|
} else if (logs == "syslog") {
|
||||||
LogPrint(eLogInfo, "Log: Sending messages to syslog");
|
LogPrint(eLogInfo, "Log: will send messages to syslog");
|
||||||
i2p::log::Logger().SendTo("i2pd", LOG_DAEMON);
|
i2p::log::Logger().SendTo("i2pd", LOG_DAEMON);
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
// use stdout -- default
|
// use stdout -- default
|
||||||
}
|
}
|
||||||
|
|
||||||
LogPrint(eLogNone, "i2pd v", VERSION, " (", I2P_VERSION, ") starting...");
|
LogPrint(eLogNone, "i2pd v", VERSION, " starting");
|
||||||
LogPrint(eLogDebug, "FS: Main config file: ", config);
|
LogPrint(eLogDebug, "FS: main config file: ", config);
|
||||||
LogPrint(eLogDebug, "FS: Data directory: ", datadir);
|
LogPrint(eLogDebug, "FS: data directory: ", datadir);
|
||||||
LogPrint(eLogDebug, "FS: Certificates directory: ", certsdir);
|
LogPrint(eLogDebug, "FS: certificates directory: ", certsdir);
|
||||||
|
|
||||||
bool precomputation; i2p::config::GetOption("precomputation.elgamal", precomputation);
|
bool precomputation; i2p::config::GetOption("precomputation.elgamal", precomputation);
|
||||||
bool ssu; i2p::config::GetOption("ssu", ssu);
|
bool aesni; i2p::config::GetOption("cpuext.aesni", aesni);
|
||||||
if (!ssu && i2p::config::IsDefault ("precomputation.elgamal"))
|
bool avx; i2p::config::GetOption("cpuext.avx", avx);
|
||||||
precomputation = false; // we don't elgamal table if no ssu, unless it's specified explicitly
|
bool forceCpuExt; i2p::config::GetOption("cpuext.force", forceCpuExt);
|
||||||
i2p::crypto::InitCrypto (precomputation);
|
i2p::crypto::InitCrypto (precomputation, aesni, avx, forceCpuExt);
|
||||||
|
|
||||||
i2p::transport::InitAddressFromIface (); // get address4/6 from interfaces
|
|
||||||
|
|
||||||
int netID; i2p::config::GetOption("netid", netID);
|
int netID; i2p::config::GetOption("netid", netID);
|
||||||
i2p::context.SetNetID (netID);
|
i2p::context.SetNetID (netID);
|
||||||
|
|
||||||
bool checkReserved; i2p::config::GetOption("reservedrange", checkReserved);
|
|
||||||
i2p::transport::transports.SetCheckReserved(checkReserved);
|
|
||||||
|
|
||||||
i2p::context.Init ();
|
i2p::context.Init ();
|
||||||
|
|
||||||
i2p::transport::InitTransports ();
|
bool ipv6; i2p::config::GetOption("ipv6", ipv6);
|
||||||
|
bool ipv4; i2p::config::GetOption("ipv4", ipv4);
|
||||||
bool isFloodfill; i2p::config::GetOption("floodfill", isFloodfill);
|
#ifdef MESHNET
|
||||||
if (isFloodfill)
|
// manual override for meshnet
|
||||||
|
ipv4 = false;
|
||||||
|
ipv6 = true;
|
||||||
|
#endif
|
||||||
|
// ifname -> address
|
||||||
|
std::string ifname; i2p::config::GetOption("ifname", ifname);
|
||||||
|
if (ipv4 && i2p::config::IsDefault ("address4"))
|
||||||
{
|
{
|
||||||
LogPrint(eLogInfo, "Daemon: Router configured as floodfill");
|
std::string ifname4; i2p::config::GetOption("ifname4", ifname4);
|
||||||
i2p::context.SetFloodfill (true);
|
if (!ifname4.empty ())
|
||||||
|
i2p::config::SetOption ("address4", i2p::util::net::GetInterfaceAddress(ifname4, false).to_string ()); // v4
|
||||||
|
else if (!ifname.empty ())
|
||||||
|
i2p::config::SetOption ("address4", i2p::util::net::GetInterfaceAddress(ifname, false).to_string ()); // v4
|
||||||
|
}
|
||||||
|
if (ipv6 && i2p::config::IsDefault ("address6"))
|
||||||
|
{
|
||||||
|
std::string ifname6; i2p::config::GetOption("ifname6", ifname6);
|
||||||
|
if (!ifname6.empty ())
|
||||||
|
i2p::config::SetOption ("address6", i2p::util::net::GetInterfaceAddress(ifname6, true).to_string ()); // v6
|
||||||
|
else if (!ifname.empty ())
|
||||||
|
i2p::config::SetOption ("address6", i2p::util::net::GetInterfaceAddress(ifname, true).to_string ()); // v6
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ygg; i2p::config::GetOption("meshnets.yggdrasil", ygg);
|
||||||
|
boost::asio::ip::address_v6 yggaddr;
|
||||||
|
if (ygg)
|
||||||
|
{
|
||||||
|
std::string yggaddress; i2p::config::GetOption ("meshnets.yggaddress", yggaddress);
|
||||||
|
if (!yggaddress.empty ())
|
||||||
|
{
|
||||||
|
yggaddr = boost::asio::ip::address_v6::from_string (yggaddress);
|
||||||
|
if (yggaddr.is_unspecified () || !i2p::util::net::IsYggdrasilAddress (yggaddr) ||
|
||||||
|
!i2p::util::net::IsLocalAddress (yggaddr))
|
||||||
|
{
|
||||||
|
LogPrint(eLogWarning, "Daemon: Can't find Yggdrasil address ", yggaddress);
|
||||||
|
ygg = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
yggaddr = i2p::util::net::GetYggdrasilAddress ();
|
||||||
|
if (yggaddr.is_unspecified ())
|
||||||
|
{
|
||||||
|
LogPrint(eLogWarning, "Daemon: Yggdrasil is not running. Disabled");
|
||||||
|
ygg = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint16_t port; i2p::config::GetOption("port", port);
|
||||||
|
if (!i2p::config::IsDefault("port"))
|
||||||
|
{
|
||||||
|
LogPrint(eLogInfo, "Daemon: accepting incoming connections at port ", port);
|
||||||
|
i2p::context.UpdatePort (port);
|
||||||
|
}
|
||||||
|
i2p::context.SetSupportsV6 (ipv6);
|
||||||
|
i2p::context.SetSupportsV4 (ipv4);
|
||||||
|
i2p::context.SetSupportsMesh (ygg, yggaddr);
|
||||||
|
|
||||||
|
i2p::context.RemoveNTCPAddress (!ipv6); // TODO: remove later
|
||||||
|
bool ntcp2; i2p::config::GetOption("ntcp2.enabled", ntcp2);
|
||||||
|
if (ntcp2)
|
||||||
|
{
|
||||||
|
bool published; i2p::config::GetOption("ntcp2.published", published);
|
||||||
|
if (published)
|
||||||
|
{
|
||||||
|
std::string ntcp2proxy; i2p::config::GetOption("ntcp2.proxy", ntcp2proxy);
|
||||||
|
if (!ntcp2proxy.empty ()) published = false;
|
||||||
|
}
|
||||||
|
if (published)
|
||||||
|
{
|
||||||
|
uint16_t ntcp2port; i2p::config::GetOption("ntcp2.port", ntcp2port);
|
||||||
|
if (!ntcp2port) ntcp2port = port; // use standard port
|
||||||
|
i2p::context.PublishNTCP2Address (ntcp2port, true, ipv4, ipv6, false); // publish
|
||||||
|
if (ipv6)
|
||||||
|
{
|
||||||
|
std::string ipv6Addr; i2p::config::GetOption("ntcp2.addressv6", ipv6Addr);
|
||||||
|
auto addr = boost::asio::ip::address_v6::from_string (ipv6Addr);
|
||||||
|
if (!addr.is_unspecified () && addr != boost::asio::ip::address_v6::any ())
|
||||||
|
i2p::context.UpdateNTCP2V6Address (addr); // set ipv6 address if configured
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
i2p::context.PublishNTCP2Address (port, false, ipv4, ipv6, false); // unpublish
|
||||||
|
}
|
||||||
|
if (ygg)
|
||||||
|
{
|
||||||
|
i2p::context.PublishNTCP2Address (port, true, false, false, true);
|
||||||
|
i2p::context.UpdateNTCP2V6Address (yggaddr);
|
||||||
|
if (!ipv4 && !ipv6)
|
||||||
|
i2p::context.SetStatus (eRouterStatusMesh);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
i2p::context.SetFloodfill (false);
|
|
||||||
|
|
||||||
bool transit; i2p::config::GetOption("notransit", transit);
|
bool transit; i2p::config::GetOption("notransit", transit);
|
||||||
i2p::context.SetAcceptsTunnels (!transit);
|
i2p::context.SetAcceptsTunnels (!transit);
|
||||||
uint32_t transitTunnels; i2p::config::GetOption("limits.transittunnels", transitTunnels);
|
uint16_t transitTunnels; i2p::config::GetOption("limits.transittunnels", transitTunnels);
|
||||||
if (isFloodfill && i2p::config::IsDefault ("limits.transittunnels"))
|
SetMaxNumTransitTunnels (transitTunnels);
|
||||||
transitTunnels *= 2; // double default number of transit tunnels for floodfill
|
|
||||||
i2p::tunnel::tunnels.SetMaxNumTransitTunnels (transitTunnels);
|
bool isFloodfill; i2p::config::GetOption("floodfill", isFloodfill);
|
||||||
|
if (isFloodfill) {
|
||||||
|
LogPrint(eLogInfo, "Daemon: router will be floodfill");
|
||||||
|
i2p::context.SetFloodfill (true);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
i2p::context.SetFloodfill (false);
|
||||||
|
}
|
||||||
|
|
||||||
/* this section also honors 'floodfill' flag, if set above */
|
/* this section also honors 'floodfill' flag, if set above */
|
||||||
std::string bandwidth; i2p::config::GetOption("bandwidth", bandwidth);
|
std::string bandwidth; i2p::config::GetOption("bandwidth", bandwidth);
|
||||||
if (bandwidth.length () > 0)
|
if (bandwidth.length () > 0)
|
||||||
{
|
{
|
||||||
if (bandwidth.length () == 1 && ((bandwidth[0] >= 'K' && bandwidth[0] <= 'P') || bandwidth[0] == 'X' ))
|
if (bandwidth[0] >= 'K' && bandwidth[0] <= 'X')
|
||||||
{
|
{
|
||||||
i2p::context.SetBandwidth (bandwidth[0]);
|
i2p::context.SetBandwidth (bandwidth[0]);
|
||||||
LogPrint(eLogInfo, "Daemon: Bandwidth set to ", i2p::context.GetBandwidthLimit (), "KBps");
|
LogPrint(eLogInfo, "Daemon: bandwidth set to ", i2p::context.GetBandwidthLimit (), "KBps");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -197,18 +275,18 @@ namespace util
|
||||||
if (value > 0)
|
if (value > 0)
|
||||||
{
|
{
|
||||||
i2p::context.SetBandwidth (value);
|
i2p::context.SetBandwidth (value);
|
||||||
LogPrint(eLogInfo, "Daemon: Bandwidth set to ", i2p::context.GetBandwidthLimit (), " KBps");
|
LogPrint(eLogInfo, "Daemon: bandwidth set to ", i2p::context.GetBandwidthLimit (), " KBps");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LogPrint(eLogInfo, "Daemon: Unexpected bandwidth ", bandwidth, ". Set to 'low'");
|
LogPrint(eLogInfo, "Daemon: unexpected bandwidth ", bandwidth, ". Set to 'low'");
|
||||||
i2p::context.SetBandwidth (i2p::data::CAPS_FLAG_LOW_BANDWIDTH2);
|
i2p::context.SetBandwidth (i2p::data::CAPS_FLAG_LOW_BANDWIDTH2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (isFloodfill)
|
else if (isFloodfill)
|
||||||
{
|
{
|
||||||
LogPrint(eLogInfo, "Daemon: Floodfill bandwidth set to 'extra'");
|
LogPrint(eLogInfo, "Daemon: floodfill bandwidth set to 'extra'");
|
||||||
i2p::context.SetBandwidth (i2p::data::CAPS_FLAG_EXTRA_BANDWIDTH2);
|
i2p::context.SetBandwidth (i2p::data::CAPS_FLAG_EXTRA_BANDWIDTH2);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -223,12 +301,12 @@ namespace util
|
||||||
std::string family; i2p::config::GetOption("family", family);
|
std::string family; i2p::config::GetOption("family", family);
|
||||||
i2p::context.SetFamily (family);
|
i2p::context.SetFamily (family);
|
||||||
if (family.length () > 0)
|
if (family.length () > 0)
|
||||||
LogPrint(eLogInfo, "Daemon: Router family set to ", family);
|
LogPrint(eLogInfo, "Daemon: family set to ", family);
|
||||||
|
|
||||||
bool trust; i2p::config::GetOption("trust.enabled", trust);
|
bool trust; i2p::config::GetOption("trust.enabled", trust);
|
||||||
if (trust)
|
if (trust)
|
||||||
{
|
{
|
||||||
LogPrint(eLogInfo, "Daemon: Explicit trust enabled");
|
LogPrint(eLogInfo, "Daemon: explicit trust enabled");
|
||||||
std::string fam; i2p::config::GetOption("trust.family", fam);
|
std::string fam; i2p::config::GetOption("trust.family", fam);
|
||||||
std::string routers; i2p::config::GetOption("trust.routers", routers);
|
std::string routers; i2p::config::GetOption("trust.routers", routers);
|
||||||
bool restricted = false;
|
bool restricted = false;
|
||||||
|
|
@ -258,19 +336,19 @@ namespace util
|
||||||
pos = comma + 1;
|
pos = comma + 1;
|
||||||
}
|
}
|
||||||
while (comma != std::string::npos);
|
while (comma != std::string::npos);
|
||||||
LogPrint(eLogInfo, "Daemon: Setting restricted routes to use ", idents.size(), " trusted routers");
|
LogPrint(eLogInfo, "Daemon: setting restricted routes to use ", idents.size(), " trusted routers");
|
||||||
i2p::transport::transports.RestrictRoutesToRouters(idents);
|
i2p::transport::transports.RestrictRoutesToRouters(idents);
|
||||||
restricted = idents.size() > 0;
|
restricted = idents.size() > 0;
|
||||||
}
|
}
|
||||||
if(!restricted)
|
if(!restricted)
|
||||||
LogPrint(eLogError, "Daemon: No trusted routers of families specified");
|
LogPrint(eLogError, "Daemon: no trusted routers of families specified");
|
||||||
}
|
}
|
||||||
|
|
||||||
bool hidden; i2p::config::GetOption("trust.hidden", hidden);
|
bool hidden; i2p::config::GetOption("trust.hidden", hidden);
|
||||||
if (hidden)
|
if (hidden)
|
||||||
{
|
{
|
||||||
LogPrint(eLogInfo, "Daemon: Hidden mode enabled");
|
LogPrint(eLogInfo, "Daemon: using hidden mode");
|
||||||
i2p::context.SetHidden(true);
|
i2p::data::netdb.SetHidden(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string httpLang; i2p::config::GetOption("http.lang", httpLang);
|
std::string httpLang; i2p::config::GetOption("http.lang", httpLang);
|
||||||
|
|
@ -282,7 +360,7 @@ namespace util
|
||||||
bool Daemon_Singleton::start()
|
bool Daemon_Singleton::start()
|
||||||
{
|
{
|
||||||
i2p::log::Logger().Start();
|
i2p::log::Logger().Start();
|
||||||
LogPrint(eLogInfo, "Daemon: Starting NetDB");
|
LogPrint(eLogInfo, "Daemon: starting NetDB");
|
||||||
i2p::data::netdb.Start();
|
i2p::data::netdb.Start();
|
||||||
|
|
||||||
bool upnp; i2p::config::GetOption("upnp.enabled", upnp);
|
bool upnp; i2p::config::GetOption("upnp.enabled", upnp);
|
||||||
|
|
@ -299,17 +377,19 @@ namespace util
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ntcp2; i2p::config::GetOption("ntcp2.enabled", ntcp2);
|
bool ntcp2; i2p::config::GetOption("ntcp2.enabled", ntcp2);
|
||||||
bool ssu2; i2p::config::GetOption("ssu2.enabled", ssu2);
|
bool ssu; i2p::config::GetOption("ssu", ssu);
|
||||||
LogPrint(eLogInfo, "Daemon: Starting Transports");
|
bool checkInReserved; i2p::config::GetOption("reservedrange", checkInReserved);
|
||||||
if(!ssu2) LogPrint(eLogInfo, "Daemon: SSU2 disabled");
|
LogPrint(eLogInfo, "Daemon: starting Transports");
|
||||||
if(!ntcp2) LogPrint(eLogInfo, "Daemon: NTCP2 disabled");
|
if(!ssu) LogPrint(eLogInfo, "Daemon: ssu disabled");
|
||||||
|
if(!ntcp2) LogPrint(eLogInfo, "Daemon: ntcp2 disabled");
|
||||||
|
|
||||||
i2p::transport::transports.Start(ntcp2, ssu2);
|
i2p::transport::transports.SetCheckReserved(checkInReserved);
|
||||||
if (i2p::transport::transports.IsBoundSSU2() || i2p::transport::transports.IsBoundNTCP2())
|
i2p::transport::transports.Start(ntcp2, ssu);
|
||||||
|
if (i2p::transport::transports.IsBoundSSU() || i2p::transport::transports.IsBoundNTCP2())
|
||||||
LogPrint(eLogInfo, "Daemon: Transports started");
|
LogPrint(eLogInfo, "Daemon: Transports started");
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LogPrint(eLogCritical, "Daemon: Failed to start Transports");
|
LogPrint(eLogError, "Daemon: failed to start Transports");
|
||||||
/** shut down netdb right away */
|
/** shut down netdb right away */
|
||||||
i2p::transport::transports.Stop();
|
i2p::transport::transports.Stop();
|
||||||
i2p::data::netdb.Stop();
|
i2p::data::netdb.Stop();
|
||||||
|
|
@ -320,7 +400,7 @@ namespace util
|
||||||
if (http) {
|
if (http) {
|
||||||
std::string httpAddr; i2p::config::GetOption("http.address", httpAddr);
|
std::string httpAddr; i2p::config::GetOption("http.address", httpAddr);
|
||||||
uint16_t httpPort; i2p::config::GetOption("http.port", httpPort);
|
uint16_t httpPort; i2p::config::GetOption("http.port", httpPort);
|
||||||
LogPrint(eLogInfo, "Daemon: Starting Webconsole at ", httpAddr, ":", httpPort);
|
LogPrint(eLogInfo, "Daemon: starting webconsole at ", httpAddr, ":", httpPort);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
d.httpServer = std::unique_ptr<i2p::http::HTTPServer>(new i2p::http::HTTPServer(httpAddr, httpPort));
|
d.httpServer = std::unique_ptr<i2p::http::HTTPServer>(new i2p::http::HTTPServer(httpAddr, httpPort));
|
||||||
|
|
@ -328,18 +408,16 @@ namespace util
|
||||||
}
|
}
|
||||||
catch (std::exception& ex)
|
catch (std::exception& ex)
|
||||||
{
|
{
|
||||||
LogPrint (eLogCritical, "Daemon: Failed to start Webconsole: ", ex.what ());
|
LogPrint (eLogError, "Daemon: failed to start webconsole: ", ex.what ());
|
||||||
ThrowFatal ("Unable to start webconsole at ", httpAddr, ":", httpPort, ": ", ex.what ());
|
ThrowFatal ("Unable to start webconsole at ", httpAddr, ":", httpPort, ": ", ex.what ());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
LogPrint(eLogInfo, "Daemon: Starting Tunnels");
|
|
||||||
|
LogPrint(eLogInfo, "Daemon: starting Tunnels");
|
||||||
i2p::tunnel::tunnels.Start();
|
i2p::tunnel::tunnels.Start();
|
||||||
|
|
||||||
LogPrint(eLogInfo, "Daemon: Starting Router context");
|
LogPrint(eLogInfo, "Daemon: starting Client");
|
||||||
i2p::context.Start();
|
|
||||||
|
|
||||||
LogPrint(eLogInfo, "Daemon: Starting Client");
|
|
||||||
i2p::client::context.Start ();
|
i2p::client::context.Start ();
|
||||||
|
|
||||||
// I2P Control Protocol
|
// I2P Control Protocol
|
||||||
|
|
@ -347,7 +425,7 @@ namespace util
|
||||||
if (i2pcontrol) {
|
if (i2pcontrol) {
|
||||||
std::string i2pcpAddr; i2p::config::GetOption("i2pcontrol.address", i2pcpAddr);
|
std::string i2pcpAddr; i2p::config::GetOption("i2pcontrol.address", i2pcpAddr);
|
||||||
uint16_t i2pcpPort; i2p::config::GetOption("i2pcontrol.port", i2pcpPort);
|
uint16_t i2pcpPort; i2p::config::GetOption("i2pcontrol.port", i2pcpPort);
|
||||||
LogPrint(eLogInfo, "Daemon: Starting I2PControl at ", i2pcpAddr, ":", i2pcpPort);
|
LogPrint(eLogInfo, "Daemon: starting I2PControl at ", i2pcpAddr, ":", i2pcpPort);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
d.m_I2PControlService = std::unique_ptr<i2p::client::I2PControlService>(new i2p::client::I2PControlService (i2pcpAddr, i2pcpPort));
|
d.m_I2PControlService = std::unique_ptr<i2p::client::I2PControlService>(new i2p::client::I2PControlService (i2pcpAddr, i2pcpPort));
|
||||||
|
|
@ -355,7 +433,7 @@ namespace util
|
||||||
}
|
}
|
||||||
catch (std::exception& ex)
|
catch (std::exception& ex)
|
||||||
{
|
{
|
||||||
LogPrint (eLogCritical, "Daemon: Failed to start I2PControl: ", ex.what ());
|
LogPrint (eLogError, "Daemon: failed to start I2PControl: ", ex.what ());
|
||||||
ThrowFatal ("Unable to start I2PControl service at ", i2pcpAddr, ":", i2pcpPort, ": ", ex.what ());
|
ThrowFatal ("Unable to start I2PControl service at ", i2pcpAddr, ":", i2pcpPort, ": ", ex.what ());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -364,12 +442,10 @@ namespace util
|
||||||
|
|
||||||
bool Daemon_Singleton::stop()
|
bool Daemon_Singleton::stop()
|
||||||
{
|
{
|
||||||
LogPrint(eLogInfo, "Daemon: Shutting down");
|
LogPrint(eLogInfo, "Daemon: shutting down");
|
||||||
LogPrint(eLogInfo, "Daemon: Stopping Client");
|
LogPrint(eLogInfo, "Daemon: stopping Client");
|
||||||
i2p::client::context.Stop();
|
i2p::client::context.Stop();
|
||||||
LogPrint(eLogInfo, "Daemon: Stopping Router context");
|
LogPrint(eLogInfo, "Daemon: stopping Tunnels");
|
||||||
i2p::context.Stop();
|
|
||||||
LogPrint(eLogInfo, "Daemon: Stopping Tunnels");
|
|
||||||
i2p::tunnel::tunnels.Stop();
|
i2p::tunnel::tunnels.Stop();
|
||||||
|
|
||||||
if (d.UPnP)
|
if (d.UPnP)
|
||||||
|
|
@ -384,18 +460,18 @@ namespace util
|
||||||
d.m_NTPSync = nullptr;
|
d.m_NTPSync = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
LogPrint(eLogInfo, "Daemon: Stopping Transports");
|
LogPrint(eLogInfo, "Daemon: stopping Transports");
|
||||||
i2p::transport::transports.Stop();
|
i2p::transport::transports.Stop();
|
||||||
LogPrint(eLogInfo, "Daemon: Stopping NetDB");
|
LogPrint(eLogInfo, "Daemon: stopping NetDB");
|
||||||
i2p::data::netdb.Stop();
|
i2p::data::netdb.Stop();
|
||||||
if (d.httpServer) {
|
if (d.httpServer) {
|
||||||
LogPrint(eLogInfo, "Daemon: Stopping HTTP Server");
|
LogPrint(eLogInfo, "Daemon: stopping HTTP Server");
|
||||||
d.httpServer->Stop();
|
d.httpServer->Stop();
|
||||||
d.httpServer = nullptr;
|
d.httpServer = nullptr;
|
||||||
}
|
}
|
||||||
if (d.m_I2PControlService)
|
if (d.m_I2PControlService)
|
||||||
{
|
{
|
||||||
LogPrint(eLogInfo, "Daemon: Stopping I2PControl");
|
LogPrint(eLogInfo, "Daemon: stopping I2PControl");
|
||||||
d.m_I2PControlService->Stop ();
|
d.m_I2PControlService->Stop ();
|
||||||
d.m_I2PControlService = nullptr;
|
d.m_I2PControlService = nullptr;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,33 +20,27 @@ namespace util
|
||||||
class Daemon_Singleton_Private;
|
class Daemon_Singleton_Private;
|
||||||
class Daemon_Singleton
|
class Daemon_Singleton
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
virtual bool init (int argc, char* argv[], std::shared_ptr<std::ostream> logstream);
|
virtual bool init(int argc, char* argv[], std::shared_ptr<std::ostream> logstream);
|
||||||
virtual bool init (int argc, char* argv[]);
|
virtual bool init(int argc, char* argv[]);
|
||||||
virtual bool start ();
|
virtual bool start();
|
||||||
virtual bool stop ();
|
virtual bool stop();
|
||||||
virtual void run () {};
|
virtual void run () {};
|
||||||
|
|
||||||
virtual void setDataDir (std::string path);
|
bool isDaemon;
|
||||||
|
bool running;
|
||||||
|
|
||||||
bool isDaemon;
|
protected:
|
||||||
bool running;
|
|
||||||
|
|
||||||
protected:
|
Daemon_Singleton();
|
||||||
|
virtual ~Daemon_Singleton();
|
||||||
|
|
||||||
Daemon_Singleton ();
|
bool IsService () const;
|
||||||
virtual ~Daemon_Singleton ();
|
|
||||||
|
|
||||||
bool IsService () const;
|
// d-pointer for httpServer, httpProxy, etc.
|
||||||
|
class Daemon_Singleton_Private;
|
||||||
// d-pointer for httpServer, httpProxy, etc.
|
Daemon_Singleton_Private &d;
|
||||||
class Daemon_Singleton_Private;
|
|
||||||
Daemon_Singleton_Private &d;
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
std::string DaemonDataDir;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(QT_GUI_LIB) // check if QT
|
#if defined(QT_GUI_LIB) // check if QT
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013-2024, The PurpleI2P Project
|
* Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
*
|
*
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
* This file is part of Purple i2pd project and licensed under BSD3
|
||||||
*
|
*
|
||||||
|
|
@ -24,8 +24,6 @@ namespace http
|
||||||
{
|
{
|
||||||
const size_t HTTP_CONNECTION_BUFFER_SIZE = 8192;
|
const size_t HTTP_CONNECTION_BUFFER_SIZE = 8192;
|
||||||
const int TOKEN_EXPIRATION_TIMEOUT = 30; // in seconds
|
const int TOKEN_EXPIRATION_TIMEOUT = 30; // in seconds
|
||||||
const int COMMAND_REDIRECT_TIMEOUT = 5; // in seconds
|
|
||||||
const int TRANSIT_TUNNELS_LIMIT = 1000000;
|
|
||||||
|
|
||||||
class HTTPConnection: public std::enable_shared_from_this<HTTPConnection>
|
class HTTPConnection: public std::enable_shared_from_this<HTTPConnection>
|
||||||
{
|
{
|
||||||
|
|
@ -83,8 +81,8 @@ namespace http
|
||||||
|
|
||||||
bool m_IsRunning;
|
bool m_IsRunning;
|
||||||
std::unique_ptr<std::thread> m_Thread;
|
std::unique_ptr<std::thread> m_Thread;
|
||||||
boost::asio::io_context m_Service;
|
boost::asio::io_service m_Service;
|
||||||
boost::asio::executor_work_guard<boost::asio::io_context::executor_type> m_Work;
|
boost::asio::io_service::work m_Work;
|
||||||
boost::asio::ip::tcp::acceptor m_Acceptor;
|
boost::asio::ip::tcp::acceptor m_Acceptor;
|
||||||
std::string m_Hostname;
|
std::string m_Hostname;
|
||||||
};
|
};
|
||||||
|
|
@ -100,8 +98,8 @@ namespace http
|
||||||
void ShowSAMSessions (std::stringstream& s);
|
void ShowSAMSessions (std::stringstream& s);
|
||||||
void ShowI2PTunnels (std::stringstream& s);
|
void ShowI2PTunnels (std::stringstream& s);
|
||||||
void ShowLocalDestination (std::stringstream& s, const std::string& b32, uint32_t token);
|
void ShowLocalDestination (std::stringstream& s, const std::string& b32, uint32_t token);
|
||||||
void ShowSAMSession (std::stringstream& s, const std::string& id);
|
void ShowSAMSession (std::stringstream& s, const std::string& id);
|
||||||
void ShowI2CPLocalDestination (std::stringstream& s, const std::string& id);
|
void ShowI2CPLocalDestination (std::stringstream& s, const std::string& id);
|
||||||
} // http
|
} // http
|
||||||
} // i2p
|
} // i2p
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,97 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2013-2023, The PurpleI2P Project
|
|
||||||
*
|
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
|
||||||
*
|
|
||||||
* See full license text in LICENSE file at top of project tree
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef HTTP_SERVER_RESOURCES_H__
|
|
||||||
#define HTTP_SERVER_RESOURCES_H__
|
|
||||||
|
|
||||||
namespace i2p
|
|
||||||
{
|
|
||||||
namespace http
|
|
||||||
{
|
|
||||||
const std::string itoopieFavicon =
|
|
||||||
"data:image/png;base64,"
|
|
||||||
"iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACx"
|
|
||||||
"jwv8YQUAAAAJcEhZcwAALiIAAC4iAari3ZIAAAAHdElNRQfgCQsUNSZrkhi1AAAAGXRFWHRTb2Z0"
|
|
||||||
"d2FyZQBwYWludC5uZXQgNC4wLjEyQwRr7AAAAoJJREFUOE9jwAUqi4Q1oEwwcDTV1+5sETaBclGB"
|
|
||||||
"vb09C5QJB6kWpvFQJoOCeLC5kmjEHCgXE2SlyETLi3h6QrkM4VL+ssWSCZUgtopITLKqaOotRTEn"
|
|
||||||
"cbAkLqAkGtOqLBLVAWLXyWSVFkkmRiqLxuaqiWb/VBYJMAYrwgckJY25VEUzniqKhjU2y+RtCRSP"
|
|
||||||
"6lUXy/1jIBV5tlYxZUaFVMq2NInwIi9hO8fSfOEAqDZUoCwal6MulvOvyS7gi69K4j9zxZT/m0ps"
|
|
||||||
"/28ptvvvquXXryIa7QYMMdTwqi0WNtVi0GIDseXl7TnUxFKfnGlxAGp0+D8j2eH/8Ub7/9e7nf7X"
|
|
||||||
"+Af/B7rwt6pI0h0l0WhQADOC9DBkhSirpImHNVZKp24ukkyoshGLnN8d5fA/y13t/44Kq/8hlnL/"
|
|
||||||
"z7fZ/58f6vcxSNpbVUVFhV1RLNBVTsQzVYZPSwhsCAhkiIfpNMrkbO6TLf071Sfk/5ZSi/+7q6z/"
|
|
||||||
"P5ns+v9mj/P/CpuI/20y+aeNGYxZoVoYGmsF3aFMBAAZlCwftnF9ke3//bU2//fXWP8/UGv731Am"
|
|
||||||
"+V+DdNblSqnUYqhSTKAiYSOqJBrVqiaa+S3UNPr/gmyH/xuKXf63hnn/B8bIP0UxHfEyyeSNQKVM"
|
|
||||||
"EB1AEB2twhcTLp+gIBJUoyKasEpVJHmqskh8qryovUG/ffCHHRU2q/Tk/YuB6eGPsbExa7ZkpLu1"
|
|
||||||
"oLEcVDtuUCgV1w60rQzElpRUE1EVSX0BYidHiInXF4nagNhYQW60EF+ApH1ktni0A1SIITSUgVlZ"
|
|
||||||
"JHYnlIsfzJjIp9xZKswL5YKBHL+coKJoRDaUSzoozxHVrygQU4JykQADAwAT5b1NHtwZugAAAABJ"
|
|
||||||
"RU5ErkJggg==";
|
|
||||||
|
|
||||||
// bundled style sheet
|
|
||||||
const std::string internalCSS =
|
|
||||||
"<style>\r\n"
|
|
||||||
":root { --main-bg-color: #fafafa; --main-text-color: #103456; --main-link-color: #894c84; --main-link-hover-color: #fafafa; }\r\n"
|
|
||||||
"@media (prefers-color-scheme: dark) { :root { --main-bg-color: #242424; --main-text-color: #17ab5c; --main-link-color: #bf64b7; --main-link-hover-color: #000000; } }\r\n"
|
|
||||||
"body { font: 100%/1.5em sans-serif; margin: 0; padding: 1.5em; background: var(--main-bg-color); color: var(--main-text-color); }\r\n"
|
|
||||||
"a, .slide label { text-decoration: none; color: var(--main-link-color); }\r\n"
|
|
||||||
"a:hover, a.button.selected, .slide label:hover, button[type=submit]:hover { color: var(--main-link-hover-color); background: var(--main-link-color); }\r\n"
|
|
||||||
"a.button { appearance: button; text-decoration: none; padding: 0 5px; border: 1px solid var(--main-link-color); }\r\n"
|
|
||||||
".header { font-size: 2.5em; text-align: center; margin: 1em 0; color: var(--main-link-color); }\r\n"
|
|
||||||
".wrapper { margin: 0 auto; padding: 1em; max-width: 64em; }\r\n"
|
|
||||||
".menu { display: block; float: left; overflow: hidden; padding: 4px; max-width: 12em; white-space: nowrap; text-overflow: ellipsis ;}\r\n"
|
|
||||||
".listitem { display: block; font-family: monospace; font-size: 1.2em; white-space: nowrap; }\r\n"
|
|
||||||
".tableitem { font-family: monospace; font-size: 1.2em; white-space: nowrap; }\r\n"
|
|
||||||
".content { float: left; font-size: 1em; margin-left: 2em; padding: 4px; max-width: 50em; overflow: auto; }\r\n"
|
|
||||||
".tunnel.established { color: #56B734; }\r\n"
|
|
||||||
".tunnel.expiring { color: #D3AE3F; }\r\n"
|
|
||||||
".tunnel.failed { color: #D33F3F; }\r\n"
|
|
||||||
".tunnel.building { color: #434343; }\r\n"
|
|
||||||
"caption { font-size: 1.5em; text-align: center; color: var(--main-link-color); }\r\n"
|
|
||||||
"table { display: table; border-collapse: collapse; text-align: center; }\r\n"
|
|
||||||
"table.extaddr { text-align: left; }\r\n"
|
|
||||||
"table.services { width: 100%; }\r\n"
|
|
||||||
"textarea { background-color: var(--main-bg-color); color: var(--main-text-color); word-break: break-all; }\r\n"
|
|
||||||
".streamdest { width: 120px; max-width: 240px; overflow: hidden; text-overflow: ellipsis; }\r\n"
|
|
||||||
".slide div.slidecontent, .slide [type=\"checkbox\"] { display: none; }\r\n"
|
|
||||||
".slide [type=\"checkbox\"]:checked ~ div.slidecontent { display: block; margin-top: 0; padding: 0; }\r\n"
|
|
||||||
".disabled { color: #D33F3F; }\r\n"
|
|
||||||
".enabled { color: #56B734; }\r\n"
|
|
||||||
"button[type=submit] { background-color: transparent; color: var(--main-link-color); text-decoration: none;\r\n"
|
|
||||||
" padding: 5px; border: 1px solid var(--main-link-color); font-size: 14px; }\r\n"
|
|
||||||
"input, select, select option { background-color: var(--main-bg-color); color: var(--main-link-color); padding: 5px;\r\n"
|
|
||||||
" border: 1px solid var(--main-link-color); font-size: 14px; }\r\n"
|
|
||||||
"input:focus, select:focus, select option:focus { outline: none; }\r\n"
|
|
||||||
"input[type=number]::-webkit-inner-spin-button { -webkit-appearance: none; }\r\n"
|
|
||||||
"@media screen and (max-width: 1150px) { /* adaptive style */\r\n"
|
|
||||||
" .wrapper { max-width: 58em; }\r\n"
|
|
||||||
" .content { max-width: 40em; }\r\n"
|
|
||||||
"}\r\n"
|
|
||||||
"@media screen and (max-width: 980px) { body { font: 100%/1.2em sans-serif; padding: 1.2em 0 0 0; }\r\n"
|
|
||||||
" .menu { width: 100%; max-width: unset; display: block; float: none; position: unset; font-size: 16px; text-align: center; }\r\n"
|
|
||||||
" .menu a, .commands a { display: inline-block; padding: 4px; }\r\n"
|
|
||||||
" .content { float: none; margin-left: unset; margin-top: 16px; max-width: 100%; width: 100%; text-align: center; }\r\n"
|
|
||||||
" a, .slide label { display: block; }\r\n"
|
|
||||||
" .header { margin: unset; font-size: 1.5em; }\r\n"
|
|
||||||
" small { display: block; }\r\n"
|
|
||||||
" a.button { appearance: button; text-decoration: none; margin-top: 10px; padding: 6px; border: 2px solid var(--main-link-color);\r\n"
|
|
||||||
" border-radius: 5px; width: -webkit-fill-available; }\r\n"
|
|
||||||
" input, select { width: 35%; text-align: center; padding: 5px; border: 2px solid var(--main-link-color); border-radius: 5px; font-size: 18px; }\r\n"
|
|
||||||
" table.extaddr { margin: auto; text-align: unset; }\r\n"
|
|
||||||
" textarea { width: -webkit-fill-available; height: auto; padding: 5px; border: 2px solid var(--main-link-color);\r\n"
|
|
||||||
" border-radius: 5px; font-size: 12px; }\r\n"
|
|
||||||
" button[type=submit] { padding: 5px 15px; background: transparent; border: 2px solid var(--main-link-color); cursor: pointer;\r\n"
|
|
||||||
" border-radius: 5px; position: relative; height: 36px; display: -webkit-inline-box; margin-top: 10px; }\r\n"
|
|
||||||
"}\r\n"
|
|
||||||
"</style>\r\n";
|
|
||||||
|
|
||||||
// for external style sheet
|
|
||||||
std::string externalCSS;
|
|
||||||
|
|
||||||
} // http
|
|
||||||
} // i2p
|
|
||||||
|
|
||||||
#endif /* HTTP_SERVER_RESOURCES_H__ */
|
|
||||||
|
|
@ -1,27 +1,30 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2013-2025, The PurpleI2P Project
|
|
||||||
*
|
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
|
||||||
*
|
|
||||||
* See full license text in LICENSE file at top of project tree
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <iomanip>
|
|
||||||
#include <openssl/x509.h>
|
#include <openssl/x509.h>
|
||||||
#include <openssl/pem.h>
|
#include <openssl/pem.h>
|
||||||
|
|
||||||
// Use global placeholders from boost introduced when local_time.hpp is loaded
|
// Use global placeholders from boost introduced when local_time.hpp is loaded
|
||||||
#define BOOST_BIND_GLOBAL_PLACEHOLDERS
|
#define BOOST_BIND_GLOBAL_PLACEHOLDERS
|
||||||
|
|
||||||
|
#include <boost/lexical_cast.hpp>
|
||||||
|
#include <boost/date_time/local_time/local_time.hpp>
|
||||||
|
#include <boost/date_time/posix_time/posix_time.hpp>
|
||||||
|
#include <boost/property_tree/ini_parser.hpp>
|
||||||
#include <boost/property_tree/json_parser.hpp>
|
#include <boost/property_tree/json_parser.hpp>
|
||||||
|
|
||||||
|
#include "Crypto.h"
|
||||||
#include "FS.h"
|
#include "FS.h"
|
||||||
#include "Log.h"
|
#include "Log.h"
|
||||||
#include "Config.h"
|
#include "Config.h"
|
||||||
#include "NetDb.hpp"
|
#include "NetDb.hpp"
|
||||||
#include "Tunnel.h"
|
#include "RouterContext.h"
|
||||||
#include "Daemon.h"
|
#include "Daemon.h"
|
||||||
|
#include "Tunnel.h"
|
||||||
|
#include "Timestamp.h"
|
||||||
|
#include "Transports.h"
|
||||||
|
#include "version.h"
|
||||||
|
#include "util.h"
|
||||||
|
#include "ClientContext.h"
|
||||||
#include "I2PControl.h"
|
#include "I2PControl.h"
|
||||||
|
|
||||||
namespace i2p
|
namespace i2p
|
||||||
|
|
@ -29,24 +32,11 @@ namespace i2p
|
||||||
namespace client
|
namespace client
|
||||||
{
|
{
|
||||||
I2PControlService::I2PControlService (const std::string& address, int port):
|
I2PControlService::I2PControlService (const std::string& address, int port):
|
||||||
m_IsRunning (false),
|
m_IsRunning (false), m_Thread (nullptr),
|
||||||
|
m_Acceptor (m_Service, boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(address), port)),
|
||||||
m_SSLContext (boost::asio::ssl::context::sslv23),
|
m_SSLContext (boost::asio::ssl::context::sslv23),
|
||||||
m_ShutdownTimer (m_Service)
|
m_ShutdownTimer (m_Service)
|
||||||
{
|
{
|
||||||
if (port)
|
|
||||||
m_Acceptor = std::make_unique<boost::asio::ip::tcp::acceptor>(m_Service,
|
|
||||||
boost::asio::ip::tcp::endpoint(boost::asio::ip::make_address(address), port));
|
|
||||||
else
|
|
||||||
#if defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
|
|
||||||
{
|
|
||||||
std::remove (address.c_str ()); // just in case
|
|
||||||
m_LocalAcceptor = std::make_unique<boost::asio::local::stream_protocol::acceptor>(m_Service,
|
|
||||||
boost::asio::local::stream_protocol::endpoint(address));
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
LogPrint(eLogError, "I2PControl: Local sockets are not supported");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
i2p::config::GetOption("i2pcontrol.password", m_Password);
|
i2p::config::GetOption("i2pcontrol.password", m_Password);
|
||||||
|
|
||||||
// certificate / keys
|
// certificate / keys
|
||||||
|
|
@ -57,46 +47,59 @@ namespace client
|
||||||
i2pcp_crt = i2p::fs::DataDirPath(i2pcp_crt);
|
i2pcp_crt = i2p::fs::DataDirPath(i2pcp_crt);
|
||||||
if (i2pcp_key.at(0) != '/')
|
if (i2pcp_key.at(0) != '/')
|
||||||
i2pcp_key = i2p::fs::DataDirPath(i2pcp_key);
|
i2pcp_key = i2p::fs::DataDirPath(i2pcp_key);
|
||||||
if (!i2p::fs::Exists (i2pcp_crt) || !i2p::fs::Exists (i2pcp_key))
|
if (!i2p::fs::Exists (i2pcp_crt) || !i2p::fs::Exists (i2pcp_key)) {
|
||||||
{
|
LogPrint (eLogInfo, "I2PControl: creating new certificate for control connection");
|
||||||
LogPrint (eLogInfo, "I2PControl: Creating new certificate for control connection");
|
|
||||||
CreateCertificate (i2pcp_crt.c_str(), i2pcp_key.c_str());
|
CreateCertificate (i2pcp_crt.c_str(), i2pcp_key.c_str());
|
||||||
}
|
} else {
|
||||||
else
|
LogPrint(eLogDebug, "I2PControl: using cert from ", i2pcp_crt);
|
||||||
LogPrint(eLogDebug, "I2PControl: Using cert from ", i2pcp_crt);
|
}
|
||||||
m_SSLContext.set_options (boost::asio::ssl::context::default_workarounds | boost::asio::ssl::context::no_sslv2 | boost::asio::ssl::context::single_dh_use);
|
m_SSLContext.set_options (boost::asio::ssl::context::default_workarounds | boost::asio::ssl::context::no_sslv2 | boost::asio::ssl::context::single_dh_use);
|
||||||
boost::system::error_code ec;
|
m_SSLContext.use_certificate_file (i2pcp_crt, boost::asio::ssl::context::pem);
|
||||||
m_SSLContext.use_certificate_file (i2pcp_crt, boost::asio::ssl::context::pem, ec);
|
m_SSLContext.use_private_key_file (i2pcp_key, boost::asio::ssl::context::pem);
|
||||||
if (!ec)
|
|
||||||
m_SSLContext.use_private_key_file (i2pcp_key, boost::asio::ssl::context::pem, ec);
|
|
||||||
if (ec)
|
|
||||||
{
|
|
||||||
LogPrint (eLogInfo, "I2PControl: Failed to load ceritifcate: ", ec.message (), ". Recreating");
|
|
||||||
CreateCertificate (i2pcp_crt.c_str(), i2pcp_key.c_str());
|
|
||||||
m_SSLContext.use_certificate_file (i2pcp_crt, boost::asio::ssl::context::pem, ec);
|
|
||||||
if (!ec)
|
|
||||||
m_SSLContext.use_private_key_file (i2pcp_key, boost::asio::ssl::context::pem, ec);
|
|
||||||
if (ec)
|
|
||||||
// give up
|
|
||||||
LogPrint (eLogError, "I2PControl: Can't load certificates");
|
|
||||||
}
|
|
||||||
|
|
||||||
// handlers
|
// handlers
|
||||||
m_MethodHandlers["Authenticate"] = &I2PControlService::AuthenticateHandler;
|
m_MethodHandlers["Authenticate"] = &I2PControlService::AuthenticateHandler;
|
||||||
m_MethodHandlers["Echo"] = &I2PControlService::EchoHandler;
|
m_MethodHandlers["Echo"] = &I2PControlService::EchoHandler;
|
||||||
m_MethodHandlers["I2PControl"] = &I2PControlService::I2PControlHandler;
|
m_MethodHandlers["I2PControl"] = &I2PControlService::I2PControlHandler;
|
||||||
m_MethodHandlers["RouterInfo"] = &I2PControlHandlers::RouterInfoHandler;
|
m_MethodHandlers["RouterInfo"] = &I2PControlService::RouterInfoHandler;
|
||||||
m_MethodHandlers["RouterManager"] = &I2PControlService::RouterManagerHandler;
|
m_MethodHandlers["RouterManager"] = &I2PControlService::RouterManagerHandler;
|
||||||
m_MethodHandlers["NetworkSetting"] = &I2PControlHandlers::NetworkSettingHandler;
|
m_MethodHandlers["NetworkSetting"] = &I2PControlService::NetworkSettingHandler;
|
||||||
m_MethodHandlers["ClientServicesInfo"] = &I2PControlHandlers::ClientServicesInfoHandler;
|
m_MethodHandlers["ClientServicesInfo"] = &I2PControlService::ClientServicesInfoHandler;
|
||||||
|
|
||||||
// I2PControl
|
// I2PControl
|
||||||
m_I2PControlHandlers["i2pcontrol.password"] = &I2PControlService::PasswordHandler;
|
m_I2PControlHandlers["i2pcontrol.password"] = &I2PControlService::PasswordHandler;
|
||||||
|
|
||||||
|
// RouterInfo
|
||||||
|
m_RouterInfoHandlers["i2p.router.uptime"] = &I2PControlService::UptimeHandler;
|
||||||
|
m_RouterInfoHandlers["i2p.router.version"] = &I2PControlService::VersionHandler;
|
||||||
|
m_RouterInfoHandlers["i2p.router.status"] = &I2PControlService::StatusHandler;
|
||||||
|
m_RouterInfoHandlers["i2p.router.netdb.knownpeers"] = &I2PControlService::NetDbKnownPeersHandler;
|
||||||
|
m_RouterInfoHandlers["i2p.router.netdb.activepeers"] = &I2PControlService::NetDbActivePeersHandler;
|
||||||
|
m_RouterInfoHandlers["i2p.router.net.bw.inbound.1s"] = &I2PControlService::InboundBandwidth1S;
|
||||||
|
m_RouterInfoHandlers["i2p.router.net.bw.outbound.1s"] = &I2PControlService::OutboundBandwidth1S;
|
||||||
|
m_RouterInfoHandlers["i2p.router.net.status"] = &I2PControlService::NetStatusHandler;
|
||||||
|
m_RouterInfoHandlers["i2p.router.net.tunnels.participating"] = &I2PControlService::TunnelsParticipatingHandler;
|
||||||
|
m_RouterInfoHandlers["i2p.router.net.tunnels.successrate"] =
|
||||||
|
&I2PControlService::TunnelsSuccessRateHandler;
|
||||||
|
m_RouterInfoHandlers["i2p.router.net.total.received.bytes"] = &I2PControlService::NetTotalReceivedBytes;
|
||||||
|
m_RouterInfoHandlers["i2p.router.net.total.sent.bytes"] = &I2PControlService::NetTotalSentBytes;
|
||||||
|
|
||||||
// RouterManager
|
// RouterManager
|
||||||
m_RouterManagerHandlers["Reseed"] = &I2PControlService::ReseedHandler;
|
m_RouterManagerHandlers["Reseed"] = &I2PControlService::ReseedHandler;
|
||||||
m_RouterManagerHandlers["Shutdown"] = &I2PControlService::ShutdownHandler;
|
m_RouterManagerHandlers["Shutdown"] = &I2PControlService::ShutdownHandler;
|
||||||
m_RouterManagerHandlers["ShutdownGraceful"] = &I2PControlService::ShutdownGracefulHandler;
|
m_RouterManagerHandlers["ShutdownGraceful"] = &I2PControlService::ShutdownGracefulHandler;
|
||||||
|
|
||||||
|
// NetworkSetting
|
||||||
|
m_NetworkSettingHandlers["i2p.router.net.bw.in"] = &I2PControlService::InboundBandwidthLimit;
|
||||||
|
m_NetworkSettingHandlers["i2p.router.net.bw.out"] = &I2PControlService::OutboundBandwidthLimit;
|
||||||
|
|
||||||
|
// ClientServicesInfo
|
||||||
|
m_ClientServicesInfoHandlers["I2PTunnel"] = &I2PControlService::I2PTunnelInfoHandler;
|
||||||
|
m_ClientServicesInfoHandlers["HTTPProxy"] = &I2PControlService::HTTPProxyInfoHandler;
|
||||||
|
m_ClientServicesInfoHandlers["SOCKS"] = &I2PControlService::SOCKSInfoHandler;
|
||||||
|
m_ClientServicesInfoHandlers["SAM"] = &I2PControlService::SAMInfoHandler;
|
||||||
|
m_ClientServicesInfoHandlers["BOB"] = &I2PControlService::BOBInfoHandler;
|
||||||
|
m_ClientServicesInfoHandlers["I2CP"] = &I2PControlService::I2CPInfoHandler;
|
||||||
}
|
}
|
||||||
|
|
||||||
I2PControlService::~I2PControlService ()
|
I2PControlService::~I2PControlService ()
|
||||||
|
|
@ -110,7 +113,7 @@ namespace client
|
||||||
{
|
{
|
||||||
Accept ();
|
Accept ();
|
||||||
m_IsRunning = true;
|
m_IsRunning = true;
|
||||||
m_Thread = std::make_unique<std::thread>(std::bind (&I2PControlService::Run, this));
|
m_Thread = new std::thread (std::bind (&I2PControlService::Run, this));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -119,19 +122,12 @@ namespace client
|
||||||
if (m_IsRunning)
|
if (m_IsRunning)
|
||||||
{
|
{
|
||||||
m_IsRunning = false;
|
m_IsRunning = false;
|
||||||
if (m_Acceptor) m_Acceptor->cancel ();
|
m_Acceptor.cancel ();
|
||||||
#if defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
|
|
||||||
if (m_LocalAcceptor)
|
|
||||||
{
|
|
||||||
auto path = m_LocalAcceptor->local_endpoint().path();
|
|
||||||
m_LocalAcceptor->cancel ();
|
|
||||||
std::remove (path.c_str ());
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
m_Service.stop ();
|
m_Service.stop ();
|
||||||
if (m_Thread)
|
if (m_Thread)
|
||||||
{
|
{
|
||||||
m_Thread->join ();
|
m_Thread->join ();
|
||||||
|
delete m_Thread;
|
||||||
m_Thread = nullptr;
|
m_Thread = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -146,67 +142,47 @@ namespace client
|
||||||
try {
|
try {
|
||||||
m_Service.run ();
|
m_Service.run ();
|
||||||
} catch (std::exception& ex) {
|
} catch (std::exception& ex) {
|
||||||
LogPrint (eLogError, "I2PControl: Runtime exception: ", ex.what ());
|
LogPrint (eLogError, "I2PControl: runtime exception: ", ex.what ());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void I2PControlService::Accept ()
|
void I2PControlService::Accept ()
|
||||||
{
|
{
|
||||||
if (m_Acceptor)
|
auto newSocket = std::make_shared<ssl_socket> (m_Service, m_SSLContext);
|
||||||
{
|
m_Acceptor.async_accept (newSocket->lowest_layer(), std::bind (&I2PControlService::HandleAccept, this,
|
||||||
auto newSocket = std::make_shared<boost::asio::ssl::stream<boost::asio::ip::tcp::socket> > (m_Service, m_SSLContext);
|
std::placeholders::_1, newSocket));
|
||||||
m_Acceptor->async_accept (newSocket->lowest_layer(),
|
|
||||||
[this, newSocket](const boost::system::error_code& ecode)
|
|
||||||
{
|
|
||||||
HandleAccepted (ecode, newSocket);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
#if defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
|
|
||||||
else if (m_LocalAcceptor)
|
|
||||||
{
|
|
||||||
auto newSocket = std::make_shared<boost::asio::ssl::stream<boost::asio::local::stream_protocol::socket> > (m_Service, m_SSLContext);
|
|
||||||
m_LocalAcceptor->async_accept (newSocket->lowest_layer(),
|
|
||||||
[this, newSocket](const boost::system::error_code& ecode)
|
|
||||||
{
|
|
||||||
HandleAccepted (ecode, newSocket);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename ssl_socket>
|
void I2PControlService::HandleAccept(const boost::system::error_code& ecode, std::shared_ptr<ssl_socket> socket)
|
||||||
void I2PControlService::HandleAccepted (const boost::system::error_code& ecode,
|
|
||||||
std::shared_ptr<ssl_socket> newSocket)
|
|
||||||
{
|
{
|
||||||
if (ecode != boost::asio::error::operation_aborted)
|
if (ecode != boost::asio::error::operation_aborted)
|
||||||
Accept ();
|
Accept ();
|
||||||
|
|
||||||
if (ecode)
|
if (ecode) {
|
||||||
{
|
LogPrint (eLogError, "I2PControl: accept error: ", ecode.message ());
|
||||||
LogPrint (eLogError, "I2PControl: Accept error: ", ecode.message ());
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
LogPrint (eLogDebug, "I2PControl: New request from ", newSocket->lowest_layer ().remote_endpoint ());
|
LogPrint (eLogDebug, "I2PControl: new request from ", socket->lowest_layer ().remote_endpoint ());
|
||||||
Handshake (newSocket);
|
Handshake (socket);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename ssl_socket>
|
|
||||||
void I2PControlService::Handshake (std::shared_ptr<ssl_socket> socket)
|
void I2PControlService::Handshake (std::shared_ptr<ssl_socket> socket)
|
||||||
{
|
{
|
||||||
socket->async_handshake(boost::asio::ssl::stream_base::server,
|
socket->async_handshake(boost::asio::ssl::stream_base::server,
|
||||||
[this, socket](const boost::system::error_code& ecode)
|
std::bind( &I2PControlService::HandleHandshake, this, std::placeholders::_1, socket));
|
||||||
{
|
}
|
||||||
if (ecode)
|
|
||||||
{
|
void I2PControlService::HandleHandshake (const boost::system::error_code& ecode, std::shared_ptr<ssl_socket> socket)
|
||||||
LogPrint (eLogError, "I2PControl: Handshake error: ", ecode.message ());
|
{
|
||||||
return;
|
if (ecode) {
|
||||||
}
|
LogPrint (eLogError, "I2PControl: handshake error: ", ecode.message ());
|
||||||
ReadRequest (socket);
|
return;
|
||||||
});
|
}
|
||||||
|
//std::this_thread::sleep_for (std::chrono::milliseconds(5));
|
||||||
|
ReadRequest (socket);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename ssl_socket>
|
|
||||||
void I2PControlService::ReadRequest (std::shared_ptr<ssl_socket> socket)
|
void I2PControlService::ReadRequest (std::shared_ptr<ssl_socket> socket)
|
||||||
{
|
{
|
||||||
auto request = std::make_shared<I2PControlBuffer>();
|
auto request = std::make_shared<I2PControlBuffer>();
|
||||||
|
|
@ -216,20 +192,17 @@ namespace client
|
||||||
#else
|
#else
|
||||||
boost::asio::buffer (request->data (), request->size ()),
|
boost::asio::buffer (request->data (), request->size ()),
|
||||||
#endif
|
#endif
|
||||||
[this, socket, request](const boost::system::error_code& ecode, size_t bytes_transferred)
|
std::bind(&I2PControlService::HandleRequestReceived, this,
|
||||||
{
|
std::placeholders::_1, std::placeholders::_2, socket, request));
|
||||||
HandleRequestReceived (ecode, bytes_transferred, socket, request);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename ssl_socket>
|
|
||||||
void I2PControlService::HandleRequestReceived (const boost::system::error_code& ecode,
|
void I2PControlService::HandleRequestReceived (const boost::system::error_code& ecode,
|
||||||
size_t bytes_transferred, std::shared_ptr<ssl_socket> socket,
|
size_t bytes_transferred, std::shared_ptr<ssl_socket> socket,
|
||||||
std::shared_ptr<I2PControlBuffer> buf)
|
std::shared_ptr<I2PControlBuffer> buf)
|
||||||
{
|
{
|
||||||
if (ecode)
|
if (ecode)
|
||||||
{
|
{
|
||||||
LogPrint (eLogError, "I2PControl: Read error: ", ecode.message ());
|
LogPrint (eLogError, "I2PControl: read error: ", ecode.message ());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -252,7 +225,7 @@ namespace client
|
||||||
}
|
}
|
||||||
if (ss.eof ())
|
if (ss.eof ())
|
||||||
{
|
{
|
||||||
LogPrint (eLogError, "I2PControl: Malformed request, HTTP header expected");
|
LogPrint (eLogError, "I2PControl: malformed request, HTTP header expected");
|
||||||
return; // TODO:
|
return; // TODO:
|
||||||
}
|
}
|
||||||
std::streamoff rem = contentLength + ss.tellg () - bytes_transferred; // more bytes to read
|
std::streamoff rem = contentLength + ss.tellg () - bytes_transferred; // more bytes to read
|
||||||
|
|
@ -277,7 +250,7 @@ namespace client
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LogPrint (eLogWarning, "I2PControl: Unknown method ", method);
|
LogPrint (eLogWarning, "I2PControl: unknown method ", method);
|
||||||
response << "{\"id\":null,\"error\":";
|
response << "{\"id\":null,\"error\":";
|
||||||
response << "{\"code\":-32601,\"message\":\"Method not found\"},";
|
response << "{\"code\":-32601,\"message\":\"Method not found\"},";
|
||||||
response << "\"jsonrpc\":\"2.0\"}";
|
response << "\"jsonrpc\":\"2.0\"}";
|
||||||
|
|
@ -286,7 +259,7 @@ namespace client
|
||||||
}
|
}
|
||||||
catch (std::exception& ex)
|
catch (std::exception& ex)
|
||||||
{
|
{
|
||||||
LogPrint (eLogError, "I2PControl: Exception when handle request: ", ex.what ());
|
LogPrint (eLogError, "I2PControl: exception when handle request: ", ex.what ());
|
||||||
std::ostringstream response;
|
std::ostringstream response;
|
||||||
response << "{\"id\":null,\"error\":";
|
response << "{\"id\":null,\"error\":";
|
||||||
response << "{\"code\":-32700,\"message\":\"" << ex.what () << "\"},";
|
response << "{\"code\":-32700,\"message\":\"" << ex.what () << "\"},";
|
||||||
|
|
@ -295,12 +268,37 @@ namespace client
|
||||||
}
|
}
|
||||||
catch (...)
|
catch (...)
|
||||||
{
|
{
|
||||||
LogPrint (eLogError, "I2PControl: Handle request unknown exception");
|
LogPrint (eLogError, "I2PControl: handle request unknown exception");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename ssl_socket>
|
void I2PControlService::InsertParam (std::ostringstream& ss, const std::string& name, int value) const
|
||||||
|
{
|
||||||
|
ss << "\"" << name << "\":" << value;
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::InsertParam (std::ostringstream& ss, const std::string& name, const std::string& value) const
|
||||||
|
{
|
||||||
|
ss << "\"" << name << "\":";
|
||||||
|
if (value.length () > 0)
|
||||||
|
ss << "\"" << value << "\"";
|
||||||
|
else
|
||||||
|
ss << "null";
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::InsertParam (std::ostringstream& ss, const std::string& name, double value) const
|
||||||
|
{
|
||||||
|
ss << "\"" << name << "\":" << std::fixed << std::setprecision(2) << value;
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::InsertParam (std::ostringstream& ss, const std::string& name, const boost::property_tree::ptree& value) const
|
||||||
|
{
|
||||||
|
std::ostringstream buf;
|
||||||
|
boost::property_tree::write_json (buf, value, false);
|
||||||
|
ss << "\"" << name << "\":" << buf.str();
|
||||||
|
}
|
||||||
|
|
||||||
void I2PControlService::SendResponse (std::shared_ptr<ssl_socket> socket,
|
void I2PControlService::SendResponse (std::shared_ptr<ssl_socket> socket,
|
||||||
std::shared_ptr<I2PControlBuffer> buf, std::ostringstream& response, bool isHtml)
|
std::shared_ptr<I2PControlBuffer> buf, std::ostringstream& response, bool isHtml)
|
||||||
{
|
{
|
||||||
|
|
@ -310,12 +308,12 @@ namespace client
|
||||||
std::ostringstream header;
|
std::ostringstream header;
|
||||||
header << "HTTP/1.1 200 OK\r\n";
|
header << "HTTP/1.1 200 OK\r\n";
|
||||||
header << "Connection: close\r\n";
|
header << "Connection: close\r\n";
|
||||||
header << "Content-Length: " << std::to_string(len) << "\r\n";
|
header << "Content-Length: " << boost::lexical_cast<std::string>(len) << "\r\n";
|
||||||
header << "Content-Type: application/json\r\n";
|
header << "Content-Type: application/json\r\n";
|
||||||
header << "Date: ";
|
header << "Date: ";
|
||||||
std::time_t t = std::time (nullptr);
|
auto facet = new boost::local_time::local_time_facet ("%a, %d %b %Y %H:%M:%S GMT");
|
||||||
std::tm tm = *std::gmtime (&t);
|
header.imbue(std::locale (header.getloc(), facet));
|
||||||
header << std::put_time(&tm, "%a, %d %b %Y %T GMT") << "\r\n";
|
header << boost::posix_time::second_clock::local_time() << "\r\n";
|
||||||
header << "\r\n";
|
header << "\r\n";
|
||||||
offset = header.str ().size ();
|
offset = header.str ().size ();
|
||||||
memcpy (buf->data (), header.str ().c_str (), offset);
|
memcpy (buf->data (), header.str ().c_str (), offset);
|
||||||
|
|
@ -323,11 +321,16 @@ namespace client
|
||||||
memcpy (buf->data () + offset, response.str ().c_str (), len);
|
memcpy (buf->data () + offset, response.str ().c_str (), len);
|
||||||
boost::asio::async_write (*socket, boost::asio::buffer (buf->data (), offset + len),
|
boost::asio::async_write (*socket, boost::asio::buffer (buf->data (), offset + len),
|
||||||
boost::asio::transfer_all (),
|
boost::asio::transfer_all (),
|
||||||
[socket, buf](const boost::system::error_code& ecode, std::size_t bytes_transferred)
|
std::bind(&I2PControlService::HandleResponseSent, this,
|
||||||
{
|
std::placeholders::_1, std::placeholders::_2, socket, buf));
|
||||||
if (ecode)
|
}
|
||||||
LogPrint (eLogError, "I2PControl: Write error: ", ecode.message ());
|
|
||||||
});
|
void I2PControlService::HandleResponseSent (const boost::system::error_code& ecode, std::size_t bytes_transferred,
|
||||||
|
std::shared_ptr<ssl_socket> socket, std::shared_ptr<I2PControlBuffer> buf)
|
||||||
|
{
|
||||||
|
if (ecode) {
|
||||||
|
LogPrint (eLogError, "I2PControl: write error: ", ecode.message ());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// handlers
|
// handlers
|
||||||
|
|
@ -376,11 +379,96 @@ namespace client
|
||||||
|
|
||||||
void I2PControlService::PasswordHandler (const std::string& value)
|
void I2PControlService::PasswordHandler (const std::string& value)
|
||||||
{
|
{
|
||||||
LogPrint (eLogWarning, "I2PControl: New password=", value, ", to make it persistent you should update your config!");
|
LogPrint (eLogWarning, "I2PControl: new password=", value, ", to make it persistent you should update your config!");
|
||||||
m_Password = value;
|
m_Password = value;
|
||||||
m_Tokens.clear ();
|
m_Tokens.clear ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RouterInfo
|
||||||
|
|
||||||
|
void I2PControlService::RouterInfoHandler (const boost::property_tree::ptree& params, std::ostringstream& results)
|
||||||
|
{
|
||||||
|
bool first = true;
|
||||||
|
for (auto it = params.begin (); it != params.end (); it++)
|
||||||
|
{
|
||||||
|
LogPrint (eLogDebug, "I2PControl: RouterInfo request: ", it->first);
|
||||||
|
auto it1 = m_RouterInfoHandlers.find (it->first);
|
||||||
|
if (it1 != m_RouterInfoHandlers.end ())
|
||||||
|
{
|
||||||
|
if (!first) results << ",";
|
||||||
|
else first = false;
|
||||||
|
(this->*(it1->second))(results);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
LogPrint (eLogError, "I2PControl: RouterInfo unknown request ", it->first);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::UptimeHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
InsertParam (results, "i2p.router.uptime", std::to_string (i2p::context.GetUptime ()*1000LL));
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::VersionHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
InsertParam (results, "i2p.router.version", VERSION);
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::StatusHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
auto dest = i2p::client::context.GetSharedLocalDestination ();
|
||||||
|
InsertParam (results, "i2p.router.status", (dest && dest->IsReady ()) ? "1" : "0");
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::NetDbKnownPeersHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
InsertParam (results, "i2p.router.netdb.knownpeers", i2p::data::netdb.GetNumRouters ());
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::NetDbActivePeersHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
InsertParam (results, "i2p.router.netdb.activepeers", (int)i2p::transport::transports.GetPeers ().size ());
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::NetStatusHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
InsertParam (results, "i2p.router.net.status", (int)i2p::context.GetStatus ());
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::TunnelsParticipatingHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
int transit = i2p::tunnel::tunnels.GetTransitTunnels ().size ();
|
||||||
|
InsertParam (results, "i2p.router.net.tunnels.participating", transit);
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::TunnelsSuccessRateHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
int rate = i2p::tunnel::tunnels.GetTunnelCreationSuccessRate ();
|
||||||
|
InsertParam (results, "i2p.router.net.tunnels.successrate", rate);
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::InboundBandwidth1S (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
double bw = i2p::transport::transports.GetInBandwidth ();
|
||||||
|
InsertParam (results, "i2p.router.net.bw.inbound.1s", bw);
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::OutboundBandwidth1S (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
double bw = i2p::transport::transports.GetOutBandwidth ();
|
||||||
|
InsertParam (results, "i2p.router.net.bw.outbound.1s", bw);
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::NetTotalReceivedBytes (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
InsertParam (results, "i2p.router.net.total.received.bytes", (double)i2p::transport::transports.GetTotalReceivedBytes ());
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::NetTotalSentBytes (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
InsertParam (results, "i2p.router.net.total.sent.bytes", (double)i2p::transport::transports.GetTotalSentBytes ());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// RouterManager
|
// RouterManager
|
||||||
|
|
||||||
|
|
@ -388,11 +476,10 @@ namespace client
|
||||||
{
|
{
|
||||||
for (auto it = params.begin (); it != params.end (); it++)
|
for (auto it = params.begin (); it != params.end (); it++)
|
||||||
{
|
{
|
||||||
|
if (it != params.begin ()) results << ",";
|
||||||
LogPrint (eLogDebug, "I2PControl: RouterManager request: ", it->first);
|
LogPrint (eLogDebug, "I2PControl: RouterManager request: ", it->first);
|
||||||
auto it1 = m_RouterManagerHandlers.find (it->first);
|
auto it1 = m_RouterManagerHandlers.find (it->first);
|
||||||
if (it1 != m_RouterManagerHandlers.end ())
|
if (it1 != m_RouterManagerHandlers.end ()) {
|
||||||
{
|
|
||||||
if (it != params.begin ()) results << ",";
|
|
||||||
(this->*(it1->second))(results);
|
(this->*(it1->second))(results);
|
||||||
} else
|
} else
|
||||||
LogPrint (eLogError, "I2PControl: RouterManager unknown request: ", it->first);
|
LogPrint (eLogError, "I2PControl: RouterManager unknown request: ", it->first);
|
||||||
|
|
@ -407,7 +494,7 @@ namespace client
|
||||||
m_ShutdownTimer.expires_from_now (boost::posix_time::seconds(1)); // 1 second to make sure response has been sent
|
m_ShutdownTimer.expires_from_now (boost::posix_time::seconds(1)); // 1 second to make sure response has been sent
|
||||||
m_ShutdownTimer.async_wait (
|
m_ShutdownTimer.async_wait (
|
||||||
[](const boost::system::error_code& ecode)
|
[](const boost::system::error_code& ecode)
|
||||||
{
|
{
|
||||||
Daemon.running = 0;
|
Daemon.running = 0;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -421,7 +508,7 @@ namespace client
|
||||||
m_ShutdownTimer.expires_from_now (boost::posix_time::seconds(timeout + 1)); // + 1 second
|
m_ShutdownTimer.expires_from_now (boost::posix_time::seconds(timeout + 1)); // + 1 second
|
||||||
m_ShutdownTimer.async_wait (
|
m_ShutdownTimer.async_wait (
|
||||||
[](const boost::system::error_code& ecode)
|
[](const boost::system::error_code& ecode)
|
||||||
{
|
{
|
||||||
Daemon.running = 0;
|
Daemon.running = 0;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -433,6 +520,37 @@ namespace client
|
||||||
i2p::data::netdb.Reseed ();
|
i2p::data::netdb.Reseed ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// network setting
|
||||||
|
void I2PControlService::NetworkSettingHandler (const boost::property_tree::ptree& params, std::ostringstream& results)
|
||||||
|
{
|
||||||
|
for (auto it = params.begin (); it != params.end (); it++)
|
||||||
|
{
|
||||||
|
LogPrint (eLogDebug, "I2PControl: NetworkSetting request: ", it->first);
|
||||||
|
auto it1 = m_NetworkSettingHandlers.find (it->first);
|
||||||
|
if (it1 != m_NetworkSettingHandlers.end ()) {
|
||||||
|
if (it != params.begin ()) results << ",";
|
||||||
|
(this->*(it1->second))(it->second.data (), results);
|
||||||
|
} else
|
||||||
|
LogPrint (eLogError, "I2PControl: NetworkSetting unknown request: ", it->first);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::InboundBandwidthLimit (const std::string& value, std::ostringstream& results)
|
||||||
|
{
|
||||||
|
if (value != "null")
|
||||||
|
i2p::context.SetBandwidth (std::atoi(value.c_str()));
|
||||||
|
int bw = i2p::context.GetBandwidthLimit();
|
||||||
|
InsertParam (results, "i2p.router.net.bw.in", bw);
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::OutboundBandwidthLimit (const std::string& value, std::ostringstream& results)
|
||||||
|
{
|
||||||
|
if (value != "null")
|
||||||
|
i2p::context.SetBandwidth (std::atoi(value.c_str()));
|
||||||
|
int bw = i2p::context.GetBandwidthLimit();
|
||||||
|
InsertParam (results, "i2p.router.net.bw.out", bw);
|
||||||
|
}
|
||||||
|
|
||||||
// certificate
|
// certificate
|
||||||
void I2PControlService::CreateCertificate (const char *crt_path, const char *key_path)
|
void I2PControlService::CreateCertificate (const char *crt_path, const char *key_path)
|
||||||
{
|
{
|
||||||
|
|
@ -455,15 +573,15 @@ namespace client
|
||||||
X509_NAME_add_entry_by_txt (name, "O", MBSTRING_ASC, (unsigned char *)I2P_CONTROL_CERTIFICATE_ORGANIZATION, -1, -1, 0); // organization
|
X509_NAME_add_entry_by_txt (name, "O", MBSTRING_ASC, (unsigned char *)I2P_CONTROL_CERTIFICATE_ORGANIZATION, -1, -1, 0); // organization
|
||||||
X509_NAME_add_entry_by_txt (name, "CN", MBSTRING_ASC, (unsigned char *)I2P_CONTROL_CERTIFICATE_COMMON_NAME, -1, -1, 0); // common name
|
X509_NAME_add_entry_by_txt (name, "CN", MBSTRING_ASC, (unsigned char *)I2P_CONTROL_CERTIFICATE_COMMON_NAME, -1, -1, 0); // common name
|
||||||
X509_set_issuer_name (x509, name); // set issuer to ourselves
|
X509_set_issuer_name (x509, name); // set issuer to ourselves
|
||||||
X509_sign (x509, pkey, EVP_sha1 ()); // sign, last param must be NULL for EdDSA
|
X509_sign (x509, pkey, EVP_sha1 ()); // sign
|
||||||
|
|
||||||
// save cert
|
// save cert
|
||||||
if ((f = fopen (crt_path, "wb")) != NULL) {
|
if ((f = fopen (crt_path, "wb")) != NULL) {
|
||||||
LogPrint (eLogInfo, "I2PControl: Saving new cert to ", crt_path);
|
LogPrint (eLogInfo, "I2PControl: saving new cert to ", crt_path);
|
||||||
PEM_write_X509 (f, x509);
|
PEM_write_X509 (f, x509);
|
||||||
fclose (f);
|
fclose (f);
|
||||||
} else {
|
} else {
|
||||||
LogPrint (eLogError, "I2PControl: Can't write cert: ", strerror(errno));
|
LogPrint (eLogError, "I2PControl: can't write cert: ", strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
// save key
|
// save key
|
||||||
|
|
@ -472,14 +590,187 @@ namespace client
|
||||||
PEM_write_PrivateKey (f, pkey, NULL, NULL, 0, NULL, NULL);
|
PEM_write_PrivateKey (f, pkey, NULL, NULL, 0, NULL, NULL);
|
||||||
fclose (f);
|
fclose (f);
|
||||||
} else {
|
} else {
|
||||||
LogPrint (eLogError, "I2PControl: Can't write key: ", strerror(errno));
|
LogPrint (eLogError, "I2PControl: can't write key: ", strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
X509_free (x509);
|
X509_free (x509);
|
||||||
} else {
|
} else {
|
||||||
LogPrint (eLogError, "I2PControl: Can't create RSA key for certificate");
|
LogPrint (eLogError, "I2PControl: can't create RSA key for certificate");
|
||||||
}
|
}
|
||||||
EVP_PKEY_free (pkey);
|
EVP_PKEY_free (pkey);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ClientServicesInfo
|
||||||
|
|
||||||
|
void I2PControlService::ClientServicesInfoHandler (const boost::property_tree::ptree& params, std::ostringstream& results)
|
||||||
|
{
|
||||||
|
for (auto it = params.begin (); it != params.end (); it++)
|
||||||
|
{
|
||||||
|
LogPrint (eLogDebug, "I2PControl: ClientServicesInfo request: ", it->first);
|
||||||
|
auto it1 = m_ClientServicesInfoHandlers.find (it->first);
|
||||||
|
if (it1 != m_ClientServicesInfoHandlers.end ())
|
||||||
|
{
|
||||||
|
if (it != params.begin ()) results << ",";
|
||||||
|
(this->*(it1->second))(results);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
LogPrint (eLogError, "I2PControl: ClientServicesInfo unknown request ", it->first);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::I2PTunnelInfoHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
boost::property_tree::ptree pt;
|
||||||
|
boost::property_tree::ptree client_tunnels, server_tunnels;
|
||||||
|
|
||||||
|
for (auto& it: i2p::client::context.GetClientTunnels ())
|
||||||
|
{
|
||||||
|
auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
|
||||||
|
boost::property_tree::ptree ct;
|
||||||
|
ct.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
||||||
|
client_tunnels.add_child(it.second->GetName (), ct);
|
||||||
|
}
|
||||||
|
|
||||||
|
auto& serverTunnels = i2p::client::context.GetServerTunnels ();
|
||||||
|
if (!serverTunnels.empty ()) {
|
||||||
|
for (auto& it: serverTunnels)
|
||||||
|
{
|
||||||
|
auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
|
||||||
|
boost::property_tree::ptree st;
|
||||||
|
st.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
||||||
|
st.put("port", it.second->GetLocalPort ());
|
||||||
|
server_tunnels.add_child(it.second->GetName (), st);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
auto& clientForwards = i2p::client::context.GetClientForwards ();
|
||||||
|
if (!clientForwards.empty ())
|
||||||
|
{
|
||||||
|
for (auto& it: clientForwards)
|
||||||
|
{
|
||||||
|
auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
|
||||||
|
boost::property_tree::ptree ct;
|
||||||
|
ct.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
||||||
|
client_tunnels.add_child(it.second->GetName (), ct);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
auto& serverForwards = i2p::client::context.GetServerForwards ();
|
||||||
|
if (!serverForwards.empty ())
|
||||||
|
{
|
||||||
|
for (auto& it: serverForwards)
|
||||||
|
{
|
||||||
|
auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
|
||||||
|
boost::property_tree::ptree st;
|
||||||
|
st.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
||||||
|
server_tunnels.add_child(it.second->GetName (), st);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pt.add_child("client", client_tunnels);
|
||||||
|
pt.add_child("server", server_tunnels);
|
||||||
|
|
||||||
|
InsertParam (results, "I2PTunnel", pt);
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::HTTPProxyInfoHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
boost::property_tree::ptree pt;
|
||||||
|
|
||||||
|
auto httpProxy = i2p::client::context.GetHttpProxy ();
|
||||||
|
if (httpProxy)
|
||||||
|
{
|
||||||
|
auto& ident = httpProxy->GetLocalDestination ()->GetIdentHash();
|
||||||
|
pt.put("enabled", true);
|
||||||
|
pt.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
pt.put("enabled", false);
|
||||||
|
|
||||||
|
InsertParam (results, "HTTPProxy", pt);
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::SOCKSInfoHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
boost::property_tree::ptree pt;
|
||||||
|
|
||||||
|
auto socksProxy = i2p::client::context.GetSocksProxy ();
|
||||||
|
if (socksProxy)
|
||||||
|
{
|
||||||
|
auto& ident = socksProxy->GetLocalDestination ()->GetIdentHash();
|
||||||
|
pt.put("enabled", true);
|
||||||
|
pt.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
pt.put("enabled", false);
|
||||||
|
|
||||||
|
InsertParam (results, "SOCKS", pt);
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::SAMInfoHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
boost::property_tree::ptree pt;
|
||||||
|
auto sam = i2p::client::context.GetSAMBridge ();
|
||||||
|
if (sam)
|
||||||
|
{
|
||||||
|
pt.put("enabled", true);
|
||||||
|
boost::property_tree::ptree sam_sessions;
|
||||||
|
for (auto& it: sam->GetSessions ())
|
||||||
|
{
|
||||||
|
boost::property_tree::ptree sam_session, sam_session_sockets;
|
||||||
|
auto& name = it.second->GetLocalDestination ()->GetNickname ();
|
||||||
|
auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
|
||||||
|
sam_session.put("name", name);
|
||||||
|
sam_session.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
||||||
|
|
||||||
|
for (const auto& socket: sam->ListSockets(it.first))
|
||||||
|
{
|
||||||
|
boost::property_tree::ptree stream;
|
||||||
|
stream.put("type", socket->GetSocketType ());
|
||||||
|
stream.put("peer", socket->GetSocket ().remote_endpoint());
|
||||||
|
|
||||||
|
sam_session_sockets.push_back(std::make_pair("", stream));
|
||||||
|
}
|
||||||
|
sam_session.add_child("sockets", sam_session_sockets);
|
||||||
|
sam_sessions.add_child(it.first, sam_session);
|
||||||
|
}
|
||||||
|
|
||||||
|
pt.add_child("sessions", sam_sessions);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
pt.put("enabled", false);
|
||||||
|
|
||||||
|
InsertParam (results, "SAM", pt);
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::BOBInfoHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
boost::property_tree::ptree pt;
|
||||||
|
auto bob = i2p::client::context.GetBOBCommandChannel ();
|
||||||
|
if (bob)
|
||||||
|
{
|
||||||
|
/* TODO more info */
|
||||||
|
pt.put("enabled", true);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
pt.put("enabled", false);
|
||||||
|
|
||||||
|
InsertParam (results, "BOB", pt);
|
||||||
|
}
|
||||||
|
|
||||||
|
void I2PControlService::I2CPInfoHandler (std::ostringstream& results)
|
||||||
|
{
|
||||||
|
boost::property_tree::ptree pt;
|
||||||
|
auto i2cp = i2p::client::context.GetI2CPServer ();
|
||||||
|
if (i2cp)
|
||||||
|
{
|
||||||
|
/* TODO more info */
|
||||||
|
pt.put("enabled", true);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
pt.put("enabled", false);
|
||||||
|
|
||||||
|
InsertParam (results, "I2CP", pt);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013-2025, The PurpleI2P Project
|
* Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
*
|
*
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
* This file is part of Purple i2pd project and licensed under BSD3
|
||||||
*
|
*
|
||||||
|
|
@ -20,7 +20,6 @@
|
||||||
#include <boost/asio.hpp>
|
#include <boost/asio.hpp>
|
||||||
#include <boost/asio/ssl.hpp>
|
#include <boost/asio/ssl.hpp>
|
||||||
#include <boost/property_tree/ptree.hpp>
|
#include <boost/property_tree/ptree.hpp>
|
||||||
#include "I2PControlHandlers.h"
|
|
||||||
|
|
||||||
namespace i2p
|
namespace i2p
|
||||||
{
|
{
|
||||||
|
|
@ -33,8 +32,10 @@ namespace client
|
||||||
const char I2P_CONTROL_CERTIFICATE_COMMON_NAME[] = "i2pd.i2pcontrol";
|
const char I2P_CONTROL_CERTIFICATE_COMMON_NAME[] = "i2pd.i2pcontrol";
|
||||||
const char I2P_CONTROL_CERTIFICATE_ORGANIZATION[] = "Purple I2P";
|
const char I2P_CONTROL_CERTIFICATE_ORGANIZATION[] = "Purple I2P";
|
||||||
|
|
||||||
class I2PControlService: public I2PControlHandlers
|
class I2PControlService
|
||||||
{
|
{
|
||||||
|
typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> ssl_socket;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
I2PControlService (const std::string& address, int port);
|
I2PControlService (const std::string& address, int port);
|
||||||
|
|
@ -47,59 +48,94 @@ namespace client
|
||||||
|
|
||||||
void Run ();
|
void Run ();
|
||||||
void Accept ();
|
void Accept ();
|
||||||
template<typename ssl_socket>
|
void HandleAccept(const boost::system::error_code& ecode, std::shared_ptr<ssl_socket> socket);
|
||||||
void HandleAccepted (const boost::system::error_code& ecode, std::shared_ptr<ssl_socket> newSocket);
|
|
||||||
template<typename ssl_socket>
|
|
||||||
void Handshake (std::shared_ptr<ssl_socket> socket);
|
void Handshake (std::shared_ptr<ssl_socket> socket);
|
||||||
template<typename ssl_socket>
|
void HandleHandshake (const boost::system::error_code& ecode, std::shared_ptr<ssl_socket> socket);
|
||||||
void ReadRequest (std::shared_ptr<ssl_socket> socket);
|
void ReadRequest (std::shared_ptr<ssl_socket> socket);
|
||||||
template<typename ssl_socket>
|
|
||||||
void HandleRequestReceived (const boost::system::error_code& ecode, size_t bytes_transferred,
|
void HandleRequestReceived (const boost::system::error_code& ecode, size_t bytes_transferred,
|
||||||
std::shared_ptr<ssl_socket> socket, std::shared_ptr<I2PControlBuffer> buf);
|
std::shared_ptr<ssl_socket> socket, std::shared_ptr<I2PControlBuffer> buf);
|
||||||
template<typename ssl_socket>
|
|
||||||
void SendResponse (std::shared_ptr<ssl_socket> socket,
|
void SendResponse (std::shared_ptr<ssl_socket> socket,
|
||||||
std::shared_ptr<I2PControlBuffer> buf, std::ostringstream& response, bool isHtml);
|
std::shared_ptr<I2PControlBuffer> buf, std::ostringstream& response, bool isHtml);
|
||||||
|
void HandleResponseSent (const boost::system::error_code& ecode, std::size_t bytes_transferred,
|
||||||
|
std::shared_ptr<ssl_socket> socket, std::shared_ptr<I2PControlBuffer> buf);
|
||||||
|
|
||||||
void CreateCertificate (const char *crt_path, const char *key_path);
|
void CreateCertificate (const char *crt_path, const char *key_path);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
void InsertParam (std::ostringstream& ss, const std::string& name, int value) const;
|
||||||
|
void InsertParam (std::ostringstream& ss, const std::string& name, double value) const;
|
||||||
|
void InsertParam (std::ostringstream& ss, const std::string& name, const std::string& value) const;
|
||||||
|
void InsertParam (std::ostringstream& ss, const std::string& name, const boost::property_tree::ptree& value) const;
|
||||||
|
|
||||||
// methods
|
// methods
|
||||||
typedef void (I2PControlService::*MethodHandler)(const boost::property_tree::ptree& params, std::ostringstream& results);
|
typedef void (I2PControlService::*MethodHandler)(const boost::property_tree::ptree& params, std::ostringstream& results);
|
||||||
|
|
||||||
void AuthenticateHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
void AuthenticateHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
||||||
void EchoHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
void EchoHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
||||||
void I2PControlHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
void I2PControlHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
||||||
|
void RouterInfoHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
||||||
void RouterManagerHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
void RouterManagerHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
||||||
|
void NetworkSettingHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
||||||
|
void ClientServicesInfoHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
||||||
|
|
||||||
// I2PControl
|
// I2PControl
|
||||||
typedef void (I2PControlService::*I2PControlRequestHandler)(const std::string& value);
|
typedef void (I2PControlService::*I2PControlRequestHandler)(const std::string& value);
|
||||||
void PasswordHandler (const std::string& value);
|
void PasswordHandler (const std::string& value);
|
||||||
|
|
||||||
|
// RouterInfo
|
||||||
|
typedef void (I2PControlService::*RouterInfoRequestHandler)(std::ostringstream& results);
|
||||||
|
void UptimeHandler (std::ostringstream& results);
|
||||||
|
void VersionHandler (std::ostringstream& results);
|
||||||
|
void StatusHandler (std::ostringstream& results);
|
||||||
|
void NetDbKnownPeersHandler (std::ostringstream& results);
|
||||||
|
void NetDbActivePeersHandler (std::ostringstream& results);
|
||||||
|
void NetStatusHandler (std::ostringstream& results);
|
||||||
|
void TunnelsParticipatingHandler (std::ostringstream& results);
|
||||||
|
void TunnelsSuccessRateHandler (std::ostringstream& results);
|
||||||
|
void InboundBandwidth1S (std::ostringstream& results);
|
||||||
|
void OutboundBandwidth1S (std::ostringstream& results);
|
||||||
|
void NetTotalReceivedBytes (std::ostringstream& results);
|
||||||
|
void NetTotalSentBytes (std::ostringstream& results);
|
||||||
|
|
||||||
// RouterManager
|
// RouterManager
|
||||||
typedef void (I2PControlService::*RouterManagerRequestHandler)(std::ostringstream& results);
|
typedef void (I2PControlService::*RouterManagerRequestHandler)(std::ostringstream& results);
|
||||||
void ShutdownHandler (std::ostringstream& results);
|
void ShutdownHandler (std::ostringstream& results);
|
||||||
void ShutdownGracefulHandler (std::ostringstream& results);
|
void ShutdownGracefulHandler (std::ostringstream& results);
|
||||||
void ReseedHandler (std::ostringstream& results);
|
void ReseedHandler (std::ostringstream& results);
|
||||||
|
|
||||||
|
// NetworkSetting
|
||||||
|
typedef void (I2PControlService::*NetworkSettingRequestHandler)(const std::string& value, std::ostringstream& results);
|
||||||
|
void InboundBandwidthLimit (const std::string& value, std::ostringstream& results);
|
||||||
|
void OutboundBandwidthLimit (const std::string& value, std::ostringstream& results);
|
||||||
|
|
||||||
|
// ClientServicesInfo
|
||||||
|
typedef void (I2PControlService::*ClientServicesInfoRequestHandler)(std::ostringstream& results);
|
||||||
|
void I2PTunnelInfoHandler (std::ostringstream& results);
|
||||||
|
void HTTPProxyInfoHandler (std::ostringstream& results);
|
||||||
|
void SOCKSInfoHandler (std::ostringstream& results);
|
||||||
|
void SAMInfoHandler (std::ostringstream& results);
|
||||||
|
void BOBInfoHandler (std::ostringstream& results);
|
||||||
|
void I2CPInfoHandler (std::ostringstream& results);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
std::string m_Password;
|
std::string m_Password;
|
||||||
bool m_IsRunning;
|
bool m_IsRunning;
|
||||||
std::unique_ptr<std::thread> m_Thread;
|
std::thread * m_Thread;
|
||||||
|
|
||||||
boost::asio::io_context m_Service;
|
boost::asio::io_service m_Service;
|
||||||
std::unique_ptr<boost::asio::ip::tcp::acceptor> m_Acceptor;
|
boost::asio::ip::tcp::acceptor m_Acceptor;
|
||||||
#if defined(BOOST_ASIO_HAS_LOCAL_SOCKETS)
|
|
||||||
std::unique_ptr<boost::asio::local::stream_protocol::acceptor> m_LocalAcceptor;
|
|
||||||
#endif
|
|
||||||
boost::asio::ssl::context m_SSLContext;
|
boost::asio::ssl::context m_SSLContext;
|
||||||
boost::asio::deadline_timer m_ShutdownTimer;
|
boost::asio::deadline_timer m_ShutdownTimer;
|
||||||
std::set<std::string> m_Tokens;
|
std::set<std::string> m_Tokens;
|
||||||
|
|
||||||
std::map<std::string, MethodHandler> m_MethodHandlers;
|
std::map<std::string, MethodHandler> m_MethodHandlers;
|
||||||
std::map<std::string, I2PControlRequestHandler> m_I2PControlHandlers;
|
std::map<std::string, I2PControlRequestHandler> m_I2PControlHandlers;
|
||||||
|
std::map<std::string, RouterInfoRequestHandler> m_RouterInfoHandlers;
|
||||||
std::map<std::string, RouterManagerRequestHandler> m_RouterManagerHandlers;
|
std::map<std::string, RouterManagerRequestHandler> m_RouterManagerHandlers;
|
||||||
|
std::map<std::string, NetworkSettingRequestHandler> m_NetworkSettingHandlers;
|
||||||
|
std::map<std::string, ClientServicesInfoRequestHandler> m_ClientServicesInfoHandlers;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,390 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2013-2022, The PurpleI2P Project
|
|
||||||
*
|
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
|
||||||
*
|
|
||||||
* See full license text in LICENSE file at top of project tree
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <iomanip>
|
|
||||||
#define BOOST_BIND_GLOBAL_PLACEHOLDERS
|
|
||||||
#include <boost/lexical_cast.hpp>
|
|
||||||
#include <boost/property_tree/json_parser.hpp>
|
|
||||||
|
|
||||||
#include "Log.h"
|
|
||||||
#include "RouterContext.h"
|
|
||||||
#include "NetDb.hpp"
|
|
||||||
#include "Tunnel.h"
|
|
||||||
#include "Transports.h"
|
|
||||||
#include "version.h"
|
|
||||||
#include "ClientContext.h"
|
|
||||||
#include "I2PControlHandlers.h"
|
|
||||||
|
|
||||||
namespace i2p
|
|
||||||
{
|
|
||||||
namespace client
|
|
||||||
{
|
|
||||||
I2PControlHandlers::I2PControlHandlers ()
|
|
||||||
{
|
|
||||||
// RouterInfo
|
|
||||||
m_RouterInfoHandlers["i2p.router.uptime"] = &I2PControlHandlers::UptimeHandler;
|
|
||||||
m_RouterInfoHandlers["i2p.router.version"] = &I2PControlHandlers::VersionHandler;
|
|
||||||
m_RouterInfoHandlers["i2p.router.status"] = &I2PControlHandlers::StatusHandler;
|
|
||||||
m_RouterInfoHandlers["i2p.router.netdb.knownpeers"] = &I2PControlHandlers::NetDbKnownPeersHandler;
|
|
||||||
m_RouterInfoHandlers["i2p.router.netdb.activepeers"] = &I2PControlHandlers::NetDbActivePeersHandler;
|
|
||||||
m_RouterInfoHandlers["i2p.router.net.bw.inbound.1s"] = &I2PControlHandlers::InboundBandwidth1S;
|
|
||||||
m_RouterInfoHandlers["i2p.router.net.bw.inbound.15s"] = &I2PControlHandlers::InboundBandwidth15S;
|
|
||||||
m_RouterInfoHandlers["i2p.router.net.bw.outbound.1s"] = &I2PControlHandlers::OutboundBandwidth1S;
|
|
||||||
m_RouterInfoHandlers["i2p.router.net.bw.outbound.15s"] = &I2PControlHandlers::OutboundBandwidth15S;
|
|
||||||
m_RouterInfoHandlers["i2p.router.net.status"] = &I2PControlHandlers::NetStatusHandler;
|
|
||||||
m_RouterInfoHandlers["i2p.router.net.tunnels.participating"] = &I2PControlHandlers::TunnelsParticipatingHandler;
|
|
||||||
m_RouterInfoHandlers["i2p.router.net.tunnels.successrate"] = &I2PControlHandlers::TunnelsSuccessRateHandler;
|
|
||||||
m_RouterInfoHandlers["i2p.router.net.total.received.bytes"] = &I2PControlHandlers::NetTotalReceivedBytes;
|
|
||||||
m_RouterInfoHandlers["i2p.router.net.total.sent.bytes"] = &I2PControlHandlers::NetTotalSentBytes;
|
|
||||||
|
|
||||||
// NetworkSetting
|
|
||||||
m_NetworkSettingHandlers["i2p.router.net.bw.in"] = &I2PControlHandlers::InboundBandwidthLimit;
|
|
||||||
m_NetworkSettingHandlers["i2p.router.net.bw.out"] = &I2PControlHandlers::OutboundBandwidthLimit;
|
|
||||||
|
|
||||||
// ClientServicesInfo
|
|
||||||
m_ClientServicesInfoHandlers["I2PTunnel"] = &I2PControlHandlers::I2PTunnelInfoHandler;
|
|
||||||
m_ClientServicesInfoHandlers["HTTPProxy"] = &I2PControlHandlers::HTTPProxyInfoHandler;
|
|
||||||
m_ClientServicesInfoHandlers["SOCKS"] = &I2PControlHandlers::SOCKSInfoHandler;
|
|
||||||
m_ClientServicesInfoHandlers["SAM"] = &I2PControlHandlers::SAMInfoHandler;
|
|
||||||
m_ClientServicesInfoHandlers["BOB"] = &I2PControlHandlers::BOBInfoHandler;
|
|
||||||
m_ClientServicesInfoHandlers["I2CP"] = &I2PControlHandlers::I2CPInfoHandler;
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::InsertParam (std::ostringstream& ss, const std::string& name, int value) const
|
|
||||||
{
|
|
||||||
ss << "\"" << name << "\":" << value;
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::InsertParam (std::ostringstream& ss, const std::string& name, const std::string& value, bool quotes) const
|
|
||||||
{
|
|
||||||
ss << "\"" << name << "\":";
|
|
||||||
if (value.length () > 0)
|
|
||||||
{
|
|
||||||
if (quotes)
|
|
||||||
ss << "\"" << value << "\"";
|
|
||||||
else
|
|
||||||
ss << value;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
ss << "null";
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::InsertParam (std::ostringstream& ss, const std::string& name, double value) const
|
|
||||||
{
|
|
||||||
ss << "\"" << name << "\":" << std::fixed << std::setprecision(2) << value;
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::InsertParam (std::ostringstream& ss, const std::string& name, const boost::property_tree::ptree& value) const
|
|
||||||
{
|
|
||||||
std::ostringstream buf;
|
|
||||||
boost::property_tree::write_json (buf, value, false);
|
|
||||||
ss << "\"" << name << "\":" << buf.str();
|
|
||||||
}
|
|
||||||
|
|
||||||
// RouterInfo
|
|
||||||
|
|
||||||
void I2PControlHandlers::RouterInfoHandler (const boost::property_tree::ptree& params, std::ostringstream& results)
|
|
||||||
{
|
|
||||||
bool first = true;
|
|
||||||
for (auto it = params.begin (); it != params.end (); it++)
|
|
||||||
{
|
|
||||||
LogPrint (eLogDebug, "I2PControl: RouterInfo request: ", it->first);
|
|
||||||
auto it1 = m_RouterInfoHandlers.find (it->first);
|
|
||||||
if (it1 != m_RouterInfoHandlers.end ())
|
|
||||||
{
|
|
||||||
if (!first) results << ",";
|
|
||||||
else first = false;
|
|
||||||
(this->*(it1->second))(results);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
LogPrint (eLogError, "I2PControl: RouterInfo unknown request ", it->first);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::UptimeHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
InsertParam (results, "i2p.router.uptime", std::to_string (i2p::context.GetUptime ()*1000LL), false);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::VersionHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
InsertParam (results, "i2p.router.version", VERSION);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::StatusHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
auto dest = i2p::client::context.GetSharedLocalDestination ();
|
|
||||||
InsertParam (results, "i2p.router.status", (dest && dest->IsReady ()) ? "1" : "0");
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::NetDbKnownPeersHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
InsertParam (results, "i2p.router.netdb.knownpeers", i2p::data::netdb.GetNumRouters ());
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::NetDbActivePeersHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
InsertParam (results, "i2p.router.netdb.activepeers", (int)i2p::transport::transports.GetPeers ().size ());
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::NetStatusHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
InsertParam (results, "i2p.router.net.status", (int)i2p::context.GetStatus ());
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::TunnelsParticipatingHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
int transit = i2p::tunnel::tunnels.GetTransitTunnels ().size ();
|
|
||||||
InsertParam (results, "i2p.router.net.tunnels.participating", transit);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::TunnelsSuccessRateHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
int rate = i2p::tunnel::tunnels.GetTunnelCreationSuccessRate ();
|
|
||||||
InsertParam (results, "i2p.router.net.tunnels.successrate", rate);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::InboundBandwidth1S (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
double bw = i2p::transport::transports.GetInBandwidth ();
|
|
||||||
InsertParam (results, "i2p.router.net.bw.inbound.1s", bw);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::InboundBandwidth15S (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
double bw = i2p::transport::transports.GetInBandwidth15s ();
|
|
||||||
InsertParam (results, "i2p.router.net.bw.inbound.15s", bw);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::OutboundBandwidth1S (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
double bw = i2p::transport::transports.GetOutBandwidth ();
|
|
||||||
InsertParam (results, "i2p.router.net.bw.outbound.1s", bw);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::OutboundBandwidth15S (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
double bw = i2p::transport::transports.GetOutBandwidth15s ();
|
|
||||||
InsertParam (results, "i2p.router.net.bw.outbound.15s", bw);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::NetTotalReceivedBytes (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
InsertParam (results, "i2p.router.net.total.received.bytes", (double)i2p::transport::transports.GetTotalReceivedBytes ());
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::NetTotalSentBytes (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
InsertParam (results, "i2p.router.net.total.sent.bytes", (double)i2p::transport::transports.GetTotalSentBytes ());
|
|
||||||
}
|
|
||||||
|
|
||||||
// network setting
|
|
||||||
void I2PControlHandlers::NetworkSettingHandler (const boost::property_tree::ptree& params, std::ostringstream& results)
|
|
||||||
{
|
|
||||||
for (auto it = params.begin (); it != params.end (); it++)
|
|
||||||
{
|
|
||||||
LogPrint (eLogDebug, "I2PControl: NetworkSetting request: ", it->first);
|
|
||||||
auto it1 = m_NetworkSettingHandlers.find (it->first);
|
|
||||||
if (it1 != m_NetworkSettingHandlers.end ()) {
|
|
||||||
if (it != params.begin ()) results << ",";
|
|
||||||
(this->*(it1->second))(it->second.data (), results);
|
|
||||||
} else
|
|
||||||
LogPrint (eLogError, "I2PControl: NetworkSetting unknown request: ", it->first);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::InboundBandwidthLimit (const std::string& value, std::ostringstream& results)
|
|
||||||
{
|
|
||||||
if (value != "null")
|
|
||||||
i2p::context.SetBandwidth (std::atoi(value.c_str()));
|
|
||||||
int bw = i2p::context.GetBandwidthLimit();
|
|
||||||
InsertParam (results, "i2p.router.net.bw.in", bw);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::OutboundBandwidthLimit (const std::string& value, std::ostringstream& results)
|
|
||||||
{
|
|
||||||
if (value != "null")
|
|
||||||
i2p::context.SetBandwidth (std::atoi(value.c_str()));
|
|
||||||
int bw = i2p::context.GetBandwidthLimit();
|
|
||||||
InsertParam (results, "i2p.router.net.bw.out", bw);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ClientServicesInfo
|
|
||||||
|
|
||||||
void I2PControlHandlers::ClientServicesInfoHandler (const boost::property_tree::ptree& params, std::ostringstream& results)
|
|
||||||
{
|
|
||||||
for (auto it = params.begin (); it != params.end (); it++)
|
|
||||||
{
|
|
||||||
LogPrint (eLogDebug, "I2PControl: ClientServicesInfo request: ", it->first);
|
|
||||||
auto it1 = m_ClientServicesInfoHandlers.find (it->first);
|
|
||||||
if (it1 != m_ClientServicesInfoHandlers.end ())
|
|
||||||
{
|
|
||||||
if (it != params.begin ()) results << ",";
|
|
||||||
(this->*(it1->second))(results);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
LogPrint (eLogError, "I2PControl: ClientServicesInfo unknown request ", it->first);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::I2PTunnelInfoHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
boost::property_tree::ptree pt;
|
|
||||||
boost::property_tree::ptree client_tunnels, server_tunnels;
|
|
||||||
|
|
||||||
for (auto& it: i2p::client::context.GetClientTunnels ())
|
|
||||||
{
|
|
||||||
auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
|
|
||||||
boost::property_tree::ptree ct;
|
|
||||||
ct.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
|
||||||
client_tunnels.add_child(it.second->GetName (), ct);
|
|
||||||
}
|
|
||||||
|
|
||||||
auto& serverTunnels = i2p::client::context.GetServerTunnels ();
|
|
||||||
if (!serverTunnels.empty ()) {
|
|
||||||
for (auto& it: serverTunnels)
|
|
||||||
{
|
|
||||||
auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
|
|
||||||
boost::property_tree::ptree st;
|
|
||||||
st.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
|
||||||
st.put("port", it.second->GetLocalPort ());
|
|
||||||
server_tunnels.add_child(it.second->GetName (), st);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
auto& clientForwards = i2p::client::context.GetClientForwards ();
|
|
||||||
if (!clientForwards.empty ())
|
|
||||||
{
|
|
||||||
for (auto& it: clientForwards)
|
|
||||||
{
|
|
||||||
auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
|
|
||||||
boost::property_tree::ptree ct;
|
|
||||||
ct.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
|
||||||
client_tunnels.add_child(it.second->GetName (), ct);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
auto& serverForwards = i2p::client::context.GetServerForwards ();
|
|
||||||
if (!serverForwards.empty ())
|
|
||||||
{
|
|
||||||
for (auto& it: serverForwards)
|
|
||||||
{
|
|
||||||
auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
|
|
||||||
boost::property_tree::ptree st;
|
|
||||||
st.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
|
||||||
server_tunnels.add_child(it.second->GetName (), st);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pt.add_child("client", client_tunnels);
|
|
||||||
pt.add_child("server", server_tunnels);
|
|
||||||
|
|
||||||
InsertParam (results, "I2PTunnel", pt);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::HTTPProxyInfoHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
boost::property_tree::ptree pt;
|
|
||||||
|
|
||||||
auto httpProxy = i2p::client::context.GetHttpProxy ();
|
|
||||||
if (httpProxy)
|
|
||||||
{
|
|
||||||
auto& ident = httpProxy->GetLocalDestination ()->GetIdentHash();
|
|
||||||
pt.put("enabled", true);
|
|
||||||
pt.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
pt.put("enabled", false);
|
|
||||||
|
|
||||||
InsertParam (results, "HTTPProxy", pt);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::SOCKSInfoHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
boost::property_tree::ptree pt;
|
|
||||||
|
|
||||||
auto socksProxy = i2p::client::context.GetSocksProxy ();
|
|
||||||
if (socksProxy)
|
|
||||||
{
|
|
||||||
auto& ident = socksProxy->GetLocalDestination ()->GetIdentHash();
|
|
||||||
pt.put("enabled", true);
|
|
||||||
pt.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
pt.put("enabled", false);
|
|
||||||
|
|
||||||
InsertParam (results, "SOCKS", pt);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::SAMInfoHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
boost::property_tree::ptree pt;
|
|
||||||
auto sam = i2p::client::context.GetSAMBridge ();
|
|
||||||
if (sam)
|
|
||||||
{
|
|
||||||
pt.put("enabled", true);
|
|
||||||
boost::property_tree::ptree sam_sessions;
|
|
||||||
for (auto& it: sam->GetSessions ())
|
|
||||||
{
|
|
||||||
boost::property_tree::ptree sam_session, sam_session_sockets;
|
|
||||||
auto& name = it.second->GetLocalDestination ()->GetNickname ();
|
|
||||||
auto& ident = it.second->GetLocalDestination ()->GetIdentHash();
|
|
||||||
sam_session.put("name", name);
|
|
||||||
sam_session.put("address", i2p::client::context.GetAddressBook ().ToAddress(ident));
|
|
||||||
|
|
||||||
for (const auto& socket: sam->ListSockets(it.first))
|
|
||||||
{
|
|
||||||
boost::property_tree::ptree stream;
|
|
||||||
stream.put("type", socket->GetSocketType ());
|
|
||||||
stream.put("peer", socket->GetSocket ().remote_endpoint());
|
|
||||||
|
|
||||||
sam_session_sockets.push_back(std::make_pair("", stream));
|
|
||||||
}
|
|
||||||
sam_session.add_child("sockets", sam_session_sockets);
|
|
||||||
sam_sessions.add_child(it.first, sam_session);
|
|
||||||
}
|
|
||||||
|
|
||||||
pt.add_child("sessions", sam_sessions);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
pt.put("enabled", false);
|
|
||||||
|
|
||||||
InsertParam (results, "SAM", pt);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::BOBInfoHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
boost::property_tree::ptree pt;
|
|
||||||
auto bob = i2p::client::context.GetBOBCommandChannel ();
|
|
||||||
if (bob)
|
|
||||||
{
|
|
||||||
/* TODO more info */
|
|
||||||
pt.put("enabled", true);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
pt.put("enabled", false);
|
|
||||||
|
|
||||||
InsertParam (results, "BOB", pt);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I2PControlHandlers::I2CPInfoHandler (std::ostringstream& results)
|
|
||||||
{
|
|
||||||
boost::property_tree::ptree pt;
|
|
||||||
auto i2cp = i2p::client::context.GetI2CPServer ();
|
|
||||||
if (i2cp)
|
|
||||||
{
|
|
||||||
/* TODO more info */
|
|
||||||
pt.put("enabled", true);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
pt.put("enabled", false);
|
|
||||||
|
|
||||||
InsertParam (results, "I2CP", pt);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,82 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2013-2022, The PurpleI2P Project
|
|
||||||
*
|
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
|
||||||
*
|
|
||||||
* See full license text in LICENSE file at top of project tree
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef I2P_CONTROL_HANDLERS_H__
|
|
||||||
#define I2P_CONTROL_HANDLERS_H__
|
|
||||||
|
|
||||||
#include <sstream>
|
|
||||||
#include <map>
|
|
||||||
#include <string>
|
|
||||||
#include <boost/property_tree/ptree.hpp>
|
|
||||||
|
|
||||||
namespace i2p
|
|
||||||
{
|
|
||||||
namespace client
|
|
||||||
{
|
|
||||||
class I2PControlHandlers
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
|
|
||||||
I2PControlHandlers ();
|
|
||||||
|
|
||||||
// methods
|
|
||||||
// TODO: make protected
|
|
||||||
void RouterInfoHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
|
||||||
void NetworkSettingHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
|
||||||
void ClientServicesInfoHandler (const boost::property_tree::ptree& params, std::ostringstream& results);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
|
|
||||||
void InsertParam (std::ostringstream& ss, const std::string& name, int value) const;
|
|
||||||
void InsertParam (std::ostringstream& ss, const std::string& name, double value) const;
|
|
||||||
void InsertParam (std::ostringstream& ss, const std::string& name, const std::string& value, bool quotes = true) const;
|
|
||||||
void InsertParam (std::ostringstream& ss, const std::string& name, const boost::property_tree::ptree& value) const;
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
// RouterInfo
|
|
||||||
typedef void (I2PControlHandlers::*RouterInfoRequestHandler)(std::ostringstream& results);
|
|
||||||
void UptimeHandler (std::ostringstream& results);
|
|
||||||
void VersionHandler (std::ostringstream& results);
|
|
||||||
void StatusHandler (std::ostringstream& results);
|
|
||||||
void NetDbKnownPeersHandler (std::ostringstream& results);
|
|
||||||
void NetDbActivePeersHandler (std::ostringstream& results);
|
|
||||||
void NetStatusHandler (std::ostringstream& results);
|
|
||||||
void TunnelsParticipatingHandler (std::ostringstream& results);
|
|
||||||
void TunnelsSuccessRateHandler (std::ostringstream& results);
|
|
||||||
void InboundBandwidth1S (std::ostringstream& results);
|
|
||||||
void InboundBandwidth15S (std::ostringstream& results);
|
|
||||||
void OutboundBandwidth1S (std::ostringstream& results);
|
|
||||||
void OutboundBandwidth15S (std::ostringstream& results);
|
|
||||||
void NetTotalReceivedBytes (std::ostringstream& results);
|
|
||||||
void NetTotalSentBytes (std::ostringstream& results);
|
|
||||||
|
|
||||||
// NetworkSetting
|
|
||||||
typedef void (I2PControlHandlers::*NetworkSettingRequestHandler)(const std::string& value, std::ostringstream& results);
|
|
||||||
void InboundBandwidthLimit (const std::string& value, std::ostringstream& results);
|
|
||||||
void OutboundBandwidthLimit (const std::string& value, std::ostringstream& results);
|
|
||||||
|
|
||||||
// ClientServicesInfo
|
|
||||||
typedef void (I2PControlHandlers::*ClientServicesInfoRequestHandler)(std::ostringstream& results);
|
|
||||||
void I2PTunnelInfoHandler (std::ostringstream& results);
|
|
||||||
void HTTPProxyInfoHandler (std::ostringstream& results);
|
|
||||||
void SOCKSInfoHandler (std::ostringstream& results);
|
|
||||||
void SAMInfoHandler (std::ostringstream& results);
|
|
||||||
void BOBInfoHandler (std::ostringstream& results);
|
|
||||||
void I2CPInfoHandler (std::ostringstream& results);
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
std::map<std::string, RouterInfoRequestHandler> m_RouterInfoHandlers;
|
|
||||||
std::map<std::string, NetworkSettingRequestHandler> m_NetworkSettingHandlers;
|
|
||||||
std::map<std::string, ClientServicesInfoRequestHandler> m_ClientServicesInfoHandlers;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,15 +1,10 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2013-2024, The PurpleI2P Project
|
|
||||||
*
|
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
|
||||||
*
|
|
||||||
* See full license text in LICENSE file at top of project tree
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef USE_UPNP
|
#ifdef USE_UPNP
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
|
#include <boost/thread/thread.hpp>
|
||||||
|
#include <boost/asio.hpp>
|
||||||
|
|
||||||
#include "Log.h"
|
#include "Log.h"
|
||||||
|
|
||||||
#include "RouterContext.h"
|
#include "RouterContext.h"
|
||||||
|
|
@ -34,7 +29,7 @@ namespace transport
|
||||||
{
|
{
|
||||||
if (m_IsRunning)
|
if (m_IsRunning)
|
||||||
{
|
{
|
||||||
LogPrint(eLogInfo, "UPnP: Stopping");
|
LogPrint(eLogInfo, "UPnP: stopping");
|
||||||
m_IsRunning = false;
|
m_IsRunning = false;
|
||||||
m_Timer.cancel ();
|
m_Timer.cancel ();
|
||||||
m_Service.stop ();
|
m_Service.stop ();
|
||||||
|
|
@ -51,8 +46,8 @@ namespace transport
|
||||||
void UPnP::Start()
|
void UPnP::Start()
|
||||||
{
|
{
|
||||||
m_IsRunning = true;
|
m_IsRunning = true;
|
||||||
LogPrint(eLogInfo, "UPnP: Starting");
|
LogPrint(eLogInfo, "UPnP: starting");
|
||||||
boost::asio::post (m_Service, std::bind (&UPnP::Discover, this));
|
m_Service.post (std::bind (&UPnP::Discover, this));
|
||||||
std::unique_lock<std::mutex> l(m_StartedMutex);
|
std::unique_lock<std::mutex> l(m_StartedMutex);
|
||||||
m_Thread.reset (new std::thread (std::bind (&UPnP::Run, this)));
|
m_Thread.reset (new std::thread (std::bind (&UPnP::Run, this)));
|
||||||
m_Started.wait_for (l, std::chrono::seconds (5)); // 5 seconds maximum
|
m_Started.wait_for (l, std::chrono::seconds (5)); // 5 seconds maximum
|
||||||
|
|
@ -77,7 +72,7 @@ namespace transport
|
||||||
}
|
}
|
||||||
catch (std::exception& ex)
|
catch (std::exception& ex)
|
||||||
{
|
{
|
||||||
LogPrint (eLogError, "UPnP: Runtime exception: ", ex.what ());
|
LogPrint (eLogError, "UPnP: runtime exception: ", ex.what ());
|
||||||
PortMapping ();
|
PortMapping ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -98,7 +93,7 @@ namespace transport
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
isError = err != UPNPDISCOVER_SUCCESS;
|
isError = err != UPNPDISCOVER_SUCCESS;
|
||||||
#else // MINIUPNPC_API_VERSION >= 8
|
#else // MINIUPNPC_API_VERSION >= 8
|
||||||
err = 0;
|
err = 0;
|
||||||
m_Devlist = upnpDiscover (UPNP_RESPONSE_TIMEOUT, NULL, NULL, 0);
|
m_Devlist = upnpDiscover (UPNP_RESPONSE_TIMEOUT, NULL, NULL, 0);
|
||||||
isError = m_Devlist == NULL;
|
isError = m_Devlist == NULL;
|
||||||
|
|
@ -111,46 +106,39 @@ namespace transport
|
||||||
|
|
||||||
if (isError)
|
if (isError)
|
||||||
{
|
{
|
||||||
LogPrint (eLogError, "UPnP: Unable to discover Internet Gateway Devices: error ", err);
|
LogPrint (eLogError, "UPnP: unable to discover Internet Gateway Devices: error ", err);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (MINIUPNPC_API_VERSION >= 18)
|
|
||||||
err = UPNP_GetValidIGD (m_Devlist, &m_upnpUrls, &m_upnpData, m_NetworkAddr, sizeof (m_NetworkAddr),
|
|
||||||
m_externalIPAddress, sizeof (m_externalIPAddress));
|
|
||||||
#else
|
|
||||||
err = UPNP_GetValidIGD (m_Devlist, &m_upnpUrls, &m_upnpData, m_NetworkAddr, sizeof (m_NetworkAddr));
|
err = UPNP_GetValidIGD (m_Devlist, &m_upnpUrls, &m_upnpData, m_NetworkAddr, sizeof (m_NetworkAddr));
|
||||||
#endif
|
|
||||||
m_upnpUrlsInitialized=err!=0;
|
m_upnpUrlsInitialized=err!=0;
|
||||||
if (err == UPNP_IGD_VALID_CONNECTED)
|
if (err == UPNP_IGD_VALID_CONNECTED)
|
||||||
{
|
{
|
||||||
#if (MINIUPNPC_API_VERSION < 18)
|
|
||||||
err = UPNP_GetExternalIPAddress (m_upnpUrls.controlURL, m_upnpData.first.servicetype, m_externalIPAddress);
|
err = UPNP_GetExternalIPAddress (m_upnpUrls.controlURL, m_upnpData.first.servicetype, m_externalIPAddress);
|
||||||
if(err != UPNPCOMMAND_SUCCESS)
|
if(err != UPNPCOMMAND_SUCCESS)
|
||||||
{
|
{
|
||||||
LogPrint (eLogError, "UPnP: Unable to get external address: error ", err);
|
LogPrint (eLogError, "UPnP: unable to get external address: error ", err);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
LogPrint (eLogError, "UPnP: Found Internet Gateway Device ", m_upnpUrls.controlURL);
|
LogPrint (eLogError, "UPnP: found Internet Gateway Device ", m_upnpUrls.controlURL);
|
||||||
if (!m_externalIPAddress[0])
|
if (!m_externalIPAddress[0])
|
||||||
{
|
{
|
||||||
LogPrint (eLogError, "UPnP: Found Internet Gateway Device doesn't know our external address");
|
LogPrint (eLogError, "UPnP: found Internet Gateway Device doesn't know our external address");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LogPrint (eLogError, "UPnP: Unable to find valid Internet Gateway Device: error ", err);
|
LogPrint (eLogError, "UPnP: unable to find valid Internet Gateway Device: error ", err);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// UPnP discovered
|
// UPnP discovered
|
||||||
LogPrint (eLogDebug, "UPnP: ExternalIPAddress is ", m_externalIPAddress);
|
LogPrint (eLogDebug, "UPnP: ExternalIPAddress is ", m_externalIPAddress);
|
||||||
i2p::context.UpdateAddress (boost::asio::ip::make_address (m_externalIPAddress));
|
i2p::context.UpdateAddress (boost::asio::ip::address::from_string (m_externalIPAddress));
|
||||||
// port mapping
|
// port mapping
|
||||||
PortMapping ();
|
PortMapping ();
|
||||||
}
|
}
|
||||||
|
|
@ -171,18 +159,17 @@ namespace transport
|
||||||
|
|
||||||
void UPnP::PortMapping ()
|
void UPnP::PortMapping ()
|
||||||
{
|
{
|
||||||
auto a = context.GetRouterInfo().GetAddresses();
|
const auto& a = context.GetRouterInfo().GetAddresses();
|
||||||
if (!a) return;
|
for (const auto& address : a)
|
||||||
for (const auto& address : *a)
|
|
||||||
{
|
{
|
||||||
if (address && !address->host.is_v6 () && address->port)
|
if (!address->host.is_v6 () && address->port)
|
||||||
TryPortMapping (address);
|
TryPortMapping (address);
|
||||||
}
|
}
|
||||||
m_Timer.expires_from_now (boost::posix_time::minutes(UPNP_PORT_FORWARDING_INTERVAL)); // every 20 minutes
|
m_Timer.expires_from_now (boost::posix_time::minutes(20)); // every 20 minutes
|
||||||
m_Timer.async_wait ([this](const boost::system::error_code& ecode)
|
m_Timer.async_wait ([this](const boost::system::error_code& ecode)
|
||||||
{
|
{
|
||||||
if (ecode != boost::asio::error::operation_aborted)
|
if (ecode != boost::asio::error::operation_aborted)
|
||||||
PortMapping ();
|
PortMapping ();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -196,7 +183,7 @@ namespace transport
|
||||||
err = CheckMapping (strPort.c_str (), strType.c_str ());
|
err = CheckMapping (strPort.c_str (), strType.c_str ());
|
||||||
if (err != UPNPCOMMAND_SUCCESS) // if mapping not found
|
if (err != UPNPCOMMAND_SUCCESS) // if mapping not found
|
||||||
{
|
{
|
||||||
LogPrint (eLogDebug, "UPnP: Port ", strPort, " is possibly not forwarded: return code ", err);
|
LogPrint (eLogDebug, "UPnP: possibly port ", strPort, " is not forwarded: return code ", err);
|
||||||
|
|
||||||
#if ((MINIUPNPC_API_VERSION >= 8) || defined (UPNPDISCOVER_SUCCESS))
|
#if ((MINIUPNPC_API_VERSION >= 8) || defined (UPNPDISCOVER_SUCCESS))
|
||||||
err = UPNP_AddPortMapping (m_upnpUrls.controlURL, m_upnpData.first.servicetype, strPort.c_str (), strPort.c_str (), m_NetworkAddr, strDesc.c_str (), strType.c_str (), NULL, NULL);
|
err = UPNP_AddPortMapping (m_upnpUrls.controlURL, m_upnpData.first.servicetype, strPort.c_str (), strPort.c_str (), m_NetworkAddr, strDesc.c_str (), strType.c_str (), NULL, NULL);
|
||||||
|
|
@ -205,29 +192,28 @@ namespace transport
|
||||||
#endif
|
#endif
|
||||||
if (err != UPNPCOMMAND_SUCCESS)
|
if (err != UPNPCOMMAND_SUCCESS)
|
||||||
{
|
{
|
||||||
LogPrint (eLogError, "UPnP: Port forwarding to ", m_NetworkAddr, ":", strPort, " failed: return code ", err);
|
LogPrint (eLogError, "UPnP: port forwarding to ", m_NetworkAddr, ":", strPort, " failed: return code ", err);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LogPrint (eLogInfo, "UPnP: Port successfully forwarded (", m_externalIPAddress ,":", strPort, " type ", strType, " -> ", m_NetworkAddr ,":", strPort ,")");
|
LogPrint (eLogInfo, "UPnP: port successfully forwarded (", m_externalIPAddress ,":", strPort, " type ", strType, " -> ", m_NetworkAddr ,":", strPort ,")");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
LogPrint (eLogDebug, "UPnP: External forward from ", m_NetworkAddr, ":", strPort, " exists on current Internet Gateway Device");
|
LogPrint (eLogDebug, "UPnP: external forward from ", m_NetworkAddr, ":", strPort, " exists on current Internet Gateway Device");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void UPnP::CloseMapping ()
|
void UPnP::CloseMapping ()
|
||||||
{
|
{
|
||||||
auto a = context.GetRouterInfo().GetAddresses();
|
const auto& a = context.GetRouterInfo().GetAddresses();
|
||||||
if (!a) return;
|
for (const auto& address : a)
|
||||||
for (const auto& address : *a)
|
|
||||||
{
|
{
|
||||||
if (address && !address->host.is_v6 () && address->port)
|
if (!address->host.is_v6 () && address->port)
|
||||||
CloseMapping (address);
|
CloseMapping (address);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -239,7 +225,7 @@ namespace transport
|
||||||
}
|
}
|
||||||
std::string strType (GetProto (address)), strPort (std::to_string (address->port));
|
std::string strType (GetProto (address)), strPort (std::to_string (address->port));
|
||||||
int err = UPNPCOMMAND_SUCCESS;
|
int err = UPNPCOMMAND_SUCCESS;
|
||||||
|
|
||||||
err = CheckMapping (strPort.c_str (), strType.c_str ());
|
err = CheckMapping (strPort.c_str (), strType.c_str ());
|
||||||
if (err == UPNPCOMMAND_SUCCESS)
|
if (err == UPNPCOMMAND_SUCCESS)
|
||||||
{
|
{
|
||||||
|
|
@ -262,10 +248,10 @@ namespace transport
|
||||||
{
|
{
|
||||||
switch (address->transportStyle)
|
switch (address->transportStyle)
|
||||||
{
|
{
|
||||||
case i2p::data::RouterInfo::eTransportNTCP2:
|
case i2p::data::RouterInfo::eTransportNTCP:
|
||||||
return "TCP";
|
return "TCP";
|
||||||
break;
|
break;
|
||||||
case i2p::data::RouterInfo::eTransportSSU2:
|
case i2p::data::RouterInfo::eTransportSSU:
|
||||||
default:
|
default:
|
||||||
return "UDP";
|
return "UDP";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013-2024, The PurpleI2P Project
|
* Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
*
|
*
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
* This file is part of Purple i2pd project and licensed under BSD3
|
||||||
*
|
*
|
||||||
|
|
@ -28,8 +28,7 @@ namespace i2p
|
||||||
namespace transport
|
namespace transport
|
||||||
{
|
{
|
||||||
const int UPNP_RESPONSE_TIMEOUT = 2000; // in milliseconds
|
const int UPNP_RESPONSE_TIMEOUT = 2000; // in milliseconds
|
||||||
const int UPNP_PORT_FORWARDING_INTERVAL = 20; // in minutes
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
UPNP_IGD_NONE = 0,
|
UPNP_IGD_NONE = 0,
|
||||||
|
|
@ -52,7 +51,7 @@ namespace transport
|
||||||
private:
|
private:
|
||||||
|
|
||||||
void Discover ();
|
void Discover ();
|
||||||
int CheckMapping (const char* port, const char* type);
|
int CheckMapping (const char* port, const char* type);
|
||||||
void PortMapping ();
|
void PortMapping ();
|
||||||
void TryPortMapping (std::shared_ptr<i2p::data::RouterInfo::Address> address);
|
void TryPortMapping (std::shared_ptr<i2p::data::RouterInfo::Address> address);
|
||||||
void CloseMapping ();
|
void CloseMapping ();
|
||||||
|
|
@ -67,7 +66,7 @@ namespace transport
|
||||||
std::unique_ptr<std::thread> m_Thread;
|
std::unique_ptr<std::thread> m_Thread;
|
||||||
std::condition_variable m_Started;
|
std::condition_variable m_Started;
|
||||||
std::mutex m_StartedMutex;
|
std::mutex m_StartedMutex;
|
||||||
boost::asio::io_context m_Service;
|
boost::asio::io_service m_Service;
|
||||||
boost::asio::deadline_timer m_Timer;
|
boost::asio::deadline_timer m_Timer;
|
||||||
bool m_upnpUrlsInitialized = false;
|
bool m_upnpUrlsInitialized = false;
|
||||||
struct UPNPUrls m_upnpUrls;
|
struct UPNPUrls m_upnpUrls;
|
||||||
|
|
@ -81,7 +80,7 @@ namespace transport
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#else // USE_UPNP
|
#else // USE_UPNP
|
||||||
namespace i2p {
|
namespace i2p {
|
||||||
namespace transport {
|
namespace transport {
|
||||||
/* class stub */
|
/* class stub */
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013-2024, The PurpleI2P Project
|
* Copyright (c) 2013-2020, The PurpleI2P Project
|
||||||
*
|
*
|
||||||
* This file is part of Purple i2pd project and licensed under BSD3
|
* This file is part of Purple i2pd project and licensed under BSD3
|
||||||
*
|
*
|
||||||
|
|
@ -24,8 +24,6 @@
|
||||||
#include "Tunnel.h"
|
#include "Tunnel.h"
|
||||||
#include "RouterContext.h"
|
#include "RouterContext.h"
|
||||||
#include "ClientContext.h"
|
#include "ClientContext.h"
|
||||||
#include "Transports.h"
|
|
||||||
#include "util.h"
|
|
||||||
|
|
||||||
void handle_signal(int sig)
|
void handle_signal(int sig)
|
||||||
{
|
{
|
||||||
|
|
@ -56,14 +54,6 @@ void handle_signal(int sig)
|
||||||
case SIGPIPE:
|
case SIGPIPE:
|
||||||
LogPrint(eLogInfo, "SIGPIPE received");
|
LogPrint(eLogInfo, "SIGPIPE received");
|
||||||
break;
|
break;
|
||||||
case SIGTSTP:
|
|
||||||
LogPrint(eLogInfo, "Daemon: Got SIGTSTP, disconnecting from network...");
|
|
||||||
i2p::transport::transports.SetOnline(false);
|
|
||||||
break;
|
|
||||||
case SIGCONT:
|
|
||||||
LogPrint(eLogInfo, "Daemon: Got SIGCONT, restoring connection to network...");
|
|
||||||
i2p::transport::transports.SetOnline(true);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -82,8 +72,7 @@ namespace i2p
|
||||||
|
|
||||||
if (pid < 0) // error
|
if (pid < 0) // error
|
||||||
{
|
{
|
||||||
LogPrint(eLogError, "Daemon: Could not fork: ", strerror(errno));
|
LogPrint(eLogError, "Daemon: could not fork: ", strerror(errno));
|
||||||
std::cerr << "i2pd: Could not fork: " << strerror(errno) << std::endl;
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -92,15 +81,13 @@ namespace i2p
|
||||||
int sid = setsid();
|
int sid = setsid();
|
||||||
if (sid < 0)
|
if (sid < 0)
|
||||||
{
|
{
|
||||||
LogPrint(eLogError, "Daemon: Could not create process group.");
|
LogPrint(eLogError, "Daemon: could not create process group.");
|
||||||
std::cerr << "i2pd: Could not create process group." << std::endl;
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
std::string d = i2p::fs::GetDataDir();
|
std::string d = i2p::fs::GetDataDir();
|
||||||
if (chdir(d.c_str()) != 0)
|
if (chdir(d.c_str()) != 0)
|
||||||
{
|
{
|
||||||
LogPrint(eLogError, "Daemon: Could not chdir: ", strerror(errno));
|
LogPrint(eLogError, "Daemon: could not chdir: ", strerror(errno));
|
||||||
std::cerr << "i2pd: Could not chdir: " << strerror(errno) << std::endl;
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -115,14 +102,14 @@ namespace i2p
|
||||||
uint16_t nfiles; i2p::config::GetOption("limits.openfiles", nfiles);
|
uint16_t nfiles; i2p::config::GetOption("limits.openfiles", nfiles);
|
||||||
getrlimit(RLIMIT_NOFILE, &limit);
|
getrlimit(RLIMIT_NOFILE, &limit);
|
||||||
if (nfiles == 0) {
|
if (nfiles == 0) {
|
||||||
LogPrint(eLogInfo, "Daemon: Using system limit in ", limit.rlim_cur, " max open files");
|
LogPrint(eLogInfo, "Daemon: using system limit in ", limit.rlim_cur, " max open files");
|
||||||
} else if (nfiles <= limit.rlim_max) {
|
} else if (nfiles <= limit.rlim_max) {
|
||||||
limit.rlim_cur = nfiles;
|
limit.rlim_cur = nfiles;
|
||||||
if (setrlimit(RLIMIT_NOFILE, &limit) == 0) {
|
if (setrlimit(RLIMIT_NOFILE, &limit) == 0) {
|
||||||
LogPrint(eLogInfo, "Daemon: Set max number of open files to ",
|
LogPrint(eLogInfo, "Daemon: set max number of open files to ",
|
||||||
nfiles, " (system limit is ", limit.rlim_max, ")");
|
nfiles, " (system limit is ", limit.rlim_max, ")");
|
||||||
} else {
|
} else {
|
||||||
LogPrint(eLogError, "Daemon: Can't set max number of open files: ", strerror(errno));
|
LogPrint(eLogError, "Daemon: can't set max number of open files: ", strerror(errno));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
LogPrint(eLogError, "Daemon: limits.openfiles exceeds system limit: ", limit.rlim_max);
|
LogPrint(eLogError, "Daemon: limits.openfiles exceeds system limit: ", limit.rlim_max);
|
||||||
|
|
@ -135,11 +122,11 @@ namespace i2p
|
||||||
if (cfsize <= limit.rlim_max) {
|
if (cfsize <= limit.rlim_max) {
|
||||||
limit.rlim_cur = cfsize;
|
limit.rlim_cur = cfsize;
|
||||||
if (setrlimit(RLIMIT_CORE, &limit) != 0) {
|
if (setrlimit(RLIMIT_CORE, &limit) != 0) {
|
||||||
LogPrint(eLogError, "Daemon: Can't set max size of coredump: ", strerror(errno));
|
LogPrint(eLogError, "Daemon: can't set max size of coredump: ", strerror(errno));
|
||||||
} else if (cfsize == 0) {
|
} else if (cfsize == 0) {
|
||||||
LogPrint(eLogInfo, "Daemon: coredumps disabled");
|
LogPrint(eLogInfo, "Daemon: coredumps disabled");
|
||||||
} else {
|
} else {
|
||||||
LogPrint(eLogInfo, "Daemon: Set max size of core files to ", cfsize / 1024, "Kb");
|
LogPrint(eLogInfo, "Daemon: set max size of core files to ", cfsize / 1024, "Kb");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
LogPrint(eLogError, "Daemon: limits.coresize exceeds system limit: ", limit.rlim_max);
|
LogPrint(eLogError, "Daemon: limits.coresize exceeds system limit: ", limit.rlim_max);
|
||||||
|
|
@ -156,43 +143,28 @@ namespace i2p
|
||||||
pidFH = open(pidfile.c_str(), O_RDWR | O_CREAT, 0600);
|
pidFH = open(pidfile.c_str(), O_RDWR | O_CREAT, 0600);
|
||||||
if (pidFH < 0)
|
if (pidFH < 0)
|
||||||
{
|
{
|
||||||
LogPrint(eLogError, "Daemon: Could not create pid file ", pidfile, ": ", strerror(errno));
|
LogPrint(eLogError, "Daemon: could not create pid file ", pidfile, ": ", strerror(errno));
|
||||||
std::cerr << "i2pd: Could not create pid file " << pidfile << ": " << strerror(errno) << std::endl;
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef ANDROID
|
#ifndef ANDROID
|
||||||
if (lockf(pidFH, F_TLOCK, 0) != 0)
|
if (lockf(pidFH, F_TLOCK, 0) != 0)
|
||||||
#else
|
|
||||||
struct flock fl;
|
|
||||||
fl.l_len = 0;
|
|
||||||
fl.l_type = F_WRLCK;
|
|
||||||
fl.l_whence = SEEK_SET;
|
|
||||||
fl.l_start = 0;
|
|
||||||
|
|
||||||
if (fcntl(pidFH, F_SETLK, &fl) != 0)
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
LogPrint(eLogError, "Daemon: Could not lock pid file ", pidfile, ": ", strerror(errno));
|
LogPrint(eLogError, "Daemon: could not lock pid file ", pidfile, ": ", strerror(errno));
|
||||||
std::cerr << "i2pd: Could not lock pid file " << pidfile << ": " << strerror(errno) << std::endl;
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
char pid[10];
|
char pid[10];
|
||||||
sprintf(pid, "%d\n", getpid());
|
sprintf(pid, "%d\n", getpid());
|
||||||
ftruncate(pidFH, 0);
|
ftruncate(pidFH, 0);
|
||||||
if (write(pidFH, pid, strlen(pid)) < 0)
|
if (write(pidFH, pid, strlen(pid)) < 0)
|
||||||
{
|
{
|
||||||
LogPrint(eLogCritical, "Daemon: Could not write pidfile ", pidfile, ": ", strerror(errno));
|
LogPrint(eLogError, "Daemon: could not write pidfile: ", strerror(errno));
|
||||||
std::cerr << "i2pd: Could not write pidfile " << pidfile << ": " << strerror(errno) << std::endl;
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
gracefulShutdownInterval = 0; // not specified
|
gracefulShutdownInterval = 0; // not specified
|
||||||
|
|
||||||
// handle signal TSTP
|
|
||||||
bool handleTSTP; i2p::config::GetOption("unix.handle_sigtstp", handleTSTP);
|
|
||||||
|
|
||||||
// Signal handler
|
// Signal handler
|
||||||
struct sigaction sa;
|
struct sigaction sa;
|
||||||
sa.sa_handler = handle_signal;
|
sa.sa_handler = handle_signal;
|
||||||
|
|
@ -204,11 +176,6 @@ namespace i2p
|
||||||
sigaction(SIGTERM, &sa, 0);
|
sigaction(SIGTERM, &sa, 0);
|
||||||
sigaction(SIGINT, &sa, 0);
|
sigaction(SIGINT, &sa, 0);
|
||||||
sigaction(SIGPIPE, &sa, 0);
|
sigaction(SIGPIPE, &sa, 0);
|
||||||
if (handleTSTP)
|
|
||||||
{
|
|
||||||
sigaction(SIGTSTP, &sa, 0);
|
|
||||||
sigaction(SIGCONT, &sa, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Daemon_Singleton::start();
|
return Daemon_Singleton::start();
|
||||||
}
|
}
|
||||||
|
|
@ -221,7 +188,6 @@ namespace i2p
|
||||||
|
|
||||||
void DaemonLinux::run ()
|
void DaemonLinux::run ()
|
||||||
{
|
{
|
||||||
i2p::util::SetThreadName ("i2pd-daemon");
|
|
||||||
while (running)
|
while (running)
|
||||||
{
|
{
|
||||||
std::this_thread::sleep_for (std::chrono::seconds(1));
|
std::this_thread::sleep_for (std::chrono::seconds(1));
|
||||||
|
|
|
||||||
5
debian/NEWS
vendored
5
debian/NEWS
vendored
|
|
@ -1,5 +0,0 @@
|
||||||
i2pd (2.53.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
i2pd binary moved from /usr/sbin to /usr/bin. Please check your scripts if you used the old path.
|
|
||||||
|
|
||||||
-- r4sas <r4sas@i2pmail.org> Fri, 19 Jul 2024 16:00:00 +0000
|
|
||||||
151
debian/changelog
vendored
151
debian/changelog
vendored
|
|
@ -1,154 +1,3 @@
|
||||||
i2pd (2.56.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.56.0/0.9.65
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Tue, 11 Feb 2025 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.55.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.55.0
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Mon, 30 Dec 2024 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.54.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.54.0/0.9.64
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Sun, 6 Oct 2024 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.53.1-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.53.1
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Tue, 30 Jul 2024 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.53.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.53.0/0.9.63
|
|
||||||
* binary moved from /usr/sbin to /usr/bin
|
|
||||||
|
|
||||||
-- r4sas <r4sas@i2pmail.org> Sat, 20 Jul 2024 15:10:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.52.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.52.0
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Sun, 12 May 2024 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.51.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.51.0/0.9.62
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Sat, 06 Apr 2024 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.50.2-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.50.2/0.9.61
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Sat, 06 Jan 2024 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.50.1-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.50.1/0.9.61
|
|
||||||
|
|
||||||
-- r4sas <r4sas@i2pmail.org> Sat, 23 Dec 2023 18:30:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.50.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.50.0/0.9.61
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Mon, 18 Dec 2023 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.49.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.49.0/0.9.60
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Mon, 18 Sep 2023 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.48.0-1) unstable; urgency=high
|
|
||||||
|
|
||||||
* updated to version 2.48.0/0.9.59
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Mon, 12 Jun 2023 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.47.0-1) unstable; urgency=high
|
|
||||||
|
|
||||||
* updated to version 2.47.0/0.9.58
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Sat, 11 Mar 2023 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.46.1-2) unstable; urgency=critical
|
|
||||||
|
|
||||||
* re-pushed release due to new critical bug
|
|
||||||
|
|
||||||
-- r4sas <r4sas@i2pmail.org> Mon, 20 Feb 2023 23:40:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.46.1-1) unstable; urgency=high
|
|
||||||
|
|
||||||
* updated to version 2.46.1/0.9.57
|
|
||||||
|
|
||||||
-- r4sas <r4sas@i2pmail.org> Mon, 20 Feb 2023 02:45:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.46.0-1) unstable; urgency=high
|
|
||||||
|
|
||||||
* updated to version 2.46.0/0.9.57
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Wed, 15 Feb 2023 19:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.45.1-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.45.1/0.9.57
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Wed, 11 Jan 2023 19:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.45.0-1) unstable; urgency=high
|
|
||||||
|
|
||||||
* updated to version 2.45.0/0.9.57
|
|
||||||
* compat level 12
|
|
||||||
* standards version 4.3.0
|
|
||||||
* increased nofile limit in service and init.d to 8192
|
|
||||||
* added conffiles
|
|
||||||
* removed #1210 patch
|
|
||||||
|
|
||||||
-- r4sas <r4sas@i2pmail.org> Tue, 3 Jan 2023 18:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.44.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.44.0/0.9.56
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Sun, 20 Nov 2022 19:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.43.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.43.0/0.9.55
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Mon, 22 Aug 2022 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.42.1-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.42.1/0.9.54
|
|
||||||
* remove -O3 optimization flag
|
|
||||||
|
|
||||||
-- r4sas <r4sas@i2pmail.org> Tue, 24 May 2022 12:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.42.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.42.0/0.9.54
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Sun, 22 May 2022 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.41.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.41.0/0.9.53
|
|
||||||
|
|
||||||
-- r4sas <r4sas@i2pmail.org> Sun, 20 Feb 2022 13:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.40.0-1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* updated to version 2.40.0/0.9.52
|
|
||||||
|
|
||||||
-- orignal <orignal@i2pmail.org> Mon, 29 Nov 2021 16:00:00 +0000
|
|
||||||
|
|
||||||
i2pd (2.39.0-1) unstable; urgency=medium
|
i2pd (2.39.0-1) unstable; urgency=medium
|
||||||
|
|
||||||
* updated to version 2.39.0/0.9.51
|
* updated to version 2.39.0/0.9.51
|
||||||
|
|
|
||||||
2
debian/compat
vendored
2
debian/compat
vendored
|
|
@ -1 +1 @@
|
||||||
12
|
9
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue