Merge pull request #281 from anonimal/master

Catch exception in SSUServer that would dump core.

.dir-locals.el

@@ -1,2 +0,0 @@
-((c++-mode . ((indent-tabs-mode . t)))
- (c-mode . ((mode . c++))))

.gitignore

@@ -1,21 +1,32 @@
 # i2pd
-*.o
 router.info
 router.keys
 i2p
 libi2pd.so
 netDb
-/i2pd
-/libi2pd.a
-/libi2pdclient.a
-*.exe
+tunnels.cfg
+tests/tests
+
+# Build files
+CMakeCache.txt
+build/CMakeFiles/*
+build/tests
+build/client
+build/core
+build/benchmark
+build/i2pd
+build/i2pd-tests
+build/i2pd-benchmark
+*.cmake
+*.a
+*.o
 
 
 # Autotools
 autom4te.cache
 .deps
 stamp-h1
-#Makefile
+Makefile
 config.h
 config.h.in~
 config.log
@@ -52,6 +63,14 @@ local.properties
 # PDT-specific
 .buildpath
 
+#################
+## Netbeans
+#################
+
+# CMake: if "Project with Existing Sources" is properly setup, then only the following needs to be ignored:
+# (e.g., don't select "Automatic" but instead select "Run Configure Script in Subfolder:" into ./build/)
+build/compile_commands.json
+nbproject/
 
 #################
 ## Visual Studio
@@ -235,32 +254,3 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
-
-# Sphinx
-docs/_build
-/androidIdea/
-
-# Doxygen
-docs/generated
-
-# emacs files
-*~
-*\#*
-
-# gdb files
-.gdb_history
-
-# cmake makefile
-build/Makefile
-
-# debian stuff
-.pc/
-
-# qt 
-
-qt/i2pd_qt/*.ui.autosave
-qt/i2pd_qt/*.ui.bk*
-qt/i2pd_qt/*.ui_*
-
-#unknown android stuff
-android/libs/

.travis.yml

@@ -1,54 +0,0 @@
-language: cpp
-cache:
-  apt: true
-os:
-- linux
-#- osx
-dist: trusty
-sudo: required
-compiler:
-- g++
-- clang++
-env:
-  global:
-  - MAKEFLAGS="-j 2"
-  matrix:
-  - BUILD_TYPE=make UPNP=ON MAKE_UPNP=yes
-  - BUILD_TYPE=make UPNP=OFF MAKE_UPNP=no
-  - BUILD_TYPE=cmake UPNP=ON MAKE_UPNP=yes
-  - BUILD_TYPE=cmake UPNP=OFF MAKE_UPNP=no
-matrix:
-  exclude:
-  - os: osx
-    env: BUILD_TYPE=cmake UPNP=ON MAKE_UPNP=yes
-  - os: osx
-    env: BUILD_TYPE=cmake UPNP=OFF MAKE_UPNP=no
-  - os: linux
-    compiler: clang++
-    env: BUILD_TYPE=make UPNP=ON MAKE_UPNP=yes
-  - os: linux
-    compiler: clang++
-    env: BUILD_TYPE=make UPNP=OFF MAKE_UPNP=no
-addons:
-  apt:
-    packages:
-    - build-essential
-    - cmake
-    - g++
-    - clang
-    - libboost-chrono-dev
-    - libboost-date-time-dev
-    - libboost-filesystem-dev
-    - libboost-program-options-dev
-    - libboost-system-dev
-    - libboost-thread-dev
-    - libminiupnpc-dev
-    - libssl-dev
-before_install:
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libressl miniupnpc ; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated boost || brew upgrade boost ; fi
-script:
-- if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_TYPE" == "cmake" ]]; then cd build && cmake -DCMAKE_BUILD_TYPE=Release -DWITH_UPNP=${UPNP} && make ; fi
-- if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_TYPE" == "make" ]]; then make USE_UPNP=${MAKE_UPNP} ; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make HOMEBREW=1 USE_UPNP=${MAKE_UPNP} ; fi

CMakeLists.txt

@@ -0,0 +1,195 @@
+cmake_minimum_required ( VERSION 2.8.12 )
+project ( "i2pd" )
+
+# configurale options
+option(WITH_AESNI     "Use AES-NI instructions set" OFF)
+option(WITH_HARDENING "Use hardening compiler flags" OFF)
+option(WITH_LIBRARY   "Build library" ON)
+option(WITH_BINARY    "Build binary" ON)
+option(WITH_STATIC    "Static build" OFF)
+option(WITH_UPNP      "Include support for UPnP client" OFF)
+option(WITH_TESTS     "Build unit tests" OFF)
+option(WITH_BENCHMARK "Build benchmarking code" OFF)
+option(WITH_OPTIMIZE  "Optimization flags" OFF)
+option(I2PD_DATA_PATH "The path to the i2pd data folder")
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake_modules")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+
+# Default build is Debug
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Debug)
+endif()
+
+# compiler flags customization (by vendor)
+if(NOT MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Winvalid-pch")
+    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)
+    set(
+        CMAKE_CXX_FLAGS_MINSIZEREL
+        "${CMAKE_CXX_FLAGS_MINSIZEREL} -flto -s -ffunction-sections -fdata-sections"
+    )
+    # -flto is added from above
+    set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "-Wl,--gc-sections")
+endif()
+
+# Check for c++11 support
+include(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=c++11" CXX11_SUPPORTED)
+CHECK_CXX_COMPILER_FLAG("-std=c++0x" CXX0X_SUPPORTED)
+if(CXX11_SUPPORTED)
+    add_definitions("-std=c++11")
+elseif(CXX0X_SUPPORTED) # gcc 4.6
+    add_definitions("-std=c++0x")
+elseif(NOT MSVC)
+    message(SEND_ERROR "C++11 standard not supported by compiler. Version too old?")
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    if(WITH_HARDENING)
+        add_definitions( "-D_FORTIFY_SOURCE=2" )
+        set(
+            CMAKE_CXX_FLAGS
+            "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security -Werror=format-security"
+        )
+        set(
+            CMAKE_CXX_FLAGS
+            "${CMAKE_CXX_FLAGS} -fstack-protector-strong -fPIE --param ssp-buffer-size=4 -z relro -z now"
+        )
+    endif()
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    # TODO: Clang-specific flags 
+endif()
+
+# Compiler flags customization (by system)
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+  # "'sleep_for' is not a member of 'std::this_thread'" in gcc 4.7/4.8
+  add_definitions( "-D_GLIBCXX_USE_NANOSLEEP=1" )
+endif ()
+
+if(WITH_UPNP)
+    add_definitions(-DUSE_UPNP)
+    if(NOT MSVC)
+        set(DL_LIB ${CMAKE_DL_LIBS})
+    endif()
+endif()
+
+if(WITH_AESNI)
+    add_definitions( "-maes -DAESNI")
+endif()
+
+if(WITH_OPTIMIZE AND (NOT MSVC))
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+endif()
+
+# 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)
+find_package (Threads REQUIRED)
+if(THREADS_HAVE_PTHREAD_ARG) # compile time flag
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+endif()
+
+if(WITH_STATIC)
+    set(Boost_USE_STATIC_LIBS ON)
+    set(Boost_USE_STATIC_RUNTIME OFF)
+    if(NOT WIN32)
+        set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
+    endif()
+
+    set(BUILD_SHARED_LIBS OFF)
+    if(${CMAKE_CXX_COMPILER} MATCHES ".*-openwrt-.*")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+        set(
+            CMAKE_THREAD_LIBS_INIT
+            "gcc_eh -Wl,-u,pthread_create,-u,pthread_once,-u,pthread_mutex_lock,-u,pthread_mutex_unlock,-u,pthread_join,-u,pthread_equal,-u,pthread_detach,-u,pthread_cond_wait,-u,pthread_cond_signal,-u,pthread_cond_destroy,-u,pthread_cond_broadcast,-u,pthread_cancel"
+        )
+    endif()
+elseif(NOT WIN32)
+    # TODO: Consider separate compilation for COMMON_SRC for library.
+    # No need in -fPIC overhead for binary if not interested in library
+    # HINT: revert c266cff CMakeLists.txt: compilation speed up
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+else() # Not a static build
+    add_definitions(-DBOOST_ALL_DYN_LINK)
+endif()
+
+find_package(
+    Boost COMPONENTS
+    system filesystem regex program_options date_time thread chrono REQUIRED
+)
+if(NOT DEFINED Boost_INCLUDE_DIRS)
+    message(SEND_ERROR "Boost not found, or version below 1.46. Please download Boost!")
+endif()
+
+find_package(CryptoPP REQUIRED)
+if(NOT DEFINED CRYPTO++_INCLUDE_DIR)
+  message(SEND_ERROR "Could not find Crypto++. Please download and install it first!")
+endif()
+
+find_package(MiniUPnPc)
+if(NOT ${MINIUPNPC_FOUND})
+    set(WITH_UPNP OFF)
+endif()
+
+# Load includes
+include_directories(
+    ${CMAKE_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${CRYPTO++_INCLUDE_DIR}
+    "core/"
+)
+
+if(I2PD_DATA_PATH)
+    set(I2PD_DATA_DIR ${I2PD_DATA_PATH})
+    # Using custom path, make sure the code knows about this
+    add_definitions(-DI2PD_CUSTOM_DATA_PATH="${I2PD_DATA_PATH}")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    set(I2PD_DATA_DIR "$ENV{APPDATA}\\i2pd")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(I2PD_DATA_DIR "$ENV{HOME}/Library/Application Support/i2pd")
+else()
+    set(I2PD_DATA_DIR "$ENV{HOME}/.i2pd")
+endif()
+
+# Show summary
+message(STATUS "---------------------------------------")
+message(STATUS "Build type         : ${CMAKE_BUILD_TYPE}")
+message(STATUS "Compiler vendor    : ${CMAKE_CXX_COMPILER_ID}")
+message(STATUS "Compiler version   : ${CMAKE_CXX_COMPILER_VERSION}")
+message(STATUS "Compiler path      : ${CMAKE_CXX_COMPILER}")
+message(STATUS "Install prefix:    : ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "I2PD data directory: ${I2PD_DATA_DIR}")
+message(STATUS "Options:")
+message(STATUS "  AESNI            : ${WITH_AESNI}")
+message(STATUS "  HARDENING        : ${WITH_HARDENING}")
+message(STATUS "  LIBRARY          : ${WITH_LIBRARY}")
+message(STATUS "  BINARY           : ${WITH_BINARY}")
+message(STATUS "  STATIC BUILD     : ${WITH_STATIC}")
+message(STATUS "  UPnP             : ${WITH_UPNP}")
+message(STATUS "  TESTS            : ${WITH_TESTS}")
+message(STATUS "  BENCHMARKING     : ${WITH_BENCHMARK}")
+message(STATUS "  OPTIMIZATION     : ${WITH_OPTIMIZE}")
+message(STATUS "---------------------------------------")
+
+# Handle paths nicely
+include(GNUInstallDirs)
+
+set(CORE_NAME "${PROJECT_NAME}-core")
+set(CLIENT_NAME "${PROJECT_NAME}-client")
+set(TESTS_NAME "${PROJECT_NAME}-tests")
+set(BENCHMARK_NAME "${PROJECT_NAME}-benchmark")
+add_subdirectory(core)
+add_subdirectory(client)
+add_subdirectory(tests)
+add_subdirectory(benchmark)
+
+if(WITH_BINARY)
+    file(MAKE_DIRECTORY "${I2PD_DATA_DIR}/webui")
+    file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/webui" DESTINATION "${I2PD_DATA_DIR}")
+endif()

ChangeLog

@@ -1,436 +0,0 @@
-# for this file format description,
-# see https://github.com/olivierlacan/keep-a-changelog
-
-## [2.30.0] - 2020-02-25
-### Added
-- Single threaded SAM
-- Experimental support of ECIES-X25519-AEAD-Ratchet crypto type
-### Changed
-- Minimal MTU size is 1280 for ipv6
-- Use unordered_map instead map for destination's sessions and tags list
-- Use std::shuffle instead std::random_shuffle
-- SAM is single threaded by default
-- Reseeds list
-### Fixed
-- Correct termination of streaming destination
-- Extra ',' in RouterInfo response in I2PControl
-- SAM crash on session termination
-- Storage for Android 10
-
-## [2.29.0] - 2019-10-21
-### Added
-- Client auth flag for b33 address
-### Changed
-- Remove incoming  NTCP2 session from pending list when established 
-- Handle errors for NTCP2 SessionConfrimed send
-### Fixed
-- Failure to start on Windows XP
-- SAM crash if invalid lookup address
-- Possible crash when UPnP enabled on shutdown
-
-## [2.28.0] - 2019-08-27
-### Added
-- RAW datagrams in SAM
-- Publishing encrypted LeaseSet2 with DH or PSH authentication
-- Ability to disable battery optimization for Android
-- Transport Network ID Check
-### Changed
-- Set and handle published encrypted flag for LeaseSet2
-### Fixed
-- ReceiveID changes in the same stream
-- "\r\n" command terminator in SAM
-- Addressbook lines with signatures
-
-## [2.27.0] - 2019-07-03
-### Added
-- Support of PSK and DH authentication for encrypted LeaseSet2
-### Changed
-- Uptime is based on monotonic timer
-### Fixed
-- BOB status command response
-- Correct NTCP2 port if NTCP is disabled
-- Flood encrypted LeaseSet2 with store hash
-
-## [2.26.0] - 2019-06-07
-### Added
-- HTTP method "PROPFIND"
-- Detection of external ipv6 address through the SSU
-- NTCP2 publishing depends on network status
-### Changed
-- ntcp is disabled by default, ntcp2 is published by default
-- Response to BOB's "list" command
-- ipv6 address is not longer NTCP's local endpoint's address
-- Reseeds list
-- HTTP_REFERER stripping in httpproxy (#823)
-### Fixed
-- Check and handle incorrect BOB input
-- Ignore introducers for NTCP or NTCP2 addresses
-- RouterInfo check from NTCP2
-
-## [2.25.0] - 2019-05-09
-### Added
-- Create, publish and handle encrypted LeaseSet2
-- Support of b33 addresses 
-- RedDSA key blinding
-- .b32.i2p addresses in jump links
-- ntcp2.addressv6 parameter
-### Changed
-- Allow HTTP headers without value
-- Set data directory from external storage path for Android
-- addresshelper support is configurable per tunnel
-- gradlew script for android build
-### Fixed
-- Deletion of expired encrypted LeaseSet2 on floodfills
-- ipv6 fallback address
-- SSU incoming packets routing
-
-## [2.24.0] - 2019-03-21
-### Added
-- Support of transient keys for LeaseSet2
-- Support of encrypted LeaseSet2
-- Recognize signature type 11 (RedDSA)
-- Support websocket connections over HTTP proxy
-- Ability to disable full addressbook persist
-### Changed
-- Don't load peer profiles if non-persistant
-- REUSE_ADDR for ipv6 acceptors
-- Reset eTags if addressbook can't be loaded
-### Fixed
-- Build with boost 1.70
-- Filter out unspecified addresses from RouterInfo
-- Check floodfill status change
-- Correct SAM response for invalid key
-- SAM crash on termination for Windows
-- Race condition for publishing
- 
-## [2.23.0] - 2019-01-21
-### Added
-- Standard LeaseSet2 support
-- Ability to adjust timestamps through the NTP
-- Ability to disable peer profile persist
-- Request permission for android >= 6
-- Initial addressbook to android assets
-- Cancel graceful shutdown for android
-- Russian translation for android
-### Changed
-- Chacha20 and Poly1305 implementation
-- Eliminate extra copy of NTCP2 send buffers
-- Extract content of tunnel.d from assets on android
-- Removed name resolvers from transports
-- Update reseed certificates
-### Fixed
-- LeaseSet published content verification
-- Exclude invalid LeaseSets from the list on a floodfill
-- Build for OpenWrt with openssl 1.1.1
-
-## [2.22.0] - 2018-11-09
-### Added
-- Multiple tunnel config files from tunnels.d folder
-### Changed
-- Fetch own RouterInfo upon SessionRequest for NTCP2
-- Faster XOR between AES blocks for non AVX capable CPUs
-### Fixed
-- Fixed NTCP2 termination send
-
-## [2.21.1] - 2018-10-22
-### Changed
-- cost=13 for unpublished NTCP2 address
-### Fixed
-- Handle I2NP messages longer than 32K
-
-## [2.21.0] - 2018-10-04
-### Added
-- EdDSA, x25519 and SipHash from openssl 1.1.1
-- NTCP2 ipv6 incoming connections
-- Show total number of destination's outgoing tags in the web console
-### Changed
-- Android build with openssl 1.1.1/boost 1.64
-- Bandwidth classes 'P' and 'X' don't add 'O' anymore
-### Fixed
-- Update own RouterInfo if no SSU
-- Recognize 'P' and 'X' routers as high bandwidth without 'O'
-- NTCP address doesn't disappear if NTCP2 enabled
-- Android with api 26+
-
-## [2.20.0] - 2018-08-23
-### Added
-- Full implementation of NTCP2
-- Assets for android
-### Changed
-- armeabi-v7a and x86 in one apk for android
-- NTCP2 is enabled by default
-- Show lease's expiration time in readable format in the web console
-### Fixed
-- Correct names for transports in the web console 
-
-## [2.19.0] - 2018-06-26
-### Added
-- ECIES support for RouterInfo
-- HTTP outproxy authorization
-- AVX/AESNI runtime detection
-- Initial implementation of NTCP2
-- I2CP session reconfigure
-- I2CP method ClientServicesInfo
-- Datagrams to websocks
-### Changed
-- RouterInfo uses EdDSA signature by default
-- Remove stream bans
-- Android build system changed to gradle
-- Multiple changes in QT GUI
-- Dockerfile
-### Fixed
-- zero tunnelID issue
-- tunnels reload
-- headers in webconsole
-- XSS in webconsole from SAM session name
-- build for gcc 8
-- cmake build scripts
-- systemd service files
-- some netbsd issues
-
-## [2.18.0] - 2018-01-30
-### Added
-- Show tunnel nicknames for I2CP destination in WebUI
-- Re-create HTTP and SOCKS proxy by tunnel reload
-- Graceful shutdown as soon as no more transit tunnels
-### Changed
-- Regenerate shared local destination by tunnel reload
-- Use transient local destination by default if not specified
-- Return correct code if pid file can't be created
-- Timing and number of attempts for adressbook requests
-- Certificates list
-### Fixed
-- Malformed addressbook subsctiption request
-- Build with boost 1.66
-- Few race conditions for SAM
-- Check LeaseSet's signature before update
-
-## [2.17.0] - 2017-12-04
-### Added
-- Reseed through HTTP and SOCKS proxy
-- Show status of client services through web console
-- Change log level through web connsole
-- transient keys for tunnels
-- i2p.streaming.initialAckDelay parameter
-- CRYPTO_TYPE for SAM destination
-- signature and crypto type for newkeys BOB command
-### Changed
-- Correct publication of ECIES destinations
-- Disable RSA signatures completely
-### Fixed
-- CVE-2017-17066
-- Possible buffer overflow for RSA-4096
-- Shutdown from web console for Windows
-- Web console page layout
-## [2.16.0] - 2017-11-13
-### Added
-- https and "Connect" method for HTTP proxy
-- outproxy for HTTP proxy
-- initial support of ECIES crypto
-- NTCP soft and hard descriptors limits
-- Support full timestamps in logs
-### Changed
-- Faster implementation of GOST R 34.11 hash
-- Reject routers with RSA signtures
-- Reload config and shudown from Windows GUI
-- Update tunnels address(destination) without restart
-### Fixed
-- BOB crashes if destination is not set
-- Correct SAM tunnel name
-- QT GUI issues
-
-## [2.15.0] - 2017-08-17
-### Added
-- QT GUI
-- Ability to add and remove I2P tunnels without restart
-- Ability to disable SOCKS outproxy option
-### Changed
-- Strip-out Accept-* hedaers in HTTP proxy
-- Don't run peer test if nat=false
-- Separate output of NTCP and SSU sessions in Transports tab
-### Fixed
-- Handle lines with comments in hosts.txt file for address book
-- Run router with empty netdb for testnet
-- Skip expired introducers by iexp
-
-## [2.14.0] - 2017-06-01
-### Added
-- Transit traffic bandwidth limitation
-- NTCP connections through HTTP and SOCKS proxies
-- Ability to disable address helper for HTTP proxy
-### Changed
-- Reseed servers list
-- Minimal required version is 4.0 for Android
-### Fixed
-- Ignore comments in addressbook feed
-
-## [2.13.0] - 2017-04-06
-### Added
-- Persist local destination's tags
-- GOST signature types 9 and 10
-- Exploratory tunnels configuration
-### Changed
-- Reseed servers list
-- Inactive NTCP sockets get closed faster
-- Some EdDSA speed up
-### Fixed
-- Multiple acceptors for SAM
-- Follow on data after STREAM CREATE for SAM
-- Memory leaks
-
-## [2.12.0] - 2017-02-14
-### Added
-- Additional HTTP and SOCKS proxy tunnels
-- Reseed from ZIP archive
-- Some stats in a main window for Windows version
-### Changed
-- Reseed servers list
-- MTU of 1488 for ipv6
-- Android and Mac OS X versions use OpenSSL 1.1
-- New logo for Android
-### Fixed
-- Multiple memory leaks
-- Incomptibility of some EdDSA private keys with Java
-- Clock skew for Windows XP
-- Occasional crashes with I2PSnark
-
-## [2.11.0] - 2016-12-18
-### Added
-- Websockets support
-- Reseed through a floodfill
-- Tunnel configuration for HTTP and SOCKS proxy
-- Zero-hops tunnels for destinations
-- Multiple acceptors for SAM
-### Changed
-- Reseed servers list
-- DHT uses AVX if applicable
-- New logo
-- LeaseSet lookups
-### Fixed
-- HTTP Proxy connection reset for Windows
-- Crash upon SAM session termination
-- Can't connect to a destination for a longer time after restart
-- Mass packet loss for UDP tunnels
-
-## [2.10.2] - 2016-12-04
-### Fixed
-- Fixes UPnP discovery bug, producing excessive CPU usage
-- Fixes sudden SSU thread stop for Windows.
-
-## [2.10.1] - 2016-11-07
-### Fixed
-- Fixed some performance issues for Windows and Android
-
-## [2.10.0] - 2016-10-17
-### Added
-- Datagram i2p tunnels
-- Unique local addresses for server tunnels
-- Configurable list of reseed servers  and initial addressbook
-- Configurable netid
-- Initial iOS support
-
-### Changed
-- Reduced file descriptors usage
-- Strict reseed checks enabled by default
-
-## Fixed
-- Multiple fixes in I2CP and BOB implementations
-
-## [2.9.0] - 2016-08-12
-### Changed
-- Proxy refactoring & speedup
-- Transmission-I2P support
-- Graceful shutdown for Windows
-- Android without QT
-- Reduced number of timers in SSU
-- ipv6 peer test support
-- Reseed from SU3 file
-
-## [2.8.0] - 2016-06-20
-### Added
-- Basic Android support
-- I2CP implementation
-- 'doxygen' target
-
-### Changed
-- I2PControl refactoring & fixes (proper jsonrpc responses on errors)
-- boost::regex no more needed
-
-### Fixed
-- initscripts: added openrc one, in sysv-ish make I2PD_PORT optional
-- properly close NTCP sessions (memleak)
-
-## [2.7.0] - 2016-05-18
-### Added
-- Precomputed El-Gamal/DH tables
-- Configurable limit of transit tunnels
-
-### Changed
-- Speed-up of asymmetric crypto for non-x64 platforms
-- Refactoring of web-console
-
-## [2.6.0] - 2016-03-31
-### Added
-- Graceful shutdown on SIGINT
-- Numeric bandwidth limits (was: by router class)
-- Jumpservices in web-console
-- Logging to syslog
-- Tray icon for windows application
-
-### Changed
-- Logs refactoring
-- Improved statistics in web-console
-
-### Deprecated:
-- Renamed main/tunnels config files (will use old, if found, but emits warning)
-
-## [2.5.1] - 2016-03-10
-### Fixed
-- Doesn't create ~/.i2pd dir if missing
-
-## [2.5.0] - 2016-03-04
-### Added
-- IRC server tunnels
-- SOCKS outproxy support
-- Support for gzipped addressbook updates
-- Support for router families
-
-### Changed
-- Shared RTT/RTO between streams
-- Filesystem work refactoring
-
-## [2.4.0] - 2016-02-03
-### Added
-- X-I2P-* headers for server http-tunnels
-- I2CP options for I2P tunnels
-- Show I2P tunnels in webconsole
-
-### Changed
-- Refactoring of cmdline/config parsing
-
-## [2.3.0] - 2016-01-12
-### Added
-- Support for new router bandwidth class codes (P and X)
-- I2PControl supports external webui
-- Added --pidfile and --notransit parameters
-- Ability to specify signature type for i2p tunnel
-
-### Changed
-- Fixed multiple floodfill-related bugs
-- New webconsole layout
-
-## [2.2.0] - 2015-12-22
-### Added
-- Ability to connect to router without ip via introducer
-
-### Changed
-- Persist temporary encryption keys for local destinations
-- Performance improvements for EdDSA
-- New addressbook structure
-
-## [2.1.0] - 2015-11-12
-### Added
-- Implementation of EdDSA
-
-### Changed
-- EdDSA is default signature type for new RouterInfos

Makefile

@@ -1,137 +0,0 @@
-SYS := $(shell $(CXX) -dumpmachine)
-SHLIB := libi2pd.so
-ARLIB := libi2pd.a
-SHLIB_CLIENT := libi2pdclient.so
-ARLIB_CLIENT := libi2pdclient.a
-I2PD := i2pd
-GREP := grep
-DEPS := obj/make.dep
-
-LIB_SRC_DIR := libi2pd
-LIB_CLIENT_SRC_DIR := libi2pd_client
-DAEMON_SRC_DIR := daemon
-
-include filelist.mk
-
-USE_AESNI	:= yes
-USE_AVX		:= yes
-USE_STATIC	:= no
-USE_MESHNET	:= no
-USE_UPNP	:= no
-DEBUG		:= yes
-
-ifeq ($(DEBUG),yes)
-	CXX_DEBUG = -g
-else
-	CXX_DEBUG = -Os
-	LD_DEBUG = -s
-endif
-
-ifeq ($(WEBSOCKETS),1)
-	NEEDED_CXXFLAGS += -DWITH_EVENTS
-endif
-
-ifneq (, $(findstring darwin, $(SYS)))
-	DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
-	ifeq ($(HOMEBREW),1)
-		include Makefile.homebrew
-	else
-		include Makefile.osx
-	endif
-else ifneq (, $(findstring linux, $(SYS))$(findstring gnu, $(SYS)))
-	DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
-	include Makefile.linux
-else ifneq (, $(findstring freebsd, $(SYS))$(findstring openbsd, $(SYS)))
-	DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
-	include Makefile.bsd
-else ifneq (, $(findstring mingw, $(SYS))$(findstring cygwin, $(SYS)))
-	DAEMON_SRC += Win32/DaemonWin32.cpp Win32/Win32Service.cpp Win32/Win32App.cpp
-	include Makefile.mingw
-else # not supported
-	$(error Not supported platform)
-endif
-
-ifeq ($(USE_MESHNET),yes)
-	NEEDED_CXXFLAGS += -DMESHNET
-endif
-
-NEEDED_CXXFLAGS += -I$(LIB_SRC_DIR) -I$(LIB_CLIENT_SRC_DIR)
-
-all: mk_obj_dir $(ARLIB) $(ARLIB_CLIENT) $(I2PD)
-
-mk_obj_dir:
-	@mkdir -p obj
-	@mkdir -p obj/Win32
-	@mkdir -p obj/$(LIB_SRC_DIR)
-	@mkdir -p obj/$(LIB_CLIENT_SRC_DIR)
-	@mkdir -p obj/$(DAEMON_SRC_DIR)
-
-api: mk_obj_dir $(SHLIB) $(ARLIB)
-api_client: mk_obj_dir $(SHLIB) $(ARLIB) $(SHLIB_CLIENT) $(ARLIB_CLIENT)
-
-## NOTE: The NEEDED_CXXFLAGS are here so that CXXFLAGS can be specified at build time
-## **without** overwriting the CXXFLAGS which we need in order to 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
-## -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.
-
-deps: mk_obj_dir
-	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) -MM *.cpp > $(DEPS)
-	@sed -i -e '/\.o:/ s/^/obj\//' $(DEPS)
-
-obj/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $<
-
-# '-' is 'ignore if missing' on first run
--include $(DEPS)
-
-DAEMON_OBJS += $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC))
-$(I2PD): $(DAEMON_OBJS) $(ARLIB) $(ARLIB_CLIENT)
-	$(CXX) -o $@ $^ $(LDFLAGS) $(LDLIBS)
-
-$(SHLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
-ifneq ($(USE_STATIC),yes)
-	$(CXX) $(LDFLAGS) $(LDLIBS) -shared -o $@ $^
-endif
-
-$(SHLIB_CLIENT): $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC))
-	$(CXX) $(LDFLAGS) $(LDLIBS) -shared -o $@ $^
-
-$(ARLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
-	$(AR) -r $@ $^
-
-$(ARLIB_CLIENT): $(patsubst %.cpp,obj/%.o,$(LIB_CLIENT_SRC))
-	$(AR) -r $@ $^
-
-clean:
-	$(RM) -r obj
-	$(RM) -r docs/generated
-	$(RM) $(I2PD) $(SHLIB) $(ARLIB) $(SHLIB_CLIENT) $(ARLIB_CLIENT)
-
-strip: $(I2PD) $(SHLIB_CLIENT) $(SHLIB)
-	strip $^
-
-LATEST_TAG=$(shell git describe --tags --abbrev=0 openssl)
-BRANCH=$(shell git rev-parse --abbrev-ref HEAD)
-dist:
-	git archive --format=tar.gz -9 --worktree-attributes \
-	    --prefix=i2pd_$(LATEST_TAG)/ $(LATEST_TAG) -o i2pd_$(LATEST_TAG).tar.gz
-
-last-dist:
-	git archive --format=tar.gz -9 --worktree-attributes \
-	    --prefix=i2pd_$(LATEST_TAG)/ $(BRANCH) -o ../i2pd_$(LATEST_TAG).orig.tar.gz
-
-doxygen:
-	doxygen -s docs/Doxyfile
-
-.PHONY: all
-.PHONY: clean
-.PHONY: deps
-.PHONY: doxygen
-.PHONY: dist
-.PHONY: last-dist
-.PHONY: api
-.PHONY: api_client
-.PHONY: mk_obj_dir
-.PHONY: install

Makefile.bsd

@@ -1,12 +0,0 @@
-CXX = clang++
-CXXFLAGS ?= ${CXX_DEBUG} -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-misleading-indentation
-## 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.
-## For example, when adding 'hardening flags' to the build
-## (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
-## custom FLAGS to work at build-time.
-NEEDED_CXXFLAGS = -std=c++11 -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 = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread

Makefile.homebrew

@@ -1,54 +0,0 @@
-# root directory holding homebrew
-BREWROOT = /usr/local
-BOOSTROOT = ${BREWROOT}/opt/boost
-SSLROOT = ${BREWROOT}/opt/openssl@1.1
-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}
-
-ifndef TRAVIS
-	CXX = clang++
-endif
-
-ifeq ($(USE_STATIC),yes)
-	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
-else
-	LDFLAGS += -L${SSLROOT}/lib -L${BOOSTROOT}/lib
-	LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
-endif
-
-ifeq ($(USE_UPNP),yes)
-	LDFLAGS += -ldl
-	CXXFLAGS += -DUSE_UPNP
-	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 += -maes
-endif
-ifeq ($(USE_AVX),1)
-	CXXFLAGS += -mavx
-endif
-
-install: all
-	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 644 contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf ${PREFIX}/etc/i2pd
-	@cp -R contrib/certificates ${PREFIX}/share/i2pd/
-	install -m 644 ChangeLog LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf ${PREFIX}/share/doc/i2pd
-	@gzip debian/i2pd.1 && install debian/i2pd.1.gz ${PREFIX}/share/man/man1
-	@ln -sf ${PREFIX}/share/i2pd/certificates ${PREFIX}/var/lib/i2pd/
-	@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

Makefile.linux

@@ -1,76 +0,0 @@
-# set defaults instead redefine
-CXXFLAGS ?= ${CXX_DEBUG} -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-misleading-indentation
-LDFLAGS ?= ${LD_DEBUG}
-
-## NOTE: The NEEDED_CXXFLAGS are here so that custom CXXFLAGS can be specified at build time
-## **without** overwriting the CXXFLAGS which we need in order to 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
-## -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.
-
-# detect proper flag for c++11 support by compilers
-CXXVER := $(shell $(CXX) -dumpversion)
-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\.[7-9]"),3) # >= 4.7
-	NEEDED_CXXFLAGS += -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1
-else ifeq ($(shell expr match ${CXXVER} "4\.6"),3) # = 4.6
-	NEEDED_CXXFLAGS += -std=c++0x
-else ifeq ($(shell expr match ${CXXVER} "[5-9]"),1) # gcc >= 5
-	NEEDED_CXXFLAGS += -std=c++11
-	LDLIBS = -latomic
-else # not supported
-$(error Compiler too old)
-endif
-
-NEEDED_CXXFLAGS += -fPIC
-
-ifeq ($(USE_STATIC),yes)
-# NOTE: on glibc you will get this warning:
-#   Using 'getaddrinfo' in statically linked applications requires at runtime
-#   the shared libraries from the glibc version used for linking
-	LIBDIR := /usr/lib
-	LDLIBS += $(LIBDIR)/libboost_system.a
-	LDLIBS += $(LIBDIR)/libboost_date_time.a
-	LDLIBS += $(LIBDIR)/libboost_filesystem.a
-	LDLIBS += $(LIBDIR)/libboost_program_options.a
-	LDLIBS += $(LIBDIR)/libssl.a
-	LDLIBS += $(LIBDIR)/libcrypto.a
-	LDLIBS += $(LIBDIR)/libz.a
-	LDLIBS += -lpthread -static-libstdc++ -static-libgcc -lrt -ldl
-	USE_AESNI := no
-else
-	LDLIBS += -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
-endif
-
-# UPNP Support (miniupnpc 1.5 and higher)
-ifeq ($(USE_UPNP),yes)
-	CXXFLAGS += -DUSE_UPNP
-ifeq ($(USE_STATIC),yes)
-	LDLIBS += $(LIBDIR)/libminiupnpc.a
-else
-	LDLIBS += -lminiupnpc
-endif
-endif
-
-ifeq ($(USE_AESNI),yes)
-#check if AES-NI is supported by CPU
-ifneq ($(shell $(GREP) -c aes /proc/cpuinfo),0)
-	machine := $(shell uname -m)
-	ifeq ($(machine), aarch64)
-		CXXFLAGS += -DARM64AES
-	else
-		CPU_FLAGS += -maes
-	endif
-endif
-endif
-
-ifeq ($(USE_AVX),yes)
-#check if AVX supported by CPU
-ifneq ($(shell $(GREP) -c avx /proc/cpuinfo),0)
-	CPU_FLAGS += -mavx
-endif
-endif

Makefile.mingw

@@ -1,60 +0,0 @@
-USE_WIN32_APP=yes
-CXX = g++
-WINDRES = windres
-CXXFLAGS := ${CXX_DEBUG} -D_MT -DWIN32 -D_WINDOWS -DWIN32_LEAN_AND_MEAN
-NEEDED_CXXFLAGS = -std=c++11
-INCFLAGS = -Idaemon -I.
-LDFLAGS := ${LD_DEBUG} -Wl,-Bstatic -static-libgcc -static-libstdc++
-
-# Boost libraries suffix
-BOOST_SUFFIX = -mt
-
-# UPNP Support
-ifeq ($(USE_UPNP),yes)
-	CXXFLAGS += -DUSE_UPNP -DMINIUPNP_STATICLIB
-	LDLIBS = -lminiupnpc
-endif
-
-LDLIBS += \
-	-lboost_system$(BOOST_SUFFIX) \
-	-lboost_date_time$(BOOST_SUFFIX) \
-	-lboost_filesystem$(BOOST_SUFFIX) \
-	-lboost_program_options$(BOOST_SUFFIX) \
-	-lssl \
-	-lcrypto \
-	-lz \
-	-lwsock32 \
-	-lws2_32 \
-	-lgdi32 \
-	-liphlpapi \
-	-lstdc++ \
-	-lpthread
-
-ifeq ($(USE_WIN32_APP), yes)
-	CXXFLAGS += -DWIN32_APP
-	LDFLAGS += -mwindows
-	DAEMON_RC += Win32/Resource.rc
-	DAEMON_OBJS += $(patsubst %.rc,obj/%.o,$(DAEMON_RC))
-endif
-
-ifeq ($(USE_WINXP_FLAGS), yes)
-	CXXFLAGS += -DWINVER=0x0501 -D_WIN32_WINNT=0x0501
-endif
-
-# don't change following line to ifeq ($(USE_AESNI),yes) !!!
-ifeq ($(USE_AESNI),1)
-	CPU_FLAGS += -maes
-else
-	CPU_FLAGS += -msse
-endif
-
-ifeq ($(USE_AVX),1)
-	CPU_FLAGS += -mavx
-endif
-
-ifeq ($(USE_ASLR),yes)
-	LDFLAGS += -Wl,--nxcompat -Wl,--high-entropy-va -Wl,--dynamicbase,--export-all-symbols
-endif
-
-obj/%.o : %.rc
-	$(WINDRES) -i $< -o $@

Makefile.osx

@@ -1,33 +0,0 @@
-CXX = clang++
-CXXFLAGS := ${CXX_DEBUG} -Wall -std=c++11 -DMAC_OSX
-INCFLAGS = -I/usr/local/include
-LDFLAGS := -Wl,-rpath,/usr/local/lib -L/usr/local/lib
-LDFLAGS += -Wl,-dead_strip
-LDFLAGS += -Wl,-dead_strip_dylibs
-LDFLAGS += -Wl,-bind_at_load
-
-ifeq ($(USE_STATIC),yes)
-	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
-	LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
-endif
-
-ifeq ($(USE_UPNP),yes)
-	LDFLAGS += -ldl
-	CXXFLAGS += -DUSE_UPNP
-	ifeq ($(USE_STATIC),yes)
-		LDLIBS += /usr/local/lib/libminiupnpc.a
-	else
-		LDLIBS += -lminiupnpc
-	endif
-endif
-
-ifeq ($(USE_AESNI),1)
-	CXXFLAGS += -maes
-else
-	CXXFLAGS += -msse
-endif
-
-ifeq ($(USE_AVX),1)
-	CXXFLAGS += -mavx
-endif

README.md

@@ -1,95 +1,21 @@
-[![GitHub release](https://img.shields.io/github/release/PurpleI2P/i2pd.svg?label=latest%20release)](https://github.com/PurpleI2P/i2pd/releases/latest)
-[![Snapcraft release](https://snapcraft.io/i2pd/badge.svg)](https://snapcraft.io/i2pd)
-[![License](https://img.shields.io/github/license/PurpleI2P/i2pd.svg)](https://github.com/PurpleI2P/i2pd/blob/openssl/LICENSE)
-
 i2pd
 ====
 
-[Русская версия](https://github.com/PurpleI2P/i2pd_docs_ru/blob/master/README.md)
+I2P router written in C++.
 
-i2pd (I2P Daemon) is a full-featured C++ implementation of I2P client.  
+Documentation for config files, command line options, build instructions and more can be found under the doc directory.
 
-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.  
+Downloads
+------------
 
-I2P client is a software used for building and using anonymous I2P
-networks. Such networks are commonly used for anonymous peer-to-peer
-applications (filesharing, cryptocurrencies) and anonymous client-server
-applications (websites, instant messengers, chat-servers).  
-
-I2P allows people from all around the world to communicate and share information
-without restrictions.  
-
-Features
---------
-
-* Distributed anonymous networking framework  
-* End-to-end encrypted communications  
-* Small footprint, simple dependencies, fast performance  
-* Rich set of APIs for developers of secure applications  
-
-Resources
----------
-
-* [Website](http://i2pd.website)
-* [Documentation](https://i2pd.readthedocs.io/en/latest/)
-* [Wiki](https://github.com/PurpleI2P/i2pd/wiki)
-* [Tickets/Issues](https://github.com/PurpleI2P/i2pd/issues)
-* [Specifications](https://geti2p.net/spec)
-* [Twitter](https://twitter.com/hashtag/i2pd)
-
-Installing
-----------
-
-The easiest way to install i2pd is by using precompiled packages and binaries.
-You can fetch most of them on [release](https://github.com/PurpleI2P/i2pd/releases/latest) page.  
-Please see [documentation](https://i2pd.readthedocs.io/en/latest/user-guide/install/) for more info.
-
-Building
---------
-See [documentation](https://i2pd.readthedocs.io/en/latest/) for how to build
-i2pd from source on your OS.  
+Official binary releases could be found at:
+http://download.i2p.io/purplei2p/i2pd/releases/
 
 
-Build instructions:
+Build Statuses
+---------------
 
-* [unix](https://i2pd.readthedocs.io/en/latest/devs/building/unix/)
-* [windows](https://i2pd.readthedocs.io/en/latest/devs/building/windows/)
-* [iOS](https://i2pd.readthedocs.io/en/latest/devs/building/ios/)
-* [android](https://i2pd.readthedocs.io/en/latest/devs/building/android/)
-
-
-**Supported systems:**
-
-* GNU/Linux - [![Build Status](https://travis-ci.org/PurpleI2P/i2pd.svg?branch=openssl)](https://travis-ci.org/PurpleI2P/i2pd)
-* Windows - [![Build status](https://ci.appveyor.com/api/projects/status/1908qe4p48ff1x23?svg=true)](https://ci.appveyor.com/project/PurpleI2P/i2pd)
-* Mac OS X - [![Build Status](https://travis-ci.org/PurpleI2P/i2pd.svg?branch=openssl)](https://travis-ci.org/PurpleI2P/i2pd)
-* CentOS / Fedora / Mageia - [![Build Status](https://copr.fedorainfracloud.org/coprs/supervillain/i2pd/package/i2pd-git/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/supervillain/i2pd/package/i2pd-git/)
-* Docker image - [![Build Status](https://dockerbuildbadges.quelltext.eu/status.svg?organization=meeh&repository=i2pd)](https://hub.docker.com/r/meeh/i2pd/builds/)
-* Snap - [![Snap Status](https://build.snapcraft.io/badge/PurpleI2P/i2pd-snap.svg)](https://build.snapcraft.io/user/PurpleI2P/i2pd-snap)
-* FreeBSD
-* Android
-* iOS
-
-Using i2pd
-----------
-
-See [documentation](https://i2pd.readthedocs.io/en/latest/user-guide/run/) and
-[example config file](https://github.com/PurpleI2P/i2pd/blob/openssl/contrib/i2pd.conf).
-
-Donations
----------
-
-BTC: 3MDoGJW9TLMTCDGrR9bLgWXfm6sjmgy86f  
-LTC: LKQirrYrDeTuAPnpYq5y7LVKtywfkkHi59  
-ETH: 0x9e5bac70d20d1079ceaa111127f4fb3bccce379d  
-DASH: Xw8YUrQpYzP9tZBmbjqxS3M97Q7v3vJKUF  
-ZEC: t1cTckLuXsr1dwVrK4NDzfhehss4NvMadAJ  
-GST: GbD2JSQHBHCKLa9WTHmigJRpyFgmBj4woG  
-
-License
--------
-
-This project is licensed under the BSD 3-clause license, which can be found in the file
-LICENSE in the root of the project source code.  
+- Linux x64      - Maintenance
+- Linux ARM      - Maintenance
+- Mac OS X       - Maintenance
+- Microsoft VC13 - To be added

TODO

@@ -0,0 +1,16 @@
+Refactoring:
+    - SSUSession:637, SSUSession:635 get rid of casting to SSUHeader
+    - Identity.cpp:156 check for self asignment
+    - Rely on a library for TLS and SSL.
+    - Move parsing code out of networking code, to allow better testing. 
+    - Move streaming code to a separate directory.
+    - Separate front-end code (SAM, BOB, ...) from the back-end.
+
+Additions:
+    - Write tests.
+    - Add documentation.
+    - Create a specialized IRC tunnel (instead of just a generic ClientTunnel instance).
+    - Ban peers with unexpected / bad behaviour.
+    - EdDSA support.
+    - Return correct error codes in HTTPProxy.
+    - Modify web interface layout and use AJAX to update information.

Win32/DaemonWin32.cpp

@@ -1,113 +0,0 @@
-#include <thread>
-#include <clocale>
-#include "Config.h"
-#include "Daemon.h"
-#include "util.h"
-#include "Log.h"
-
-#ifdef _WIN32
-#include "Win32/Win32Service.h"
-#ifdef WIN32_APP
-#include "Win32/Win32App.h"
-#endif
-
-namespace i2p
-{
-namespace util
-{
-	bool DaemonWin32::init(int argc, char* argv[])
-	{
-		setlocale(LC_CTYPE, "");
-		SetConsoleCP(1251);
-		SetConsoleOutputCP(1251);
-		setlocale(LC_ALL, "Russian");
-		setlocale(LC_TIME, "C");
-
-		if (!Daemon_Singleton::init(argc, argv))
-			return false;
-
-		std::string serviceControl; i2p::config::GetOption("svcctl", serviceControl);
-		if (serviceControl == "install")
-		{
-			LogPrint(eLogInfo, "WinSVC: installing ", SERVICE_NAME, " as service");
-			InstallService(
-				SERVICE_NAME,               // Name of service
-				SERVICE_DISPLAY_NAME,       // Name to display
-				SERVICE_START_TYPE,         // Service start type
-				SERVICE_DEPENDENCIES,       // Dependencies
-				SERVICE_ACCOUNT,            // Service running account
-				SERVICE_PASSWORD            // Password of the account
-				);
-			return false;
-		}
-		else if (serviceControl == "remove")
-		{
-			LogPrint(eLogInfo, "WinSVC: uninstalling ", SERVICE_NAME, " service");
-			UninstallService(SERVICE_NAME);
-			return false;
-		}
-
-		if (isDaemon)
-		{
-			LogPrint(eLogDebug, "Daemon: running as service");
-			I2PService service((PSTR)SERVICE_NAME);
-			if (!I2PService::Run(service))
-			{
-				LogPrint(eLogError, "Daemon: Service failed to run w/err 0x%08lx\n", GetLastError());
-				return false;
-			}
-			return false;
-		}
-		else
-			LogPrint(eLogDebug, "Daemon: running as user");
-		return true;
-	}
-
-	bool DaemonWin32::start()
-	{
-		setlocale(LC_CTYPE, "");
-		SetConsoleCP(1251);
-		SetConsoleOutputCP(1251);
-		setlocale(LC_ALL, "Russian");
-		setlocale(LC_TIME, "C");
-#ifdef WIN32_APP
-		if (!i2p::win32::StartWin32App ()) return false;
-
-		// override log
-		i2p::config::SetOption("log", std::string ("file"));
-#endif
-		bool ret = Daemon_Singleton::start();
-		if (ret && i2p::log::Logger().GetLogType() == eLogFile)
-		{
-			// TODO: find out where this garbage to console comes from
-			SetStdHandle(STD_OUTPUT_HANDLE, INVALID_HANDLE_VALUE);
-			SetStdHandle(STD_ERROR_HANDLE, INVALID_HANDLE_VALUE);
-		}
-		bool insomnia; i2p::config::GetOption("insomnia", insomnia);
-		if (insomnia)
-			SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED);
-		return ret;
-	}
-
-	bool DaemonWin32::stop()
-	{
-#ifdef WIN32_APP
-		i2p::win32::StopWin32App ();
-#endif
-		return Daemon_Singleton::stop();
-	}
-
-	void DaemonWin32::run ()
-	{
-#ifdef WIN32_APP
-		i2p::win32::RunWin32App ();
-#else
-		while (running)
-		{
-			std::this_thread::sleep_for (std::chrono::seconds(1));
-		}
-#endif
-	}
-}
-}
-#endif //_WIN32

Win32/Resource.rc

@@ -1,36 +0,0 @@
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-#include "winres.h"
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-
-#ifdef APSTUDIO_INVOKED
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
-    "\r\n"
-    "\0"
-END
-#endif		// APSTUDIO_INVOKED
-
-MAINICON ICON "mask.ico"
-#endif		// English (United States) resources
-
-#ifndef APSTUDIO_INVOKED
-#include "Resource.rc2"
-#endif		// not APSTUDIO_INVOKED
-

Win32/Resource.rc2

@@ -1,38 +0,0 @@
-#ifdef APSTUDIO_INVOKED
-#error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-#include "../libi2pd/version.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION I2PD_VERSION_MAJOR,I2PD_VERSION_MINOR,I2PD_VERSION_MICRO,I2PD_VERSION_PATCH
- PRODUCTVERSION I2P_VERSION_MAJOR,I2P_VERSION_MINOR,I2P_VERSION_MICRO,I2P_VERSION_PATCH
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Purple I2P"
-            VALUE "FileDescription", "C++ I2P daemon"
-            VALUE "FileVersion", I2PD_VERSION
-            VALUE "InternalName", CODENAME
-            VALUE "LegalCopyright", "Copyright (C) 2013-2017, The PurpleI2P Project"
-            VALUE "OriginalFilename", "i2pd"
-            VALUE "ProductName", "Purple I2P"
-            VALUE "ProductVersion", I2P_VERSION
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

Win32/Win32App.cpp

@@ -1,453 +0,0 @@
-#include <string.h>
-#include <windows.h>
-#include <shellapi.h>
-#include "ClientContext.h"
-#include "Config.h"
-#include "NetDb.hpp"
-#include "RouterContext.h"
-#include "Transports.h"
-#include "Tunnel.h"
-#include "version.h"
-#include "resource.h"
-#include "Daemon.h"
-#include "Win32App.h"
-#include <stdio.h>
-
-#define ID_ABOUT 2000
-#define ID_EXIT 2001
-#define ID_CONSOLE 2002
-#define ID_APP 2003
-#define ID_GRACEFUL_SHUTDOWN 2004
-#define ID_STOP_GRACEFUL_SHUTDOWN 2005
-#define ID_RELOAD 2006
-#define ID_ACCEPT_TRANSIT 2007
-#define ID_DECLINE_TRANSIT 2008
-
-#define ID_TRAY_ICON 2050
-#define WM_TRAYICON (WM_USER + 1)
-
-#define IDT_GRACEFUL_SHUTDOWN_TIMER 2100
-#define FRAME_UPDATE_TIMER 2101
-#define IDT_GRACEFUL_TUNNELCHECK_TIMER 2102
-
-namespace i2p
-{
-namespace win32
-{
-	static DWORD GracefulShutdownEndtime = 0;
-	
-	typedef DWORD (* IPN)();
-	IPN GetTickCountLocal = (IPN)GetProcAddress (GetModuleHandle ("KERNEL32.dll"), "GetTickCount");
-
-	static void ShowPopupMenu (HWND hWnd, POINT *curpos, int wDefaultItem)
-	{
-		HMENU hPopup = CreatePopupMenu();
-		InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_CONSOLE, "Open &console");
-		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_SEPARATOR, 0, NULL);
-		if(!i2p::context.AcceptsTunnels())
-			InsertMenu (hPopup, -1,
-				i2p::util::DaemonWin32::Instance ().isGraceful ? MF_BYPOSITION | MF_STRING | MF_GRAYED : MF_BYPOSITION | MF_STRING,
-				ID_ACCEPT_TRANSIT, "Accept &transit");
-		else
-			InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_DECLINE_TRANSIT, "Decline &transit");
-		InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_RELOAD, "&Reload tunnels config");
-		if (!i2p::util::DaemonWin32::Instance ().isGraceful)
-			InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_GRACEFUL_SHUTDOWN, "&Graceful shutdown");
-		else
-			InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_STOP_GRACEFUL_SHUTDOWN, "Stop &graceful shutdown");
-		InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_EXIT, "E&xit");
-		SetMenuDefaultItem (hPopup, ID_CONSOLE, FALSE);
-		SendMessage (hWnd, WM_INITMENUPOPUP, (WPARAM)hPopup, 0);
-
-		POINT p;
-		if (!curpos)
-		{
-			GetCursorPos (&p);
-			curpos = &p;
-		}
-
-		WORD cmd = TrackPopupMenu (hPopup, TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD | TPM_NONOTIFY, curpos->x, curpos->y, 0, hWnd, NULL);
-		SendMessage (hWnd, WM_COMMAND, cmd, 0);
-
-		DestroyMenu(hPopup);
-	}
-
-	static void AddTrayIcon (HWND hWnd)
-	{
-		NOTIFYICONDATA nid;
-		memset(&nid, 0, sizeof(nid));
-		nid.cbSize = sizeof(nid);
-		nid.hWnd = hWnd;
-		nid.uID = ID_TRAY_ICON;
-		nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP | NIF_INFO;
-		nid.uCallbackMessage = WM_TRAYICON;
-		nid.hIcon = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE (MAINICON));
-		strcpy (nid.szTip, "i2pd");
-		strcpy (nid.szInfo, "i2pd is starting");
-		Shell_NotifyIcon(NIM_ADD, &nid );
-	}
-
-	static void RemoveTrayIcon (HWND hWnd)
-	{
-		NOTIFYICONDATA nid;
-		nid.hWnd = hWnd;
-		nid.uID = ID_TRAY_ICON;
-		Shell_NotifyIcon (NIM_DELETE, &nid);
-	}
-
-	static void ShowUptime (std::stringstream& s, int seconds)
-	{
-		int num;
-
-		if ((num = seconds / 86400) > 0) {
-			s << num << " days, ";
-			seconds -= num * 86400;
-		}
-		if ((num = seconds / 3600) > 0) {
-			s << num << " hours, ";
-			seconds -= num * 3600;
-		}
-		if ((num = seconds / 60) > 0) {
-			s << num << " min, ";
-			seconds -= num * 60;
-		}
-		s << seconds << " seconds\n";
-	}
-
-	template <typename size> static void ShowTransfered (std::stringstream& s, size transfer)
-	{
-		auto bytes = transfer & 0x03ff;
-		transfer >>= 10;
-		auto kbytes = transfer & 0x03ff;
-		transfer >>= 10;
-		auto mbytes = transfer & 0x03ff;
-		transfer >>= 10;
-		auto gbytes = transfer & 0x03ff;
-
-		if (gbytes)
-			s << gbytes << " GB, ";
-		if (mbytes)
-			s << mbytes << " MB, ";
-		if (kbytes)
-			s << kbytes << " KB, ";
-		s << bytes << " Bytes\n";
-	}
-
-	static void PrintMainWindowText (std::stringstream& s)
-	{
-		s << "\n";
-		s << "Status: ";
-		switch (i2p::context.GetStatus())
-		{
-			case eRouterStatusOK: s << "OK"; break;
-			case eRouterStatusTesting: s << "Testing"; break;
-			case eRouterStatusFirewalled: s << "Firewalled"; break;
-			case eRouterStatusError:
-			{
-				switch (i2p::context.GetError())
-				{
-					case eRouterErrorClockSkew: s << "Clock skew"; break;
-					default: s << "Error";
-				}
-				break;
-			}
-			default: s << "Unknown";
-		}
-		s << "; ";
-		s << "Success Rate: " << i2p::tunnel::tunnels.GetTunnelCreationSuccessRate() << "%\n";
-		s << "Uptime: "; ShowUptime(s, i2p::context.GetUptime ());
-		if (GracefulShutdownEndtime != 0)
-		{
-			DWORD GracefulTimeLeft = (GracefulShutdownEndtime - GetTickCountLocal()) / 1000;
-			s << "Graceful shutdown, time left: "; ShowUptime(s, GracefulTimeLeft);
-		}
-		else
-			s << "\n";
-		s << "Inbound: " << i2p::transport::transports.GetInBandwidth() / 1024 << " KiB/s; ";
-		s << "Outbound: " << i2p::transport::transports.GetOutBandwidth() / 1024 << " KiB/s\n";
-		s << "Received: "; ShowTransfered (s, i2p::transport::transports.GetTotalReceivedBytes());
-		s << "Sent: "; ShowTransfered (s, i2p::transport::transports.GetTotalSentBytes());
-		s << "\n";
-		s << "Routers: " << i2p::data::netdb.GetNumRouters () << "; ";
-		s << "Floodfills: " << i2p::data::netdb.GetNumFloodfills () << "; ";
-		s << "LeaseSets: " << i2p::data::netdb.GetNumLeaseSets () << "\n";
-		s << "Tunnels: ";
-		s << "In: " << i2p::tunnel::tunnels.CountInboundTunnels() << "; ";
-		s << "Out: " << i2p::tunnel::tunnels.CountOutboundTunnels() << "; ";
-		s << "Transit: " << i2p::tunnel::tunnels.CountTransitTunnels() << "\n";
-		s << "\n";
-	}
-
-	static LRESULT CALLBACK WndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-	{
-		static UINT s_uTaskbarRestart;
-
-		switch (uMsg)
-		{
-			case WM_CREATE:
-			{
-				s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated"));
-				AddTrayIcon (hWnd);
-				break;
-			}
-			case WM_CLOSE:
-			{
-				RemoveTrayIcon (hWnd);
-				KillTimer (hWnd, FRAME_UPDATE_TIMER);
-				KillTimer (hWnd, IDT_GRACEFUL_SHUTDOWN_TIMER);
-				KillTimer (hWnd, IDT_GRACEFUL_TUNNELCHECK_TIMER);
-				PostQuitMessage (0);
-				break;
-			}
-			case WM_COMMAND:
-			{
-				switch (LOWORD(wParam))
-				{
-					case ID_ABOUT:
-					{
-						std::stringstream text;
-						text << "Version: " << I2PD_VERSION << " " << CODENAME;
-						MessageBox( hWnd, TEXT(text.str ().c_str ()), TEXT("i2pd"), MB_ICONINFORMATION | MB_OK );
-						return 0;
-					}
-					case ID_EXIT:
-					{
-						PostMessage (hWnd, WM_CLOSE, 0, 0);
-						return 0;
-					}
-					case ID_ACCEPT_TRANSIT:
-					{
-						i2p::context.SetAcceptsTunnels (true);
-						std::stringstream text;
-						text << "I2Pd now accept transit tunnels";
-						MessageBox( hWnd, TEXT(text.str ().c_str ()), TEXT("i2pd"), MB_ICONINFORMATION | MB_OK );
-						return 0;
-					}
-					case ID_DECLINE_TRANSIT:
-					{
-						i2p::context.SetAcceptsTunnels (false);
-						std::stringstream text;
-						text << "I2Pd now decline new transit tunnels";
-						MessageBox( hWnd, TEXT(text.str ().c_str ()), TEXT("i2pd"), MB_ICONINFORMATION | MB_OK );
-						return 0;
-					}
-					case ID_GRACEFUL_SHUTDOWN:
-					{
-						i2p::context.SetAcceptsTunnels (false);
-						SetTimer (hWnd, IDT_GRACEFUL_SHUTDOWN_TIMER, 10*60*1000, nullptr); // 10 minutes
-						SetTimer (hWnd, IDT_GRACEFUL_TUNNELCHECK_TIMER, 1000, nullptr); // check tunnels every second
-						GracefulShutdownEndtime = GetTickCountLocal() + 10*60*1000;
-						i2p::util::DaemonWin32::Instance ().isGraceful = true;
-						return 0;
-					}
-					case ID_STOP_GRACEFUL_SHUTDOWN:
-					{
-						i2p::context.SetAcceptsTunnels (true);
-						KillTimer (hWnd, IDT_GRACEFUL_SHUTDOWN_TIMER);
-						KillTimer (hWnd, IDT_GRACEFUL_TUNNELCHECK_TIMER);
-						GracefulShutdownEndtime = 0;
-						i2p::util::DaemonWin32::Instance ().isGraceful = false;
-						return 0;
-					}
-					case ID_RELOAD:
-					{
-						i2p::client::context.ReloadConfig();
-						std::stringstream text;
-						text << "I2Pd reloading configs...";
-						MessageBox( hWnd, TEXT(text.str ().c_str ()), TEXT("i2pd"), MB_ICONINFORMATION | MB_OK );
-						return 0;
-					}
-					case ID_CONSOLE:
-					{
-						char buf[30];
-						std::string httpAddr; i2p::config::GetOption("http.address", httpAddr);
-						uint16_t httpPort; i2p::config::GetOption("http.port", httpPort);
-						snprintf(buf, 30, "http://%s:%d", httpAddr.c_str(), httpPort);
-						ShellExecute(NULL, "open", buf, NULL, NULL, SW_SHOWNORMAL);
-						return 0;
-					}
-					case ID_APP:
-					{
-						ShowWindow(hWnd, SW_SHOW);
-						SetTimer(hWnd, FRAME_UPDATE_TIMER, 3000, NULL);
-						return 0;
-					}
-				}
-				break;
-			}
-			case WM_SYSCOMMAND:
-			{
-				switch (wParam)
-				{
-					case SC_MINIMIZE:
-					{
-						ShowWindow(hWnd, SW_HIDE);
-						KillTimer (hWnd, FRAME_UPDATE_TIMER);
-						return 0;
-					}
-					case SC_CLOSE:
-					{
-						std::string close; i2p::config::GetOption("close", close);
-						if (0 == close.compare("ask"))
-						switch(::MessageBox(hWnd, "Would you like to minimize instead of exiting?"
-						" You can add 'close' configuration option. Valid values are: ask, minimize, exit.",
-						"Minimize instead of exiting?", MB_ICONQUESTION | MB_YESNOCANCEL | MB_DEFBUTTON1))
-						{
-							case IDYES: close = "minimize"; break;
-							case IDNO: close = "exit"; break;
-							default: return 0;
-						}
-						if (0 == close.compare("minimize"))
-						{
-							ShowWindow(hWnd, SW_HIDE);
-							KillTimer (hWnd, FRAME_UPDATE_TIMER);
-							return 0;
-						}
-						if (0 != close.compare("exit"))
-						{
-							::MessageBox(hWnd, close.c_str(), "Unknown close action in config", MB_OK | MB_ICONWARNING);
-							return 0;
-						}
-					}
-				}
-			}
-			case WM_TRAYICON:
-			{
-				switch (lParam)
-				{
-					case WM_LBUTTONUP:
-					case WM_RBUTTONUP:
-					{
-						SetForegroundWindow (hWnd);
-						ShowPopupMenu(hWnd, NULL, -1);
-						PostMessage (hWnd, WM_APP + 1, 0, 0);
-						break;
-					}
-				}
-				break;
-			}
-			case WM_TIMER:
-			{
-				switch(wParam)
-				{
-					case IDT_GRACEFUL_SHUTDOWN_TIMER:
-					{
-						GracefulShutdownEndtime = 0;
-						PostMessage (hWnd, WM_CLOSE, 0, 0); // exit
-						return 0;
-					}
-					case FRAME_UPDATE_TIMER:
-					{
-						InvalidateRect(hWnd, NULL, TRUE);
-						return 0;
-					}
-					case IDT_GRACEFUL_TUNNELCHECK_TIMER:
-					{
-						if (i2p::tunnel::tunnels.CountTransitTunnels() == 0)
-							PostMessage (hWnd, WM_CLOSE, 0, 0);
-						else
-							SetTimer (hWnd, IDT_GRACEFUL_TUNNELCHECK_TIMER, 1000, nullptr);
-						return 0;
-					}
-				}
-				break;
-			}
-			case WM_PAINT:
-			{
-				HDC hDC;
-				PAINTSTRUCT ps;
-				RECT rp;
-				HFONT hFont;
-				std::stringstream s; PrintMainWindowText (s);
-				hDC = BeginPaint (hWnd, &ps);
-				GetClientRect(hWnd, &rp);
-				SetTextColor(hDC, 0x00D43B69);
-				hFont = CreateFont(18,0,0,0,0,0,0,0,DEFAULT_CHARSET,0,0,0,0,TEXT("Times New Roman"));
-				SelectObject(hDC,hFont);
-				DrawText(hDC, TEXT(s.str().c_str()), s.str().length(), &rp, DT_CENTER|DT_VCENTER);
-				DeleteObject(hFont);
-				EndPaint(hWnd, &ps);
-				break;
-			}
-			default:
-			{
-				if (uMsg == s_uTaskbarRestart)
-					AddTrayIcon (hWnd);
-				break;
-			}
-		}
-		return DefWindowProc( hWnd, uMsg, wParam, lParam);
-	}
-
-	bool StartWin32App ()
-	{
-		if (FindWindow (I2PD_WIN32_CLASSNAME, TEXT("i2pd")))
-		{
-			MessageBox(NULL, TEXT("I2Pd is running already"), TEXT("Warning"), MB_OK);
-			return false;
-		}
-		// register main window
-		auto hInst = GetModuleHandle(NULL);
-		WNDCLASSEX wclx;
-		memset (&wclx, 0, sizeof(wclx));
-		wclx.cbSize = sizeof(wclx);
-		wclx.style = 0;
-		wclx.lpfnWndProc = WndProc;
-		//wclx.cbClsExtra = 0;
-		//wclx.cbWndExtra = 0;
-		wclx.hInstance = hInst;
-		wclx.hIcon = LoadIcon (hInst, MAKEINTRESOURCE(MAINICON));
-		wclx.hCursor = LoadCursor (NULL, IDC_ARROW);
-		//wclx.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
-		wclx.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
-		wclx.lpszMenuName = NULL;
-		wclx.lpszClassName = I2PD_WIN32_CLASSNAME;
-		RegisterClassEx (&wclx);
-		// create new window
-		if (!CreateWindow(I2PD_WIN32_CLASSNAME, TEXT("i2pd"), WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX, 100, 100, 350, 210, NULL, NULL, hInst, NULL))
-		{
-			MessageBox(NULL, "Failed to create main window", TEXT("Warning!"), MB_ICONERROR | MB_OK | MB_TOPMOST);
-			return false;
-		}
-		return true;
-	}
-
-	int RunWin32App ()
-	{
-		MSG msg;
-		while (GetMessage (&msg, NULL, 0, 0 ))
-		{
-			TranslateMessage (&msg);
-			DispatchMessage (&msg);
-		}
-		return msg.wParam;
-	}
-
-	void StopWin32App ()
-	{
-		HWND hWnd = FindWindow (I2PD_WIN32_CLASSNAME, TEXT("i2pd"));
-		if (hWnd)
-			PostMessage (hWnd, WM_COMMAND, MAKEWPARAM(ID_EXIT, 0), 0);
-		UnregisterClass (I2PD_WIN32_CLASSNAME, GetModuleHandle(NULL));
-	}
-
-	bool GracefulShutdown ()
-	{
-		HWND hWnd = FindWindow (I2PD_WIN32_CLASSNAME, TEXT("i2pd"));
-		if (hWnd)
-			PostMessage (hWnd, WM_COMMAND, MAKEWPARAM(ID_GRACEFUL_SHUTDOWN, 0), 0);
-		return hWnd;
-	}
-
-	bool StopGracefulShutdown ()
-	{
-		HWND hWnd = FindWindow (I2PD_WIN32_CLASSNAME, TEXT("i2pd"));
-		if (hWnd)
-			PostMessage (hWnd, WM_COMMAND, MAKEWPARAM(ID_STOP_GRACEFUL_SHUTDOWN, 0), 0);
-		return hWnd;
-	}
-
-}
-}

Win32/Win32App.h

@@ -1,17 +0,0 @@
-#ifndef WIN32APP_H__
-#define WIN32APP_H__
-
-#define I2PD_WIN32_CLASSNAME "i2pd main window"
-
-namespace i2p
-{
-namespace win32
-{
-	bool StartWin32App ();
-	void StopWin32App ();
-	int RunWin32App ();
-	bool GracefulShutdown ();
-	bool StopGracefulShutdown ();
-}
-}
-#endif // WIN32APP_H__

Win32/installer.iss

@@ -1,42 +0,0 @@
-#define I2Pd_AppName "i2pd"
-#define I2Pd_ver "2.30.0"
-#define I2Pd_Publisher "PurpleI2P"
-
-[Setup]
-AppName={#I2Pd_AppName}
-AppVersion={#I2Pd_ver}
-AppPublisher={#I2Pd_Publisher}
-DefaultDirName={pf}\I2Pd
-DefaultGroupName=I2Pd
-UninstallDisplayIcon={app}\I2Pd.exe
-OutputDir=.
-LicenseFile=../LICENSE
-OutputBaseFilename=setup_{#I2Pd_AppName}_v{#I2Pd_ver}
-SetupIconFile=mask.ico
-InternalCompressLevel=ultra64
-Compression=lzma/ultra64
-SolidCompression=true
-ArchitecturesInstallIn64BitMode=x64
-AppVerName={#I2Pd_AppName}
-ExtraDiskSpaceRequired=15
-AppID={{621A23E0-3CF4-4BD6-97BC-4835EA5206A2}
-AppPublisherURL=http://i2pd.website/
-AppSupportURL=https://github.com/PurpleI2P/i2pd/issues
-AppUpdatesURL=https://github.com/PurpleI2P/i2pd/releases
-
-[Files]
-Source: ..\i2pd_x86.exe; DestDir: {app}; DestName: i2pd.exe; Flags: ignoreversion; Check: not IsWin64
-Source: ..\i2pd_x64.exe; DestDir: {app}; DestName: i2pd.exe; Flags: ignoreversion; Check: IsWin64
-Source: ..\README.md; DestDir: {app}; DestName: Readme.txt; Flags: onlyifdoesntexist
-Source: ..\contrib\i2pd.conf; DestDir: {userappdata}\i2pd; Flags: onlyifdoesntexist
-Source: ..\contrib\subscriptions.txt; 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\tunnels.d\*; DestDir: {userappdata}\i2pd\tunnels.d; Flags: onlyifdoesntexist recursesubdirs createallsubdirs
-
-[Icons]
-Name: {group}\I2Pd; Filename: {app}\i2pd.exe
-Name: {group}\Readme; Filename: {app}\Readme.txt
-
-[UninstallDelete]
-Type: filesandordirs; Name: {app}

Win32/resource.h

@@ -1,11 +0,0 @@
-//{{NO_DEPENDENCIES}}
-#define MAINICON						101
-
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE		102
-#define _APS_NEXT_COMMAND_VALUE			40001
-#define _APS_NEXT_CONTROL_VALUE			1001
-#define _APS_NEXT_SYMED_VALUE			101
-#endif
-#endif

Win32/winres.h

@@ -1,6 +0,0 @@
-#ifndef WINRES_H__
-#define WINRES_H__
-
-#include <winresrc.h>
-
-#endif

android/.gitignore

@@ -1,16 +0,0 @@
-gen
-tests
-bin
-libs
-log*
-obj
-.gradle
-.idea
-.externalNativeBuild
-ant.properties
-local.properties
-build.sh
-android.iml
-build
-*.iml
-*.local

android/AndroidManifest.xml

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.purplei2p.i2pd"
-    android:installLocation="auto">
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/icon"
-        android:label="@string/app_name"
-        android:theme="@android:style/Theme.Holo.Light.DarkActionBar"
-        android:requestLegacyExternalStorage="true"
-        >
-        <receiver android:name=".NetworkStateChangeReceiver">
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-            </intent-filter>
-        </receiver>
-
-        <activity
-            android:name=".I2PDPermsAskerActivity"
-            android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".I2PDActivity"
-            android:label="@string/app_name" />
-
-        <service
-            android:name=".ForegroundService"
-            android:enabled="true" />
-
-        <activity
-            android:name=".I2PDPermsExplanationActivity"
-            android:label="@string/title_activity_i2_pdperms_asker_prompt"
-            android:parentActivityName=".I2PDPermsAskerActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.purplei2p.i2pd.I2PDPermsAskerActivity" />
-        </activity>
-    </application>
-</manifest>

android/assets/addressbook/addresses.csv

@@ -1,693 +0,0 @@
-00.i2p,zmzpltxslembpaupg3srh4bbhv5txgh5jmms6sfj4hzsvlv3xugq
-0ipfs.i2p,cdii3ou5mve5sfxyirs6kogt4tbvivk2d6o25awbcbazjrlhjeza
-0xcc.i2p,gawouxh2sg32cluwlqsnpy3dwedvoqtfroi4evvdvm2pfv7tdadq
-1.fcp.freenet.i2p,cuxbeputgxn75ak4nr7ltp7fjktnzl5sul3wstwnsoytbbpb4ixq
-102chan.i2p,xxu3lso4h2rh6wmrxiou3ax7r7la7x6dhoepnku3jvrlwp35pefq
-1st.i2p,rduua7bhest6rwsmmyttzssfdw3p4eu6bgl3mb4hin32qo3x5zfq
-2.fcp.freenet.i2p,ndsznnipoeyapnsg3gj3yi2dzsqduxwalmujm5mzjm7e6x374tta
-333.i2p,ctvfe2fimcsdfxmzmd42brnbf7ceenwrbroyjx3wzah5eudjyyza
-55cancri.i2p,b4iqenefh2fr4xtuq6civfc6nhnia6e2yo36pf7vcgdvrwmh7xua
-adab.i2p,pxjr6f2cig6v7v7ekam3smdnkqgmgseyy5cdwrozdyejm7jknkha
-alice.i2p,iq26r2ls2qlkhbn62cvgb6a4iib7m5lkoulohdua5z6uvzlovjtq
-always.i2p,wp43sdtuxum6gxbjvyeor35r5yvgtkp3dcu7dv47lx22zeb3relq
-amazone.i2p,e6kq73lsxaeyiwpmykdbdo3uy4ppj64bl7y3viegp6mqrilqybqa
-amiga.i2p,edy2xappzjjh7bxqounevji4wd2binqkv7gft4usrkan45xhbk5q
-amobius.i2p,rj6432agdprun5baai2hj62xfhb4l75uvzl55dhj6z5zzoxv3htq
-anarchistfaq.i2p,xosberjz2geveh5dcstztq5kwew6xx2brrqaorkjf2323bjzcd3q
-animal.i2p,5iedafy32swqq4t2wcmjb4fvg3onscng7ct7wb237jkvrclaftla
-anodex.i2p,25cb5kixhxm6i6c6wequrhi65mez4duc4l5qk6ictbik3tnxlu6a
-anoncoin.i2p,nmi3loretkk4zbili32t2e5wyznwoxcsgzmd2z4ll3msgndyqpfa
-anongw.i2p,owrnciwubb3f3dctvlmnaknb6tjdxtlzvv7klocb45mmhievdjhq
-anonsfw.i2p,ir6hzi66izmvqx3usjl6br3nndkpazonlckrzt3gtltqcy5ralyq
-anonymnet.i2p,77ouyl2ane7ffgydosd4ye42g67aomtc4jrusmi76lds5qonlffa
-anonynanny.i2p,l2lnhq2dynnmf3m46tcbpcmbbn4kifjgt26go6n2hlapy4drhyja
-anonyradio.i2p,cbobsax3rhoyjbk7ii2nd2fnl5bxh3x7bbearokyxgvmudn7o5bq
-antipiracyagency.i2p,by4kcmklz7xnkai6ndfio47kts3rndm6wwleegtxghllimikdapq
-antipiratbyran.i2p,y2qbhrvuciifbszaqqwxd5t75bomp7kzdqx4yxsrkaq542t75k3a
-aosp.i2p,ly7raldsh2na2cgw5yvueyvqqjgx3vbqinecjrqdldgya76i2p2q
-arc2.i2p,rnmosuwvtftfcrk5sk7zoyhyadh2g4dhe2mif5ml7qjisgkyw2na
-archaicbinarybbs.i2p,t7o2tw36cffedgfr6kahewpkrntofnliuapji2e4rucl3os55epa
-archiv.tutorials.i2p,lldr2miowq6353fxy44pnxfk37d6yn2f6kaivzecbmvvnnf5exyq
-archive.i2p,x54d5st3dl6mwgfxj6raiekqkypo5pdvuex3n62szwju7hgefiyq
-archive.syndie.i2p,abbyu5n3mh3nj7pe3b6byldrxswvva5ttxcafsnnseidanurq3kq
-ardor-wallet.i2p,tm23k5ny3umhf6vf3kghnnwacli5zywq5wrr3xcqowbcofuyr4gq
-ardvark.i2p,jcmw2sol3hruwc6rfinonx4e23pjkukkg7lg7xt7xb2gpiyyraiq
-arf.i2p,o46lsq4u7udxg3qqlidrmpj4lb4nr7ldxmbb2x53nftndaeyxqeq
-arkan.i2p,7o5y2lyyrjx5tf6l4fyumywui7msjv5azaaheatvw5sqj7mxbuvq
-asciiwhite.i2p,itbzny5ktuenhjwjfqx3jravolhlj5wullhhr2m4qr6k2emnm5dq
-aspnet.i2p,tsb7zqru57p4q2a7cto2lko4w5cg4lieglwm6t27c44fkphqmf2a
-asylum.i2p,p45ejjw4p2q6nq3mzi6cm6ep35grtzshboidj2lojmrmic22noha
-auchan.i2p,6vxz4yp3vhjwbkmxajj7wiikxafwujig63gkhjknbq6xh4rqpm5a
-aum.i2p,ohdfneqxapfd3fwfbum4tut7z6k3rnr7rrguoxdrrfe2tln2kpbq
-awup.i2p,v6g32duzrkacnrezfbll3pza5u37h7lnukr2wbsk6rqen6prhbga
-b.i2p,272kt3gcx6wjurunzaiiwld7s5p4mpjewfubzmlcvw2vie62ckpq
-bacardi.i2p,hivhnx2v47vh234c7coi2urj5cyvbl4bu3ypjr7snklortyqeljq
-backup.i2p,kepphem42whle3rkfv26wcksmnegdbg6rdp6t3oobdkc2fmzrdkq
-badfish.i2p,f6v26gyr4eipy3a7pi2voulw5qvob6dg7zij6xpo2ywbi5tvbu6a
-badtoyz.i2p,3qz6ubtwlt2c4iasofjirkckq43u5fgkzyg7mlutcsym5gzhijna
-barry.i2p,4kyahq53ol52n23l44tefgeaxqpp3cbb632t5k3umdvqcooevdzq
-bash.i2p,s3wouoilbl3mrefxjhp4qoyujgok34e7y6vmpbu6hx4342ivqo4q
-bdl.i2p,kp6fnuulenbjm7r26pfbmjcq3u7c7kvxeajodvgr5flcnskdgi5a
-bdsm.i2p,pa7fxql5jljegg7j5tglhnnaod2sptq3gxvdn3ji6muqyhgn3poq
-betaguru.i2p,d7cduwwhrcc2voameqfkvd66u3advu4jw2p6pysgax35vq6ovriq
-beyond.i2p,uaicfqlrpjtitqbqkpfujanj5dollzfzee5glsuls67ekw6hlpoa
-bible.i2p,pypz7ca24n3lyp4tm3kvncg3ltp3gd5pgnacc6zltoeffiyyegda
-bible4u.i2p,xs6lr2g5jiaajtb3nkno2zmy34eipitrggooxb7wtey7uko7bqmq
-bigbrother.i2p,tnxiifs6uticzyg6ac4lhv2l5luwi6xra7yngocro56ive5e4jsq
-bitlox.i2p,lqw5khxcdntlv3u4vhn53upcqirplvnc4etjlmoytrzs66ytettq
-bittorrent.i2p,pgax2vz572i4zsp6u6paox5xubmjrkqohq6g4hvlp6ruzzy56l5q
-bk1k.i2p,nlyegmtyfffo5jfgg5h4dxxnlmqko2g36gpaye5a7vd3is35xxfq
-bl.i2p,e73d6uhnfbylza6wqkhxejmqeyfb7thkzw35gn5ojmna64jzyk2a
-black.i2p,sjwueu62qpe6dtv5b322k3f23fl4uz3w6qe6wcrwauiwpnymypfq
-blackbox.i2p,7josyf7zjieoib3ovmr5a4dh5w64kmfh45lv5h436eljtgfegtqa
-blackexchange.i2p,ztgr5kghkyn43fhhkuycroxgfti6cojo3vg4wdd3usqonyvrla5q
-blog.curiosity.i2p,yiz6jec5k7ccxdgnh7msqa4ze52bqqmf6rpq6bqdyojra2erd4ta
-blog.polecat.i2p,orlccceubewvxo3fbdyydq6e4uuidbs4xd5u2gyqbculnowo3ehq
-blog.tinlans.i2p,ylkch2nkrwehakx4z6wiyjbeqwlgasknukdkex6r6yq4xusrjnda
-bluebeam.i2p,lvxp3cbcfwtol57d5pmrsck32t7ndutlxubjb4smaf32bynhlk6a
-blueheron.i2p,anfb5jrhixjmvkyxctqwkezqer7dbob22wge2bh6wsewbhgnftfa
-bnc.i2p,fr4zbcygmx2vdct6nrabakfys4b4derm6jqu2ovppkgqillvlqxa
-bob.i2p,i76m7dwm5hnapljendbie6fc5y3mjlkdlduo3tvbwiwmvhxbpyaa
-bobcat.i2p,ftuukjtcquuvppt726w37boit7gp5hf2yxwfop35prx3grzzzxlq
-bobthebuilder.i2p,qlahgthqhr4uojkkwahnper2cl3ro5f5gtzy5t4lzapbzo4osy6q
-boerse.i2p,7633w56hd53sesr6b532r5qlbdnvyl5bnvama6ign6xryaxol4rq
-bofh.i2p,auvuinzogu6gc4pwsgbjijuszxgcjygciu2wy53pfz7mo5nfpc5a
-boing.i2p,bgsq33bh74j66hn4oh7oovlvuhhdyw22lq2qi2fnv3jyh2ryap3a
-books.manveru.i2p,eb2tisc2vr5jvjqrixrozcujiucwxg4m722stxwho5666ipl67zq
-bote.i2p,bhjhc3lsdqzoyhxwzyrd63kvyg4br6n2337d74blyintae66mr2a
-bozo.i2p,7a2d23h6htprhzrol36vgwgklsbqrnuya4tbaaaspmaeaodt57iq
-brittanyworld.i2p,e76umhhic3474sdxiuax25ixyfg7y3z7oojj4fmxvhgv3ruet6aa
-bt.i2p,uhkuu54pg47zey76h45tnvsdtpkf5bthbtrjgnaloi5m54h4hlaq
-bugfuzz.i2p,ubszn4gsf22vga67rvzzlg4qj2bfcq6o52fmxz46xruawqm6z7rq
-burntout.i2p,lkep3fd7tjvxrs25crr2c3jy7xm4s7bqiua5r327zgpw37sgyerq
-bytepay.i2p,7amc4ztwkzu3cgsaaaw3223ohuihn5hlsqc6gpf2rxdyptdkyugq
-ca.i2pd.i2p,u5safmawcxj5vlrdtqrsqbsndkr5cfenpicgg5euu4xqm73yicba
-cases.i2p,kmpmk2fmineaiwublteqlifg4fkmewnhmxqlcgg7qwecz6daj43a
-cathugger.i2p,vq43xjjcnejqpzfprws5qzrea2siieshu4tglpdepql2w3w3bpba
-cbs.i2p,u3lp7wazvq6opodzwjg5sc5w5kwxehmxd4wcdpt4s4j2k4dx4apq
-cerapadus.i2p,zroed2cxga5zeuu6rcvmp2yfi77nzduw7yhdplbeuqkuyxwbrzaq
-cerebrum.i2p,u5gtsfn267udwfh2uq35jiabkufifvcbgv456zz34cydutsiw2eq
-cgan.i2p,43z65gdr52xe3fxmkumwp3dzhedu4tu4rdtzr24hz5b4awcpfbqa
-chat.i2p,ollpwnp6yidc3obbb3famgt6rw5jg5w3k3a6z7hhaegj6gcohiuq
-chess.fillament.i2p,tv6wbanei647yf5bie4dhg2wmybkjurezlpdfwftc5ajqlfswwya
-chess.i2p,sbnoqznp5yzxals3vs6nzyqaj2fetvonys4e3b3x4ktmfeus54sa
-china.i2p,wit6f2zx6dtuqqze6nhbykrds3idppfirxvhf2f7ydqoqf4xdzeq
-chitanka.i2p,u4s3jneepk3akoez46kqiwikoezi6zyj2ibjkjyi4uuvsbcojzba
-ciaran.i2p,2r3645eete6xwbfu62ogonudcrcgqq25sbnij5v4geru74yrscna
-ciphercraft.i2p,7s5pkqbpbfdkxtwuu2e2iwstbikyewvvscy76lij4x5pfbygbjca
-closedshop.i2p,6fg67mbw2okopzyonsck4bsy3cy7l2fame56uiysr2cezhjhzdbq
-cneal.i2p,g4za73ffigv3ht4jnhzy4dae52djjq7lqcguqsfg3w5cxzqm7nba
-co.i2p,3mvo5eifcwplcsoubtvqkzdahwo2sdhfygfdde7lj2glybk4q22q
-codevoid.i2p,2mukrqwtinsw27uoejtrz74zxtilyhnnfdyso7j3yo6vaa6nzlaa
-colombo-bt.i2p,cyr75zgiu2uuzap5zeosforbgvpfbqos2g6spe4qfulvzpyhnzxa
-complication.i2p,x2av6rwj5e5tp64yhdmifdyleo4wblw4ncrrcrabxwscuevpdv7a
-comwiz.i2p,6p7zqfotzbd66etl5xqy3p6xvr5ijucru3am2xqa7wmnj6vf3djq
-confessions.i2p,lh5vitshufxpmyr44zgyymebo5elc42eda7pxvn5lmtes47c7rxa
-connelly.i2p,5yrris3nigb3fapvzrlrcaew6cdmzdknzvgrc7y2jpn3ntqurweq
-costeira.i2p,abhty5xlmnyab2kqdxcd56352kcescxoux3p6dbqdrghggyygnxa
-cowsay.i2p,q4ghzfpah4ffvm3bhc6fdkrznk5f6jxfjm2daytlparznai5d54q
-crstrack.i2p,mm3zx3besctrx6peq5wzzueil237jdgscuvn5ugwilxrwzyuajja
-crypthost.i2p,zywhrxtnkjc3rxxvxbocom7ml4hnutomgtuvqrwyf3rhuupnq5ca
-crypto.i2p,vffax5jzewwv6pfim55hvhqyynafkygdalvzoqd74lkib3hla3ta
-cryptostorm.i2p,mlu7mswyirjf53usqq7gyamvqc6rqihezgdbevov3dkxmkfo57aq
-curiosity.i2p,eomeif4xrykxlzhawc3icdilje5iammijos6tyizwhrfh3j7qdvq
-cvs.i2p,yd6k7dzpsa2tnlzx4q7xqkmd4qsjk5xk5hbiqpiarwbeyvxaxgba
-danwin1210.i2p,eoqdf4no5dxn4tw5n256kkd4lzz3uk4p47np4mepsykpsdzrnvba
-darknetnow.i2p,gkx3o5fy7mv7l4psqqnhp35d5iun7rt3soci6ylf3rgb7a5a655q
-darknut.i2p,2mk37gtvpk2i63o6vl7vna4dr46rqexxetupgn5efuuins7x3qya
-darkrealm.i2p,gbh4eerxdsph7etxsxznfhvmuiz54trlkenakqep343u4xcoekzq
-darrob.i2p,hz2xhtpeo6btgiwi6od4qj2575ml5o2246rd5orarruyjhd63zja
-dashninja.i2p,dzjzoefy7fx57h5xkdknikvfv3ckbxu2bx5wryn6taud343g2jma
-davidkra.i2p,nq7ca2egm563nir3xegfv52ocgmxstpz56droji4jgnzfoosk45a
-dcherukhin.i2p,qa4boq364ndjdgow4kadycr5vvch7hofzblcqangh3nobzvyew7a
-de-ebook-archiv.i2p,6mhurvyn6b6j6xa4a3wpuz7ovpsejbuncvyl6rnhepasfgdgmn7q
-de-ebooks.i2p,epqdyuuhtydkg5muwwq47n7jvr66pq4jheve7ky5euls6klzwuyq
-dead.i2p,7ko27dxvicr2sezvykkrfiktlghx5y5onup3f2bas5ipocy6ibvq
-deadgod.i2p,63bveyh7wefb44hlia7wtxxb3jal3r67thd6jekmwrtq4ulaaksa
-debian-multimedia.i2p,cylxxz2y35x6cvyrl57wu3brckurtexatyi2i5awz3eeamqwjspq
-decadence.i2p,pw5ys7k2grjb5myydpv6ohikm6nna7y6u2dro44i4rucgulu3ikq
-deepwebradio.i2p,2nait2gdeozkgf6gyhzjfij6mwldwkxxwcvtxobb4b5q5cvtm5la
-def2.i2p,cepsrw27kdegwo7ihzouwvgcvw2obswwjs23ollgj7hk2yrce3da
-def3.i2p,xbf3ots2purqun7orn72ypkpjmrzbfrkj3u654zfe77hbrbow6la
-def4.i2p,yyzdq4fwwmnlojp23drfpfqujln2vcjozjrfzfeuriuqzdq7g4mq
-deploy.i2p,ujzspsqkbz5z272eozsrdv4ukl434h3fuliwrfxxnab74jmd7e6a
-det.i2p,y6d4fs3rpqrctuv77ltfajf5m4tl4kzcu7rtwhxgiohylfxxow4q
-detonate.i2p,nykapdsjjswdkjov7x3jzslhg4ig3cpkhmshxqzijuhbisx25jja
-dev.i2p,cfscxpnm3w3qxnlv3oikewxm4qrot4u6dwp52ec2iuo6m7xb5mna
-di.i2p,3irnooyt5spqiem66upksabez4f3yyrvvjwkmwyzlbealg64mgxa
-diasporg.i2p,edvccoobtjukjgw2os5eetywanbb2mpag5aknkrpia5qx2koksua
-diftracker.i2p,m4mer767ipj7mq6l7gdrmrq37yzvsj3kzezd7n7nsfuctntjseka
-dm.i2p,heysbdivyeugdbggpscco5wje3dsvwgcpp5ot4sopooebnmiqvtq
-docs.i2p,ato242wckzs4eaawlr5matzxudt6t5enw73e4p6r3wajwkxsm3za
-docs.i2p2.i2p,las5l45ulwwf5i72nht6vk33sfkidcpr2okpf5b6mvgbk3a2ujna
-downloads.legion.i2p,xpmxdpuuptlekyhs7mmdwkvry7h2jbvpqpzsijqe3a5ctxgodesq
-dox.i2p,vk27cjdrtegfdnrjqutebgxkpyrfj42trdfbsupl5zn2kp34wb3a
-dropbox.i2p,omax2s5n4mzvymidpuxp2yqknf23asvu54uon6cxl6gdrlblnuiq
-duck.i2p,3u2mqm3mvcyc27yliky3xnr4khpgfd4eeadhwwjneaqhj25a65ua
-dumpteam.i2p,2fwlpuouwxlk2nj4xklvm43m52tqyhqnu2fcfiuv7clvf3wd5nwa
-dust.i2p,u6xgh6zhhhvdvefbqksfljfs3nyjvqcrmyamp5bryz5f4injmniq
-dvdr-core.i2p,fg6l2ej6qrk5rkyfzdptxx5xkcm4kvdla4gg2tun7z7fm5cxxw5q
-dyad.i2p,7n2ljphvp2dep7imoujvydxp4myuxfld3axwfgcny5xc5x6jj6ka
-e-reading.i2p,z54dnry6rxtmzcg7e6y3qtsig5yf5fmehuvakcg5wnuahx3iafuq
-easygpg2.i2p,bwxry5alzx5ihgrd3glah4eotddblzhalvpheppnw4zcajzqoora
-eboochka.i2p,ou7g64d5in4sugv5fgmmzwnunuw5hloixio7puthmrvrkwrp6egq
-ebooks.i2p,bvpy6xf6ivyws6mshhqmdmr36pruh2hvoceznzeag52mpu647nzq
-echelon.i2p,afvtspvugtd32rsalxircjglh3fhcjzk7gxrm3gw4s2yrpvzk6wq
-echo.baffled.i2p,bfr3lyicr72psxvt2umqfb562rtex66w6q3hi3tktzkoyane2iha
-eco.i2p,2dq2o5h6c6a674qaduipp55mid5iktumjbswuwmpsrcqaeowdvwa
-eddysblog.i2p,ieac3ub4g5sy3wuhsbqfembnpp7f3a37xgcx537ytzsmgfzexnbq
-edge.i2p,aknsl5wmzjmwyc4wxutfdwy2w5vgd3vcx52mqx647hcgvyurmqta
-eepdot.i2p,t6edyotbxmxvy56fofdvmragvsj65te2gkhvzv5qnblicutyvgoa
-eepshare-project.i2p,sn26kom4qyuzouppv4lwnk6bqabdydcegtrilybviibwiq2s4nfq
-eepsites.i2p,isskhl4ak3g7qevrarlmblddgr4ugnn3ckalwpjcvxafk5rjgypq
-elf.i2p,duz6ey27ohpcp3llylklzdb63lylolzcixad6bh7rt5tkq42qqpa
-elgoog.i2p,z6hrgkg2ajmuzlrddjlffrgctx7x7fkipm6c4hdzmohyn5wkr4ya
-ems.i2p,734zw4jsegdf55zl3z6s22tqkbxcghu4qvk6q2wevjfmx7xhbn6q
-epub-eepsite.i2p,yxvzjwd4vin6pnjauekdufh7lxaijal3kqe2bhakuf47g5zkb6xa
-es.hiddenanswers.i2p,cw7ge5ey4ekp5iep2kaw6j54boebtqytpcbnvio2bfpccd5ejzfa
-eschaton.i2p,xe75f5hzmrq6rkhsef2geslmi2v2yfngdiysmlmxvh7b4pyyjk4q
-esuwiki.i2p,cwxuiwcpymb72vm5vluba66ofhugyf5qeevvwo7e2fqrxl243coa
-evil.i2p,ljfl7cujtmxfffcydq77pgkqfxhgbikbc6qxjgkvcpn4wzd73a4a
-evilchat.i2p,s5b7l3hzs3ea535vqc5qe2ufnutyxzd63ke5hdvnhz24ltp3pjla
-evilgit.i2p,mx5vyoqhg77yuhthwznsxrepjsemq4uwitx4lxdzetk36ryl5rla
-exch.i2p,vsyjsbbf2pyggtilpqwqnhgcc7mymjxblamarmxe5hmbxaxvcndq
-exchange.gostcoin.i2p,n33uthzyqsbozl2qh5zii2bq2nnvbz6g6c4ew3mwp6uukk6u7wva
-exchanged.i2p,ylmulgfskl6uiwac4hw4ecwqdzd3oxtwaemzj25zc6k5q4rkexra
-exitpoint.i2p,5zmjurq3enudcenegnxu5hqmfmayz4lxvnik6ulch4xssa2ithta
-exotrack.i2p,blbgywsjubw3d2zih2giokakhe3o2cko7jtte4risb3hohbcoyva
-explorer.gostcoin.i2p,ktoacmumifddtqdw6ewns3szxths2hq2fat2o7xnwq4y3auga3za
-fa.i2p,6n6p3aj6xqhevfojj36dixwbl4reopkhymxmatz7ai5sroh75rka
-falafel.i2p,djpn5cbcgmpumwcriuzqistbae66txca2j4apjd2xesfgb7r5zmq
-false.i2p,77mpz4z6s4eenjexleclqb36uxvqjtztqikjfqa4sovojh6gwwha
-false2.i2p,j5i2tfumh3ti5sdtafwzzbpupmlcbg5drysfay2kxbdpsaljrosa
-fantasy-worlds.i2p,62a4xcyyhvfrcq2bkckb7ia37fmrssrgx467tlkxp32fjpq577wq
-fcp.entropy.i2p,de6h6ti5z3mcbdcwucu45vplikqyoeddsu3rqy7s2zy5i47j3peq
-fcp.i2p,ndsznnipoeyapnsg3gj3yi2dzsqduxwalmujm5mzjm7e6x374tta
-fedo.i2p,zoamh7e3k2vf2g6pfy46ho4taujk2f4mxqqsv3gbg554fxbvyfqq
-feedspace.i2p,kvtnpx4jylgeyojfhix4x462sqn5uork3roml4sfzotkxx62i4wa
-ferret.i2p,kkqie5qmja7bkf3iad4zxhrdarwj7kbrx2m3etn5kmba3shgwj4q
-fido.r4sas.i2p,i522xmu63hfbaw2k54cthffcoqmeao6urjyq3jg4hddf6wf57p3q
-fifi4all.i2p,v2stz6bsot7sbjzix5tky5dm5ej7gidmjnkvzqjju5xvz5sz6fwa
-files.hypercubus.i2p,qfglq25jwieszgyt7muz6dambzqsrmjhhszygzzx2ttubc77sffa
-files.i2p,w2sy74xe6oqnuz6sfh5fhkzu7boholgzd5f3anhj47srxwpj2vaa
-files.nickster.i2p,yil7dp2hg5pbqyovsiwb2ig6zjsq4tize3fnwemmqdrr6j5itdtq
-fillament.i2p,udj2kiino4cylstsj4edpz2jsls77e32jvffn2a4knjn4222s2oq
-firerabbit.i2p,awqh7n3wskzl3epyvkdwgarmfybsncm7vye6psg4tpkmplh3mj2q
-flibs.i2p,ocdm33e3h5tdml3yyholj4objdwsrhlugfqjnqgdkslmgdzb6b3a
-flibusta.i2p,zmw2cyw2vj7f6obx3msmdvdepdhnw2ctc4okza2zjxlukkdfckhq
-flipkick.i2p,aso5rzc4ym6g2bcbxjy2n573bmbenkjawva2jg7fhyqhwtwgu6lq
-flock.i2p,hflpi33ko5bi2655lx6bpzstdnjqgzrz23inovqjx5zpntyzyb3q
-floureszination.i2p,vitpvfb25sikuk3crgcvtcdi7hajxnnq2t6weay3no7ulur2wwwq
-forum.fr.i2p,onvelkowkbuwrglhw2cnocggvbdudi75sll5mfirde3cbopjqivq
-forum.i2p,33pebl3dijgihcdxxuxm27m3m4rgldi5didiqmjqjtg4q6fla6ya
-forum.rus.i2p,zd37rfivydhkiyvau27qxwzmerlzbqtthsa5ohtcww62zrygjaga
-forums.i2p,tmlxlzag7lmkgwf6g2msygby3qttxvm6ixlfkq6s6cpgwubp33ya
-fproxy.i2p,keknios3gm6kh6onez6x2bm2t7stv54oanvltuagphgdfjdw5e2a
-fproxy.tino.i2p,fpaituvuvyxp6xdjnv3i27alnj2ifzcvqdweqb6yj5uybotzvyha
-fproxy2.i2p,r4lgw4wmza25g7j5fjocjbwzwthfg4ymcbm52ref3hh2hogskcza
-fr.i2p,ia6xlsnygorllplx2owokahtrkospukvsmysz7i7bzw3vejc4hdq
-freeciv.nightblade.i2p,rluupsgxbvw5t7jno3apyzlrdirjkljft4gdoy4mxxh4fmd4xzta
-freedomarchives.i2p,4ck6oliqfjz3sccpya2q4rh5xkj5xdxkqs76ieml37537nfhwd2q
-freedomforum.i2p,abzmusjcm3p3llj4z7b5kkkexpsxcnsylikokouk5txfim3evqua
-freefallheavens.i2p,giqnkltyugfmsb4ot5ywpvf3ievuswfurk6bjie4hxi2hh2axajq
-freenet.eco.i2p,2kf7ovb35ztqkrurkm76y34jfpwi6go25xj7peznnmxrl7aieo7a
-freshcoffee.i2p,sscuukigp6alcb3ylhkcugoejjfw5jqgtqbsbafw4hyku42lgc3q
-frooze.i2p,m6ofa5dmyse4b4jg7kfmluuuc4pw5jqu6zh4qnboin4vropxepja
-frosk.i2p,63naq7zb3hvbcppj2ng7qwf6ztusp4kwpyrzbt4ptafcdbu4pfjq
-frostmirror.i2p,ycz3imuz6yte2zhlapmsm3bsvc46senvc2jxzwsbfdct5c72qulq
-fs.i2p,ah4r4vzunzfa67atljlbrdgtg3zak5esh7ablpm6xno6fhqij35q
-fsoc.i2p,vaqc4jm2trq7lx2kkglve7rkzxhhaptcwwl32uicx4ehf5k3hx6q
-galen.i2p,4weo7zkxscxbcouiqx4mlnb35uwl2lromikzk33er3fljktyvi2q
-gaming.i2p,rfxberwod6st2zc6gblqswxjl57nucgc3xrbwss43pe3dvqqzj4q
-garden.i2p,qkk2dqx6nocycgt3vinsoc76cxkb4jreybcpgz3fcps2dbe4rowq
-gaytorrents.i2p,fnggbr2t2aulr6rvlo4aehotx6wecfob7u3k2nxsnvtm4xex424q
-general.i2p,5fklrsztdqpl3hkkwwrrw2rdowrq7wwhwb6h7avvk4fhansp4vvq
-gernika.i2p,wpzqv3lxpecdsvcaadvbmrhhwlc7kp4n2mijdv2qjw3zr3ye232a
-ginnegappen.i2p,kbhfkzx5jeqhfgss4xixnf4cb3jpuo432l3hxc32feelcmnr3yja
-git-ssh.crypthost.i2p,llcp7jvz3hgtt3yzkdgjolwobisgvhv4xqa5a4oddejllyozur5a
-git.crypthost.i2p,7frihhdcisdcyrzdbax6jzvx5gvtgwsm7m6kcem2tlaw4jtahbqa
-git.psi.i2p,em763732l4b7b7zhaolctpt6wewwr7zw3nsxfchr6qmceizzmgpa
-git.repo.i2p,vsd2vtgtuua2vwqsal2mpmxm2b2cpn3qzmqjoeumrrw2p4aot7uq
-git.volatile.i2p,gwqdodo2stgwgwusekxpkh3hbtph5jjc3kovmov2e2fbfdxg3woq
-glog.i2p,ciaqmqmd2wnws3hcpyboqymauyz4dbwmkb3gm2eckklgvdca4rgq
-gloinsblog.i2p,zqazjq6ttjtbf2psrtmmjthjeuxaubi742ujrk2eptcsaoam4k7a
-go.i2p,ll6q4lsirhwkln4dqxwqkh2xu4mu3jiy546b4uhe4fypyb4vvx2q
-gonzo2000.i2p,nogsv7okydhbvrewv6hb4xdojncvhkusnyib4lglluc4uw67a37a
-google.i2p,4p3ajq4cotnflmuv7fhef3ptop5qpm3uzzgp5bahxif3nc4w3ffq
-gostcoin.i2p,4gzcllfxktrqzv3uys5k4vgkzbth4gqednwhfpt755yivm3davuq
-gott.i2p,dqows7dpftxxl2bd4bgcpkck6knrysdun6mtqy4ms5dxobbvg3ja
-greenflog.i2p,zny5ftmhzxulxzyczmeat53qjnue2xtqv2clisc7dg76lwfceecq
-gstbtc.i2p,n33uthzyqsbozl2qh5zii2bq2nnvbz6g6c4ew3mwp6uukk6u7wva
-gusion.i2p,4qyfdhizjixe2psu7wcvqufix5wlijocehpb2futurcmlhlktrta
-guttersnipe.i2p,kizkhzes2bzp45widihremo6geepfk7dl6juourkvzuvlc6y3spq
-hack8.i2p,un63fgjgi3auvi7zscznwqfol7ka4johgthvqf635mg3fefsjgpq
-hagen.i2p,e2t6rqd2ysbvs53t5nnaf7drllkgk6kfriq3lfuz6mip6xfg644q
-heisenberg.i2p,jz4quyw7zt63tmw65jfp76fblwadjss4iyi4puqdg3dye7oaqlvq
-heligoland.i2p,gzrjm62ektpqjfsem3r3kwvg6zpjvvhvpjvwfxkm2ay4zu7sp6oq
-hidden.i2p,iqodhhqo473qv5gwhjcs2bsrbhlqtpzgpnuumpastfiyhuwb2kyq
-hiddenanswers.i2p,kj2kbzt27naifij4ki6bklsa2qfewxnkzbkgvximr4ecm7y4ojdq
-hiddenbooru.i2p,zma5du344hy2ip5xcu6xmt4c7dgibnlv5jm4c2fre5nxv44sln3q
-hiddenchan.i2p,6y4tltjdgqwfdcz6tqwc7dxhhuradop2vejatisu64nwjzh5tuwa
-hiddengate.i2p,rvblcu54jvkkfffp3fobhunsvpgfc6546crcgzielzwe2s5m5hbq
-home.duck.i2p,jsh7yfvm2t5urdcnmfzdy4n6vegqskdtlwem53chgxli4ipfmuma
-hopekiller.i2p,kcaelbgsvrkiwpx36b4wxofebrl3njx7rgm5amzfmqwbomt44cxa
-hotline.i2p,6cczi27iuxkm3aivazaemzltdqgh42ljzurqp43uclbz2lid2uqq
-hq.postman.i2p,27ivgyi2xhbwjyqmnx3ufjvc2slg6mv7767hxct74cfwzksjemaq
-http.entropy.i2p,ytu7kz5bdoc26nkpw2hajwt3q7n5rcbg2eokyefhmkxmmslimbdq
-human.i2p,nrtcelq3humyfvoxmzmngpka6tmyifweouku5mbi5av4lc43hzaa
-i2host.i2p,awdf3nnmxxup5q2i6dobhozgcbir7fxpccejwruqcde2ptld443q
-i2jump.i2p,633kqgmwzzu6vhkevwvbf2pfyejt3gkes34i6upa4og57fgdfcxa
-i2p-bt.postman.i2p,jeudwnx7mekjcowpqo6xpkwn7263c57y5piurrjrdzinjziu4fla
-i2p-epub-eepsite.i2p,yxvzjwd4vin6pnjauekdufh7lxaijal3kqe2bhakuf47g5zkb6xa
-i2p-javadocs.i2p,icgmr6hhjudl4yxhtuq4pxvss2pzypwddzowajgs5rdz6f55novq
-i2p-projekt.i2p,udhdrtrcetjm5sxzskjyr5ztpeszydbh4dpl3pl4utgqqw2v4jna
-i2pbote.i2p,tjgidoycrw6s3guetge3kvrvynppqjmvqsosmtbmgqasa6vmsf6a
-i2pbuggenie.i2p,bioq5jbcnfopqwvk7qssaxcl7avzeta6mu72jmxjeowflpcrhf6q
-i2pchan.i2p,tduxyvfs7fzi26znvph3mu2d2ewaess7emomfci22wvownajphuq
-i2pd.i2p,4bpcp4fmvyr46vb4kqjvtxlst6puz4r3dld24umooiy5mesxzspa
-i2pdocs.str4d.i2p,yfvbtrhjac3jutdsqzugog6mbz3jtyhpwovrt2mqc5mzv534y7cq
-i2peek-a-boo.i2p,qgv64klyy4tgk4ranaznet5sjgi7ccsrawtjx3j5tvekvvfl67aa
-i2pforum.i2p,tmipbl5d7ctnz3cib4yd2yivlrssrtpmuuzyqdpqkelzmnqllhda
-i2pjump.i2p,2mwcgdjvfvd3xwumzqzqntual3l57h3zo7lwdmkjboeraudpkyka
-i2plugins.i2p,bb63kmnmbpitsdu45ez54kmogvvljn3yudksurcxiyq7dn5abt7a
-i2pmetrics.i2p,v65p4czypwxrn35zlrfkar2w77vr42acd7gbszegsrqq4u7sip5a
-i2pnews.i2p,tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq
-i2podisy.i2p,3c2jzypzjpxuq2ncr3wn3swn5d4isxlulqgccb6oq5f6zylcrvcq
-i2push.i2p,mabdiml4busx53hjh4el5wlyn4go5mgji2dxsfyelagi4v5mzjxq
-i2pwiki.i2p,nrbnshsndzb6homcipymkkngngw4s6twediqottzqdfyvrvjw3pq
-iamevil.i2p,au7jhslyt4cxkjp365bvqvend3hhykrrhbohtjqlgoqrlijbezja
-icu812.i2p,bxgqwfsnr3bgnr6adn62anjcin5nuthqglotb3wn3dgynsfofeva
-id3nt.i2p,ufuqdzsxltiz224vq5gnuslt3a3t72dhy5kq6i2xway53m6pzv6q
-identiguy.i2p,3mzmrus2oron5fxptw7hw2puho3bnqmw2hqy7nw64dsrrjwdilva
-ilcosmista.i2p,6u2rfuq3cyeb7ytjzjxgbfa73ipzpzen5wx3tihyast2f2oeo24q
-ilita.i2p,isxls447iuumsb35pq5r3di6xrxr2igugvshqwhi5hj5gvhwvqba
-illuminati.i2p,syi6jakreatlm2z22u76izyqvbm4yi4yj7hr7jb63lgru5yhwwla
-imhotep.i2p,qegmmhy52bdes2wqot4kfyqyg7xnxm5jzbafdb42rfoafadj2q7a
-in.i2p,r5vbv2akbp6txy5amkftia757klgdy44s6cglqhmstpg65xycyjq
-infosecurity.i2p,v3gkh5kqzawn2l3uzhw6xnszsh6w3nztjmlwil7p4kyrwrsm2dba
-infoserver.i2p,jd3agbakybnhfvkeoxrx7t33iln6suzomv3kxkxf77j7rkonch6q
-inproxy.tino.i2p,ex5yf6eqqmjkrzxnkn6cgvefgne24qxsskqnpmarmajoit43pgma
-inr.i2p,joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq
-instantexchange.i2p,5wiyndm44bysev22kxvczxt37p6o6qroiqykytrvn2yzi55aqfxq
-investigaciones.i2p,n7hqd4asxrdwf3zwo7rzv27y2qkcfmakmz6mjar6aw6hlc4c7mha
-invisible-internet.i2p,jnpykdpp46zenz4p64eb3opadl5g42dls3rurk2cvq6a3g3rvbvq
-io.i2p,tx22i6crnorzuti3x6va4mijsbhoqswy2cfdxjbvprgsq4eerg7q
-irc.00.i2p,bvcja52pppgfspp2ueuipoysjnvvoyblz2h6smpxcmanjquogirq
-irc.arcturus.i2p,5nywlbn35p2nwsymwpfmicu6fxono6g64vwusxbsvmm2qwz6vupq
-irc.baffled.i2p,5zmtoopscym6qagkvpgyn7jnkp6dwnfai745xevkxlou77c2fsjq
-irc.carambar.i2p,hxzbpivxqxy6nuae4t6fnkhcgnhs4c72vt6mmsqfmfhrkn2ca6gq
-irc.cerapadus.i2p,e4ckznxcxvgyikzjmjsu72i2dbj2d76ogexyukklbjvpcnhp6zzq
-irc.dg.i2p,fvp3pkcw4uvijqabwtekcdilklp73gyasuek67wdcs2mucep4caq
-irc.duck.i2p,chdpmm4gxffyn24xx5dhxvfd5httu42i5gtoe6cctjlsf4mbofeq
-irc.echelon.i2p,ez2czsvej5p3z5bquue5q3thujcodfze7ptybctqhnqc7hms5uzq
-irc.freshcoffee.i2p,ubiu2ehtfnrleemgpzsqkahwnvzuaifqa3u4wmaz5maaisd5ycfa
-irc.i2p,l3ohmm4ccxvyuxuajeaddiptci5lsrnxtvtyq7iohphrt3oj2evq
-irc.ilita.i2p,5xeoyfvtddmo5k3kxzv7b3d5risil6333ntqrr3yvx3yubz5tk3a
-irc.ircbnc.i2p,4rqcsqd7xif6r4v55blqvmqu5er6due4eyene3mjorfkts4o3rxa
-irc.killyourtv.i2p,wre4majmg2vnbi6id27et7yw6lnpf56wkbm6ftnlwpvxnktq73hq
-irc.nickster.i2p,dhq3fhd5scw3jqhj5ge7kqfpprfolcgxfjbaw24obohaiqjtdu7a
-irc.orz.i2p,7gifacog4aoons3syybojbbnyqqaaqijhngrehn2xlq3eucuyjcq
-irc.postman.i2p,mpvr7qmek2yz2ekegp5rur573z7e77vp3xqt2lfbco5i6nkfppcq
-irc.r4sas.i2p,hodhusp73gltozgrnianlbploon3rrvhrzfn5mf2g46o7aaau5la
-ircssl.cerapadus.i2p,4x2i745i4w52ss3he2kse6tzwt64pr62yvrcb72lgvrb63fup6ea
-irongeeks.i2p,ecduxoion5uc5hnvzjxff6iiwhdwph6gse3dknyvlo7e6gaeho7a
-iscofsi.i2p,enjgdxs4um2dmhdb2ajff2egrdijkjji3g47m6unb74swbrqsddq
-isotoxin.i2p,wue3ycaccf4texikza3fh6p5yrmtgnooisuypnepo5mo67lmpcqq
-itemname.i2p,o35ut7hgywy35okvgkjkv3ufzv2ejv4luap4oytwbyy2jqy6u4vq
-ivorytower.i2p,fpwrfvidfexsz7dspofkwtkmmizm7lyralfz5kvykffk7gubvxsq
-j.i2p,kjxvohlsf5sdrzxzfcrmvquccnoevi6ytbl63mstsru5wt2dx3ea
-jabber-2.i2p,pvnmzgemetkwcuvt45omgowmeznwk5xw3nc3ygeoz7yekqxy57na
-jabber.duck.i2p,rhdzvvzraqzzm67zpyegb7knpfrjeffitixqzeyymdoz56uh2rtq
-jake.i2p,v2axvy6pqefnla7gun5fmqs4lqe4xfyqovgzcundhxrpcdvfd7cq
-jar.i2p,2fthkmujup3xiiu3yple24n6g4emzdiiimbuqwvpdddtsr3c4nrq
-jazzy.i2p,ha5c3zafwkt6mwqwjcf4oqwvbwz473652ljjadiwrj4gfkfkjofa
-jdot.i2p,kw4jr5qw4bhnj33avkwankjdh3zi7wtahlmgkjwvsv2isskkzgpq
-jhor.i2p,c6rnm7oemydhuwzmhwwwxphkzanez5rnn7fkcs3lpgu6gkgtssoa
-jikx.i2p,aazr55itvyns4lwppvx5njyx5tjdwemw4w6jbmpegdunznod2ieq
-jisko.i2p,jxgfvr663uhr6m65hrgkscshysfshkq32ywdubc4ed7zda3e2pca
-jmg.i2p,oglpnq7zungdukmk6gk5fzj5jp6wibuoihqgks453wztrwos4ggq
-jnymo.i2p,nbfplxgykyfutyadlfko2rmizdsxox2pee2ahboj5mju4s3putda
-jrandom.dev.i2p,htynimemonyzqmn76gworxyfkmqtsa7zcprbrd3i5cxqqm75tuzq
-jrandom.i2p,dqows7dpftxxl2bd4bgcpkck6knrysdun6mtqy4ms5dxobbvg3ja
-jrrecology.i2p,qxi24gpbum3w3kesuxvheyu3p5u5o6tuvoypaolub2gnvbld57xq
-jwebcache.i2p,xdffxnxtjd6ji2zig3cgva7igvl2tiapyjoc7ylbzwqhxudbmvfa
-k1773r.i2p,zam7u6vslhemddz347uusuzjdk5wma4h5hcmcqlng4ybbpdbjhnq
-kaji.i2p,z5ic7gvm2k4doczphtrnrspl2w5sfbss2de4z3ihjijhtjw67ydq
-kaji2.i2p,4lscgc6napekfx7ay5fdcjofeja4fnl7tqcd3fek63t4saavur2a
-keys.echelon.i2p,mwfpkdmjur5ytq4og36ym3ychinv36b2a57f4rmgqmtrwepq3fva
-keys.i2p,6qv4x7ltaxckd4vbay5s4ntqqflq4efk6oke2d5yzicqrmk443ba
-keyserver.sigterm.i2p,isoxvnflrdn7cm76yjlfg5tbcugoito2hur7eidbqmo33xmwz5ga
-killyourtv.i2p,aululz24ugumppq56jsaw3d7mkbmcgo7dl2lgeanvpniyk2cbrda
-knijka.i2p,knjkodsakcxihwk5w5new76hibywia5zqcgoqgjttzsausnd22oa
-knotwork.i2p,2yocdbcjiyfaqgxb4l6oenrrrrie6nydgmbnbfulqg7cik6bozxq
-kohaar.i2p,qchpjehbhqjbxdo7w3m55jbkrtsneb7oqoxcr24qttiq6j5g3z5q
-krabs.i2p,3yamyk5bgfgovg6zpvtvpdjk37ivjj2wog2w7wha5agzgxxkqaca
-kuroneko.i2p,wbit2huhhwlyqp2j4undccuyrodh6qcmzdeyuaoy5o4ym7g5gdgq
-kycklingar.i2p,gctswdhp4447yibxfbqg3uq2bvx63qjeqnaoaux75zw73leakyva
-lazyguy.i2p,ia6xlsnygorllplx2owokahtrkospukvsmysz7i7bzw3vejc4hdq
-legion.i2p,5oirascyhwfy2tr2horw6mixozsre7z6s7jfq7qbnj523q3bkebq
-legwork.i2p,cuss2sgthm5wfipnnztrjdvtaczb22hnmr2ohnaqqqz3jf6ubf3a
-lenta.i2p,nevfjzoo3eeef3lbj2nqsuwj5qh3veiztiw6gzeu2eokcowns3ra
-libertor.i2p,7gajvk4dnnob6wlkoo2zcws7nor3gunvoi7ofalcps5lc76wruuq
-library.i2p,brqqaq44vbeagesj5o3sxcnkc5yivkwouafyxa77ciu7l644ei2a
-lifebox.i2p,pyqjnycm55cuxow22voqj62qysrjdnb6nbyladaiaiirqi7vp2yq
-linuxagent.i2p,ap5riaikrjq2uv5qvy7klzhhqywvqi7wqscyipsewcun7w2eynlq
-lists.i2p2.i2p,vmfwbic2brek2ez223j6fc6bl5mmouzqvbsch45msvyyzih3iqua
-lm.i2p,yeyar743vuwmm6fpgf3x6bzmj7fxb5uxhuoxx4ea76wqssdi4f3q
-lodikon.i2p,u3f67staiwhqxpacya3clmvurdwd2kp7qcthzhstqnhrmlwc2g4a
-lolicatgirls.i2p,a4lzmjyba7aq7hl6okqpds7znnwymolqnr7xhvno2wraqb7uhfla
-lolifox.i2p,7fd2clkiotjnaoeigdtxlkkb24eik675ovezjf67x26ysham4zca
-longhorn.i2p,pohcihzxzttjclrazhs3p76wt3ih737egb5bovqb6ym3du6z3o7a
-lp.i2p,jiklbujn3cbfikf4pca526jgmorx6mxhil3twqmfoteaplx6ddwq
-lucky.i2p,wx36m3wnpt2y6bngdpg3ifrarvtkpwnluarx377bllpgvkuhybaa
-luckypunk.i2p,y4t6cujjxnnrtln3rgmfbgbh46hic7wkef57krd7opitbgngohka
-lunokhod.i2p,3yc6sp7xic4grmpfecbwuij6z3dp5kdgoo362pszaco7io42mnwa
-m16.i2p,ucsr3eveuc4mx5y6gxnoaywd4ojvbel5q3ynns6s5yfw3vusmfva
-mac7.i2p,3yjowssqzydciwa5zx55kazgf7q7w6g7rkocr7bngy35ii44t34q
-madman2003.i2p,a2sam2xbhxbzmeyobphbxrkdwlppoerewq5qvibbyk3ftsr643qq
-magix.i2p,cgfnyxv62msfynsfbv3kju22j2mt6tfnopshhmrcmpcrxyts6xwq
-magnets.i2p,snz46nez6hrrpg6336neinflw56l3vwatk6bzzytwu77xmsfsoca
-manas.i2p,6qolj62ikkoq6wdn3hbvcbdmlvf2rcyv432kgi5uy7mvrczmjtba
-manveru.i2p,pbmbofs76wpjnxi55eqtwg4y6ltyij72o4fm4sxfjol3y57ze5sq
-marcos.i2p,vpo36bsil2voqaou53zshuegssqaroa5mbrzxfmhjywlbojckalq
-marshmallow.i2p,svdqd6j3y3gwryufcl4fkzpmcujgvrvphvk2oy4r7m75xs327e2q
-marxists.i2p,lepah55qyp2fhuwxlz7bwrhzckn4gkuofivnofoeuyfpmke5x2hq
-mattermost.i2p,x5oovnhnuli5fnwtgkbd5z5jvrvdvprqyuofywx6uoxkk4bie6ya
-me.i2p,dbpegthe42sx2yendpesxgispuohjixm4bds7ts5gjxzni5nu6na
-meeh.i2p,4oes3rlgrpbkmzv4lqcfili23h3cvpwslqcfjlk6vvguxyggspwa
-mesh.firerabbit.i2p,3x5wokr4bjy5z3ynji4fyhvwzv4fvgry3xafi5df5h75doezjytq
-messageinabottle.i2p,avfhe3kvrrv7utxn2vre65lg7damxzzsewq3vukwie4llitd254a
-metrics.i2p,z45ieamhex2ihqv7oowk5fz4qq47rbvxhhhbaaiinpajbhuevtpq
-mhatta.i2p,o4rsxdeepfrnncsnjq675xogp5v5qkbfgbt6ooqeyfvlifobrjxq
-microbleu.i2p,mtapervgibruizniems2yyr47pin2wpysyh7m632rigl26vjc6qa
-microsoft.i2p,hvaqr5idszdyrjph34amb4mjosqd3ynggoxlnj7ciqhnx7q6plza
-mindisl0st.i2p,u7rnqhvsuyxd3fabm4kyzn7brgz3i3cporj2emk2jmbpcmltyf7a
-mindspore.i2p,uuh5dd3y2rqa7x2jpggm4p2pg6znarm5uanwsvybe4tk36ymwr4q
-modulus.i2p,ctz3o6hdefrzwt3hlg6rjhdcbjk6irppbndq32u6jnn4lz72f62a
-monerotools.i2p,5bal7dngxde2ddmhuzbtfken6w5nmxmixtjlrlmxt3wbhnemv73q
-monerujo.i2p,puri6y5dtwh6zr4u77ep6ozatun6iz7v4wai2dzxppz7654corlq
-morph.i2p,iovyp2dao5rta6g5v6hke2s4ugx2btkpcljddak2yhxfrx3l4dqa
-mosbot.i2p,5bhmrp43mjwlzf4x64xgdrkwmw4luvng6eq5waa663a7vnkp732a
-mosfet.i2p,s5ynkgagndmpxpf2kmnenv4x72io664gzd2x3qef54ilammnte3q
-moxonom.i2p,gcjdrvnlobgexh7ebv276pwmnoj3yoyaqm3w4vmmdha4lgxfinqq
-mp3.aum.i2p,n7bmu5dwux7f6gedmdik6zrm77bnls4lkzo2vo3bf4bwegk7vkjq
-mp3.tc.i2p,w3ied5s7ldjcvnhxu2gyofe3oogzbplkyxshzfkhspiy2526snsa
-mpaa.i2p,m6cqnglo7xlytwxkdsmwf3d23d6lq5r446c3tktb2tdmuah36zya
-mrbamboo.i2p,tmpmkx6wlbbrgsnexrqlrib7laoegpbfeop7bnyezegii7hecpxa
-mrflibble.i2p,u7k2qcmkrril6yvudvwxjqz7k3dzgp3jdejjjeapej7liselj3eq
-mrplod.i2p,fjn5hxtybxyfyvdf6u5v5seg2sjd47hb5by6sa6ais4w3xnrxwyq
-mtn.i2p,xisk3h6sku3iqj52uriogaajmnku7pwjux7wa4omx2zloamuw6eq
-mtn.i2p-projekt.i2p,f52x5fp6uhq53f5zle5d6rq5un34xgmxgazvilvmzcby37xcmsfa
-mtn.i2p2.i2p,l6kuhtmgvbp57d7jwalj5nksi6nr4gfzbz4oit62lxgipb3llt5a
-mtn.meeh.i2p,h7ylrsuzzynrxp3jql7anoozyqblavj7eqces6o3wngvuuxhs2la
-mudgaard.i2p,yz32lk42gtoesknesfolq3tt4erxxcejcote5pontaeqev3bj2kq
-mush.zeit.i2p,dk3sg23kljawxqp3cb6xz5mnzjlyckzvq5jhqs5gnvdsv7wqn6ha
-music.i2p,akamh76yi6p7xxbvl3qv3yhaockne57yfuh77acogbgpjmwypvia
-mysterious.i2p,p66g2a4nzfkvidd3l7nwphcnfa3ttyu5kiolcb4czec2rn2kvwsq
-mywastedlife.i2p,ceumy3puvvsrru5bmfmtgsajsx5qyehqac7l7a23xpwtfs2bvcgq
-nacl.i2p,bm2fib3tumer72lopjh4nmqomwvqu2sdfyb2hmr6lnk7jbw3vvia
-nano.i2p,ex5ssv7s3hj6jp7hvadxfw3wvbjbvnczxr4pbk7qw26ihiorjmba
-nassai.i2p,v653cocvn3i6bgjdm3ciwbdnu32supglv6gn4fh23bohemsp545q
-neodome.i2p,5hkhjehj3ct2pvcah7dcylwef2oti3xij5myxbv3pd7rocio5vkq
-news-i2pn.i2p,wwcqkwfo5yhe6uribv5tzylk25j5hkdk6gdnyftzd3k7dawlzwca
-news.neodome.i2p,trhwcnygfkeqjj6g4xhmrdp4gsjqsye47lsxshbmwbten4ywt5oq
-news.underscore.i2p,rl7t3kspoktuatjcu7gf7xleu7y6biibs4fspzo24kll6n7hbq4q
-newsbyte.i2p,gsk3rgsejxxrfabjxu5w5plplxsu47aoeoke22vvhlwwllzosnxq
-nibble.i2p,jmdxcpdzqafedn3clc4y7u6o56qocfiffrzbzncmtggqtio5qjpa
-nic.i2p,vzu5ymab6klevpcdudv4ypisjqaznmt44e6lcg7dwiuza4saibxq
-nickster.i2p,zkwsa6kvq2wdhovw5g5wqakpb7rlaylyhfriwmurots5pvwbqauq
-nickster2.i2p,eofzi7npzpk4p5gb4qper4hmwgxo6kepo3dheeblakewedxj2bwq
-nickyb.i2p,gmpxk4tje7mnud32kg2kjmf36f6cpwqakzc2dxuzjnnz4qr5w4sa
-nightblade.i2p,p4gkon7ytswxrbwkl7vruw6mg7kfw5aofovqjgt4c7tnqmbq6lha
-ninja.i2p,q6dg6hlb3egzdqz352ri5rc4fx4gcrdeu3tpiyfxlv73yfjgrhya
-nm.i2p,3itdpqzyn3ii7sivppo4sxxwhvgtpskzkbokrdibim6gqpvlw5ya
-nntp.baffled.i2p,kc6muo2tih5mttbpzecteegvtonuysjidk3emcy4cm4yifzild2a
-nntp.duck.i2p,gvzzor4utsqxswvf6jaglfks7yxudlz2s326ftrk56i4lpd2s47q
-nntp.fr.i2p,npoztnqadfnu4vrokoh6rusoi3yne47s6jurc3lzhcrzzia5eqva
-nntp.i2p,wwdzmeyler4djegvyt2bxmkwrckfgg3epkkwowyb75s47he6df6q
-no.i2p,lpsg4x4gdrf7antxcdy47cl6abcqei5ommgzt55retq7go5ku3ba
-noname56.i2p,oiyoslismzyxuw7ehxoigmtkdj35idim6flmlplddxuiiif6msfa
-nop.i2p,ssag45lathm4gqp46si7c4w4tioyvjpcza5uvz5x2zuljnplylca
-normal.i2p,j5fex634r2altzb3kjvu35qekt2r3hgsqzg5qxoy7dp53heu5pma
-normanabcd.i2p,si2vh43gvxjnw2shwr24j76xyanow4oa6gbu4idookbraoxl3s3a
-nothingburger.i2p,tesfpn757ysc7nih7mxher2b3jstkc3l5fhfcyb5kxhzhvv52trq
-nothingspecial.i2p,wzrwqrp52bilqijrlboclynuev4kzpjzfzlvzl5aqxqt5fdnpbga
-novospice.i2p,ukqap24nwac4gns77s4zy7j5cagt7l7syb5zo7eukfg3zn5gg5qq
-nsa.i2p,nsetvbclpomqxfcit4mghn6z7vdhnza6jdzczby4crnto32uykga
-nvspc.i2p,anlncoi2fzbsadbujidqmtji7hshfw3nrkqvbgdleepbxx3d5xra
-nxt-wallet.i2p,33pp74k4ivy67z332qpyl3qlcqmi6gxqumrow4bldkblxxlxqq5a
-obmen.i2p,vodkv54jaetjw7q2t2iethc4cbi4gjdrmw2ovfmr43mcybt7ekxa
-obscuratus.i2p,i4j37hcmfssokfb6w3npup77v6v4awdxzxa65ranu34urjs4cota
-ogg.aum.i2p,wchgsx6d6p3czloeqvna2db5jr7odw4v4kqrn4gr4qiipfyrbh5q
-ogg.baffled.i2p,tfbvj2xal6lcuxv3hzuw7cw4g3whguombcv2zuotzvul4qtrimgq
-ol.i2p,bnb46culzbssz6aipcjkuytanflz6dtndyhmlaxn3pfiv6zqrohq
-onboard.i2p,qwlgxrmv62mhdu6bgkh4ufnxowxsatfb6tbs2zr666qyunwqnecq
-onelon.i2p,irkvgdnlc6tidoqomre4qr7q4w4qcjfyvbovatgyolk6d4uvcyha
-onhere.i2p,vwjowg5exhxxsmt4uhjeumuecf5tvticndq2qilfnhzrdumcnuva
-oniichan.i2p,nnkikjorplul4dlytwfovkne66lwo7ln26xzuq33isvixw3wu3yq
-onionforum.i2p,yadam2bp6hccgy7uvcigf5cabknovj5hrplcqxnufcu4ey33pu5q
-ooo.i2p,iqp5wt326fyai5jajsa3vkkk5uk56ofn4anocgpe5iwlpisq6l7a
-opal.i2p,li5kue3hfaqhhvaoxiw2ollhhkw765myhwcijgock5rs4erdqdaa
-open4you.i2p,ice6ax5qrzwfwzsy64bctffj6zlzpuzdr5np65zsxlbt7hztyc6a
-opendiftracker.i2p,bikpeyxci4zuyy36eau5ycw665dplun4yxamn7vmsastejdqtfoq
-openforums.i2p,lho7cvuuzddql24utu7x6mzfsdmxqq7virxp5bcqsxzry2vmwj5q
-opentracker.dg2.i2p,w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa
-orion.i2p,5vntdqqckjex274sma3uqckwqep2czxs5zew25zlntwoofxk3sga
-orz.i2p,oxomqkekybmyk6befjlouesit5mhstonzvzd2xnvsk7i6uyrqsfq
-os3.i2p,s7x4ww5osrrfein3xgwyq67wnk6lgliw4mzt7shtu66wrb2zdojq
-osiristomb.i2p,t3slf77axkv3qm7c3gzpv3jgmkraoqqe2bojr6h66eipibofsyzq
-ot.knotwork.i2p,cxhvvfkbp2qbv5qojph7zb46molpe2ffanghnerjag3xdmy6ltxq
-outproxy-tor.meeh.i2p,77igjr2pbg73ox5ngqy5ohzvrnur3ezqcogtl4vpuqtrcl3irsqq
-outproxy.h2ik.i2p,nwgvfpfarpnyjjl4pwsxr2zdsppcx5we3kos2vlwicbiukopgaza
-outproxyng.h2ik.i2p,v32zse2zczzgegelwxbx7n5i2lm2xhh2avltg76h6fz5tb53sfxq
-overchan.oniichan.i2p,g7c54d4b7yva4ktpbaabqeu2yx6axalh4gevb44afpbwm23xuuya
-p4bl0.i2p,lkgdfm4w6e2kkjhcdzr4ahhz26s3aunhrn6t2or436o73qh4z7ga
-pants.i2p,xez3clscjfafkqwk6f473ccp3yvac4kh6rdp6dptwxa2lhixizgq
-papel.i2p,mxskjqntn2d34q4ovsnd5mud7cgde734tdjldd3lt4hczh2645zq
-pasta-nojs.i2p,dkkl3ab6iovxfqnp44wsjgqaabznvu7u3hugpzyagbeqlxgvx3la
-paste.crypthost.i2p,2zaj4u4s4l3lgas2h5p6c6pvzr2dckylkrh5ngabursj4oh25ozq
-paste.i2p2.i2p,b2gizskfea4sjxlw6ru2tb6kdrj47dsjc77cijsf5mzh4ogbmfvq
-paste.r4sas.i2p,csen43keji3qiw6uobsgzysxyjd225g6446ylq5uuz6ur2glkzaa
-pastebin.i2p,mnicncxrg2qqi55qftigiitaheugnj4rpysbk7zabdrirgktelqa
-pastethis.i2p,erkqiwnjl7vtysqd3wvddv6tfvnhswarqkbn4blhdlhfxn7cf2ha
-pdforge.i2p,wzeg3ehf6d2mqjqji3sd3rns776thvhe2vam2r6gjlmsqis2dctq
-perv.i2p,f3k3wm4ae7t7ottfjd4hu6is7zsls73izl2gm2qynzficxcdsiwq
-pgp.duck.i2p,wujajyxj3cgsfsbtr3g7g7npv5ft3de6pcstxlav26zq6cxdjmha
-pharos.i2p,vathk2pyvaskeie63yyg4tshjkx5xt6zfvhwhgr3de67q46ob3sa
-pharoz.i2p,vathk2pyvaskeie63yyg4tshjkx5xt6zfvhwhgr3de67q46ob3sa
-phonebooth.i2p,noxia7rv6uvamoy2fkcgyj4ssjpdt4io6lzgx6jl6wujpufxedrq
-photo.i2p,fqhuy77ugd5htnubzkyy5guvwboqn6goahtmn2g7feewvdj7k3iq
-piespy.i2p,vzusfjzcu5ntnvobcvyzc4dcu4j6ommtnpmba2puk3kexgdzrl7a
-pisekot.i2p,7yzdwhy723fodqz4onp6k3nyvixra2sa6dl45tcblhmyoa7i36nq
-pizdabol.i2p,5vik2232yfwyltuwzq7ht2yocla46q76ioacin2bfofgy63hz6wa
-planet.i2p,y45f23mb2apgywmftrjmfg35oynzfwjed7rxs2mh76pbdeh4fatq
-plugins.i2p,wwgtflbaa7od2fxbw4u7q7uugmdclxf56alddvizugwcz5edjgia
-polecat.i2p,het5jrdn35nhkanxmom5mjyggyvmn2wdj2agyqlrv4mhzhtmavwq
-politguy.i2p,6dkkh3wnlwlr6k7wnlp4dbtf7pebjrph5afra2vqgfjnbihdglkq
-pomoyka.i2p,omt56v4jxa4hurbwk44vqbbcwn3eavuynyc24c25cy7grucjh24q
-pool.gostcoin.i2p,m4f4k3eeaj7otbc254ccj7d5hivguqgnohwelkibr4ddk43qhywa
-pop.mail.i2p,bup6pmac7adgzkb5r6eknk2juczkxigolkwqkbmenawkes5s5qfq
-pop.postman.i2p,ipkiowj7x4yjj7jc35yay3c6gauynkkl64gzzyxra3wmyhtfxlya
-pravtor.i2p,2sr27o5x2v2pyqro7wl5nl6krrsbizwrzsky5y7pkohwh24gn6xq
-pris.i2p,ahiwycgzuutdxvfqu3wseqffdnhy675nes57s4it2uysy5pxmz6a
-project-future.i2p,ivqynpfwxzl746gxf376lxqvgktql2lqshzwnwjk2twut6xq7xta
-projectmayhem2012-086.i2p,ehkjj4ptsagxlo27wpv4a5dk4zxqf4kg4p6fh35xrlz4y6mhe4eq
-protokol.i2p,f4xre35ehc5l6ianjvt3zcktxkjlyp2iwdje65qnu2j6vurhy6nq
-proxynet.i2p,7gar5a3n4hzvsgi73iizo65mjza4kujf7feopfxuwu5p6wtwog5a
-psi.i2p,avviiexdngd32ccoy4kuckvc3mkf53ycvzbz6vz75vzhv4tbpk5a
-psy.i2p,s3elzoj3wo6v6wqu5ehd56vevpz2vrhhjc5m6mxoazicrl43y62q
-psyco.i2p,eoilbrgyaiikxzdtmk2zeoalteupjrvcu3ui23p4wvfqo25bb73q
-pt.hiddenanswers.i2p,o5jlxbbnx3byzgmihqye3kysop5jgl3unsrkmurbtr2nrnl2y74a
-ptm.i2p,7dna5745ynxgogpjermnq26hwrqyjdlsibpjfmjxlwig247bjisa
-ptt.i2p,q7r32j7lc3xgrcw2ym33wv4lfgqbez7vtm4lts7n34qfe3iygeha
-pull.git.repo.i2p,3so7htzxzz6h46qvjm3fbd735zl3lrblerlj2xxybhobublcv67q
-push.git.repo.i2p,jef4g5vxnqybm4zpouum3lzbl6ti6456q57nbyj5kfyldkempm3a
-pycache.awup.i2p,w45lkxdnqhil4sgzanmxce62sv3q4szeowcjb2e72a5y5vbhm4ra
-r4sas.i2p,2gafixvoztrndawkmhfxamci5lgd3urwnilxqmlo6ittu552cndq
-radio.r4sas.i2p,cv72xsje5ihg6e24atitmhyk2cbml6eggi6b6fjfh2vgw62gdpla
-ragnarok.i2p,jpzw6kbuzz3ll2mfi3emcaan4gidyt7ysdhu62r5k5xawrva7kca
-ransack.i2p,mqamk4cfykdvhw5kjez2gnvse56gmnqxn7vkvvbuor4k4j2lbbnq
-rasputin-sucks.i2p,fdozdbyak4rul4jwpqfisbkcx4xbrkuvf2o5r6fd3xryyrjgvjiq
-rebel.i2p,nch2arl45crkyk6bklyk2hrdwjf5nztyxdtoshy6llhwqgxho5jq
-red.i2p,fzbdltgsg7jrpz7gmjfvhpcdnw5yrglwspnxqp4zoym3bglntzfa
-redpanda.i2p,3wcnp6afz4cikqzdu2ktb5wfz7hb3ejdbpn7ocpy7fmeqyzbaiea
-redzara.i2p,ty7bt62rw5ryvk44dd3v5sua6c7wnbpxxqb6v4dohajmwmezi7va
-reefer.i2p,4cde25mrrnt5n4nvp5tl62gej33nekfvq2viubmx4xdakhm5pfaa
-relatelist.i2p,utrer5zgnou72hs4eztmk37pmzdtfw3d6s23wwl7nk3lkqpzbdiq
-repo.i2p,uxe3lqueuuyklel23sf5h25zwgqgjwsofrqchhnptd5y6pedzbxa
-repo.r4sas.i2p,ymzx5zgt6qzdg6nhxnecdgbqjd34ery6mpqolnbyo5kcwxadnodq
-reseed.i2p,j7xszhsjy7orrnbdys7yykrssv5imkn4eid7n5ikcnxuhpaaw6cq
-retrobbs-nntp.i2p,fkyzl24oxcxvjzkx74t3533x7qjketzmvzk6bwn3d6hj5t7hlw6q
-retrobbs.i2p,mnn77stihntxdoade3ca2vcf456w6vhhvdsfepdvq5qggikvprxq
-retrobbs2.i2p,ejff7jtyaus37slkwgeqrrcmyhpj26carp7n27f5h6s5vlbeiy6q
-revo-ua.i2p,hpojpumki22xjwhmhe6zkiy44oanyn7u4ctcfe3in2ibwm5l32hq
-riaa.i2p,lfbezn7amkzhswnx7lb4lxihyggl2kuqo5c7vwkcv6bwqmr4cuoa
-rideronthestorm.i2p,xrdc2qc7quhumhglpbcuiqxr42nuffv4xj4a73jbr4ygepitibqq
-romster.i2p,eaf2stdqdbepylt53egvixdi34g2usvgi7a4oixsja6atkran43a
-rootd.i2p,mzbe5wofwn7eaqq4yefrmxizqaxoslwqxrv5qcv2opx5lnhg64dq
-rospravosudie.i2p,z55khrnlj6bzhs5zielutm6ae6t2bbhfuiujwlrp3teubqyc4w7q
-rotten.i2p,j4bm3rvezlejnb44elniagi5v2gazh7jaqrzhbod2pbxmgeb2frq
-rpi.i2p,56p5qxsrvo5ereibevetw2qbj5bronmos7wxunku27g2s4kpbnlq
-rslight.i2p,bitag46q3465nylvzuikfwjcj7ewi4gjkjtvuxhn73f6vsxffyiq
-rsync.thetower.i2p,w4brpcdod7wnfqhwqrxyt4sbf2acouqfk5wyosfpq4mxq4s35kqa
-ru.hiddenanswers.i2p,o6rmndvggfwnuvxwyq54y667fmmurgveerlzufyrhub6w3vkagva
-ru.i2p,m7fqktjgtmsb3x7bvfrdx4tf7htnhytnz5qi2ujjcnph33u3hnja
-rufurus.i2p,7msryymfdta3ssyz34qur6gi4jyfkvca5iyfmnceviipwu7g2wca
-rus.i2p,gh6655arkncnbrzq5tmq4xpn36734d4tdza6flbw5xppye2dt6ga
-ruslibgen.i2p,kk566cv37hivbjafiij5ryoui2ebxnm7b25gb3troniixopaj6nq
-rutor.i2p,tro5tvvtd2qg34naxhvqp4236it36jjaipbda5vnjmggp55navdq
-salt.i2p,6aflphlze6btsbez5cm4x53ydrmwhqrkxsud535d3qjh4wq62rxq
-sasquotch.i2p,p6535uyfk2y6etc3t47vd3oqxydznqior5jxcvq5bdxe5kw5th6q
-schwarzwald.i2p,4gokilzy73mmudufy3pohgatm42fcstx7uzg5hjvnfyphxpnphuq
-sciencebooks.i2p,ypftjpgck75swz3bnsu4nw7rmrlr2vqsn4mwivwt3zcc3rxln5cq
-scp.duck.i2p,ghbpsolpnveizxu4wbs7jbs2vj3kntnsexfcdleyhpqdhfpxleda
-search.i2p,nz4qj6xaw5fda3rsmsax6yjthqy4c7uak2j3dzcehtkgyso4q46q
-secretchat.i2p,cl3j2zxhpw6u6jevny45i557ojhwfxn4g375nnuqhy6lp27mry2q
-secure.thetinhat.i2p,4q3qyzgz3ub5npbmt3vqqege5lg4zy62rhbgage4lpvnujwfpala
-seeker.i2p,ipll7sit24oyhnwawpvokz5u7dabq6klveuqpx3sbi6o5qemy2bq
-seomon.i2p,5mvpsy4h45w4fx7upen7ay3vkrs5klphz5nptmtcqvc3fsajsm4q
-septu.i2p,5lqvih7yzbqacfi63hwnmih57dxopu5g2o5o4e2aorq7bt4ooyra
-serien.i2p,3z5k3anbbk32thinvwcy4g5al7dmb75fagcm3zgh4rzrt3maphda
-ses.i2p,5qfoz6qfgbo7z5sdi26naxstpi2xiltamkcdbhmj6y6q2bo4inja
-shiftfox.i2p,wpvnuzslu7hjy4gujvnphtyckchdoxccrlhbyomsmjizykczyseq
-shoieq3.i2p,3fjk4nfk3mccch4hdreghnyijcvovsi3yucjz3qzj5sxngqk5j6q
-shoronil.i2p,7shqzgmb6tabiwrnwlasruq7pswy2d3emvfhaitehkqgod7i62sa
-short.i2p,z5mt5rvnanlex6r3x3jnjhzzfqpv36r4ylesynigytegjmebauba
-sion.i2p,lcbmmw2tvplvqh2dq5lmpxl3vnd5o4j3bdul5moa23deakjrso5q
-sirup.i2p,aohdp4yajnkitrtw7v2mo3sp7swuqhjfwlsi5xwd7dudzftumsma
-site.games.i2p,zeuczucfxeev3k7tvqlfcdpfbnqggheiknyyb5r2q4utn3d2auja
-skank.i2p,qiii4iqrj3fwv4ucaji2oykcvsob75jviycv3ghw7dhzxg2kq53q
-slack.i2p,gfcsh2yrb2tx7hyvmobriv52skz7qoobn7n7y7n6xaehhh4rpbja
-slacker.i2p,wq7m2wdguzweleb666ygv3bmfhha63zj74rub76vfesbyhsyk6iq
-smeghead.i2p,ojf4czveeuekxqkjvkszvv7eiop5dg7x2p6rgfzl4ng4xrjk6lja
-smtp.mail.i2p,kdn7zx7fgoe4bn5abaaj5cb3e4ql22fklb5veui5yajpj4cxapya
-smtp.postman.i2p,jj7pt6chsziz6oxxnzpqj7mzhxm2xfhcrbh7dl3tegifb577vx5q
-socks1.tor.i2p,sifawcdexgdmoc3krv46pvvz74nzd6fkju2vzykjxsx3egqsb6wq
-sonax.i2p,jmuxdhlok5ggojehesfjlit2e2q3fhzwwfxjndts7vzdshucbjjq
-sponge.i2p,o5hu7phy7udffuhts6w5wn5mw3sepwe3hyvw6kthti33wa2xn5tq
-squid.i2p,r4ll5zkbokgxlttqc2lrojvvey5yar4xr5prnndvnmggnqzjaeoq
-squid2.i2p,hum4wlwizbsckbudcklflei66qxhpxsdkyo4l2rn256smmjleila
-sqz.i2p,3jvbwc7sy4lnhj25nj7yepx7omli4ulqirnawv3mz6qlhgokjgzq
-ssh.i2p,xpvdadaouc4qr75pteymyozc7mcsynjfkuqqkkla542lpcsqionq
-stasher.i2p,6ilgpudnba4kroleunc2weh5txgoxys5yucij5gla6pjyki4oewa
-stats.i2p,7tbay5p4kzeekxvyvbf6v7eauazemsnnl2aoyqhg5jzpr5eke7tq
-status.str4d.i2p,ycyyjo3psqbo45nuz243xvgvwnmzlanzqbzxv3kh6gyjztv7425q
-sto-man.i2p,rg4eilfpe24ws6nctix63qw2dlvd2tqgwdcgdxzji6l5bc4dc7aa
-str4d.i2p,wrrwzdgsppwl2g2bdohhajz3dh45ui6u3y7yuop5ivvfzxtwnipa
-stream.i2p,prmbv3xm63ksoetnhbzqg4nzu2lhqdnqytgsydb7u3quxfrg7rna
-streams.darkrealm.i2p,ud3gcmvysjch4lbjr2khmhqpf7r2x5if4q43xkqdptl4k7lc4muq
-striker.i2p,4gswsrfpbd44hwjoj33jbqfbwzxfkwpuplb3ydq5zm7nfu2pxvdq
-subrosa.i2p,g3lnglrnoual7wyabnwwv37uwhadgbxiqz36pf3f5cwfuxsx4mxq
-subterra.i2p,vdmhe4u26unzgd7ysq6w36ubjncms5wzbhzr2gq576sq4xut5zwq
-sugadude.i2p,yzjn76iyqard64wgggfrnywkxi7tbfkw7mjhpviqz3p2dguey4yq
-suicidal.i2p,yfamynllow5xiqbbca7eh5xn733wtnuti5bi4ovc7dwycntqmiuq
-sungo.i2p,h67s3jw56rwfyoxqxj3fngrluybsgxc2meendngkehzqowxnpj3q
-surrender.adab.i2p,jgz7xglgfgnjfklrytyn427np2ubipztlm5bxrtbiucayglukrta
-susi.i2p,qc6g2qfi2ccw7vjwpst6rwuofgzbeoewsb2usv7rubutf4gzqveq
-syncline.i2p,5kcqmhislu3lmr7llgmdl72yu3efhyriljdc6wp774ftpwlcs5ra
-syndie-project.i2p,xa63tpfoaqt3zru2ehxjjfbpadwj4ha6qsdvtcqtyr3b7hmt4iaq
-syndie.echelon.i2p,vwrl2qmcif722fdkn3ldxcgz76df5cq4qypbndzthxwgmykyewta
-syndie.i2p,7lm3yzpuejhpl4tt4l7o4ndqlu7hgijohofh7oaydx7q7kelenbq
-syndiemedia.i2p,4lrbbblclodhobn3jadt5bf2yab2pxzoz4ey4a2cvrl44tdv3jma
-tabak.i2p,y5o2vwb6kart7ivpnbpk4yte3i7kf2dsx7fy3i6w7htqtxhmbzia
-tahoeserve.i2p,yhs7tsjeznxdenmdho5gjmk755wtredfzipb5t272oi5otipfkoa
-tc.i2p,qkv2yk6rof3rh7n3eelg5niujae6cmdzcpqbv3wsttedxtqqqj7a
-telegram.i2p,i6jow7hymogz2s42xq62gqgej2zdm4xtnmpc6vjcwktdxpdoupja
-templar.i2p,zxeralsujowfpyi2ynyjooxy222pzz4apc2qcwrfx5ikhf64et7q
-terror.i2p,wsijm6aqz4qtuyn2jedpx6imar5uq4yuhjdgtfqumxbqww47vbnq
-thebland.i2p,oiviukgwapzxsrwxsoucpqa47s3wt6nfuhfjxvgbqsyrze2mwrda
-thebreton.i2p,woutbsflcrlgppx4y7ag2kawlqijyenvlwrhbbvbkoaksuhf2hkq
-thedarkside.i2p,fxt3z33nzkrg5kjrk7bp5vvmu7w2vsn4i6jo6cily3hsm6u664ca
-theland.i2p,26ppxbseda6xmim37ksarccdb4q5ctdagfmt2u5aba6xjh452zsa
-thetower.i2p,3xqa5nype64y6fxgqjq6r5w2qpiqftoraj2niebumseat4cj654a
-thornworld.i2p,vinz4ygmodxarocntyjlfwk2wjpvzndlf4hxss2w2t3fk52oplva
-tino.i2p,e4bfnhvaofu4s67ztcgiskos2mqyhskid64dvlqexxs2c2bno3iq
-tinyurl.i2p,mc4oxv3v7dnyzpvok7v5qxkwtgjprgyz6w7x3tag4fipsen6rdwa
-tome.i2p,qktkxwawgixrm5lzofnj5n24zspbnzxy4pvjm7uvaxvmgwrsuvgq
-tor-gw.meeh.i2p,ounrqi7cfemnt66yhnhigt2u27fkctbvct527cp2522ozy3btjza
-tor-www-proxy.i2p,xov45rvjks5fe4ofmpblkj23bnwxgslbypbgvchbr7yul2ujej2q
-torapa.i2p,eejqjtpko6mdd4opvntbpsuandstrebxpbymfhix7avp5obrw5ta
-torrentfinder.i2p,mpc73okj7wq2xl6clofl64cn6v7vrvhpmi6d524nrsvbeuvjxalq
-torrfreedom.i2p,nfrjvknwcw47itotkzmk6mdlxmxfxsxhbhlr5ozhlsuavcogv4hq
-trac.i2p,kyioa2lgdi2za2fwfwajnb3ljz6zwlx7yzjdpnxnch5uw3iqn6ca
-trac.i2p2.i2p,i43xzkihpdq34f2jlmtgiyyay5quafg5rebog7tk7xil2c6kbyoa
-tracker-fr.i2p,qfrvqrfoqkistgzo2oxpfduz4ktkhtqopleozs3emblmm36fepea
-tracker.awup.i2p,dl47cno335ltvqm6noi5zcij5hpvbj7vjkzuofu262efvu6yp6cq
-tracker.crypthost.i2p,ri5a27ioqd4vkik72fawbcryglkmwyy4726uu5j3eg6zqh2jswfq
-tracker.fr.i2p,rzwqr7pfibq5wlcq4a7akm6ohfyhz7hchmy4wz5t55lhd7dwao5q
-tracker.i2p,lsjcplya2b4hhmezz2jy5gqh6zlk3nskisjkhhwapy3jjly4ds5q
-tracker.lodikon.i2p,q2a7tqlyddbyhxhtuia4bmtqpohpp266wsnrkm6cgoahdqrjo3ra
-tracker.mastertracker.i2p,tiwurhqvaaguwpz2shdahqmcfze5ejre52ed2rmoadnjkkilskda
-tracker.postman.i2p,jfcylf4j3gfmqogkltwy7v5m47wp4h7ffrnfsva6grfdavdn7ueq
-tracker.psi.i2p,vmow3h54yljn7zvzbqepdddt5fmygijujycod2q6yznpy2rrzuwa
-tracker.thebland.i2p,s5ikrdyjwbcgxmqetxb3nyheizftms7euacuub2hic7defkh3xhq
-tracker.welterde.i2p,cfmqlafjfmgkzbt4r3jsfyhgsr5abgxryl6fnz3d3y5a365di5aa
-tracker2.postman.i2p,ahsplxkbhemefwvvml7qovzl5a2b5xo5i7lyai7ntdunvcyfdtna
-traditio.i2p,wkpjjloylf6jopu2itgpktr45t2xvpjijxilxd5tq4i7wkqgwhhq
-trevorreznik.i2p,wc2z6o5fxm2saqzpfcawr63lejwccvzkysmgtfudkrigqopzfdma
-true.i2p,pdilhl5vmefyzrrnmak5bnmxqxk2pmw7rpy4f7wbaeppqu2vvugq
-trwcln.i2p,evml6jiiujhulsgxkdu3wcmkwbokxlv4is6w5qj46tp3ajz3hqzq
-trypanom.i2p,tgv5acj4khwvr6t44cmryohybd2e5o2kndysnzae6qwcr4hzda3q
-ts.i2p,nebcjgfx3f7q4wzihqmguwcdeopaf7f6wyk2dojw4bcuku472zxq
-ttc.i2p,wb4tsfyvfv4idgrultsq6o7inza4fxkc7dijsfpncbx7zko4cdlq
-ttp.i2p,uuczclxejmetohwf2vqewovx3qcumdfh5zecjb3xkcdmk6e5j72a
-tumbach.i2p,u6pciacxnpbsq7nwc3tgutywochfd6aysgayijr7jxzoysgxklvq
-tutorials.i2p,zy37tq6ynucp3ufoyeegswqjaeofmj57cpm5ecd7nbanh2h6f2ja
-ugha.i2p,z3f3owc72awbywk4p6qb5l2mxgitvs6ejztggbpn2a3ddmymfjda
-uk.i2p,vydbychnep3mzkzhg43ptewp242issy47whamfbxodc4ma6wc63a
-underground.i2p,dlnuthb6tpw3kchlb7xoztyspy4ehlggjhl44l64vbcrulrfeica
-underscore.i2p,3gmezyig6gvsjbpkq2kihoskpuqpkfrajmhhm7hpyrjuvtasgepa
-unqueued.i2p,3gvn4kwd7z74jxc2sn4ucx52dpvpscxbzjluux3ul4t3eu5g64xq
-up.i2p,25it5olgdo7pht25z6buzd32sw7jvc65oziqeuocfozfhgua655q
-update.dg.i2p,iqj6ysfh3wl26m4buvyna73yhduifv523l7bwuexxak4mgldexja
-update.killyourtv.i2p,gqdfg25jlqtm35qnmt4b7r53d6u2vep4ob23fwd42iyy4j6cvdqq
-update.postman.i2p,u5rbu6yohfafplp6lgbbmmcuip34s7g3zqdd63cp27dl3nbd7gtq
-utansans.i2p,u2oyre7ygqv4qs5xjjijfg3x7ddwtod6nqwgbomuuzljzvnq4rda
-v2mail.i2p,4gg7fykcqe7oaqt4w5fmlarnia7vtmwkv3h45zzgoj6o6crryg5a
-vadino.i2p,aalttzlt3z25ktokesceweabm5yyhhvml2z3rfotndgpfyh6myra
-visibility.i2p,pwgma3snbsgkddxgb54mrxxkt3l4jzchrtp52vxmw7rbkjygylxq
-volatile.i2p,q6rve733tvhgyys57jfw4fymqf3xsnza6dqailcdjcq7w4fa5m3a
-vpnbest.i2p,ov5f74ndsy5rfkuyps56waf42vxncufqu5rzm3vsnxkdtogccaea
-vudu.i2p,3zlwci7pvgep2igygzyjej24ue7mjsktlhaff6crpsr75yquak2q
-w.i2p,j2xorlcb3qxubnthzqu7lt4fvxqn63it4ikwmze55yjkzeeampuq
-wa11ed.city.i2p,7mxwtmala3ycg2sybjwwfil7s6dqck2fbemeutghhwu73rznmqoa
-wahoo.i2p,vqe5vkpe5wbda7lwekcd2jaj44ar3rawgv54u5rcolezbg5f5vwa
-wallet.gostcoin.i2p,reuvum7lgetglafn72chypesvto773oy53zumagrpigkckybrwda
-wallsgetbombed.i2p,tzhea5d65fllm4263wztghgw4ijdgibsca5xsecp6lk4xlsbdeuq
-web.telegram.i2p,re6cgwg2yrkgaixlqvt5ufajbb3w42fsldlq7k5brpvnd5gp6x5a
-wiht.i2p,yojmpj3sh76g3i6ogzgsf7eouipdgdij5o2blcpdgmu5oyjk5xca
-wiki.fr.i2p,lrqa7hw52uxjb5q3pedmjs6hzos5zrod4y6a4e25hu7vcjhohvxq
-wiki.ilita.i2p,r233yskmowqe4od4he4b37wydr5fqzvj3z77v5fdei2etp2kg34a
-wintermute.i2p,4gvlfrdy2rkmem33c342tjntpvqik65wekcvm4275qbkuwotoila
-wspucktracker.i2p,ubd2txda3kllumx7ftg4unzgqy536cn6dd2ax6mlhodczfas7rgq
-www.aum.i2p,3xolizygkzkqrldncjqsb734szznw2u36lliceuacqnbs2n65aeq
-www.baffled.i2p,lqrsfslwu4xnubkk2hofhmuvvr4dia2zevxefinbzdsjurvehtqq
-www.fr.i2p,rmkgvlfwo3vkb3xrr6epoypxasdzzuilv3sckcqbo6c4os5jo2ea
-www.i2p,ojxyenivrrqvycgbxbm3phgisu5abspzq4g2us4fjlwz4tx222va
-www.i2p2.i2p,rjxwbsw4zjhv4zsplma6jmf5nr24e4ymvvbycd3swgiinbvg7oga
-www.imule.i2p,657xcllunctawyjtar5kgh3wpt6z4l7ba6mmam5rf7hev5w2lsvq
-www.infoserver.i2p,fq7xhxkdcauhwn4loufcadiiy24zbei25elnup33a3gfrdzrtlyq
-www.janonymous.i2p,vosqx5qw22hwrzcgsm4ib7hymf5ryovsbtaexqrzmnzshy5bhakq
-www.mail.i2p,nctas6ioo7aaekfstv3o45yh6ywzwa3vznrdae52ouupzke5pyba
-www.nntp.i2p,kly3o7zmetuwyz7xonnhttw4lj2244pkbibjz26uflyfte3b3dka
-www.postman.i2p,rb3srw2gaooyw63q62cp4udrxxa6molr2irbkgrloveylpkkblhq
-www.syndie.i2p,vojgy5ep4wffmtpjmpnbpa4gq64bgn4yicuw6qmhbm6nqa2ysrva
-www1.squid.i2p,vbh3bltd2duwbukafgj6f6vfi6aigwso7snucp5zohnf66a2hkpa
-xc.i2p,mt45a2z3sb2iyy2mwauj4rwa2lwu4peanfy6gx6ybidwnbasusyq
-xeha.i2p,oartgetziabrdemxctowp7bbeggc7ktmj7tr4qgk5y5jcz4prbtq
-xilog.i2p,eoc5i5q52hutnmsmq56edvooulutaxfikddgdz27otmgtsxmiloq
-xmpp.crypthost.i2p,ittkqpjuliwsdewdugkhvgzstejr2jp5tzou7p332lxx4xw7srba
-xmpp.rpi.i2p,3yv65pfwiwfuv4ciwtx34clqps6o2mc3vtyltcbqdkcki6untbca
-xn--l2bl5aw.i2p,d2epikjh5crt2l5xjmtceqw2ho44hzp6x3u7hgjrd4mi4wywikwa
-xolotl.i2p,rwr6rrlmrotxfkxt22mah42cycliy2g5k7hgxyxkpcyyxkd2bgwq
-xotc.i2p,gqgvzum3xdgtaahkjfw3layb33vjrucmw5btyhrppm463cz3c5oq
-z-lab.i2p,s6g2pz3mrwzsl4ts65ox3scqawfj7mzvd7hn2ekiiycawopkriba
-zab.i2p,n4xen5sohufgjhv327ex4qra77f4tpqohlcyoa3atoboknzqazeq
-zcash.i2p,zcashmliuw3yd2ptfyd5sadatcpyxj4ldiqahtjzg73cgoevxp4q
-zener.i2p,mcbyglflte3dhwhqyafsfpnqtcapqkv2sepqd62wzd7fo2dzz4ca
-zerobin.i2p,3564erslxzaoucqasxsjerk4jz2xril7j2cbzd4p7flpb4ut67hq
-zeroman.i2p,gq77fmto535koofcd53f6yzcc5y57ccrxg3pb6twhcodc7v5dutq
-zeronet.i2p,fe6pk5sibhkr64veqxkfochdfptehyxrrbs3edwjs5ckjbjn4bna
-znc.i2p,uw2yt6njjl676fupd72hiezwmd4ouuywowrph6fvhkzhlnvp7jwa
-znc.str4d.i2p,ufkajv3stxpxlwgwwb2ae6oixdjircnbwog77qxpxv7nt67rpcxq
-zzz.i2p,ukeu3k5oycgaauneqgtnvselmt4yemvoilkln7jpvamvfx7dnkdq

android/assets/certificates

@@ -1 +0,0 @@
-../../contrib/certificates

android/assets/i2pd.conf

@@ -1,90 +0,0 @@
-## Configuration file for a typical i2pd user
-## See https://i2pd.readthedocs.io/en/latest/user-guide/configuration/
-## for more options you can use in this file.
-
-#logfile = /sdcard/i2pd/i2pd.log
-loglevel = none
-#tunnelsdir = /sdcard/i2pd/tunnels.d
-
-# host = 1.2.3.4
-# port = 4567
-
-ipv4 = true
-ipv6 = false
-
-# ntcp = true
-# ntcpproxy = http://127.0.0.1:8118
-# ssu = true
-
-bandwidth = L
-# share = 100
-
-# notransit = true
-# floodfill = true
-
-[ntcp2]
-enabled = true
-
-[http]
-enabled = true
-address = 127.0.0.1
-port = 7070
-# auth = true
-# user = i2pd
-# pass = changeme
-
-[httpproxy]
-enabled = true
-address = 127.0.0.1
-port = 4444
-inbound.length = 1
-inbound.quantity = 5
-outbound.length = 1
-outbound.quantity = 5
-signaturetype=7
-keys = proxy-keys.dat
-# addresshelper = true
-# outproxy = http://false.i2p
-## httpproxy section also accepts I2CP parameters, like "inbound.length" etc.
-
-[socksproxy]
-enabled = true
-address = 127.0.0.1
-port = 4447
-keys = proxy-keys.dat
-# outproxy.enabled = false
-# outproxy = 127.0.0.1
-# outproxyport = 9050
-## socksproxy section also accepts I2CP parameters, like "inbound.length" etc.
-
-[sam]
-enabled = false
-# address = 127.0.0.1
-# port = 7656
-
-[precomputation]
-elgamal = true
-
-[upnp]
-enabled = true
-# name = I2Pd
-
-[reseed]
-verify = true
-## Path to local reseed data file (.su3) for manual reseeding
-# file = /path/to/i2pseeds.su3
-## or HTTPS URL to reseed from
-# file = https://legit-website.com/i2pseeds.su3
-## Path to local ZIP file or HTTPS URL to reseed from
-# zipfile = /path/to/netDb.zip
-## If you run i2pd behind a proxy server, set proxy server for reseeding here
-## Should be http://address:port or socks://address:port
-# proxy = http://127.0.0.1:8118
-## Minimum number of known routers, below which i2pd triggers reseeding. 25 by default
-# threshold = 25
-
-[limits]
-transittunnels = 50
-
-[persist]
-profiles = false

android/assets/subscriptions.txt

@@ -1,3 +0,0 @@
-http://inr.i2p/export/alive-hosts.txt
-http://stats.i2p/cgi-bin/newhosts.txt
-http://i2p-projekt.i2p/hosts.txt

android/assets/tunnels.conf

@@ -1,33 +0,0 @@
-[IRC-IRC2P]
-#type = client
-#address = 127.0.0.1
-#port = 6668
-#destination = irc.postman.i2p
-#destinationport = 6667
-#keys = irc-keys.dat
-
-#[IRC-ILITA]
-#type = client
-#address = 127.0.0.1
-#port = 6669
-#destination = irc.ilita.i2p
-#destinationport = 6667
-#keys = irc-keys.dat
-
-#[SMTP]
-#type = client
-#address = 127.0.0.1
-#port = 7659
-#destination = smtp.postman.i2p
-#destinationport = 25
-#keys = smtp-keys.dat
-
-#[POP3]
-#type = client
-#address = 127.0.0.1
-#port = 7660
-#destination = pop.postman.i2p
-#destinationport = 110
-#keys = pop3-keys.dat
-
-# see more examples at https://i2pd.readthedocs.io/en/latest/user-guide/tunnels/

android/assets/tunnels.d

@@ -1 +0,0 @@
-../../contrib/tunnels.d

android/build.gradle

@@ -1,89 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        jcenter()
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
-    }
-}
-
-apply plugin: 'com.android.application'
-
-repositories {
-    jcenter()
-    maven {
-        url 'https://maven.google.com'
-    }
-    google()
-}
-
-dependencies {
-    implementation 'androidx.core:core:1.0.2'
-}
-
-android {
-    compileSdkVersion 29
-    buildToolsVersion "28.0.3"
-    defaultConfig {
-        applicationId "org.purplei2p.i2pd"
-        targetSdkVersion 29
-        minSdkVersion 14
-        versionCode 2300
-        versionName "2.30.0"
-        ndk {
-            abiFilters 'armeabi-v7a'
-            abiFilters 'x86'
-            //abiFilters 'arm64-v8a'
-            //abiFilters 'x86_64'
-        }
-        externalNativeBuild {
-            ndkBuild {
-                arguments "-j3"
-            }
-        }
-    }
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            res.srcDirs = ['res']
-            jniLibs.srcDirs = ['libs']
-            assets.srcDirs = ['assets']
-        }
-    }
-    splits {
-        abi {
-            // change that to true if you need splitted apk
-            enable false
-            reset()
-            include "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
-            universalApk true
-        }
-    }
-    signingConfigs {
-        orignal {
-            storeFile file("i2pdapk.jks")
-            storePassword "android"
-            keyAlias "i2pdapk"
-            keyPassword "android"
-        }
-    }
-    buildTypes {
-        release {
-            minifyEnabled true
-            signingConfig signingConfigs.orignal
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
-        }
-    }
-    externalNativeBuild {
-        ndkBuild {
-            path './jni/Android.mk'
-        }
-    }
-    compileOptions {
-        sourceCompatibility = '1.8'
-        targetCompatibility = '1.8'
-    }
-}

android/build.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="i2pd" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Insert sdk.dir=... into './local.properties'. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <fail
-            message="ndk.dir is missing. Insert ndk.dir=... into './local.properties'."
-            unless="ndk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-</project>

android/gradle.properties

@@ -1,3 +0,0 @@
-android.enableJetifier=true
-android.useAndroidX=true
-org.gradle.parallel=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Tue Aug 20 14:39:08 MSK 2019
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

android/gradlew

@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

android/gradlew.bat

@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

android/jni/Android.mk

@@ -1,73 +0,0 @@
-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 := DaemonAndroid.cpp i2pd_android.cpp $(IFADDRS_PATH)/ifaddrs.c \
-	$(wildcard $(LIB_SRC_PATH)/*.cpp)\
-	$(wildcard $(LIB_CLIENT_SRC_PATH)/*.cpp)\
-	$(DAEMON_SRC_PATH)/Daemon.cpp \
-	$(DAEMON_SRC_PATH)/UPnP.cpp \
-	$(DAEMON_SRC_PATH)/HTTPServer.cpp \
-	$(DAEMON_SRC_PATH)/I2PControl.cpp
-
-include $(BUILD_SHARED_LIBRARY)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := boost_system
-LOCAL_SRC_FILES := $(BOOST_PATH)/boost_1_68_0-clang/$(TARGET_ARCH_ABI)/lib/libboost_system.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_68_0-clang/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_68_0-clang/$(TARGET_ARCH_ABI)/lib/libboost_date_time.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_68_0-clang/include
-include $(PREBUILT_STATIC_LIBRARY)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := boost_filesystem
-LOCAL_SRC_FILES := $(BOOST_PATH)/boost_1_68_0-clang/$(TARGET_ARCH_ABI)/lib/libboost_filesystem.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_68_0-clang/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_68_0-clang/$(TARGET_ARCH_ABI)/lib/libboost_program_options.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_68_0-clang/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)

android/jni/Application.mk

@@ -1,36 +0,0 @@
-#APP_ABI := armeabi-v7a x86
-#APP_PLATFORM := android-14
-
-# ABI arm64-v8a and x86_64 supported only from platform-21
-#APP_ABI := arm64-v8a x86_64
-#APP_PLATFORM := android-21
-
-NDK_TOOLCHAIN_VERSION := clang
-#APP_STL := c++_shared
-APP_STL := c++_static
-
-# Enable c++11 extensions in source code
-APP_CPPFLAGS += -std=c++11 -fexceptions -frtti
-
-APP_CPPFLAGS += -DANDROID -D__ANDROID__ -DUSE_UPNP
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-APP_CPPFLAGS += -DANDROID_ARM7A
-endif
-
-# git clone https://github.com/PurpleI2P/Boost-for-Android-Prebuilt.git
-# 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

android/jni/DaemonAndroid.cpp

@@ -1,214 +0,0 @@
-#include <iostream>
-#include <chrono>
-#include <thread>
-#include <exception>
-#include <boost/exception/diagnostic_information.hpp>
-#include <boost/exception_ptr.hpp>
-//#include "mainwindow.h"
-#include "FS.h"
-#include "DaemonAndroid.h"
-#include "Daemon.h"
-
-namespace i2p
-{
-namespace android
-{
-/*	Worker::Worker (DaemonAndroidImpl& daemon):
-		m_Daemon (daemon)
-	{
-	}
-
-	void Worker::startDaemon()
-	{
-		Log.d(TAG"Performing daemon start...");
-		m_Daemon.start();
-		Log.d(TAG"Daemon started.");
-		emit resultReady();
-	}
-	void Worker::restartDaemon()
-	{
-		Log.d(TAG"Performing daemon restart...");
-		m_Daemon.restart();
-		Log.d(TAG"Daemon restarted.");
-		emit resultReady();
-	}
-	void Worker::stopDaemon() {
-		Log.d(TAG"Performing daemon stop...");
-		m_Daemon.stop();
-		Log.d(TAG"Daemon stopped.");
-		emit resultReady();
-	}
-
-	Controller::Controller(DaemonAndroidImpl& daemon):
-		m_Daemon (daemon)
-	{
-		Worker *worker = new Worker (m_Daemon);
-		worker->moveToThread(&workerThread);
-		connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater);
-		connect(this, &Controller::startDaemon, worker, &Worker::startDaemon);
-		connect(this, &Controller::stopDaemon, worker, &Worker::stopDaemon);
-		connect(this, &Controller::restartDaemon, worker, &Worker::restartDaemon);
-		connect(worker, &Worker::resultReady, this, &Controller::handleResults);
-		workerThread.start();
-	}
-	Controller::~Controller()
-	{
-		Log.d(TAG"Closing and waiting for daemon worker thread...");
-		workerThread.quit();
-		workerThread.wait();
-		Log.d(TAG"Waiting for daemon worker thread finished.");
-		if(m_Daemon.isRunning())
-		{
-			Log.d(TAG"Stopping the daemon...");
-			m_Daemon.stop();
-			Log.d(TAG"Stopped the daemon.");
-		}
-	}
-*/
-	std::string dataDir = "";
-
-	DaemonAndroidImpl::DaemonAndroidImpl ()
-		//:
-		/*mutex(nullptr), */
-		//m_IsRunning(false),
-		//m_RunningChangedCallback(nullptr)
-	{
-	}
-
-	DaemonAndroidImpl::~DaemonAndroidImpl ()
-	{
-		//delete mutex;
-	}
-
-	bool DaemonAndroidImpl::init(int argc, char* argv[])
-	{
-		//mutex=new QMutex(QMutex::Recursive);
-		//setRunningCallback(0);
-		//m_IsRunning=false;
-
-		// make sure assets are ready before proceed
-		i2p::fs::DetectDataDir(dataDir, false);
-		int numAttempts = 0;
-		do
-		{
-			if (i2p::fs::Exists (i2p::fs::DataDirPath("assets.ready"))) break; // assets ready
-			numAttempts++;
-			std::this_thread::sleep_for (std::chrono::seconds(1)); // otherwise wait for 1 more second
-		}
-		while (numAttempts <= 10); // 10 seconds max
-		return Daemon.init(argc,argv);
-	}
-
-	void DaemonAndroidImpl::start()
-	{
-		//QMutexLocker locker(mutex);
-		//setRunning(true);
-		Daemon.start();
-	}
-
-	void DaemonAndroidImpl::stop()
-	{
-		//QMutexLocker locker(mutex);
-		Daemon.stop();
-		//setRunning(false);
-	}
-
-	void DaemonAndroidImpl::restart()
-	{
-		//QMutexLocker locker(mutex);
-		stop();
-		start();
-	}
-	/*
-	void DaemonAndroidImpl::setRunningCallback(runningChangedCallback cb)
-	{
-		m_RunningChangedCallback = cb;
-	}
-
-	bool DaemonAndroidImpl::isRunning()
-	{
-		return m_IsRunning;
-	}
-
-	void DaemonAndroidImpl::setRunning(bool newValue)
-	{
-		bool oldValue = m_IsRunning;
-		if(oldValue!=newValue)
-		{
-			m_IsRunning = newValue;
-			if(m_RunningChangedCallback)
-				m_RunningChangedCallback();
-		}
-	}
-*/
-	static DaemonAndroidImpl daemon;
-	static char* argv[1]={strdup("tmp")};
-	/**
-	 * returns error details if failed
-	 * returns "ok" if daemon initialized and started okay
-	 */
-	std::string start(/*int argc, char* argv[]*/)
-	{
-		try
-		{
-			//int result;
-
-			{
-				//Log.d(TAG"Initialising the daemon...");
-				bool daemonInitSuccess = daemon.init(1,argv);
-				if(!daemonInitSuccess)
-				{
-					//QMessageBox::critical(0, "Error", "Daemon init failed");
-					return "Daemon init failed";
-				}
-				//Log.d(TAG"Initialised, creating the main window...");
-				//MainWindow w;
-				//Log.d(TAG"Before main window.show()...");
-				//w.show ();
-
-				{
-					//i2p::qt::Controller daemonQtController(daemon);
-					//Log.d(TAG"Starting the daemon...");
-					//emit daemonQtController.startDaemon();
-					//daemon.start ();
-					//Log.d(TAG"Starting GUI event loop...");
-					//result = app.exec();
-					//daemon.stop ();
-					daemon.start();
-				}
-			}
-
-			//QMessageBox::information(&w, "Debug", "demon stopped");
-			//Log.d(TAG"Exiting the application");
-			//return result;
-		}
-		catch (boost::exception& ex)
-		{
-			std::stringstream ss;
-			ss << boost::diagnostic_information(ex);
-			return ss.str();
-		}
-		catch (std::exception& ex)
-		{
-			std::stringstream ss;
-			ss << ex.what();
-			return ss.str();
-		}
-		catch(...)
-		{
-			return "unknown exception";
-		}
-		return "ok";
-	}
-
-	void stop()
-	{
-		daemon.stop();
-	}
-
-	void SetDataDir(std::string jdataDir)
-	{
-		dataDir = jdataDir;
-	}
-}
-}

android/jni/DaemonAndroid.h

@@ -1,89 +0,0 @@
-#ifndef DAEMON_ANDROID_H
-#define DAEMON_ANDROID_H
-
-#include <string>
-
-namespace i2p
-{
-namespace android
-{
-	class DaemonAndroidImpl
-	{
-	public:
-
-		DaemonAndroidImpl ();
-		~DaemonAndroidImpl ();
-
-		//typedef void (*runningChangedCallback)();
-
-		/**
-		 * @return success
-		 */
-		bool init(int argc, char* argv[]);
-		void start();
-		void stop();
-		void restart();
-		//void setRunningCallback(runningChangedCallback cb);
-		//bool isRunning();
-	private:
-		//void setRunning(bool running);
-	private:
-		//QMutex* mutex;
-		//bool m_IsRunning;
-		//runningChangedCallback m_RunningChangedCallback;
-	};
-
-	/**
-	 * returns "ok" if daemon init failed
-	 * returns errinfo if daemon initialized and started okay
-	 */
-	std::string start();
-
-	// stops the daemon
-	void stop();
-
-	// set datadir received from jni
-	void SetDataDir(std::string jdataDir);
-	/*
-	class Worker : public QObject
-	{
-		Q_OBJECT
-	public:
-
-		Worker (DaemonAndroidImpl& daemon);
-
-	private:
-
-		DaemonAndroidImpl& m_Daemon;
-
-	public slots:
-		void startDaemon();
-		void restartDaemon();
-		void stopDaemon();
-
-	signals:
-		void resultReady();
-	};
-
-	class Controller : public QObject
-	{
-		Q_OBJECT
-		QThread workerThread;
-	public:
-		Controller(DaemonAndroidImpl& daemon);
-		~Controller();
-	private:
-		DaemonAndroidImpl& m_Daemon;
-
-	public slots:
-		void handleResults(){}
-	signals:
-		void startDaemon();
-		void stopDaemon();
-		void restartDaemon();
-	};
-	*/
-}
-}
-
-#endif // DAEMON_ANDROID_H

android/jni/i2pd_android.cpp

@@ -1,94 +0,0 @@
-#include <jni.h>
-#include "org_purplei2p_i2pd_I2PD_JNI.h"
-#include "DaemonAndroid.h"
-#include "RouterContext.h"
-#include "Transports.h"
-
-JNIEXPORT jstring JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_getABICompiledWith
-	(JNIEnv *env, jclass clazz) {
-#if defined(__arm__)
-	#if defined(__ARM_ARCH_7A__)
-		#if defined(__ARM_NEON__)
-			#if defined(__ARM_PCS_VFP)
-				#define ABI "armeabi-v7a/NEON (hard-float)"
-				#else
-				#define ABI "armeabi-v7a/NEON"
-			#endif
-			#else
-			#if defined(__ARM_PCS_VFP)
-				#define ABI "armeabi-v7a (hard-float)"
-				#else
-				#define ABI "armeabi-v7a"
-			#endif
-		#endif
-		#else
-		#define ABI "armeabi"
-	#endif
-	#elif defined(__i386__)
-	#define ABI "x86"
-	#elif defined(__x86_64__)
-	#define ABI "x86_64"
-	#elif defined(__mips64)  /* mips64el-* toolchain defines __mips__ too */
-	#define ABI "mips64"
-	#elif defined(__mips__)
-	#define ABI "mips"
-	#elif defined(__aarch64__)
-	#define ABI "arm64-v8a"
-	#else
-	#define ABI "unknown"
-#endif
-
-	return env->NewStringUTF(ABI);
-}
-
-JNIEXPORT jstring JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_startDaemon
-	(JNIEnv *env, jclass clazz) {
-	return env->NewStringUTF(i2p::android::start().c_str());
-}
-
-JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_stopDaemon
-	(JNIEnv *env, jclass clazz) {
-	i2p::android::stop();
-}
-
-JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_stopAcceptingTunnels
-	(JNIEnv *env, jclass clazz) {
-	i2p::context.SetAcceptsTunnels (false);
-}
-
-JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_startAcceptingTunnels
-	(JNIEnv *env, jclass clazz) {
-	i2p::context.SetAcceptsTunnels (true);
-}
-
-JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_onNetworkStateChanged
-	(JNIEnv *env, jclass clazz, jboolean isConnected) {
-	bool isConnectedBool = (bool) isConnected;
-	i2p::transport::transports.SetOnline (isConnectedBool);
-}
-
-JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_setDataDir
-	(JNIEnv *env, jclass clazz, jstring jdataDir) {
-
-	/*
-	// Method 1: convert UTF-16 jstring to std::string (https://stackoverflow.com/a/41820336)
-	const jclass stringClass = env->GetObjectClass(jdataDir);
-	const jmethodID getBytes = env->GetMethodID(stringClass, "getBytes", "(Ljava/lang/String;)[B");
-	const jbyteArray stringJbytes = (jbyteArray) env->CallObjectMethod(jdataDir, getBytes, env->NewStringUTF("UTF-8"));
-
-	size_t length = (size_t) env->GetArrayLength(stringJbytes);
-	jbyte* pBytes = env->GetByteArrayElements(stringJbytes, NULL);
-
-	std::string dataDir = std::string((char *)pBytes, length);
-	env->ReleaseByteArrayElements(stringJbytes, pBytes, JNI_ABORT);
-
-	env->DeleteLocalRef(stringJbytes);
-	env->DeleteLocalRef(stringClass); */
-
-	// Method 2: get string chars and make char array.
-	auto dataDir = env->GetStringUTFChars(jdataDir, NULL);
-	env->ReleaseStringUTFChars(jdataDir, dataDir);
-
-	// Set DataDir
-	i2p::android::SetDataDir(dataDir);
-}

android/jni/org_purplei2p_i2pd_I2PD_JNI.h

@@ -1,39 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_purplei2p_i2pd_I2PD_JNI */
-
-#ifndef _Included_org_purplei2p_i2pd_I2PD_JNI
-#define _Included_org_purplei2p_i2pd_I2PD_JNI
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     org_purplei2p_i2pd_I2PD_JNI
- * Method:    stringFromJNI
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_getABICompiledWith
-	(JNIEnv *, jclass);
-
-JNIEXPORT jstring JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_startDaemon
-	(JNIEnv *, jclass);
-
-JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_stopDaemon
-	(JNIEnv *, jclass);
-
-JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_stopAcceptingTunnels
-	(JNIEnv *, jclass);
-
-JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_startAcceptingTunnels
-	(JNIEnv *, jclass);
-
-JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_onNetworkStateChanged
-	(JNIEnv * env, jclass clazz, jboolean isConnected);
-
-JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_setDataDir
-	(JNIEnv *env, jclass clazz, jstring jdataDir);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

android/proguard-project.txt

@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

android/project.properties

@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-29

android/res/layout/activity_perms_asker.xml

@@ -1,27 +0,0 @@
-<LinearLayout android:id="@+id/main_layout"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/vertical_page_margin"
-    android:paddingLeft="@dimen/horizontal_page_margin"
-    android:paddingRight="@dimen/horizontal_page_margin"
-    android:paddingTop="@dimen/vertical_page_margin"
-    tools:context=".I2PDPermsAskerActivity">
-
-    <TextView
-        android:id="@+id/textview_retry"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/horizontal_page_margin"
-        android:visibility="gone"
-        />
-
-    <Button
-        android:id="@+id/button_request_write_ext_storage_perms"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Retry requesting the SD card write permissions"
-        android:visibility="gone"/>
-</LinearLayout>

android/res/layout/activity_perms_explanation.xml

@@ -1,27 +0,0 @@
-<LinearLayout android:id="@+id/layout_prompt"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/vertical_page_margin"
-    android:paddingLeft="@dimen/horizontal_page_margin"
-    android:paddingRight="@dimen/horizontal_page_margin"
-    android:paddingTop="@dimen/vertical_page_margin"
-    tools:context=".I2PDPermsAskerActivity">
-
-    <TextView
-        android:id="@+id/textview_explanation"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/horizontal_page_margin"
-        android:text="SD card write access is required to write the keys and other files to the I2PD folder on SD card."
-        />
-
-    <Button
-        android:id="@+id/button_ok"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="OK"
-        />
-</LinearLayout>

android/res/menu/options_main.xml

@@ -1,21 +0,0 @@
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".I2PDActivity">
-    <group android:id="@+id/group_i2pd_control" >
-        <item
-            android:id="@+id/action_stop"
-            android:orderInCategory="99"
-            android:title="@string/action_stop" />
-        <item
-            android:id="@+id/action_graceful_stop"
-            android:orderInCategory="98"
-            android:title="@string/action_graceful_stop" />
-    </group>
-    <group android:id="@+id/group_various" >
-        <item
-            android:id="@+id/action_battery_otimizations"
-            android:title="@string/menu_item_battery_optimizations_str" />
-    </group>
-</menu>

android/res/values-ru/strings.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">i2pd</string>
-    <string name="action_stop">Остановить</string>
-    <string name="action_graceful_stop">Корректная остановка</string>
-    <string name="action_cancel_graceful_stop">Отменить корректную остановку</string>
-    <string name="graceful_stop_is_already_in_progress">Корректная остановка уже запущена</string>
-    <string name="graceful_stop_is_in_progress">Корректная остановка запущена</string>
-    <string name="already_stopped">Уже остановлено</string>
-    <string name="uninitialized">Приложение инициализируется</string>
-    <string name="starting">Приложение запускается</string>
-    <string name="jniLibraryLoaded">Загружены JNI библиотеки</string>
-    <string name="startedOkay">Приложение запущено</string>
-    <string name="startFailed">Запуск не удался</string>
-    <string name="gracefulShutdownInProgress">Корректная остановка запущена</string>
-    <string name="stopped">Приложение было остановлено</string>
-    <string name="remaining">осталось</string>
-    <string name="title_activity_i2_pdperms_asker_prompt">Запрос</string>
-    <string name="permDenied">Права для записи на SD карту отклонены, вам необходимо предоставить их для продолжения</string>
-    <string name="menu_item_battery_optimizations_str">Оптимизации аккумулятора</string>
-    <string name="battery_optimizations_enabled">Оптимизации аккумулятора включены</string>
-    <string name="device_does_not_support_disabling_battery_optimizations">Ваша версия Андроид не поддерживает отключение оптимизаций аккумулятора</string>
-    <string name="battery_optimizations_enabled_explained">Ваша операционная система осуществляет оптимизации расхода аккумулятора, которые могут приводить к выгрузке I2PD из памяти и прекращению его работы с целью сэкономить заряд аккумулятора.\nРекомендуется отключить эти оптимизации.</string>
-    <string name="battery_optimizations_enabled_dialog"   >Ваша операционная система осуществляет оптимизации расхода аккумулятора, которые могут приводить к выгрузке I2PD из памяти и прекращению его работы с целью сэкономить заряд аккумулятора.\n\nВам сейчас будет предложено разрешить отключение этих оптимизаций.</string>
-    <string name="continue_str">Продолжить</string>
-    <string name="os_version_does_not_support_battery_optimizations_show_os_dialog_api">Ваша версия Андроид не поддерживает показ диалога об оптимизациях аккумулятора для приложений.</string>
-    <string name="shutdown_canceled">Плановая остановка отменена</string>
-</resources>

android/res/values/strings.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">i2pd</string>
-    <string name="action_stop">Stop</string>
-    <string name="action_graceful_stop">Graceful Stop</string>
-    <string name="action_cancel_graceful_stop">Cancel Graceful Stop</string>
-    <string name="graceful_stop_is_already_in_progress">Graceful stop is already in progress</string>
-    <string name="graceful_stop_is_in_progress">Graceful stop is in progress</string>
-    <string name="already_stopped">Already stopped</string>
-    <string name="uninitialized">Application initializing</string>
-    <string name="starting">Application starting</string>
-    <string name="jniLibraryLoaded">Loaded JNI libraries</string>
-    <string name="startedOkay">Application Started</string>
-    <string name="startFailed">Start failed</string>
-    <string name="gracefulShutdownInProgress">Graceful shutdown in progress</string>
-    <string name="stopped">Application stopped</string>
-    <string name="remaining">remaining</string>
-    <string name="title_activity_i2_pdperms_asker_prompt">Prompt</string>
-    <string name="permDenied">SD card write permission denied, you need to allow this to continue</string>
-    <string name="battery_optimizations_enabled">Battery optimizations enabled</string>
-    <string name="battery_optimizations_enabled_explained">Your Android is doing some heavy battery optimizations on I2PD that might lead to daemon closing with no other reason.\nIt is recommended to allow disabling those battery optimizations.</string>
-    <string name="battery_optimizations_enabled_dialog"   >Your Android is doing some heavy battery optimizations on I2PD that might lead to daemon closing with no other reason.\n\nYou will now be asked to allow to disable those.</string>
-    <string name="continue_str">Continue</string>
-    <string name="device_does_not_support_disabling_battery_optimizations">Your Android version does not support opting out of battery optimizations</string>
-    <string name="menu_item_battery_optimizations_str">Battery Optimizations</string>
-    <string name="os_version_does_not_support_battery_optimizations_show_os_dialog_api">Your Android OS version does not support showing the dialog for battery optimizations for applications.</string>
-    <string name="shutdown_canceled">Planned shutdown canceled</string>
-</resources>

android/res/values/template-dimens.xml

@@ -1,16 +0,0 @@
-<resources>
-
-    <!-- Define standard dimensions to comply with Holo-style grids and rhythm. -->
-
-    <dimen name="margin_tiny">4dp</dimen>
-    <dimen name="margin_small">8dp</dimen>
-    <dimen name="margin_medium">16dp</dimen>
-    <dimen name="margin_large">32dp</dimen>
-    <dimen name="margin_huge">64dp</dimen>
-
-    <!-- Semantic definitions -->
-
-    <dimen name="horizontal_page_margin">@dimen/margin_medium</dimen>
-    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>

android/settings.gradle

@@ -1 +0,0 @@
-rootProject.name = "i2pd"

android/src/org/purplei2p/i2pd/DaemonSingleton.java

@@ -1,143 +0,0 @@
-package org.purplei2p.i2pd;
-
-import java.util.HashSet;
-import java.util.Set;
-import android.os.Environment;
-import android.util.Log;
-
-import org.purplei2p.i2pd.R;
-
-public class DaemonSingleton {
-	private static final String TAG = "i2pd";
-	private static final DaemonSingleton instance = new DaemonSingleton();
-	public interface StateUpdateListener { void daemonStateUpdate(); }
-	private final Set<StateUpdateListener> stateUpdateListeners = new HashSet<>();
-
-	public static DaemonSingleton getInstance() { return instance; }
-
-	public synchronized void addStateChangeListener(StateUpdateListener listener) { stateUpdateListeners.add(listener); }
-	public synchronized void removeStateChangeListener(StateUpdateListener listener) { stateUpdateListeners.remove(listener); }
-
-	private synchronized void setState(State newState) {
-		if(newState==null)throw new NullPointerException();
-		State oldState = state;
-		if(oldState==null)throw new NullPointerException();
-		if(oldState.equals(newState))return;
-		state=newState;
-		fireStateUpdate1();
-	}
-	public synchronized void stopAcceptingTunnels() {
-		if(isStartedOkay()){
-			setState(State.gracefulShutdownInProgress);
-			I2PD_JNI.stopAcceptingTunnels();
-		}
-	}
-
-	public synchronized void startAcceptingTunnels() {
-		if(isStartedOkay()){
-			setState(State.startedOkay);
-			I2PD_JNI.startAcceptingTunnels();
-		}
-	}
-
-	private volatile boolean startedOkay;
-
-	public enum State {
-		uninitialized(R.string.uninitialized),
-		starting(R.string.starting),
-		jniLibraryLoaded(R.string.jniLibraryLoaded),
-		startedOkay(R.string.startedOkay),
-		startFailed(R.string.startFailed),
-		gracefulShutdownInProgress(R.string.gracefulShutdownInProgress),
-		stopped(R.string.stopped);
-
-		State(int statusStringResourceId) {
-			this.statusStringResourceId = statusStringResourceId;
-		}
-
-		private final int statusStringResourceId;
-
-		public int getStatusStringResourceId() {
-			return statusStringResourceId;
-		}
-	};
-
-	private volatile State state = State.uninitialized;
-
-	public State getState() { return state; }
-
-	{
-		setState(State.starting);
-		new Thread(new Runnable(){
-
-			@Override
-			public void run() {
-				try {
-					I2PD_JNI.loadLibraries();
-					setState(State.jniLibraryLoaded);
-				} catch (Throwable tr) {
-					lastThrowable=tr;
-					setState(State.startFailed);
-					return;
-				}
-				try {
-					synchronized (DaemonSingleton.this) {
-						I2PD_JNI.setDataDir(Environment.getExternalStorageDirectory().getAbsolutePath() + "/i2pd");
-						daemonStartResult = I2PD_JNI.startDaemon();
-						if("ok".equals(daemonStartResult)){
-							setState(State.startedOkay);
-							setStartedOkay(true);
-						}else setState(State.startFailed);
-					}
-				} catch (Throwable tr) {
-					lastThrowable=tr;
-					setState(State.startFailed);
-				}
-			}
-
-		}, "i2pdDaemonStart").start();
-	}
-	private Throwable lastThrowable;
-	private String daemonStartResult="N/A";
-
-	private void fireStateUpdate1() {
-		Log.i(TAG, "daemon state change: "+state);
-		for(StateUpdateListener listener : stateUpdateListeners) {
-			try {
-				listener.daemonStateUpdate();
-			} catch (Throwable tr) {
-				Log.e(TAG, "exception in listener ignored", tr);
-			}
-		}
-	}
-
-	public Throwable getLastThrowable() {
-		return lastThrowable;
-	}
-
-	public String getDaemonStartResult() {
-		return daemonStartResult;
-	}
-
-	private final Object startedOkayLock = new Object();
-
-	public boolean isStartedOkay() {
-		synchronized (startedOkayLock) {
-			return startedOkay;
-		}
-	}
-
-	private void setStartedOkay(boolean startedOkay) {
-		synchronized (startedOkayLock) {
-			this.startedOkay = startedOkay;
-		}
-	}
-
-	public synchronized void stopDaemon() {
-		if(isStartedOkay()){
-			try {I2PD_JNI.stopDaemon();}catch(Throwable tr){Log.e(TAG, "", tr);}
-			setStartedOkay(false);
-			setState(State.stopped);
-		}
-	}
-}

android/src/org/purplei2p/i2pd/ForegroundService.java

@@ -1,149 +0,0 @@
-package org.purplei2p.i2pd;
-
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Binder;
-import android.os.Build;
-import android.os.IBinder;
-import androidx.annotation.RequiresApi;
-import androidx.core.app.NotificationCompat;
-import android.util.Log;
-
-public class ForegroundService extends Service {
-	private static final String TAG="FgService";
-
-	private volatile boolean shown;
-
-	private final DaemonSingleton.StateUpdateListener daemonStateUpdatedListener =
-			new DaemonSingleton.StateUpdateListener() {
-
-				@Override
-				public void daemonStateUpdate() {
-					try {
-						synchronized (ForegroundService.this) {
-							if (shown) cancelNotification();
-							showNotification();
-						}
-					} catch (Throwable tr) {
-						Log.e(TAG,"error ignored",tr);
-					}
-				}
-			};
-
-
-	private NotificationManager notificationManager;
-
-	// Unique Identification Number for the Notification.
-	// We use it on Notification start, and to cancel it.
-	private int NOTIFICATION = 1;
-
-	/**
-	 * Class for clients to access.  Because we know this service always
-	 * runs in the same process as its clients, we don't need to deal with
-	 * IPC.
-	 */
-	public class LocalBinder extends Binder {
-		ForegroundService getService() {
-			return ForegroundService.this;
-		}
-	}
-
-	@Override
-	public void onCreate() {
-		notificationManager = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
-
-		synchronized (this) {
-			DaemonSingleton.getInstance().addStateChangeListener(daemonStateUpdatedListener);
-			if (!shown) daemonStateUpdatedListener.daemonStateUpdate();
-		}
-		// Tell the user we started.
-//		Toast.makeText(this, R.string.i2pd_service_started, Toast.LENGTH_SHORT).show();
-	}
-
-	@Override
-	public int onStartCommand(Intent intent, int flags, int startId) {
-		Log.i("ForegroundService", "Received start id " + startId + ": " + intent);
-		return START_STICKY;
-	}
-
-	@Override
-	public void onDestroy() {
-		DaemonSingleton.getInstance().removeStateChangeListener(daemonStateUpdatedListener);
-		cancelNotification();
-	}
-
-	private synchronized void cancelNotification() {
-		// Cancel the persistent notification.
-		notificationManager.cancel(NOTIFICATION);
-
-		stopForeground(true);
-
-		// Tell the user we stopped.
-		//Toast.makeText(this, R.string.i2pd_service_stopped, Toast.LENGTH_SHORT).show();
-		shown=false;
-	}
-
-	@Override
-	public IBinder onBind(Intent intent) {
-		return mBinder;
-	}
-
-	// This is the object that receives interactions from clients.  See
-	// RemoteService for a more complete example.
-	private final IBinder mBinder = new LocalBinder();
-
-	/**
-	 * Show a notification while this service is running.
-	 */
-	private synchronized void showNotification() {
-		// In this sample, we'll use the same text for the ticker and the expanded notification
-		CharSequence text = getText(DaemonSingleton.getInstance().getState().getStatusStringResourceId());
-
-		// The PendingIntent to launch our activity if the user selects this notification
-		PendingIntent contentIntent = PendingIntent.getActivity(this, 0,
-				new Intent(this, I2PDActivity.class), 0);
-
-		// If earlier version channel ID is not used
-		// https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
-		String channelId = Build.VERSION.SDK_INT >= 26 ? createNotificationChannel() : "";
-
-		// Set the info for the views that show in the notification panel.
-		NotificationCompat.Builder builder = new NotificationCompat.Builder(this, channelId)
-				.setOngoing(true)
-				.setSmallIcon(R.drawable.itoopie_notification_icon); // the status icon
-		if(Build.VERSION.SDK_INT >= 16) builder = builder.setPriority(Notification.PRIORITY_DEFAULT);
-		if(Build.VERSION.SDK_INT >= 21) builder = builder.setCategory(Notification.CATEGORY_SERVICE);
-		Notification notification = builder
-				.setTicker(text) // the status text
-				.setWhen(System.currentTimeMillis()) // the time stamp
-				.setContentTitle(getText(R.string.app_name)) // the label of the entry
-				.setContentText(text) // the contents of the entry
-				.setContentIntent(contentIntent) // The intent to send when the entry is clicked
-				.build();
-
-		// Send the notification.
-		//mNM.notify(NOTIFICATION, notification);
-		startForeground(NOTIFICATION, notification);
-		shown = true;
-	}
-
-	@RequiresApi(Build.VERSION_CODES.O)
-	private synchronized String createNotificationChannel() {
-		String channelId = getString(R.string.app_name);
-		CharSequence channelName = "I2Pd service";
-		NotificationChannel chan = new NotificationChannel(channelId, channelName, NotificationManager.IMPORTANCE_LOW);
-		//chan.setLightColor(Color.PURPLE);
-		chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
-		NotificationManager service = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
-		if(service!=null)service.createNotificationChannel(chan);
-		else Log.e(TAG, "error: NOTIFICATION_SERVICE is null");
-		return channelId;
-	}
-
-    private static final DaemonSingleton daemon = DaemonSingleton.getInstance();
-}

android/src/org/purplei2p/i2pd/I2PDActivity.java

@@ -1,620 +0,0 @@
-package org.purplei2p.i2pd;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.BufferedReader;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.content.res.AssetManager;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Build;
-import android.os.Environment;
-import android.os.IBinder;
-import android.os.PowerManager;
-import android.preference.PreferenceManager;
-import android.provider.Settings;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-// For future package update checking
-
-import static android.provider.Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS;
-
-public class I2PDActivity extends Activity {
-	private static final String TAG = "i2pdActvt";
-	private static final int MY_PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE = 1;
-	public static final int GRACEFUL_DELAY_MILLIS = 10 * 60 * 1000;
-	public static final String PACKAGE_URI_SCHEME = "package:";
-
-	private TextView textView;
-	private boolean assetsCopied;
-	private String i2pdpath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/i2pd/";
-
-	private static final DaemonSingleton daemon = DaemonSingleton.getInstance();
-
-	private final DaemonSingleton.StateUpdateListener daemonStateUpdatedListener =
-	new DaemonSingleton.StateUpdateListener() {
-		@Override
-		public void daemonStateUpdate()
-		{
-			processAssets();
-			runOnUiThread(() -> {
-                try {
-                    if(textView==null) return;
-                    Throwable tr = daemon.getLastThrowable();
-                    if(tr!=null) {
-                        textView.setText(throwableToString(tr));
-                        return;
-                    }
-                    DaemonSingleton.State state = daemon.getState();
-                    String startResultStr = DaemonSingleton.State.startFailed.equals(state) ? String.format(": %s", daemon.getDaemonStartResult()) : "";
-                    String graceStr = DaemonSingleton.State.gracefulShutdownInProgress.equals(state) ? String.format(": %s %s", formatGraceTimeRemaining(), getText(R.string.remaining)) : "";
-                    textView.setText(String.format("%s%s%s", getText(state.getStatusStringResourceId()), startResultStr, graceStr));
-                } catch (Throwable tr) {
-                    Log.e(TAG,"error ignored",tr);
-                }
-            });
-		}
-	};
-	private static volatile long graceStartedMillis;
-	private static final Object graceStartedMillis_LOCK=new Object();
-	private Menu optionsMenu;
-
-	private static String formatGraceTimeRemaining() {
-		long remainingSeconds;
-		synchronized (graceStartedMillis_LOCK){
-			remainingSeconds=Math.round(Math.max(0,graceStartedMillis+GRACEFUL_DELAY_MILLIS-System.currentTimeMillis())/1000.0D);
-		}
-		long remainingMinutes=(long)Math.floor(remainingSeconds/60.0D);
-		long remSec=remainingSeconds-remainingMinutes*60;
-		return remainingMinutes+":"+(remSec/10)+remSec%10;
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		Log.i(TAG, "onCreate");
-		super.onCreate(savedInstanceState);
-
-		textView = new TextView(this);
-		setContentView(textView);
-		daemon.addStateChangeListener(daemonStateUpdatedListener);
-		daemonStateUpdatedListener.daemonStateUpdate();
-
-		 // request permissions
-		if (Build.VERSION.SDK_INT >= 23)
-		{
-			if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) 
-			{
-				ActivityCompat.requestPermissions(this,
-					new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-					MY_PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE);
-			}
-		}
-
-		// set the app be foreground
-		doBindService();
-
-		final Timer gracefulQuitTimer = getGracefulQuitTimer();
-		if(gracefulQuitTimer!=null){
-			long gracefulStopAtMillis;
-			synchronized (graceStartedMillis_LOCK) {
-				gracefulStopAtMillis = graceStartedMillis + GRACEFUL_DELAY_MILLIS;
-			}
-			rescheduleGraceStop(gracefulQuitTimer, gracefulStopAtMillis);
-		}
-
-		openBatteryOptimizationDialogIfNeeded();
-	}
-
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		textView = null;
-		daemon.removeStateChangeListener(daemonStateUpdatedListener);
-		//cancelGracefulStop0();
-		try{
-			doUnbindService();
-			}catch(Throwable tr){
-			Log.e(TAG, "", tr);
-		}
-	}
-
-	@Override
-	public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults)
-	{
-        if (requestCode == MY_PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED)
-                Log.e(TAG, "WR_EXT_STORAGE perm granted");
-            else {
-                Log.e(TAG, "WR_EXT_STORAGE perm declined, stopping i2pd");
-                i2pdStop();
-                //TODO must work w/o this perm, ask orignal
-            }
-        }
-	}
-
-	private void cancelGracefulStop0() {
-		Timer gracefulQuitTimer = getGracefulQuitTimer();
-		if(gracefulQuitTimer!=null) {
-			gracefulQuitTimer.cancel();
-			setGracefulQuitTimer(null);
-		}
-	}
-
-	private CharSequence throwableToString(Throwable tr) {
-		StringWriter sw = new StringWriter(8192);
-		PrintWriter pw = new PrintWriter(sw);
-		tr.printStackTrace(pw);
-		pw.close();
-		return sw.toString();
-	}
-
-	// private LocalService mBoundService;
-
-	private ServiceConnection mConnection = new ServiceConnection() {
-		public void onServiceConnected(ComponentName className, IBinder service) {
-			// This is called when the connection with the service has been
-			// established, giving us the service object we can use to
-			// interact with the service.  Because we have bound to a explicit
-			// service that we know is running in our own process, we can
-			// cast its IBinder to a concrete class and directly access it.
-			//		mBoundService = ((LocalService.LocalBinder)service).getService();
-
-			// Tell the user about this for our demo.
-			//		Toast.makeText(Binding.this, R.string.local_service_connected,
-			//		Toast.LENGTH_SHORT).show();
-		}
-
-		public void onServiceDisconnected(ComponentName className) {
-			// This is called when the connection with the service has been
-			// unexpectedly disconnected -- that is, its process crashed.
-			// Because it is running in our same process, we should never
-			// see this happen.
-			//		mBoundService = null;
-			//		Toast.makeText(Binding.this, R.string.local_service_disconnected,
-			//		Toast.LENGTH_SHORT).show();
-		}
-	};
-
-	private static volatile boolean mIsBound;
-
-	private void doBindService() {
-		synchronized (I2PDActivity.class) {
-			if (mIsBound) return;
-			// Establish a connection with the service.  We use an explicit
-			// class name because we want a specific service implementation that
-			// we know will be running in our own process (and thus won't be
-			// supporting component replacement by other applications).
-			bindService(new Intent(this, ForegroundService.class), mConnection, Context.BIND_AUTO_CREATE);
-			mIsBound = true;
-		}
-	}
-
-	private void doUnbindService() {
-		synchronized (I2PDActivity.class) {
-			if (mIsBound) {
-				// Detach our existing connection.
-				unbindService(mConnection);
-				mIsBound = false;
-			}
-		}
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		// Inflate the menu; this adds items to the action bar if it is present.
-		getMenuInflater().inflate(R.menu.options_main, menu);
-		menu.findItem(R.id.action_battery_otimizations).setVisible(isBatteryOptimizationsOpenOsDialogApiAvailable());
-		this.optionsMenu = menu;
-		return true;
-	}
-
-	private boolean isBatteryOptimizationsOpenOsDialogApiAvailable() {
-		return android.os.Build.VERSION.SDK_INT >= 23;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-		// Handle action bar item clicks here. The action bar will
-		// automatically handle clicks on the Home/Up button, so long
-		// as you specify a parent activity in AndroidManifest.xml.
-		int id = item.getItemId();
-
-		switch(id){
-			case R.id.action_stop:
-			i2pdStop();
-			return true;
-			case R.id.action_graceful_stop:
-				synchronized (graceStartedMillis_LOCK) {
-					if (getGracefulQuitTimer() != null)
-						cancelGracefulStop();
-					else
-						i2pdGracefulStop();
-				}
-				return true;
-			case R.id.action_battery_otimizations:
-				onActionBatteryOptimizations();
-				return true;
-		}
-
-		return super.onOptionsItemSelected(item);
-	}
-
-	private void onActionBatteryOptimizations() {
-		if (isBatteryOptimizationsOpenOsDialogApiAvailable()) {
-			try {
-				startActivity(new Intent(ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS));
-			} catch (ActivityNotFoundException e) {
-				Log.e(TAG,"BATT_OPTIM_DIALOG_ActvtNotFound", e);
-				Toast.makeText(this, R.string.os_version_does_not_support_battery_optimizations_show_os_dialog_api, Toast.LENGTH_SHORT).show();
-			}
-		}
-	}
-
-	private void i2pdStop() {
-		cancelGracefulStop0();
-		new Thread(() -> {
-            Log.d(TAG, "stopping");
-            try {
-                daemon.stopDaemon();
-            } catch (Throwable tr) {
-                Log.e(TAG, "", tr);
-            }
-            quit(); //TODO make menu items for starting i2pd. On my Android, I need to reboot the OS to restart i2pd.
-        },"stop").start();
-	}
-
-	private static volatile Timer gracefulQuitTimer;
-
-	private void i2pdGracefulStop() {
-		if(daemon.getState()==DaemonSingleton.State.stopped){
-			Toast.makeText(this, R.string.already_stopped,
-			Toast.LENGTH_SHORT).show();
-			return;
-		}
-		if(getGracefulQuitTimer()!=null){
-			Toast.makeText(this, R.string.graceful_stop_is_already_in_progress,
-			Toast.LENGTH_SHORT).show();
-			return;
-		}
-		Toast.makeText(this, R.string.graceful_stop_is_in_progress,
-		Toast.LENGTH_SHORT).show();
-		new Thread(() -> {
-            try {
-                Log.d(TAG, "grac stopping");
-                if(daemon.isStartedOkay()) {
-                    daemon.stopAcceptingTunnels();
-                    long gracefulStopAtMillis;
-                    synchronized (graceStartedMillis_LOCK) {
-                        graceStartedMillis = System.currentTimeMillis();
-                        gracefulStopAtMillis = graceStartedMillis + GRACEFUL_DELAY_MILLIS;
-                    }
-                    rescheduleGraceStop(null,gracefulStopAtMillis);
-                } else {
-                    i2pdStop();
-                }
-            } catch(Throwable tr) {
-                Log.e(TAG,"",tr);
-            }
-        },"gracInit").start();
-	}
-	
-	private void cancelGracefulStop()
-	{
-		cancelGracefulStop0();
-		new Thread(() -> {
-            try
-            {
-                Log.d(TAG, "canceling grac stop");
-                if(daemon.isStartedOkay()) {
-					daemon.startAcceptingTunnels();
-					runOnUiThread(() -> Toast.makeText(this, R.string.shutdown_canceled, Toast.LENGTH_SHORT).show());
-				}
-                else
-                    i2pdStop();
-            }
-            catch(Throwable tr)
-            {
-                Log.e(TAG,"",tr);
-            }
-        },"gracCancel").start();
-	}
-
-	private void rescheduleGraceStop(Timer gracefulQuitTimerOld, long gracefulStopAtMillis) {
-		if(gracefulQuitTimerOld!=null)gracefulQuitTimerOld.cancel();
-		final Timer gracefulQuitTimer = new Timer(true);
-		setGracefulQuitTimer(gracefulQuitTimer);
-		gracefulQuitTimer.schedule(new TimerTask(){
-
-			@Override
-			public void run() {
-				i2pdStop();
-			}
-
-		}, Math.max(0,gracefulStopAtMillis-System.currentTimeMillis()));
-		final TimerTask tickerTask = new TimerTask() {
-			@Override
-			public void run() {
-				daemonStateUpdatedListener.daemonStateUpdate();
-			}
-		};
-		gracefulQuitTimer.scheduleAtFixedRate(tickerTask,0/*start delay*/,1000/*millis period*/);
-	}
-
-	private static Timer getGracefulQuitTimer() {
-		return gracefulQuitTimer;
-	}
-
-	private void setGracefulQuitTimer(Timer gracefulQuitTimer) {
-		I2PDActivity.gracefulQuitTimer = gracefulQuitTimer;
-		runOnUiThread(()-> {
-			Menu menu = optionsMenu;
-			if (menu != null) {
-				MenuItem item = menu.findItem(R.id.action_graceful_stop);
-				if (item != null) {
-					synchronized (graceStartedMillis_LOCK) {
-						item.setTitle(getGracefulQuitTimer() != null ? R.string.action_cancel_graceful_stop : R.string.action_graceful_stop);
-					}
-				}
-			}
-		});
-	}
-
-	/**
-		* Copy the asset at the specified path to this app's data directory. If the
-		* asset is a directory, its contents are also copied.
-		*
-		* @param path
-		* Path to asset, relative to app's assets directory.
-	*/
-	private void copyAsset(String path) {
-		AssetManager manager = getAssets();
-
-		// If we have a directory, we make it and recurse. If a file, we copy its
-		// contents.
-		try {
-			String[] contents = manager.list(path);
-
-			// The documentation suggests that list throws an IOException, but doesn't
-			// say under what conditions. It'd be nice if it did so when the path was
-			// to a file. That doesn't appear to be the case. If the returned array is
-			// null or has 0 length, we assume the path is to a file. This means empty
-			// directories will get turned into files.
-			if (contents == null || contents.length == 0) {
-				copyFileAsset(path);
-				return;
-			}
-
-			// Make the directory.
-			File dir = new File(i2pdpath, path);
-			boolean result = dir.mkdirs();
-			Log.d(TAG, "dir.mkdirs() returned " + result);
-
-			// Recurse on the contents.
-			for (String entry : contents) {
-				copyAsset(path + '/' + entry);
-			}
-		} catch (IOException e) {
-			Log.e(TAG, "ex ignored for path='" + path + "'", e);
-		}
-	}
-
-	/**
-		* Copy the asset file specified by path to app's data directory. Assumes
-		* parent directories have already been created.
-		*
-		* @param path
-		* Path to asset, relative to app's assets directory.
-	*/
-	private void copyFileAsset(String path) {
-		File file = new File(i2pdpath, path);
-		if(!file.exists()) {
-			try {
-				try (InputStream in = getAssets().open(path) ) {
-					try (OutputStream out = new FileOutputStream(file)) {
-						byte[] buffer = new byte[1024];
-						int read = in.read(buffer);
-						while (read != -1) {
-							out.write(buffer, 0, read);
-							read = in.read(buffer);
-						}
-					}
-				}
-			} catch (IOException e) {
-				Log.e(TAG, "", e);
-			}
-		}
-	}
-
-	private void deleteRecursive(File fileOrDirectory) {
-		if (fileOrDirectory.isDirectory()) {
-			File[] files = fileOrDirectory.listFiles();
-			if(files!=null) {
-				for (File child : files) {
-					deleteRecursive(child);
-				}
-			}
-		}
-		boolean deleteResult = fileOrDirectory.delete();
-        if(!deleteResult)Log.e(TAG, "fileOrDirectory.delete() returned "+deleteResult+", absolute path='"+fileOrDirectory.getAbsolutePath()+"'");
-	}
-
-	private void processAssets() {
-		if (!assetsCopied) try {
-			assetsCopied = true; // prevent from running on every state update
-
-			File holderFile = new File(i2pdpath, "assets.ready");
-			String versionName = BuildConfig.VERSION_NAME; // here will be app version, like 2.XX.XX
-			StringBuilder text = new StringBuilder();
-
-			if (holderFile.exists()) {
-                try { // if holder file exists, read assets version string
-                    FileReader fileReader = new FileReader(holderFile);
-
-                    try {
-                        BufferedReader br = new BufferedReader(fileReader);
-
-                        try {
-                            String line;
-
-                            while ((line = br.readLine()) != null) {
-                                text.append(line);
-                            }
-                        }finally {
-                            try{
-                                br.close();
-                            } catch (IOException e) {
-                                Log.e(TAG, "", e);
-                            }
-                        }
-                    } finally {
-                        try{
-                            fileReader.close();
-                        } catch (IOException e) {
-                            Log.e(TAG, "", e);
-                        }
-                    }
-                } catch (IOException e) {
-                    Log.e(TAG, "", e);
-                }
-            }
-
-			// if version differs from current app version or null, try to delete certificates folder
-			if (!text.toString().contains(versionName)) try {
-                boolean deleteResult = holderFile.delete();
-                if(!deleteResult)Log.e(TAG, "holderFile.delete() returned "+deleteResult+", absolute path='"+holderFile.getAbsolutePath()+"'");
-				File certPath = new File(i2pdpath, "certificates");
-				deleteRecursive(certPath);
-			}
-			catch (Throwable tr) {
-				Log.e(TAG, "", tr);
-			}
-
-			// copy assets. If processed file exists, it won't be overwritten
-			copyAsset("addressbook");
-			copyAsset("certificates");
-			copyAsset("tunnels.d");
-			copyAsset("i2pd.conf");
-			copyAsset("subscriptions.txt");
-			copyAsset("tunnels.conf");
-
-			// update holder file about successful copying
-			FileWriter writer = new FileWriter(holderFile);
-			try {
-                writer.append(versionName);
-            } finally {
-			    try{
-                    writer.close();
-                }catch (IOException e){
-                    Log.e(TAG,"on writer close", e);
-                }
-            }
-		}
-		catch (Throwable tr)
-		{
-			Log.e(TAG,"on assets copying", tr);
-		}
-	}
-
-	@SuppressLint("BatteryLife")
-	private void openBatteryOptimizationDialogIfNeeded() {
-		boolean questionEnabled = getPreferences().getBoolean(getBatteryOptimizationPreferenceKey(), true);
-		Log.i(TAG,"BATT_OPTIM_questionEnabled=="+questionEnabled);
-		if (!isKnownIgnoringBatteryOptimizations()
-				&& android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M
-				&& questionEnabled) {
-			AlertDialog.Builder builder = new AlertDialog.Builder(this);
-			builder.setTitle(R.string.battery_optimizations_enabled);
-			builder.setMessage(R.string.battery_optimizations_enabled_dialog);
-			builder.setPositiveButton(R.string.continue_str, (dialog, which) -> {
-				try {
-					startActivity(new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS, Uri.parse(PACKAGE_URI_SCHEME + getPackageName())));
-				} catch (ActivityNotFoundException e) {
-					Log.e(TAG,"BATT_OPTIM_ActvtNotFound", e);
-					Toast.makeText(this, R.string.device_does_not_support_disabling_battery_optimizations, Toast.LENGTH_SHORT).show();
-				}
-			});
-			builder.setOnDismissListener(dialog -> setNeverAskForBatteryOptimizationsAgain());
-			final AlertDialog dialog = builder.create();
-			dialog.setCanceledOnTouchOutside(false);
-			dialog.show();
-		}
-	}
-
-	private void setNeverAskForBatteryOptimizationsAgain() {
-		getPreferences().edit().putBoolean(getBatteryOptimizationPreferenceKey(), false).apply();
-	}
-
-	protected boolean isKnownIgnoringBatteryOptimizations() {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-			final PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE);
-			if (pm == null) {
-			    Log.i(TAG, "BATT_OPTIM: POWER_SERVICE==null");
-			    return false;
-            }
-            boolean ignoring = pm.isIgnoringBatteryOptimizations(getPackageName());
-            Log.i(TAG, "BATT_OPTIM: ignoring==" + ignoring);
-            return ignoring;
-		} else {
-            Log.i(TAG, "BATT_OPTIM: old sdk version=="+Build.VERSION.SDK_INT);
-			return false;
-		}
-	}
-
-	protected SharedPreferences getPreferences() {
-		return PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-	}
-
-	private String getBatteryOptimizationPreferenceKey() {
-		@SuppressLint("HardwareIds") String device = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
-		return "show_battery_optimization" + (device == null ? "" : device);
-	}
-
-	private void quit() {
-		try {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-				finishAndRemoveTask();
-			} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-				finishAffinity();
-			} else {
-				//moveTaskToBack(true);
-				finish();
-			}
-		}catch (Throwable tr) {
-			Log.e(TAG, "", tr);
-		}
-		try{
-			daemon.stopDaemon();
-		}catch (Throwable tr) {
-			Log.e(TAG, "", tr);
-		}
-		System.exit(0);
-	}
-}

android/src/org/purplei2p/i2pd/I2PDPermsAskerActivity.java

@@ -1,170 +0,0 @@
-package org.purplei2p.i2pd;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import java.lang.reflect.Method;
-
-//dangerous perms, per https://developer.android.com/guide/topics/permissions/normal-permissions.html :
-//android.permission.WRITE_EXTERNAL_STORAGE
-public class I2PDPermsAskerActivity extends Activity {
-
-	private static final int PERMISSION_WRITE_EXTERNAL_STORAGE = 0;
-
-	private Button button_request_write_ext_storage_perms;
-	private TextView textview_retry;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		//if less than Android 6, no runtime perms req system present
-		if (android.os.Build.VERSION.SDK_INT < 23) {
-			startMainActivity();
-			return;
-		}
-
-
-		setContentView(R.layout.activity_perms_asker);
-		button_request_write_ext_storage_perms = (Button) findViewById(R.id.button_request_write_ext_storage_perms);
-		textview_retry = (TextView) findViewById(R.id.textview_retry);
-
-		button_request_write_ext_storage_perms.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				request_write_ext_storage_perms();
-			}
-		});
-		request_write_ext_storage_perms();
-	}
-
-	private void request_write_ext_storage_perms() {
-
-		textview_retry.setVisibility(TextView.GONE);
-		button_request_write_ext_storage_perms.setVisibility(Button.GONE);
-
-		Method methodCheckPermission;
-		Method method_shouldShowRequestPermissionRationale;
-		Method method_requestPermissions;
-		try {
-			methodCheckPermission = getClass().getMethod("checkSelfPermission", String.class);
-			method_shouldShowRequestPermissionRationale =
-					getClass().getMethod("shouldShowRequestPermissionRationale", String.class);
-			method_requestPermissions =
-					getClass().getMethod("requestPermissions", String[].class, int.class);
-		} catch (NoSuchMethodException e) {
-			throw new RuntimeException(e);
-		}
-		Integer resultObj;
-		try {
-			resultObj = (Integer) methodCheckPermission.invoke(
-					this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
-		} catch (Throwable e) {
-			throw new RuntimeException(e);
-		}
-
-		if (resultObj != PackageManager.PERMISSION_GRANTED) {
-
-			// Should we show an explanation?
-			Boolean aBoolean;
-			try {
-				aBoolean = (Boolean) method_shouldShowRequestPermissionRationale.invoke(this,
-						Manifest.permission.WRITE_EXTERNAL_STORAGE);
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
-			if (aBoolean) {
-
-				// Show an explanation to the user *asynchronously* -- don't block
-				// this thread waiting for the user's response! After the user
-				// sees the explanation, try again to request the permission.
-
-				showExplanation();
-
-			} else {
-
-				// No explanation needed, we can request the permission.
-
-				try {
-					method_requestPermissions.invoke(this,
-							new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-							PERMISSION_WRITE_EXTERNAL_STORAGE);
-				} catch (Exception e) {
-					throw new RuntimeException(e);
-				}
-			}
-		} else startMainActivity();
-	}
-
-	@Override
-	public void onRequestPermissionsResult(int requestCode,
-		String permissions[], int[] grantResults) {
-		switch (requestCode) {
-			case PERMISSION_WRITE_EXTERNAL_STORAGE: {
-				// If request is cancelled, the result arrays are empty.
-				if (grantResults.length > 0
-						&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-
-					// permission was granted, yay! Do the
-					// contacts-related task you need to do.
-
-					startMainActivity();
-
-				} else {
-
-					// permission denied, boo! Disable the
-					// functionality that depends on this permission.
-					textview_retry.setText(R.string.permDenied);
-					textview_retry.setVisibility(TextView.VISIBLE);
-					button_request_write_ext_storage_perms.setVisibility(Button.VISIBLE);
-				}
-			}
-
-			// other 'case' lines to check for other
-			// permissions this app might request.
-		}
-	}
-
-	private void startMainActivity() {
-		startActivity(new Intent(this, I2PDActivity.class));
-		finish();
-	}
-
-	private static final int SHOW_EXPLANATION_REQUEST = 1;  // The request code
-	private void showExplanation() {
-		Intent intent = new Intent(this, I2PDPermsExplanationActivity.class);
-		startActivityForResult(intent, SHOW_EXPLANATION_REQUEST);
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		// Check which request we're responding to
-		if (requestCode == SHOW_EXPLANATION_REQUEST) {
-			// Make sure the request was successful
-			if (resultCode == RESULT_OK) {
-				// Request the permission
-				Method method_requestPermissions;
-				try {
-					method_requestPermissions =
-							getClass().getMethod("requestPermissions", String[].class, int.class);
-				} catch (NoSuchMethodException e) {
-					throw new RuntimeException(e);
-				}
-				try {
-					method_requestPermissions.invoke(this,
-							new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-							PERMISSION_WRITE_EXTERNAL_STORAGE);
-				} catch (Exception e) {
-					throw new RuntimeException(e);
-				}
-			} else {
-				finish(); //close the app
-			}
-		}
-	}
-}

android/src/org/purplei2p/i2pd/I2PDPermsExplanationActivity.java

@@ -1,38 +0,0 @@
-package org.purplei2p.i2pd;
-
-import android.app.ActionBar;
-import android.content.Intent;
-import android.os.Bundle;
-import android.app.Activity;
-import android.view.View;
-import android.widget.Button;
-
-public class I2PDPermsExplanationActivity extends Activity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_perms_explanation);
-		ActionBar actionBar = getActionBar();
-		if(actionBar!=null)actionBar.setHomeButtonEnabled(false);
-		Button button_ok = (Button) findViewById(R.id.button_ok);
-		button_ok.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				returnFromActivity();
-			}
-		});
-	}
-
-	private void returnFromActivity() {
-		Intent data = new Intent();
-		Activity parent = getParent();
-		if (parent == null) {
-			setResult(Activity.RESULT_OK, data);
-		} else {
-			parent.setResult(Activity.RESULT_OK, data);
-		}
-		finish();
-	}
-
-}

android/src/org/purplei2p/i2pd/I2PD_JNI.java

@@ -1,27 +0,0 @@
-package org.purplei2p.i2pd;
-
-public class I2PD_JNI {
-	public static native String getABICompiledWith();
-
-	/**
-	 * returns error info if failed
-	 * returns "ok" if daemon initialized and started okay
-	 */
-	public static native String startDaemon();
-
-	//should only be called after startDaemon() success
-	public static native void stopDaemon();
-
-	public static native void stopAcceptingTunnels();
-
-	public static native void startAcceptingTunnels();
-
-	public static native void onNetworkStateChanged(boolean isConnected);
-
-	public static native void setDataDir(String jdataDir);
-
-	public static void loadLibraries() {
-		//System.loadLibrary("c++_shared");
-		System.loadLibrary("i2pd");
-	}
-}

android/src/org/purplei2p/i2pd/NetworkStateChangeReceiver.java

@@ -1,30 +0,0 @@
-package org.purplei2p.i2pd;
-
-import android.util.Log;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-
-public class NetworkStateChangeReceiver extends BroadcastReceiver {
-
-	private static final String TAG = "i2pd";
-
-	//api level 1
-	@Override
-	public void onReceive(final Context context, final Intent intent) {
-		Log.d(TAG,"Network state change");
-		try {
-			ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-			NetworkInfo activeNetworkInfo = cm.getActiveNetworkInfo();
-			boolean isConnected = activeNetworkInfo!=null && activeNetworkInfo.isConnected();
-			// https://developer.android.com/training/monitoring-device-state/connectivity-monitoring.html?hl=ru
-			// boolean isWiFi = activeNetworkInfo!=null && (activeNetworkInfo.getType() == ConnectivityManager.TYPE_WIFI);
-
-			I2PD_JNI.onNetworkStateChanged(isConnected);
-		} catch (Throwable tr) {
-			Log.d(TAG,"",tr);
-		}
-	}
-}

android_binary_only/.gitignore

@@ -1,18 +0,0 @@
-gen
-tests
-bin
-libs
-log*
-obj
-.gradle
-.idea
-.externalNativeBuild
-ant.properties
-local.properties
-build.sh
-android.iml
-build
-gradle
-gradlew
-gradlew.bat
-

android_binary_only/jni/Android.mk

@@ -1,74 +0,0 @@
-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_68_0-clang/$(TARGET_ARCH_ABI)/lib/libboost_system.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_68_0-clang/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_68_0-clang/$(TARGET_ARCH_ABI)/lib/libboost_date_time.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_68_0-clang/include
-include $(PREBUILT_STATIC_LIBRARY)
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := boost_filesystem
-LOCAL_SRC_FILES := $(BOOST_PATH)/boost_1_68_0-clang/$(TARGET_ARCH_ABI)/lib/libboost_filesystem.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_68_0-clang/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_68_0-clang/$(TARGET_ARCH_ABI)/lib/libboost_program_options.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_68_0-clang/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)

android_binary_only/jni/Application.mk

@@ -1,40 +0,0 @@
-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++11 extensions in source code
-APP_CPPFLAGS += -std=c++11 -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
-# 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

appveyor.yml

@@ -1,49 +0,0 @@
-version: 2.30.0.{build}
-pull_requests:
-  do_not_increment_build_number: true
-branches:
-  only:
-  - openssl
-skip_tags: true
-os: Visual Studio 2015
-shallow_clone: true
-clone_depth: 1
-
-environment:
-  MSYS2_PATH_TYPE: inherit
-  CHERE_INVOKING: enabled_from_arguments
-  matrix:
-  - MSYSTEM: MINGW64
-  - MSYSTEM: MINGW32
-
-install:
-- c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Rns gcc-fortran gcc mingw-w64-{i686,x86_64}-gcc-ada mingw-w64-{i686,x86_64}-gcc-objc"
-- c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
-
-- c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"
-
-- if "%MSYSTEM%" == "MINGW64" (
-    c:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-x86_64-boost mingw-w64-x86_64-miniupnpc"
-  ) else (
-    c:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-boost mingw-w64-i686-miniupnpc"
-  )
-
-- if "%MSYSTEM%" == "MINGW64" (
-    set "bitness=64"
-  ) else (
-    set "bitness=32"
-  )
-
-build_script:
-- cmd: >-
-    cd \projects\i2pd
-
-    echo MSYSTEM = %MSYSTEM%, bitness = %bitness%
-
-- c:\msys64\usr\bin\bash -lc "make USE_UPNP=yes -j2"
-- 7z a -tzip -mx9 -mmt i2pd-mingw-win%bitness%.zip i2pd.exe
-
-test: off
-
-artifacts:
-- path: i2pd-mingw-win*.zip

benchmark/CMakeLists.txt

@@ -0,0 +1,14 @@
+set(BENCHMARK_SRC
+  "main.cpp"
+)
+
+if(WITH_BENCHMARK)
+    add_executable(${BENCHMARK_NAME} ${BENCHMARK_SRC})
+    target_link_libraries(
+        ${BENCHMARK_NAME} ${CORE_NAME} ${DL_LIB} ${Boost_LIBRARIES} ${CRYPTO++_LIBRARIES}
+        ${CMAKE_THREAD_LIBS_INIT}
+    )
+    install(TARGETS
+        ${BENCHMARK_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    )
+endif()

benchmark/main.cpp

@@ -0,0 +1,83 @@
+#include "crypto/Signature.h"
+#include <cryptopp/osrng.h>
+#include <iostream>
+#include <chrono>
+#include <functional>
+
+typedef std::function<void(CryptoPP::RandomNumberGenerator&, uint8_t*, uint8_t*)> KeyGenerator;
+
+template<class Verifier, class Signer>
+void benchmark(std::size_t count, std::size_t public_key_size, std::size_t private_key_size,
+    std::size_t signature_size, KeyGenerator generator)
+{
+    typedef std::chrono::time_point<std::chrono::high_resolution_clock> TimePoint;
+    CryptoPP::AutoSeededRandomPool rng;
+
+    uint8_t private_key[private_key_size] = {};
+    uint8_t public_key[public_key_size] = {};
+
+    generator(rng, private_key, public_key);
+
+    Verifier verifier(public_key); 
+    Signer signer(private_key); 
+
+    uint8_t message[512] = {};
+    uint8_t output[signature_size] = {};
+
+    std::chrono::nanoseconds sign_duration(0);
+    std::chrono::nanoseconds verify_duration(0);
+
+    for(std::size_t i = 0; i < count; ++i) {
+        rng.GenerateBlock(message, 512); 
+        TimePoint begin1 = std::chrono::high_resolution_clock::now();
+        signer.Sign(rng, message, 512, output);
+        TimePoint end1 = std::chrono::high_resolution_clock::now();
+
+        sign_duration += std::chrono::duration_cast<std::chrono::nanoseconds>(end1 - begin1);
+
+        TimePoint begin2 = std::chrono::high_resolution_clock::now();
+        verifier.Verify(message, 512, output);
+        TimePoint end2 = std::chrono::high_resolution_clock::now();
+
+        verify_duration += std::chrono::duration_cast<std::chrono::nanoseconds>(end2 - begin2);
+    }
+    std::cout << "Conducted " << count << " experiments." << std::endl;
+    std::cout << "Total sign time: " << std::chrono::duration_cast<std::chrono::milliseconds>(sign_duration).count() << std::endl;
+    std::cout << "Total verify time: " << std::chrono::duration_cast<std::chrono::milliseconds>(verify_duration).count() << std::endl;
+}
+
+
+int main()
+{
+    using namespace i2p::crypto;
+    std::cout << "--------DSA---------" << std::endl;
+    benchmark<DSAVerifier, DSASigner>(
+        1000, DSA_PUBLIC_KEY_LENGTH,
+        DSA_PRIVATE_KEY_LENGTH, DSA_SIGNATURE_LENGTH,
+        &CreateDSARandomKeys
+    );
+    std::cout << "-----ECDSAP256------" << std::endl;
+    benchmark<ECDSAP256Verifier, ECDSAP256Signer>(
+        1000, ECDSAP256_KEY_LENGTH,
+        ECDSAP256_KEY_LENGTH, 64,
+        &CreateECDSAP256RandomKeys
+    );
+    std::cout << "-----ECDSAP384------" << std::endl;
+    benchmark<ECDSAP384Verifier, ECDSAP384Signer>(
+        1000, ECDSAP384_KEY_LENGTH,
+        ECDSAP384_KEY_LENGTH, 64,
+        &CreateECDSAP384RandomKeys
+    );
+    std::cout << "-----ECDSAP521------" << std::endl;
+    benchmark<ECDSAP521Verifier, ECDSAP521Signer>(
+        1000, ECDSAP521_KEY_LENGTH,
+        ECDSAP521_KEY_LENGTH, 64,
+        &CreateECDSAP521RandomKeys
+    );
+    std::cout << "-----EDDSA25519-----" << std::endl;
+    benchmark<EDDSA25519Verifier, EDDSA25519Signer>(
+        1000, EDDSA25519_PUBLIC_KEY_LENGTH,
+        EDDSA25519_PRIVATE_KEY_LENGTH, 64,
+        &CreateEDDSARandomKeys
+    );
+}

build/.gitignore

@@ -1,14 +0,0 @@
-# Various generated files
-/CMakeFiles/
-/i2pd
-/libi2pd.a
-/libi2pdclient.a
-/cmake_install.cmake
-/CMakeCache.txt
-/CPackConfig.cmake
-/CPackSourceConfig.cmake
-/install_manifest.txt
-/arch.c
-# windows build script
-i2pd*.zip
-build*.log

build/CMakeLists.txt

@@ -1,593 +0,0 @@
-cmake_minimum_required ( VERSION 2.8.12 )
-# this addresses CMP0059 with CMake > 3.3 for PCH flags
-cmake_policy( VERSION 2.8.12 )
-project ( "i2pd" )
-
-# for debugging
-#set(CMAKE_VERBOSE_MAKEFILE on)
-
-# configurale options
-option(WITH_AESNI     "Use AES-NI instructions set" OFF)
-option(WITH_AVX       "Use AVX instructions" OFF)
-option(WITH_HARDENING "Use hardening compiler flags" OFF)
-option(WITH_LIBRARY   "Build library" ON)
-option(WITH_BINARY    "Build binary" ON)
-option(WITH_STATIC    "Static build" OFF)
-option(WITH_UPNP "Include support for UPnP client" OFF)
-option(WITH_PCH "Use precompiled header" OFF)
-option(WITH_GUI "Include GUI (currently MS Windows only)" ON)
-option(WITH_MESHNET "Build for cjdns test network" OFF)
-option(WITH_ADDRSANITIZER "Build with address sanitizer unix only" OFF)
-option(WITH_THREADSANITIZER "Build with thread sanitizer unix only" OFF)
-option(WITH_I2LUA "Build for i2lua" OFF)
-option(WITH_WEBSOCKETS "Build with websocket ui" OFF)
-
-# paths
-set ( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
-set ( CMAKE_SOURCE_DIR ".." )
-
-# architecture
-include(TargetArch)
-target_architecture(ARCHITECTURE)
-
-set(LIBI2PD_SRC_DIR ../libi2pd)
-set(LIBI2PD_CLIENT_SRC_DIR ../libi2pd_client)
-
-include_directories(${LIBI2PD_SRC_DIR})
-include_directories(${LIBI2PD_CLIENT_SRC_DIR})
-
-set (LIBI2PD_SRC
-  "${LIBI2PD_SRC_DIR}/BloomFilter.cpp"
-  "${LIBI2PD_SRC_DIR}/Config.cpp"
-  "${LIBI2PD_SRC_DIR}/CPU.cpp"
-  "${LIBI2PD_SRC_DIR}/Crypto.cpp"
-  "${LIBI2PD_SRC_DIR}/CryptoKey.cpp"
-  "${LIBI2PD_SRC_DIR}/Garlic.cpp"
-  "${LIBI2PD_SRC_DIR}/Gzip.cpp"
-  "${LIBI2PD_SRC_DIR}/HTTP.cpp"
-  "${LIBI2PD_SRC_DIR}/I2NPProtocol.cpp"
-  "${LIBI2PD_SRC_DIR}/Identity.cpp"
-  "${LIBI2PD_SRC_DIR}/LeaseSet.cpp"
-  "${LIBI2PD_SRC_DIR}/FS.cpp"
-  "${LIBI2PD_SRC_DIR}/Log.cpp"
-  "${LIBI2PD_SRC_DIR}/NTCPSession.cpp"
-  "${LIBI2PD_SRC_DIR}/NetDbRequests.cpp"
-  "${LIBI2PD_SRC_DIR}/NetDb.cpp"
-  "${LIBI2PD_SRC_DIR}/Profiling.cpp"
-  "${LIBI2PD_SRC_DIR}/Reseed.cpp"
-  "${LIBI2PD_SRC_DIR}/RouterContext.cpp"
-  "${LIBI2PD_SRC_DIR}/RouterInfo.cpp"
-  "${LIBI2PD_SRC_DIR}/SSU.cpp"
-  "${LIBI2PD_SRC_DIR}/SSUData.cpp"
-  "${LIBI2PD_SRC_DIR}/SSUSession.cpp"
-  "${LIBI2PD_SRC_DIR}/Streaming.cpp"
-  "${LIBI2PD_SRC_DIR}/Destination.cpp"
-  "${LIBI2PD_SRC_DIR}/TransitTunnel.cpp"
-  "${LIBI2PD_SRC_DIR}/Tunnel.cpp"
-  "${LIBI2PD_SRC_DIR}/TunnelGateway.cpp"
-  "${LIBI2PD_SRC_DIR}/Transports.cpp"
-  "${LIBI2PD_SRC_DIR}/TunnelEndpoint.cpp"
-  "${LIBI2PD_SRC_DIR}/TunnelPool.cpp"
-  "${LIBI2PD_SRC_DIR}/Base.cpp"
-  "${LIBI2PD_SRC_DIR}/util.cpp"
-  "${LIBI2PD_SRC_DIR}/Datagram.cpp"
-  "${LIBI2PD_SRC_DIR}/Family.cpp"
-  "${LIBI2PD_SRC_DIR}/Signature.cpp"
-  "${LIBI2PD_SRC_DIR}/Timestamp.cpp"
-  "${LIBI2PD_SRC_DIR}/api.cpp"
-  "${LIBI2PD_SRC_DIR}/Event.cpp"
-  "${LIBI2PD_SRC_DIR}/Gost.cpp"
-  "${LIBI2PD_SRC_DIR}/ChaCha20.cpp"
-  "${LIBI2PD_SRC_DIR}/Poly1305.cpp"
-  "${LIBI2PD_SRC_DIR}/Ed25519.cpp"
-  "${LIBI2PD_SRC_DIR}/NTCP2.cpp"
-  "${LIBI2PD_SRC_DIR}/Blinding.cpp"
-  "${LIBI2PD_SRC_DIR}/Elligator.cpp"
-  "${LIBI2PD_SRC_DIR}/ECIESX25519AEADRatchetSession.cpp"    
-)
-
-if (WITH_WEBSOCKETS)
-  add_definitions(-DWITH_EVENTS)
-  find_package(websocketpp REQUIRED)
-endif ()
-
-if (WIN32 OR MSYS)
-  list (APPEND LIBI2PD_SRC "${CMAKE_SOURCE_DIR}/I2PEndian.cpp")
-endif ()
-
-if (WITH_I2LUA)
-  add_definitions(-DI2LUA)
-endif()
-
-add_library(libi2pd ${LIBI2PD_SRC})
-set_target_properties(libi2pd PROPERTIES PREFIX "")
-
-if (WITH_LIBRARY)
-  install(TARGETS libi2pd
-    EXPORT libi2pd
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-    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()
-
-set (CLIENT_SRC
-  "${LIBI2PD_CLIENT_SRC_DIR}/AddressBook.cpp"
-  "${LIBI2PD_CLIENT_SRC_DIR}/BOB.cpp"
-  "${LIBI2PD_CLIENT_SRC_DIR}/ClientContext.cpp"
-  "${LIBI2PD_CLIENT_SRC_DIR}/MatchedDestination.cpp"
-  "${LIBI2PD_CLIENT_SRC_DIR}/I2PTunnel.cpp"
-  "${LIBI2PD_CLIENT_SRC_DIR}/I2PService.cpp"
-  "${LIBI2PD_CLIENT_SRC_DIR}/SAM.cpp"
-  "${LIBI2PD_CLIENT_SRC_DIR}/SOCKS.cpp"
-  "${LIBI2PD_CLIENT_SRC_DIR}/HTTPProxy.cpp"
-  "${LIBI2PD_CLIENT_SRC_DIR}/I2CP.cpp"
-  "${LIBI2PD_CLIENT_SRC_DIR}/WebSocks.cpp"
-)
-
-if(WITH_WEBSOCKETS)
-  list (APPEND CLIENT_SRC "${LIBI2PD_CLIENT_SRC_DIR}/Websocket.cpp")
-endif ()
-
-add_library(libi2pdclient ${CLIENT_SRC})
-set_target_properties(libi2pdclient PROPERTIES PREFIX "")
-
-if (WITH_LIBRARY)
-  install(TARGETS libi2pdclient
-    EXPORT libi2pdclient
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-    COMPONENT Libraries)
-endif()
-
-set(DAEMON_SRC_DIR ../daemon)
-
-set (DAEMON_SRC
-  "${DAEMON_SRC_DIR}/Daemon.cpp"
-  "${DAEMON_SRC_DIR}/HTTPServer.cpp"
-  "${DAEMON_SRC_DIR}/I2PControl.cpp"
-  "${DAEMON_SRC_DIR}/i2pd.cpp"
-  "${DAEMON_SRC_DIR}/UPnP.cpp"
-)
-
-if (WITH_MESHNET)
-  add_definitions(-DMESHNET)
-endif ()
-
-if (WITH_UPNP)
-  add_definitions(-DUSE_UPNP)
-  if (NOT MSVC AND NOT MSYS)
-    set(DL_LIB ${CMAKE_DL_LIBS})
-  endif ()
-endif ()
-
-# compiler flags customization (by vendor)
-if (MSVC)
-  add_definitions( -DWIN32_LEAN_AND_MEAN -DNOMINMAX )
-  # TODO Check & report to Boost dev, there should be no need for these two
-  add_definitions( -DBOOST_THREAD_NO_LIB -DBOOST_CHRONO_NO_LIB )
-  set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL" )
-  set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /INCREMENTAL:NO /LTCG" )
-  set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} /GL" )
-  set( CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /INCREMENTAL:NO /LTCG" )
-else()
-  if (MSYS OR MINGW)
-    add_definitions( -DWIN32_LEAN_AND_MEAN )
-  endif ()
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Winvalid-pch -Wno-unused-parameter" )
-  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)
-  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
-endif ()
-
-# check for c++11 support
-include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-std=c++11" CXX11_SUPPORTED)
-CHECK_CXX_COMPILER_FLAG("-std=c++0x" CXX0X_SUPPORTED)
-if (CXX11_SUPPORTED)
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
-elseif (CXX0X_SUPPORTED) # gcc 4.6
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x" )
-elseif (NOT MSVC)
-  message(SEND_ERROR "C++11 standard not seems to be supported by compiler. Too old version?")
-endif ()
-
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe")
-  if (WITH_HARDENING)
-    add_definitions( "-D_FORTIFY_SOURCE=2" )
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security -Werror=format-security" )
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector --param ssp-buffer-size=4" )
-  endif ()
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  # more tweaks
-  if (LINUX)
-    set (CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -stdlib=libstdc++" ) # required for <atomic>
-    list(APPEND CMAKE_REQUIRED_LIBRARIES "stdc++") # required to link with -stdlib=libstdc++
-  endif()
-  if (NOT (MSVC OR MSYS OR APPLE))
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-const-variable -Wno-overloaded-virtual -Wno-c99-extensions" )
-  endif()
-endif ()
-
-if (WITH_HARDENING AND MSVC)
-  # Most security options like dynamic base, buffer & stack checks are ON by default
-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /guard:cf" )
-endif ()
-
-# compiler flags customization (by system)
-if (UNIX)
-  list (APPEND DAEMON_SRC "${DAEMON_SRC_DIR}/UnixDaemon.cpp")
-  if (NOT (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR APPLE))
-    # "'sleep_for' is not a member of 'std::this_thread'" in gcc 4.7/4.8
-    add_definitions( "-D_GLIBCXX_USE_NANOSLEEP=1" )
-  endif ()
-elseif (WIN32 OR MSYS)
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/DaemonWin32.cpp")
-  if (WITH_GUI)
-    list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/Win32App.cpp")
-    set_source_files_properties("${CMAKE_SOURCE_DIR}/Win32/DaemonWin32.cpp"
-      PROPERTIES COMPILE_DEFINITIONS WIN32_APP)
-  endif ()
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/Win32Service.cpp")
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/Win32/Resource.rc")
-endif ()
-
-if (WITH_AESNI)
-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes" )
-endif()
-
-if (WITH_AVX)
-  set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx" )
-endif()
-
-if (WITH_ADDRSANITIZER)
-  if (NOT MSVC)
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer" )
-    set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address" )
-  else ()
-    message( SEND_ERROR "MSVC does not support address sanitizer option")
-  endif()
-endif()
-
-if (WITH_THREADSANITIZER)
-  if (WITH_ADDRSANITIZER)
-    message( FATAL_ERROR "thread sanitizer option cannot be combined with address sanitizer")
-  elseif (NOT MSVC)
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread" )
-    set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread" )
-  else ()
-    message( SEND_ERROR "MSVC does not support address sanitizer option")
-  endif()
-endif()
-
-
-# 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)
-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)
-  set(Boost_USE_STATIC_LIBS ON)
-  set(Boost_USE_STATIC_RUNTIME ON)
-  if (WIN32 AND NOT MSYS AND NOT MINGW)
-    # http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace
-    foreach(flag_var
-            CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-            CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-      if(${flag_var} MATCHES "/MD")
-        string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-      endif(${flag_var} MATCHES "/MD")
-    endforeach(flag_var)
-  else ()
-    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-  endif ()
-  set(BUILD_SHARED_LIBS OFF)
-  if (${CMAKE_CXX_COMPILER} MATCHES ".*-openwrt-.*")
-    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,-u,pthread_create,-u,pthread_once,-u,pthread_mutex_lock,-u,pthread_mutex_unlock,-u,pthread_join,-u,pthread_equal,-u,pthread_detach,-u,pthread_cond_wait,-u,pthread_cond_signal,-u,pthread_cond_destroy,-u,pthread_cond_broadcast,-u,pthread_cancel" )
-  endif ()
-else()
-  if (NOT WIN32 AND NOT MSYS)
-    # TODO: Consider separate compilation for LIBI2PD_SRC for library.
-    # No need in -fPIC overhead for binary if not interested in library
-    # HINT: revert c266cff CMakeLists.txt: compilation speed up
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
-  endif ()
-  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 ()
-
-if (WITH_PCH)
-  include_directories(BEFORE ${CMAKE_BINARY_DIR})
-  add_library(stdafx STATIC "${LIBI2PD_SRC_DIR}/stdafx.cpp")
-  if(MSVC)
-    target_compile_options(stdafx PRIVATE /Ycstdafx.h /Zm155)
-    add_custom_command(TARGET stdafx POST_BUILD
-      COMMAND xcopy /y stdafx.dir\\$<CONFIG>\\*.pdb libi2pd.dir\\$<CONFIG>\\
-      COMMAND xcopy /y stdafx.dir\\$<CONFIG>\\*.pdb i2pdclient.dir\\$<CONFIG>\\
-      COMMAND xcopy /y stdafx.dir\\$<CONFIG>\\*.pdb i2pd.dir\\$<CONFIG>\\
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      )
-    target_compile_options(libi2pd PRIVATE /FIstdafx.h /Yustdafx.h /Zm155 "/Fp${CMAKE_BINARY_DIR}/stdafx.dir/$<CONFIG>/stdafx.pch")
-    target_compile_options(libi2pdclient PRIVATE /FIstdafx.h /Yustdafx.h /Zm155 "/Fp${CMAKE_BINARY_DIR}/stdafx.dir/$<CONFIG>/stdafx.pch")
-  else()
-    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)
-  endif()
-  target_link_libraries(libi2pd stdafx)
-endif()
-
-target_link_libraries(libi2pdclient libi2pd)
-
-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!")
-endif()
-
-find_package ( OpenSSL REQUIRED )
-if(NOT DEFINED OPENSSL_INCLUDE_DIR)
-  message(SEND_ERROR "Could not find OpenSSL. Please download and install it first!")
-endif()
-
-if (WITH_UPNP)
-  find_package ( MiniUPnPc REQUIRED )
-  include_directories( SYSTEM ${MINIUPNPC_INCLUDE_DIR} )
-endif()
-
-find_package ( ZLIB )
-if (NOT ZLIB_FOUND )
-  # We are probably on Windows
-  find_program( PATCH patch C:/Program Files/Git/usr/bin C:/msys64/usr/bin C:/msys32/usr/bin C:/Strawberry/c/bin )
-  include( ExternalProject )
-  if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
-    set( ZLIB_EXTRA -DAMD64=ON )
-  else()
-    set( ZLIB_EXTRA -DASM686=ON "-DCMAKE_ASM_MASM_FLAGS=/W0 /safeseh" )
-  endif()
-  ExternalProject_Add(zlib-project
-    URL https://zlib.net/zlib-1.2.11.tar.gz
-    URL_HASH SHA256=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
-    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/zlib
-    PATCH_COMMAND "${PATCH}" -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/cmake-zlib-static.patch
-      && "${PATCH}" -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/cmake-zlib-amd64.patch
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-      -DWITH_STATIC=${WITH_STATIC} ${ZLIB_EXTRA}
-    )
-  if (WITH_PCH)
-    add_dependencies( stdafx zlib-project )
-  else ()
-    add_dependencies( libi2pd zlib-project )
-  endif ()
-  # ExternalProject_Get_Property(zlib-project install_dir)
-  set ( ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/zlib/include" CACHE FILEPATH "zlib include dir" FORCE)
-  if (NOT WITH_STATIC)
-    set ( ZLIB_LIBRARY debug zlibd optimized zlib CACHE STRING "zlib libraries" FORCE)
-  endif ()
-  link_directories(${CMAKE_CURRENT_BINARY_DIR}/zlib/lib)
-else()
-  link_directories(${ZLIB_ROOT}/lib)
-endif ()
-if (WITH_STATIC AND (MSVC OR MSYS))
-  set ( ZLIB_LIBRARY debug zlibstaticd optimized zlibstatic CACHE STRING "zlib libraries" FORCE)
-endif ()
-
-# load includes
-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()
-
-include(CheckAtomic)
-
-
-# show summary
-message(STATUS "---------------------------------------")
-message(STATUS "Build type         : ${CMAKE_BUILD_TYPE}")
-message(STATUS "Compiler vendor    : ${CMAKE_CXX_COMPILER_ID}")
-message(STATUS "Compiler version   : ${CMAKE_CXX_COMPILER_VERSION}")
-message(STATUS "Compiler path      : ${CMAKE_CXX_COMPILER}")
-message(STATUS "Architecture       : ${ARCHITECTURE}")
-message(STATUS "Install prefix:    : ${CMAKE_INSTALL_PREFIX}")
-message(STATUS "Options:")
-message(STATUS "  AESNI            : ${WITH_AESNI}")
-message(STATUS "  AVX              : ${WITH_AVX}")
-message(STATUS "  HARDENING        : ${WITH_HARDENING}")
-message(STATUS "  LIBRARY          : ${WITH_LIBRARY}")
-message(STATUS "  BINARY           : ${WITH_BINARY}")
-message(STATUS "  STATIC BUILD     : ${WITH_STATIC}")
-message(STATUS "  UPnP             : ${WITH_UPNP}")
-message(STATUS "  PCH              : ${WITH_PCH}")
-message(STATUS "  MESHNET          : ${WITH_MESHNET}")
-message(STATUS "  ADDRSANITIZER    : ${WITH_ADDRSANITIZER}")
-message(STATUS "  THREADSANITIZER  : ${WITH_THREADSANITIZER}")
-message(STATUS "  I2LUA            : ${WITH_I2LUA}")
-message(STATUS "  WEBSOCKETS       : ${WITH_WEBSOCKETS}")
-message(STATUS "---------------------------------------")
-
-#Handle paths nicely
-include(GNUInstallDirs)
-
-if (WITH_BINARY)
-  add_executable ( "${PROJECT_NAME}" ${DAEMON_SRC} )
-  if (WIN32 AND WITH_GUI)
-    set_target_properties("${PROJECT_NAME}" PROPERTIES WIN32_EXECUTABLE TRUE )
-  endif()
-  if(NOT MSVC)
-    if (WITH_STATIC)
-      set_target_properties("${PROJECT_NAME}" PROPERTIES LINK_FLAGS "-static" )
-    endif ()
-  endif()
-
-  if (WITH_PCH)
-    if (MSVC)
-      target_compile_options("${PROJECT_NAME}" PRIVATE /FIstdafx.h /Yustdafx.h /Zm155 "/Fp${CMAKE_BINARY_DIR}/stdafx.dir/$<CONFIG>/stdafx.pch")
-    else()
-      target_compile_options("${PROJECT_NAME}" PRIVATE -include libi2pd/stdafx.h)
-    endif()
-  endif()
-
-  if (WITH_HARDENING AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT MSYS AND NOT MINGW)
-    set_target_properties("${PROJECT_NAME}" PROPERTIES LINK_FLAGS "-z relro -z now" )
-  endif ()
-
-  if (WITH_UPNP)
-	  target_link_libraries("${PROJECT_NAME}" "${MINIUPNPC_LIBRARY}")
-  endif ()
-
-  # 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)
-  if(${LAST_Boost_LIBRARIES} MATCHES ".*pthread.*")
-    list(REMOVE_AT Boost_LIBRARIES -1)
-  endif()
-
-  if (MSYS OR MINGW)
-    set (MINGW_EXTRA -lws2_32 -lmswsock -liphlpapi )
-  endif ()
-  if (WITH_STATIC)
-    set(DL_LIB ${CMAKE_DL_LIBS})
-  endif()
-  target_link_libraries(libi2pd ${Boost_LIBRARIES} ${ZLIB_LIBRARY})
-  target_link_libraries( "${PROJECT_NAME}" libi2pd libi2pdclient ${DL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MINGW_EXTRA} ${DL_LIB} ${CMAKE_REQUIRED_LIBRARIES})
-
-  install(TARGETS "${PROJECT_NAME}" RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime)
-  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")
-  if (MSVC)
-    install(FILES $<TARGET_PDB_FILE:${PROJECT_NAME}> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS DEBUG RELWITHDEBINFO COMPONENT Symbols)
-    # TODO Somehow this picks lots of unrelevant stuff with MSYS. OS X testing needed.
-    INSTALL(CODE "
-      include(BundleUtilities)
-      fixup_bundle(\"${APPS}\"   \"\"   \"${DIRS}\")
-      " COMPONENT Runtime)
-  endif ()
-endif ()
-
-install(FILES ../LICENSE
-  DESTINATION .
-  COMPONENT Runtime
-  )
-# Take a copy on Appveyor
-install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICENSE"
-  DESTINATION .
-  COMPONENT Runtime
-  RENAME LICENSE_OPENSSL
-  OPTIONAL                      # for local builds only!
-  )
-
-file(GLOB_RECURSE I2PD_SOURCES "../libi2pd/*.cpp" "../libi2pd_client/*.cpp" "../daemon/*.cpp" "../build" "../Win32" "../Makefile*")
-install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source)
-# install(DIRECTORY ../ DESTINATION src/
-#   # OPTIONAL
-#   COMPONENT Source FILES_MATCHING
-#   PATTERN .git EXCLUDE
-#   PATTERN "*.cpp"
-#   )
-
-file(GLOB I2PD_HEADERS "../libi2pd/*.h" "../libi2pd_client/*.h" "../daemon/*.h")
-install(FILES ${I2PD_HEADERS} DESTINATION src/ COMPONENT Headers)
-# install(DIRECTORY ../ DESTINATION src/
-#   # OPTIONAL
-#   COMPONENT Headers FILES_MATCHING
-#   PATTERN .git EXCLUDE
-#   PATTERN "*.h"
-#   )
-
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Purple I2P, a C++ I2P daemon")
-set(CPACK_PACKAGE_VENDOR "Purple I2P")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../README.md")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE")
-file(READ ../libi2pd/version.h version_h)
-string(REGEX REPLACE ".*I2PD_VERSION_MAJOR ([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_MAJOR "${version_h}")
-string(REGEX REPLACE ".*I2PD_VERSION_MINOR ([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_MINOR "${version_h}")
-string(REGEX REPLACE ".*I2PD_VERSION_MICRO ([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_MICRO "${version_h}")
-string(REGEX REPLACE ".*I2PD_VERSION_PATCH ([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_PATCH "${version_h}")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "Purple I2P")# ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
-include(CPackComponent)
-cpack_add_component(Runtime
-  DESCRIPTION "Main files"
-  REQUIRED INSTALL_TYPES minimal)
-cpack_add_component(Symbols
-  DISPLAY_NAME "Debug symbols"
-  DESCRIPTION "Debug symbols for use with WinDbg or Visual Studio"
-  INSTALL_TYPES recommended full
-  )
-cpack_add_component(Libraries
-  DESCRIPTION "Binary libraries for development"
-  INSTALL_TYPES full dev3rd
-  )
-cpack_add_component(Source
-  DISPLAY_NAME "Source code"
-  DESCRIPTION "I2pd source code"
-  INSTALL_TYPES full
-  )
-cpack_add_component(Headers
-  DISPLAY_NAME "Header files"
-  DESCRIPTION "I2pd header files for development"
-  INSTALL_TYPES full dev3rd
-  )
-install(FILES ${MINIUPNPC_INCLUDE_DIR}/miniupnpc/miniupnpc.dll
-  DESTINATION bin
-  COMPONENT MiniUPnPc
-  OPTIONAL
-  )
-install(FILES ${MINIUPNPC_INCLUDE_DIR}/miniupnpc/LICENSE
-  DESTINATION .
-  COMPONENT MiniUPnPc
-  RENAME LICENSE_MINIUPNPC
-  OPTIONAL
-  )
-cpack_add_component(MiniUPnPc
-  INSTALL_TYPES full recommended
-  # DOWNLOADED
-  # ARCHIVE_FILE miniupnpc-win32.zip
-  )
-cpack_add_install_type(recommended DISPLAY_NAME Recommended)
-cpack_add_install_type(dev3rd DISPLAY_NAME "Third party development")
-cpack_add_install_type(full DISPLAY_NAME Full)
-cpack_add_install_type(minimal DISPLAY_NAME Minimal)
-if((WIN32 OR MSYS) AND NOT UNIX)
-  # There is a bug in NSI that does not handle full unix paths properly. Make
-  # sure there is at least one set of four (4) backlasshes.
-  set(CPACK_NSIS_DEFINES "RequestExecutionLevel user")
-  set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/../Win32\\\\mask.bmp")
-  set(CPACK_NSIS_INSTALLED_ICON_NAME "bin/i2pd.exe")
-  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
-  set(CPACK_NSIS_HELP_LINK "https:\\\\\\\\github.com\\\\PurpleI2P\\\\i2pd\\\\issues")
-  set(CPACK_NSIS_URL_INFO_ABOUT "https:\\\\\\\\github.com\\\\PurpleI2P\\\\i2pd")
-  set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Install i2pd as windows service.lnk' '$INSTDIR\\\\bin\\\\i2pd.exe' '--service=install'
-CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Remove i2pd windows service.lnk' '$INSTDIR\\\\bin\\\\i2pd.exe' '--service=remove'")
-  set(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '$SMPROGRAMS\\\\$START_MENU\\\\Install i2pd as windows service.lnk'
-Delete '$SMPROGRAMS\\\\$START_MENU\\\\Remove i2pd windows service.lnk'")
-else()
-  set(CPACK_STRIP_FILES "bin/i2pd")
-  set(CPACK_SOURCE_STRIP_FILES "")
-endif()
-set(CPACK_PACKAGE_EXECUTABLES "i2pd" "C++ I2P daemon")
-set(CPACK_SOURCE_GENERATOR "TGZ")
-include(CPack)

build/build_mingw.cmd

@@ -1,89 +0,0 @@
-@echo off
-setlocal enableextensions enabledelayedexpansion
-title Building i2pd
-
-REM Copyright (c) 2013-2017, The PurpleI2P Project
-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 To use that script, you must have installed in your MSYS installation these packages:
-REM Base: git make zip
-REM x86_64: mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-gcc
-REM i686: mingw-w64-i686-boost mingw-w64-i686-openssl mingw-w64-i686-gcc
-
-REM setting up variables for MSYS
-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 CHERE_INVOKING=enabled_from_arguments
-REM set MSYSTEM=MSYS
-set MSYSTEM=MINGW32
-
-set "xSH=%WD%bash -lc"
-
-set "FILELIST=i2pd.exe README.txt contrib/i2pd.conf contrib/tunnels.conf contrib/certificates contrib/tunnels.d"
-
-REM detecting number of processors and subtract 1.
-set /a threads=%NUMBER_OF_PROCESSORS%-1
-
-REM we must work in root of repo
-cd ..
-
-REM deleting old log files
-del /S build_*.log >> nul
-
-echo Receiving latest commit and cleaning up...
-%xSH% "git pull && make clean" > build/build_git.log 2>&1
-echo.
-
-REM set to variable current commit hash
-FOR /F "usebackq" %%a IN (`%xSH% 'git describe --tags'`) DO (
- set tag=%%a
-)
-
-%xSH% "echo To use configs and certificates, move all files and certificates folder from contrib directory here. > README.txt" >> nul
-
-REM starting building
-set MSYSTEM=MINGW32
-set bitness=32
-call :BUILDING
-echo.
-
-set MSYSTEM=MINGW64
-set bitness=64
-call :BUILDING
-echo.
-
-REM building for WinXP
-set "WD=C:\msys64-xp\usr\bin\"
-set MSYSTEM=MINGW32
-set bitness=32
-set "xSH=%WD%bash -lc"
-call :BUILDING_XP
-echo.
-
-del README.txt >> nul
-
-echo Build complete...
-pause
-exit /b 0
-
-:BUILDING
-%xSH% "make clean" >> nul
-echo Building i2pd %tag% for win%bitness%:
-echo Build AVX+AESNI...
-%xSH% "make DEBUG=no USE_UPNP=yes USE_AVX=1 USE_AESNI=1 -j%threads% && zip -r9 build/i2pd_%tag%_win%bitness%_mingw_avx_aesni.zip %FILELIST% && make clean" > build/build_win%bitness%_avx_aesni_%tag%.log 2>&1
-echo Build AVX...
-%xSH% "make DEBUG=no USE_UPNP=yes USE_AVX=1 -j%threads% && zip -r9 build/i2pd_%tag%_win%bitness%_mingw_avx.zip %FILELIST% && make clean" > build/build_win%bitness%_avx_%tag%.log 2>&1
-echo Build AESNI...
-%xSH% "make DEBUG=no USE_UPNP=yes USE_AESNI=1 -j%threads% && zip -r9 build/i2pd_%tag%_win%bitness%_mingw_aesni.zip %FILELIST% && make clean" > build/build_win%bitness%_aesni_%tag%.log 2>&1
-echo Build without extensions...
-%xSH% "make DEBUG=no USE_UPNP=yes -j%threads% && zip -r9 build/i2pd_%tag%_win%bitness%_mingw.zip %FILELIST% && make clean" > build/build_win%bitness%_%tag%.log 2>&1
-goto EOF
-
-:BUILDING_XP
-%xSH% "make clean" >> nul
-echo Building i2pd %tag% for winxp...
-%xSH% "make DEBUG=no USE_UPNP=yes USE_WINXP_FLAGS=yes -j%threads% && zip -r9 build/i2pd_%tag%_winxp_mingw.zip %FILELIST% && make clean" > build/build_winxp_%tag%.log 2>&1
-
-:EOF

build/cmake-zlib-amd64.patch

@@ -1,10 +0,0 @@
---- CMakeLists.txt.orig	2015-12-07 14:19:36.447689600 -0600
-+++ CMakeLists.txt	2015-12-07 14:18:23.004419900 -0600
-@@ -165,6 +165,7 @@
- 		ENABLE_LANGUAGE(ASM_MASM)
-         set(ZLIB_ASMS
- 			contrib/masmx64/gvmat64.asm
-+			contrib/masmx64/inffas8664.c
- 			contrib/masmx64/inffasx64.asm
- 		)
-     endif()

build/cmake-zlib-static.patch

@@ -1,28 +0,0 @@
---- CMakeLists.txt.orig	2013-04-28 17:57:10.000000000 -0500
-+++ CMakeLists.txt	2015-12-03 12:53:52.371087900 -0600
-@@ -7,6 +7,7 @@
- 
- option(ASM686 "Enable building i686 assembly implementation")
- option(AMD64 "Enable building amd64 assembly implementation")
-+option(WITH_STATIC    "Static runtime on Windows" OFF)
- 
- set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
- set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
-@@ -66,6 +67,17 @@
-     include_directories(${CMAKE_CURRENT_SOURCE_DIR})
- endif()
- 
-+if(WITH_STATIC AND (MSVC OR MSYS))
-+    # http://www.cmake.org/Wiki/CMake_FAQ#Dynamic_Replace
-+    foreach(flag_var
-+            CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-+            CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
-+      if(${flag_var} MATCHES "/MD")
-+        string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-+      endif(${flag_var} MATCHES "/MD")
-+    endforeach(flag_var)
-+endif()
-+
- if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-     # If we're doing an out of source build and the user has a zconf.h
-     # in their source tree...

build/cmake_modules/CheckAtomic.cmake

@@ -1,106 +0,0 @@
-# atomic builtins are required for threading support.
-
-INCLUDE(CheckCXXSourceCompiles)
-
-# Sometimes linking against libatomic is required for atomic ops, if
-# the platform doesn't support lock-free atomics.
-
-function(check_working_cxx_atomics varname)
-  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS "-std=c++11")
-  CHECK_CXX_SOURCE_COMPILES("
-#include <atomic>
-std::atomic<int> x;
-int main() {
-  return x;
-}
-" ${varname})
-  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-endfunction(check_working_cxx_atomics)
-
-function(check_working_cxx_atomics64 varname)
-  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS "-std=c++11 ${CMAKE_REQUIRED_FLAGS}")
-  CHECK_CXX_SOURCE_COMPILES("
-#include <atomic>
-#include <cstdint>
-std::atomic<uint64_t> x (0);
-int main() {
-  uint64_t i = x.load(std::memory_order_relaxed);
-  return 0;
-}
-" ${varname})
-  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-endfunction(check_working_cxx_atomics64)
-
-
-# This isn't necessary on MSVC, so avoid command-line switch annoyance
-# by only running on GCC-like hosts.
-if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
-  # First check if atomics work without the library.
-  check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB)
-  # If not, check if the library exists, and atomics work with it.
-  if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
-    check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC)
-    if( HAVE_LIBATOMIC )
-      list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-      check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB)
-      if (NOT HAVE_CXX_ATOMICS_WITH_LIB)
-        message(FATAL_ERROR "Host compiler must support std::atomic!")
-      endif()
-    else()
-      message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
-    endif()
-  endif()
-endif()
-
-# Check for 64 bit atomic operations.
-if(MSVC)
-  set(HAVE_CXX_ATOMICS64_WITHOUT_LIB True)
-else()
-  check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-endif()
-
-# If not, check if the library exists, and atomics work with it.
-if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
-  check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64)
-  if(HAVE_CXX_LIBATOMICS64)
-    list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-    check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB)
-    if (NOT HAVE_CXX_ATOMICS64_WITH_LIB)
-      message(FATAL_ERROR "Host compiler must support std::atomic!")
-    endif()
-  else()
-    message(FATAL_ERROR "Host compiler appears to require libatomic, but cannot find it.")
-  endif()
-endif()
-
-## TODO: This define is only used for the legacy atomic operations in
-## llvm's Atomic.h, which should be replaced.  Other code simply
-## assumes C++11 <atomic> works.
-CHECK_CXX_SOURCE_COMPILES("
-#ifdef _MSC_VER
-#include <Intrin.h> /* Workaround for PR19898. */
-#include <windows.h>
-#endif
-int main() {
-#ifdef _MSC_VER
-        volatile LONG val = 1;
-        MemoryBarrier();
-        InterlockedCompareExchange(&val, 0, 1);
-        InterlockedIncrement(&val);
-        InterlockedDecrement(&val);
-#else
-        volatile unsigned long val = 1;
-        __sync_synchronize();
-        __sync_val_compare_and_swap(&val, 1, 0);
-        __sync_add_and_fetch(&val, 1);
-        __sync_sub_and_fetch(&val, 1);
-#endif
-        return 0;
-      }
-" LLVM_HAS_ATOMICS)
-
-if( NOT LLVM_HAS_ATOMICS )
-  message(STATUS "Warning: LLVM will be built thread-unsafe because atomic builtins are missing")
-endif()

build/cmake_modules/FindCryptoPP.cmake

@@ -0,0 +1,61 @@
+# - Find Crypto++
+
+if(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
+   set(CRYPTO++_FOUND TRUE)
+
+else(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
+  find_path(CRYPTO++_INCLUDE_DIR cryptopp/cryptlib.h
+      /usr/include
+      /usr/local/include
+      $ENV{SystemDrive}/Crypto++/include
+      $ENV{CRYPTOPP}
+      $ENV{CRYPTOPP}/..
+      $ENV{CRYPTOPP}/include
+      ${PROJECT_SOURCE_DIR}/../..
+      )
+
+  find_library(CRYPTO++_LIBRARIES NAMES cryptopp
+      PATHS
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      $ENV{SystemDrive}/Crypto++/lib
+      $ENV{CRYPTOPP}/lib
+      )
+
+  if(MSVC AND NOT CRYPTO++_LIBRARIES) # Give a chance for MSVC multiconfig
+      if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+          set(PLATFORM x64)
+      else()
+          set(PLATFORM Win32)
+      endif()
+      find_library(CRYPTO++_LIBRARIES_RELEASE NAMES cryptlib cryptopp
+          HINTS
+          ${PROJECT_SOURCE_DIR}/../../cryptopp/${PLATFORM}/Output/Release
+          PATHS
+          $ENV{CRYPTOPP}/Win32/Output/Release
+      )
+      find_library(CRYPTO++_LIBRARIES_DEBUG NAMES cryptlib cryptopp
+          HINTS
+          ${PROJECT_SOURCE_DIR}/../../cryptopp/${PLATFORM}/Output/Debug
+          PATHS
+          $ENV{CRYPTOPP}/Win32/Output/Debug
+      )
+      set(CRYPTO++_LIBRARIES
+          debug ${CRYPTO++_LIBRARIES_DEBUG}
+          optimized ${CRYPTO++_LIBRARIES_RELEASE}
+          CACHE PATH "Path to Crypto++ library" FORCE
+      )
+  endif()
+
+  if(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
+    set(CRYPTO++_FOUND TRUE)
+    message(STATUS "Found Crypto++: ${CRYPTO++_INCLUDE_DIR}, ${CRYPTO++_LIBRARIES}")
+  else(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
+    set(CRYPTO++_FOUND FALSE)
+    message(STATUS "Crypto++ not found.")
+  endif(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)
+
+  mark_as_advanced(CRYPTO++_INCLUDE_DIR CRYPTO++_LIBRARIES)
+
+endif(CRYPTO++_INCLUDE_DIR AND CRYPTO++_LIBRARIES)

build/cmake_modules/FindMiniUPnPc.cmake

@@ -1,28 +1,25 @@
 # - Find MINIUPNPC
 
-if(MINIUPNPC_INCLUDE_DIR AND MINIUPNPC_LIBRARY)
+if(MINIUPNPC_INCLUDE_DIR)
    set(MINIUPNPC_FOUND TRUE)
 
 else()
-  find_path(MINIUPNPC_INCLUDE_DIR miniupnpc/miniupnpc.h
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      $ENV{SystemDrive}
-      ${PROJECT_SOURCE_DIR}/../..
+  find_path(MINIUPNPC_INCLUDE_DIR miniupnpc.h
+      /usr/include/miniupnpc
+      /usr/local/include/miniupnpc
+      /opt/local/include/miniupnpc
+      $ENV{SystemDrive}/miniupnpc
+      ${PROJECT_SOURCE_DIR}/../../miniupnpc
       )
-
-  find_library(MINIUPNPC_LIBRARY miniupnpc)
-
-  if(MINIUPNPC_INCLUDE_DIR AND MINIUPNPC_LIBRARY)
+  
+  if(MINIUPNPC_INCLUDE_DIR)
     set(MINIUPNPC_FOUND TRUE)
     message(STATUS "Found MiniUPnP headers: ${MINIUPNPC_INCLUDE_DIR}")
-    message(STATUS "Found MiniUPnP library: ${MINIUPNPC_LIBRARY}")
   else()
     set(MINIUPNPC_FOUND FALSE)
     message(STATUS "MiniUPnP not found.")
   endif()
 
-  mark_as_advanced(MINIUPNPC_INCLUDE_DIR MINIUPNPC_LIBRARY)
-
+  mark_as_advanced(MINIUPNPC_INCLUDE_DIR)
+  
 endif()

build/cmake_modules/TargetArch.cmake

@@ -1,134 +0,0 @@
-# Based on the Qt 5 processor detection code, so should be very accurate
-# https://qt.gitorious.org/qt/qtbase/blobs/master/src/corelib/global/qprocessordetection.h
-# 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,
-# "There are many more known variants/revisions that we do not handle/detect."
-
-set(archdetect_c_code "
-#if defined(__arm__) || defined(__TARGET_ARCH_ARM)
-    #if defined(__ARM_ARCH_7__) \\
-        || defined(__ARM_ARCH_7A__) \\
-        || defined(__ARM_ARCH_7R__) \\
-        || defined(__ARM_ARCH_7M__) \\
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 7)
-        #error cmake_ARCH armv7
-    #elif defined(__ARM_ARCH_6__) \\
-        || defined(__ARM_ARCH_6J__) \\
-        || defined(__ARM_ARCH_6T2__) \\
-        || defined(__ARM_ARCH_6Z__) \\
-        || defined(__ARM_ARCH_6K__) \\
-        || defined(__ARM_ARCH_6ZK__) \\
-        || defined(__ARM_ARCH_6M__) \\
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 6)
-        #error cmake_ARCH armv6
-    #elif defined(__ARM_ARCH_5TEJ__) \\
-        || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 5)
-        #error cmake_ARCH armv5
-    #else
-        #error cmake_ARCH arm
-    #endif
-#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
-    #error cmake_ARCH i386
-#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
-    #error cmake_ARCH x86_64
-#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
-    #error cmake_ARCH ia64
-#elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__) \\
-      || defined(_ARCH_COM) || defined(_ARCH_PWR) || defined(_ARCH_PPC)  \\
-      || defined(_M_MPPC) || defined(_M_PPC)
-    #if defined(__ppc64__) || defined(__powerpc64__) || defined(__64BIT__)
-        #error cmake_ARCH ppc64
-    #else
-        #error cmake_ARCH ppc
-    #endif
-#endif
-
-#error cmake_ARCH unknown
-")
-
-# 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
-
-function(target_architecture output_var)
-    if(APPLE AND CMAKE_OSX_ARCHITECTURES)
-        # On OS X we use CMAKE_OSX_ARCHITECTURES *if* it was set
-        # First let's normalize the order of the values
-
-        # Note that it's not possible to compile PowerPC applications if you are using
-        # the OS X SDK version 10.6 or later - you'll need 10.4/10.5 for that, so we
-        # disable it by default
-        # 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
-
-        # 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.
-
-        foreach(osx_arch ${CMAKE_OSX_ARCHITECTURES})
-            if("${osx_arch}" STREQUAL "ppc" AND ppc_support)
-                set(osx_arch_ppc TRUE)
-            elseif("${osx_arch}" STREQUAL "i386")
-                set(osx_arch_i386 TRUE)
-            elseif("${osx_arch}" STREQUAL "x86_64")
-                set(osx_arch_x86_64 TRUE)
-            elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support)
-                set(osx_arch_ppc64 TRUE)
-            else()
-                message(FATAL_ERROR "Invalid OS X arch name: ${osx_arch}")
-            endif()
-        endforeach()
-
-        # Now add all the architectures in our normalized order
-        if(osx_arch_ppc)
-            list(APPEND ARCH ppc)
-        endif()
-
-        if(osx_arch_i386)
-            list(APPEND ARCH i386)
-        endif()
-
-        if(osx_arch_x86_64)
-            list(APPEND ARCH x86_64)
-        endif()
-
-        if(osx_arch_ppc64)
-            list(APPEND ARCH ppc64)
-        endif()
-    else()
-        file(WRITE "${CMAKE_BINARY_DIR}/arch.c" "${archdetect_c_code}")
-
-        enable_language(C)
-
-        # Detect the architecture in a rather creative way...
-        # This compiles a small C program which is a series of ifdefs that selects a
-        # particular #error preprocessor directive whose message string contains the
-        # 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 the
-        # #error preprocessor directives... but by exploiting the preprocessor in this
-        # 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)
-        try_run(
-            run_result_unused
-            compile_result_unused
-            "${CMAKE_BINARY_DIR}"
-            "${CMAKE_BINARY_DIR}/arch.c"
-            COMPILE_OUTPUT_VARIABLE ARCH
-            CMAKE_FLAGS CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
-        )
-
-        # Parse the architecture name from the compiler output
-        string(REGEX MATCH "cmake_ARCH ([a-zA-Z0-9_]+)" ARCH "${ARCH}")
-
-        # Get rid of the value marker leaving just the architecture name
-        string(REPLACE "cmake_ARCH " "" ARCH "${ARCH}")
-
-        # If we are compiling with an unknown architecture this variable should
-        # already be set to "unknown" but in the case that it's empty (i.e. due
-        # to a typo in the code), then set it to unknown
-        if (NOT ARCH)
-            set(ARCH unknown)
-        endif()
-    endif()
-
-    set(${output_var} "${ARCH}" PARENT_SCOPE)
-endfunction()

build/docker/README.md

@@ -1,34 +0,0 @@
-Howto build & run
-==================
-
-**Build**
-
-Assuming you're in the root directory of the anoncoin source code.
-
-$ `cd build/docker`
-$ `docker -t meeh/i2pd:latest .`
-
-**Run**
-
-To run either the local build, or if not found - fetched prebuild from hub.docker.io, run the following command.
-
-$ `docker run --name anonnode -v /path/to/i2pd/datadir/on/host:/var/lib/i2pd -p 7070:7070 -p 4444:4444 -p 4447:4447 -p 7656:7656 -p 2827:2827 -p 7654:7654 -p 7650:7650  -d meeh/i2pd`
-
-All the ports ( -p HOSTPORT:DOCKERPORT ) is optional. However the command above enable all features (Webconsole, HTTP Proxy, BOB, SAM, i2cp, etc)
-
-The volume ( -v HOSTDIR:DOCKERDIR ) is also optional, but if you don't use it, your config, routerid and private keys will die along with the container.
-
-**Options**
-
-Options are set via docker environment variables. This can be set at run with -e parameters.
-
-* **ENABLE_IPV6**   - Enable IPv6 support. Any value can be used - it triggers as long as it's not empty.
-* **LOGLEVEL**      - Set the loglevel.
-* **ENABLE_AUTH**   - Enable auth for the webconsole. Username and password needs to be set manually in i2pd.conf cause security reasons.
-
-**Logging**
-
-Logging happens to STDOUT as the best practise with docker containers, since infrastructure systems like kubernetes with ELK integration can automatically forward the log to say, kibana or greylog without manual setup. :)
-
-
-

build/docker/old-ubuntu-based/Dockerfile

@@ -1,11 +0,0 @@
-FROM ubuntu
-
-RUN apt-get update && apt-get install -y libboost-dev libboost-filesystem-dev \
-       libboost-program-options-dev libboost-date-time-dev \
-       libssl-dev git build-essential
-
-RUN git clone https://github.com/PurpleI2P/i2pd.git
-WORKDIR /i2pd
-RUN make
-
-CMD ./i2pd

build/fig.yml

@@ -1,2 +0,0 @@
-i2pd:
-    build: .

client/BOB.cpp

@@ -0,0 +1,645 @@
+#include <string.h>
+#include <boost/lexical_cast.hpp>
+#include "util/Log.h"
+#include "ClientContext.h"
+#include "BOB.h"
+
+namespace i2p
+{
+namespace client
+{
+    BOBI2PInboundTunnel::BOBI2PInboundTunnel (int port, std::shared_ptr<ClientDestination> localDestination): 
+        BOBI2PTunnel (localDestination), 
+        m_Acceptor (localDestination->GetService (), boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port))
+    {
+    }
+
+    BOBI2PInboundTunnel::~BOBI2PInboundTunnel ()
+    {
+        Stop ();
+    }
+
+    void BOBI2PInboundTunnel::Start ()
+    {
+        m_Acceptor.listen ();
+        Accept ();
+    }
+
+    void BOBI2PInboundTunnel::Stop ()
+    {
+        m_Acceptor.close();
+        ClearHandlers ();
+    }
+
+    void BOBI2PInboundTunnel::Accept ()
+    {
+        auto receiver = std::make_shared<AddressReceiver> ();
+        receiver->socket = std::make_shared<boost::asio::ip::tcp::socket> (GetService ());
+        m_Acceptor.async_accept (*receiver->socket, std::bind (&BOBI2PInboundTunnel::HandleAccept, this,
+            std::placeholders::_1, receiver));
+    }   
+
+    void BOBI2PInboundTunnel::HandleAccept (const boost::system::error_code& ecode, std::shared_ptr<AddressReceiver> receiver)
+    {
+        if (!ecode)
+        {
+            Accept ();  
+            ReceiveAddress (receiver);
+        }
+    }
+
+    void BOBI2PInboundTunnel::ReceiveAddress (std::shared_ptr<AddressReceiver> receiver)
+    {
+        receiver->socket->async_read_some (boost::asio::buffer(
+                receiver->buffer + receiver->bufferOffset, 
+                BOB_COMMAND_BUFFER_SIZE - receiver->bufferOffset),                
+            std::bind(&BOBI2PInboundTunnel::HandleReceivedAddress, this, 
+                std::placeholders::_1, std::placeholders::_2, receiver));
+    }
+    
+    void BOBI2PInboundTunnel::HandleReceivedAddress (const boost::system::error_code& ecode, std::size_t bytes_transferred,
+        std::shared_ptr<AddressReceiver> receiver)
+    {
+        if (ecode)
+            LogPrint ("BOB inbound tunnel read error: ", ecode.message ());
+        else
+        {
+            receiver->bufferOffset += bytes_transferred;
+            receiver->buffer[receiver->bufferOffset] = 0;
+            char * eol = strchr (receiver->buffer, '\n');
+            if (eol)
+            {
+                *eol = 0;
+                
+                receiver->data = (uint8_t *)eol + 1;
+                receiver->dataLen = receiver->bufferOffset - (eol - receiver->buffer + 1);
+                i2p::data::IdentHash ident;
+                if (!context.GetAddressBook ().GetIdentHash (receiver->buffer, ident)) 
+                {
+                    LogPrint (eLogError, "BOB address ", receiver->buffer, " not found");
+                    return;
+                }
+                auto leaseSet = GetLocalDestination ()->FindLeaseSet (ident);
+                if (leaseSet)
+                    CreateConnection (receiver, leaseSet);
+                else
+                    GetLocalDestination ()->RequestDestination (ident, 
+                        std::bind (&BOBI2PInboundTunnel::HandleDestinationRequestComplete,
+                        this, std::placeholders::_1, receiver));
+            }
+            else
+            {
+                if (receiver->bufferOffset < BOB_COMMAND_BUFFER_SIZE)
+                    ReceiveAddress (receiver);
+                else
+                    LogPrint ("BOB missing inbound address ");
+            }           
+        }
+    }
+
+    void BOBI2PInboundTunnel::HandleDestinationRequestComplete (std::shared_ptr<i2p::data::LeaseSet> leaseSet, std::shared_ptr<AddressReceiver> receiver)
+    {
+        if (leaseSet)
+            CreateConnection (receiver, leaseSet);
+        else
+            LogPrint ("LeaseSet for BOB inbound destination not found");
+    }   
+
+    void BOBI2PInboundTunnel::CreateConnection (std::shared_ptr<AddressReceiver> receiver, std::shared_ptr<const i2p::data::LeaseSet> leaseSet)
+    {
+        LogPrint ("New BOB inbound connection");
+        auto connection = std::make_shared<I2PTunnelConnection>(this, receiver->socket, leaseSet);
+        AddHandler (connection);
+        connection->I2PConnect (receiver->data, receiver->dataLen);
+    }
+
+    BOBI2POutboundTunnel::BOBI2POutboundTunnel (const std::string& address, int port, 
+        std::shared_ptr<ClientDestination> localDestination, bool quiet): BOBI2PTunnel (localDestination),
+        m_Endpoint (boost::asio::ip::address::from_string (address), port), m_IsQuiet (quiet)
+    {
+    }
+    
+    void BOBI2POutboundTunnel::Start ()
+    {
+        Accept ();
+    }
+
+    void BOBI2POutboundTunnel::Stop ()
+    {
+        ClearHandlers ();
+    }   
+
+    void BOBI2POutboundTunnel::Accept ()
+    {
+        auto localDestination = GetLocalDestination (); 
+        if (localDestination)
+            localDestination->AcceptStreams (std::bind (&BOBI2POutboundTunnel::HandleAccept, this, std::placeholders::_1));
+        else
+            LogPrint ("Local destination not set for server tunnel");
+    }
+
+    void BOBI2POutboundTunnel::HandleAccept (std::shared_ptr<i2p::stream::Stream> stream)
+    {
+        if (stream)
+        {   
+            auto conn = std::make_shared<I2PTunnelConnection> (this, stream, std::make_shared<boost::asio::ip::tcp::socket> (GetService ()), m_Endpoint, m_IsQuiet);
+            AddHandler (conn);
+            conn->Connect ();
+        }   
+    }
+
+    BOBDestination::BOBDestination (std::shared_ptr<ClientDestination> localDestination):
+        m_LocalDestination (localDestination), 
+        m_OutboundTunnel (nullptr), m_InboundTunnel (nullptr)
+    {
+    }
+        
+    BOBDestination::~BOBDestination ()
+    {
+        delete m_OutboundTunnel;
+        delete m_InboundTunnel;
+        i2p::client::context.DeleteLocalDestination (m_LocalDestination);
+    }   
+
+    void BOBDestination::Start ()
+    {
+        if (m_OutboundTunnel) m_OutboundTunnel->Start ();
+        if (m_InboundTunnel) m_InboundTunnel->Start ();
+    }
+        
+    void BOBDestination::Stop ()
+    {       
+        StopTunnels ();
+        m_LocalDestination->Stop ();
+    }   
+
+    void BOBDestination::StopTunnels ()
+    {
+        if (m_OutboundTunnel)
+        {   
+            m_OutboundTunnel->Stop ();
+            delete m_OutboundTunnel;
+            m_OutboundTunnel = nullptr;
+        }   
+        if (m_InboundTunnel)
+        {   
+            m_InboundTunnel->Stop ();
+            delete m_InboundTunnel;
+            m_InboundTunnel = nullptr;
+        }   
+    }   
+        
+    void BOBDestination::CreateInboundTunnel (int port)
+    {
+        if (!m_InboundTunnel)
+            m_InboundTunnel = new BOBI2PInboundTunnel (port, m_LocalDestination);
+    }
+        
+    void BOBDestination::CreateOutboundTunnel (const std::string& address, int port, bool quiet)
+    {
+        if (!m_OutboundTunnel)
+            m_OutboundTunnel = new BOBI2POutboundTunnel (address, port, m_LocalDestination, quiet);
+    }   
+        
+    BOBCommandSession::BOBCommandSession (BOBCommandChannel& owner): 
+        m_Owner (owner), m_Socket (m_Owner.GetService ()), m_ReceiveBufferOffset (0),
+        m_IsOpen (true), m_IsQuiet (false), m_InPort (0), m_OutPort (0),
+        m_CurrentDestination (nullptr)
+    {
+    }
+
+    BOBCommandSession::~BOBCommandSession ()
+    {
+    }
+
+    void BOBCommandSession::Terminate ()
+    {
+        m_Socket.close ();
+        m_IsOpen = false;   
+    }
+
+    void BOBCommandSession::Receive ()
+    {
+        m_Socket.async_read_some (boost::asio::buffer(m_ReceiveBuffer + m_ReceiveBufferOffset, BOB_COMMAND_BUFFER_SIZE - m_ReceiveBufferOffset),                
+            std::bind(&BOBCommandSession::HandleReceived, shared_from_this (), 
+            std::placeholders::_1, std::placeholders::_2));
+    }
+
+    void BOBCommandSession::HandleReceived (const boost::system::error_code& ecode, std::size_t bytes_transferred)
+    {
+        if (ecode)
+        {
+            LogPrint ("BOB command channel read error: ", ecode.message ());
+            if (ecode != boost::asio::error::operation_aborted)
+                Terminate ();
+        }   
+        else
+        {   
+            size_t size = m_ReceiveBufferOffset + bytes_transferred; 
+            m_ReceiveBuffer[size] = 0;
+            char * eol = strchr (m_ReceiveBuffer, '\n');
+            if (eol)
+            {
+                *eol = 0;
+                char * operand =  strchr (m_ReceiveBuffer, ' ');
+                if (operand)  
+                {   
+                    *operand = 0;
+                    operand++;
+                }   
+                else 
+                    operand = eol;
+                // process command
+                auto& handlers = m_Owner.GetCommandHandlers ();
+                auto it = handlers.find (m_ReceiveBuffer);
+                if (it != handlers.end ())
+                    (this->*(it->second))(operand, eol - operand);
+                else    
+                {
+                    LogPrint (eLogError, "BOB unknown command ", m_ReceiveBuffer);
+                    SendReplyError ("unknown command");
+                }
+
+                m_ReceiveBufferOffset = size - (eol - m_ReceiveBuffer) - 1;
+                memmove (m_ReceiveBuffer, eol + 1, m_ReceiveBufferOffset);
+            }
+            else
+            {
+                if (size < BOB_COMMAND_BUFFER_SIZE)
+                    m_ReceiveBufferOffset = size;
+                else
+                {
+                    LogPrint (eLogError, "Malformed input of the BOB command channel");
+                    Terminate ();
+                }
+            }   
+        }
+    }
+
+    void BOBCommandSession::Send (size_t len)
+    {
+        boost::asio::async_write (m_Socket, boost::asio::buffer (m_SendBuffer, len), 
+            boost::asio::transfer_all (),
+            std::bind(&BOBCommandSession::HandleSent, shared_from_this (), 
+                std::placeholders::_1, std::placeholders::_2));
+    }
+
+    void BOBCommandSession::HandleSent (const boost::system::error_code& ecode, std::size_t)
+    {
+        if (ecode)
+        {
+            LogPrint ("BOB command channel send error: ", ecode.message ());
+            if (ecode != boost::asio::error::operation_aborted)
+                Terminate ();
+        }
+        else
+        {
+            if (m_IsOpen)
+                Receive ();
+            else
+                Terminate ();   
+        }
+    }
+
+    void BOBCommandSession::SendReplyOK (const char * msg)
+    {
+#ifdef _MSC_VER
+        size_t len = sprintf_s (m_SendBuffer, BOB_COMMAND_BUFFER_SIZE, BOB_REPLY_OK, msg);
+#else       
+        size_t len = snprintf (m_SendBuffer, BOB_COMMAND_BUFFER_SIZE, BOB_REPLY_OK, msg);
+#endif
+        Send (len);
+    }
+
+    void BOBCommandSession::SendReplyError (const char * msg)
+    {
+#ifdef _MSC_VER
+        size_t len = sprintf_s (m_SendBuffer, BOB_COMMAND_BUFFER_SIZE, BOB_REPLY_ERROR, msg);
+#else       
+        size_t len = snprintf (m_SendBuffer, BOB_COMMAND_BUFFER_SIZE, BOB_REPLY_ERROR, msg);
+#endif
+        Send (len); 
+    }
+        
+    void BOBCommandSession::SendVersion ()
+    {
+        size_t len = strlen (BOB_VERSION);
+        memcpy (m_SendBuffer, BOB_VERSION, len);
+        Send (len);
+    }
+
+    void BOBCommandSession::SendData (const char * nickname)
+    {
+#ifdef _MSC_VER
+        size_t len = sprintf_s (m_SendBuffer, BOB_COMMAND_BUFFER_SIZE, BOB_DATA, nickname);
+#else       
+        size_t len = snprintf (m_SendBuffer, BOB_COMMAND_BUFFER_SIZE, BOB_DATA, nickname);
+#endif
+        Send (len);         
+    }
+        
+    void BOBCommandSession::ZapCommandHandler (const char*, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: zap");
+        Terminate ();
+    }
+
+    void BOBCommandSession::QuitCommandHandler (const char*, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: quit");
+        m_IsOpen = false;
+        SendReplyOK ("Bye!");
+    }
+
+    void BOBCommandSession::StartCommandHandler (const char*, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: start ", m_Nickname);
+        if (!m_CurrentDestination)
+        {   
+            m_CurrentDestination = new BOBDestination (i2p::client::context.CreateNewLocalDestination (m_Keys, true, &m_Options));
+            m_Owner.AddDestination (m_Nickname, m_CurrentDestination);
+        }   
+        if (m_InPort)
+            m_CurrentDestination->CreateInboundTunnel (m_InPort);
+        if (m_OutPort && !m_Address.empty ())
+            m_CurrentDestination->CreateOutboundTunnel (m_Address, m_OutPort, m_IsQuiet);
+        m_CurrentDestination->Start (); 
+        SendReplyOK ("tunnel starting");    
+    }   
+    
+    void BOBCommandSession::StopCommandHandler (const char*, size_t)
+    {
+        auto dest = m_Owner.FindDestination (m_Nickname);
+        if (dest)
+        {
+            dest->StopTunnels ();
+            SendReplyOK ("tunnel stopping");
+        }
+        else
+            SendReplyError ("tunnel not found");
+    }   
+    
+    void BOBCommandSession::SetNickCommandHandler (const char * operand, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: setnick ", operand);
+        m_Nickname = operand;
+        std::string msg ("Nickname set to ");
+        msg += operand;
+        SendReplyOK (msg.c_str ());
+    }   
+
+    void BOBCommandSession::GetNickCommandHandler (const char * operand, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: getnick ", operand);
+        m_CurrentDestination = m_Owner.FindDestination (operand); 
+        if (m_CurrentDestination)
+        {
+            m_Keys = m_CurrentDestination->GetKeys ();
+            m_Nickname = operand;
+            std::string msg ("Nickname set to ");
+            msg += operand;
+            SendReplyOK (msg.c_str ());
+        }
+        else
+            SendReplyError ("tunnel not found");    
+    }   
+
+    void BOBCommandSession::NewkeysCommandHandler (const char*, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: newkeys");
+        m_Keys = i2p::data::PrivateKeys::CreateRandomKeys ();
+        SendReplyOK (m_Keys.GetPublic ().ToBase64 ().c_str ());
+    }   
+
+    void BOBCommandSession::SetkeysCommandHandler (const char * operand, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: setkeys ", operand);
+        m_Keys.FromBase64 (operand);
+        SendReplyOK (m_Keys.GetPublic ().ToBase64 ().c_str ());
+    }
+        
+    void BOBCommandSession::GetkeysCommandHandler (const char *, size_t)
+    {       
+        LogPrint (eLogDebug, "BOB: getkeys");
+        SendReplyOK (m_Keys.ToBase64 ().c_str ());
+    }   
+
+    void BOBCommandSession::GetdestCommandHandler (const char*, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: getdest");
+        SendReplyOK (m_Keys.GetPublic ().ToBase64 ().c_str ());
+    }   
+        
+    void BOBCommandSession::OuthostCommandHandler (const char * operand, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: outhost ", operand);
+        m_Address = operand;
+        SendReplyOK ("outhost set");
+    }
+        
+    void BOBCommandSession::OutportCommandHandler (const char * operand, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: outport ", operand);
+        m_OutPort = boost::lexical_cast<int>(operand);
+        SendReplyOK ("outbound port set");
+    }   
+
+    void BOBCommandSession::InhostCommandHandler (const char * operand, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: inhost ", operand);
+        m_Address = operand;
+        SendReplyOK ("inhost set");
+    }
+        
+    void BOBCommandSession::InportCommandHandler (const char * operand, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: inport ", operand);
+        m_InPort = boost::lexical_cast<int>(operand);
+        SendReplyOK ("inbound port set");
+    }       
+
+    void BOBCommandSession::QuietCommandHandler (const char*, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: quiet");
+        m_IsQuiet = true;
+        SendReplyOK ("quiet");
+    }   
+    
+    void BOBCommandSession::LookupCommandHandler (const char * operand, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: lookup ", operand);
+        i2p::data::IdentHash ident;
+        if (!context.GetAddressBook ().GetIdentHash (operand, ident) || !m_CurrentDestination) 
+        {
+            SendReplyError ("Address Not found");
+            return;
+        }   
+        auto localDestination = m_CurrentDestination->GetLocalDestination ();
+        auto leaseSet = localDestination->FindLeaseSet (ident);
+        if (leaseSet)
+            SendReplyOK (leaseSet->GetIdentity ().ToBase64 ().c_str ());
+        else
+        {
+            auto s = shared_from_this ();
+            localDestination->RequestDestination (ident, 
+                [s](std::shared_ptr<i2p::data::LeaseSet> ls)
+                {
+                    if (ls)
+                        s->SendReplyOK (ls->GetIdentity ().ToBase64 ().c_str ());
+                    else    
+                        s->SendReplyError ("LeaseSet Not found");
+                }   
+            );
+        }
+    }
+
+    void BOBCommandSession::ClearCommandHandler (const char*, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: clear");
+        m_Owner.DeleteDestination (m_Nickname);
+        SendReplyOK ("cleared");
+    }   
+
+    void BOBCommandSession::ListCommandHandler (const char*, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: list");
+        auto& destinations = m_Owner.GetDestinations ();
+        for (auto it: destinations)
+            SendData (it.first.c_str ());
+        SendReplyOK ("Listing done");
+    }   
+
+    void BOBCommandSession::OptionCommandHandler (const char * operand, size_t)
+    {
+        LogPrint (eLogDebug, "BOB: option ", operand);
+        const char * value = strchr (operand, '=');
+        if (value)
+        {   
+            *(const_cast<char *>(value)) = 0;
+            m_Options[operand] = value + 1; 
+            *(const_cast<char *>(value)) = '=';
+            SendReplyOK ("option");
+        }   
+        else
+            SendReplyError ("malformed");
+    }   
+        
+    BOBCommandChannel::BOBCommandChannel(const std::string& address, int port)
+        : m_IsRunning (false), m_Thread (nullptr),
+          m_Acceptor(m_Service, boost::asio::ip::tcp::endpoint(
+            boost::asio::ip::address::from_string(address), port)
+          )
+    {
+        // command -> handler
+        m_CommandHandlers[BOB_COMMAND_ZAP] = &BOBCommandSession::ZapCommandHandler; 
+        m_CommandHandlers[BOB_COMMAND_QUIT] = &BOBCommandSession::QuitCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_START] = &BOBCommandSession::StartCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_STOP] = &BOBCommandSession::StopCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_SETNICK] = &BOBCommandSession::SetNickCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_GETNICK] = &BOBCommandSession::GetNickCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_NEWKEYS] = &BOBCommandSession::NewkeysCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_GETKEYS] = &BOBCommandSession::GetkeysCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_SETKEYS] = &BOBCommandSession::SetkeysCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_GETDEST] = &BOBCommandSession::GetdestCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_OUTHOST] = &BOBCommandSession::OuthostCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_OUTPORT] = &BOBCommandSession::OutportCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_INHOST] = &BOBCommandSession::InhostCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_INPORT] = &BOBCommandSession::InportCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_QUIET] = &BOBCommandSession::QuietCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_LOOKUP] = &BOBCommandSession::LookupCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_CLEAR] = &BOBCommandSession::ClearCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_LIST] = &BOBCommandSession::ListCommandHandler;
+        m_CommandHandlers[BOB_COMMAND_OPTION] = &BOBCommandSession::OptionCommandHandler;
+    }
+
+    BOBCommandChannel::~BOBCommandChannel ()
+    {
+        Stop ();
+        for (auto it: m_Destinations)
+            delete it.second;
+    }
+
+    void BOBCommandChannel::Start ()
+    {
+        Accept ();
+        m_IsRunning = true;
+        m_Thread = new std::thread (std::bind (&BOBCommandChannel::Run, this));
+    }
+
+    void BOBCommandChannel::Stop ()
+    {
+        m_IsRunning = false;
+        for (auto it: m_Destinations)
+            it.second->Stop ();
+        m_Acceptor.cancel ();   
+        m_Service.stop ();
+        if (m_Thread)
+        {   
+            m_Thread->join (); 
+            delete m_Thread;
+            m_Thread = nullptr;
+        }   
+    }
+        
+    void BOBCommandChannel::Run () 
+    { 
+        while (m_IsRunning)
+        {
+            try
+            {   
+                m_Service.run ();
+            }
+            catch (std::exception& ex)
+            {
+                LogPrint (eLogError, "BOB: ", ex.what ());
+            }   
+        }   
+    }
+
+    void BOBCommandChannel::AddDestination (const std::string& name, BOBDestination * dest)
+    {
+        m_Destinations[name] = dest;
+    }   
+
+    void BOBCommandChannel::DeleteDestination (const std::string& name)
+    {
+        auto it = m_Destinations.find (name);
+        if (it != m_Destinations.end ())
+        {
+            it->second->Stop ();
+            delete it->second;
+            m_Destinations.erase (it);
+        }   
+    }   
+        
+    BOBDestination * BOBCommandChannel::FindDestination (const std::string& name)
+    {
+        auto it = m_Destinations.find (name);
+        if (it != m_Destinations.end ())
+            return it->second;
+        return nullptr; 
+    }
+        
+    void BOBCommandChannel::Accept ()
+    {
+        auto newSession = std::make_shared<BOBCommandSession> (*this);
+        m_Acceptor.async_accept (newSession->GetSocket (), std::bind (&BOBCommandChannel::HandleAccept, this,
+            std::placeholders::_1, newSession));
+    }
+
+    void BOBCommandChannel::HandleAccept(const boost::system::error_code& ecode, std::shared_ptr<BOBCommandSession> session)
+    {
+        if (ecode != boost::asio::error::operation_aborted)
+            Accept ();
+
+        if (!ecode)
+        {
+            LogPrint (eLogInfo, "New BOB command connection from ", session->GetSocket ().remote_endpoint ());
+            session->SendVersion ();    
+        }
+        else
+            LogPrint (eLogError, "BOB accept error: ",  ecode.message ());
+    }
+}
+}
+

client/BOB.h

@@ -0,0 +1,237 @@
+#ifndef BOB_H__
+#define BOB_H__
+
+#include <inttypes.h>
+#include <thread>
+#include <memory>
+#include <map>
+#include <string>
+#include <boost/asio.hpp>
+#include "I2PTunnel.h"
+#include "I2PService.h"
+#include "Identity.h"
+#include "LeaseSet.h"
+
+namespace i2p
+{
+namespace client
+{
+    const size_t BOB_COMMAND_BUFFER_SIZE = 1024;
+    const char BOB_COMMAND_ZAP[] = "zap";
+    const char BOB_COMMAND_QUIT[] = "quit";
+    const char BOB_COMMAND_START[] = "start";
+    const char BOB_COMMAND_STOP[] = "stop"; 
+    const char BOB_COMMAND_SETNICK[] = "setnick";
+    const char BOB_COMMAND_GETNICK[] = "getnick";       
+    const char BOB_COMMAND_NEWKEYS[] = "newkeys";
+    const char BOB_COMMAND_GETKEYS[] = "getkeys";
+    const char BOB_COMMAND_SETKEYS[] = "setkeys";
+    const char BOB_COMMAND_GETDEST[] = "getdest";
+    const char BOB_COMMAND_OUTHOST[] = "outhost";   
+    const char BOB_COMMAND_OUTPORT[] = "outport";
+    const char BOB_COMMAND_INHOST[] = "inhost"; 
+    const char BOB_COMMAND_INPORT[] = "inport";
+    const char BOB_COMMAND_QUIET[] = "quiet";
+    const char BOB_COMMAND_LOOKUP[] = "lookup"; 
+    const char BOB_COMMAND_CLEAR[] = "clear";
+    const char BOB_COMMAND_LIST[] = "list";
+    const char BOB_COMMAND_OPTION[] = "option";
+    
+    const char BOB_VERSION[] = "BOB 00.00.10\nOK\n";    
+    const char BOB_REPLY_OK[] = "OK %s\n";
+    const char BOB_REPLY_ERROR[] = "ERROR %s\n";
+    const char BOB_DATA[] = "NICKNAME %s\n";
+
+    class BOBI2PTunnel: public I2PService
+    {
+        public:
+
+            BOBI2PTunnel (std::shared_ptr<ClientDestination> localDestination): 
+                I2PService (localDestination) {};
+
+            virtual void Start () {};
+            virtual void Stop () {};                
+    };  
+    
+    class BOBI2PInboundTunnel: public BOBI2PTunnel
+    {
+            struct AddressReceiver
+            {
+                std::shared_ptr<boost::asio::ip::tcp::socket> socket;
+                char buffer[BOB_COMMAND_BUFFER_SIZE + 1]; // for destination base64 address
+                uint8_t * data; // pointer to buffer
+                size_t dataLen, bufferOffset; 
+
+                AddressReceiver (): data (nullptr), dataLen (0), bufferOffset (0) {};
+            };  
+        
+        public:
+
+            BOBI2PInboundTunnel (int port, std::shared_ptr<ClientDestination> localDestination);
+            ~BOBI2PInboundTunnel ();
+
+            void Start ();
+            void Stop ();
+
+        private:
+
+            void Accept ();
+            void HandleAccept (const boost::system::error_code& ecode, std::shared_ptr<AddressReceiver> receiver);
+
+            void ReceiveAddress (std::shared_ptr<AddressReceiver> receiver);
+            void HandleReceivedAddress (const boost::system::error_code& ecode, std::size_t bytes_transferred,
+                std::shared_ptr<AddressReceiver> receiver);
+
+            void HandleDestinationRequestComplete (std::shared_ptr<i2p::data::LeaseSet> leaseSet, std::shared_ptr<AddressReceiver> receiver);
+
+            void CreateConnection (std::shared_ptr<AddressReceiver> receiver, std::shared_ptr<const i2p::data::LeaseSet> leaseSet);
+
+        private:
+
+            boost::asio::ip::tcp::acceptor m_Acceptor;  
+    };
+
+    class BOBI2POutboundTunnel: public BOBI2PTunnel
+    {
+        public:
+
+             BOBI2POutboundTunnel (const std::string& address, int port, std::shared_ptr<ClientDestination> localDestination, bool quiet);  
+
+            void Start ();
+            void Stop ();
+
+            void SetQuiet () { m_IsQuiet = true; };
+
+        private:
+
+            void Accept ();
+            void HandleAccept (std::shared_ptr<i2p::stream::Stream> stream);
+
+        private:
+
+            boost::asio::ip::tcp::endpoint m_Endpoint;  
+            bool m_IsQuiet; 
+    };
+
+
+    class BOBDestination
+    {
+        public:
+
+            BOBDestination (std::shared_ptr<ClientDestination> localDestination);
+            ~BOBDestination ();
+
+            void Start ();
+            void Stop ();
+            void StopTunnels ();
+            void CreateInboundTunnel (int port);
+            void CreateOutboundTunnel (const std::string& address, int port, bool quiet);
+            const i2p::data::PrivateKeys& GetKeys () const { return m_LocalDestination->GetPrivateKeys (); };
+            std::shared_ptr<ClientDestination> GetLocalDestination () const { return m_LocalDestination; };
+            
+        private:    
+
+            std::shared_ptr<ClientDestination> m_LocalDestination;
+            BOBI2POutboundTunnel * m_OutboundTunnel;
+            BOBI2PInboundTunnel * m_InboundTunnel;
+    };  
+    
+    class BOBCommandChannel;
+    class BOBCommandSession: public std::enable_shared_from_this<BOBCommandSession>
+    {
+        public:
+
+            BOBCommandSession (BOBCommandChannel& owner);
+            ~BOBCommandSession ();  
+            void Terminate ();
+
+            boost::asio::ip::tcp::socket& GetSocket () { return m_Socket; };
+            void SendVersion ();
+
+            // command handlers
+            void ZapCommandHandler (const char * operand, size_t len);
+            void QuitCommandHandler (const char * operand, size_t len);
+            void StartCommandHandler (const char * operand, size_t len);
+            void StopCommandHandler (const char * operand, size_t len);
+            void SetNickCommandHandler (const char * operand, size_t len);
+            void GetNickCommandHandler (const char * operand, size_t len);
+            void NewkeysCommandHandler (const char * operand, size_t len);
+            void SetkeysCommandHandler (const char * operand, size_t len);
+            void GetkeysCommandHandler (const char * operand, size_t len);
+            void GetdestCommandHandler (const char * operand, size_t len);
+            void OuthostCommandHandler (const char * operand, size_t len);
+            void OutportCommandHandler (const char * operand, size_t len);
+            void InhostCommandHandler (const char * operand, size_t len);
+            void InportCommandHandler (const char * operand, size_t len);           
+            void QuietCommandHandler (const char * operand, size_t len);    
+            void LookupCommandHandler (const char * operand, size_t len);
+            void ClearCommandHandler (const char * operand, size_t len);
+            void ListCommandHandler (const char * operand, size_t len);
+            void OptionCommandHandler (const char * operand, size_t len);
+            
+        private:
+
+            void Receive ();
+            void HandleReceived (const boost::system::error_code& ecode, std::size_t bytes_transferred);
+
+            void Send (size_t len);
+            void HandleSent (const boost::system::error_code& ecode, std::size_t bytes_transferred);
+            void SendReplyOK (const char * msg);
+            void SendReplyError (const char * msg);
+            void SendData (const char * nickname);
+
+        private:
+
+            BOBCommandChannel& m_Owner;
+            boost::asio::ip::tcp::socket m_Socket;
+            char m_ReceiveBuffer[BOB_COMMAND_BUFFER_SIZE + 1], m_SendBuffer[BOB_COMMAND_BUFFER_SIZE + 1];
+            size_t m_ReceiveBufferOffset;
+            bool m_IsOpen, m_IsQuiet;
+            std::string m_Nickname, m_Address;
+            int m_InPort, m_OutPort;
+            i2p::data::PrivateKeys m_Keys;
+            std::map<std::string, std::string> m_Options; 
+            BOBDestination * m_CurrentDestination;
+    };
+    typedef void (BOBCommandSession::*BOBCommandHandler)(const char * operand, size_t len);
+
+    class BOBCommandChannel
+    {
+        public:
+
+            BOBCommandChannel(const std::string& address, int port);
+            ~BOBCommandChannel ();
+
+            void Start ();
+            void Stop ();
+
+            boost::asio::io_service& GetService () { return m_Service; };
+            void AddDestination (const std::string& name, BOBDestination * dest);
+            void DeleteDestination (const std::string& name);
+            BOBDestination * FindDestination (const std::string& name);
+            
+        private:
+
+            void Run ();
+            void Accept ();
+            void HandleAccept(const boost::system::error_code& ecode, std::shared_ptr<BOBCommandSession> session);
+
+        private:
+
+            bool m_IsRunning;
+            std::thread * m_Thread; 
+            boost::asio::io_service m_Service;
+            boost::asio::ip::tcp::acceptor m_Acceptor;
+            std::map<std::string, BOBDestination *> m_Destinations;
+            std::map<std::string, BOBCommandHandler> m_CommandHandlers;
+
+        public:
+
+            const decltype(m_CommandHandlers)& GetCommandHandlers () const { return m_CommandHandlers; };
+            const decltype(m_Destinations)& GetDestinations () const { return m_Destinations; };
+    };  
+}
+}
+
+#endif
+

client/CMakeLists.txt

@@ -0,0 +1,63 @@
+set(CLIENT_SRC
+  "BOB.cpp"	
+  "ClientContext.cpp"
+  "Daemon.cpp"
+  "HTTPProxy.cpp"
+  "HTTPServer.cpp"
+  "I2PService.cpp"
+  "i2pcontrol/I2PControl.cpp"	
+  "i2pcontrol/I2PControlServer.cpp"	
+  "I2PTunnel.cpp"
+  "SAM.cpp"
+  "SOCKS.cpp"
+  "i2p.cpp"
+)
+
+include_directories(".")
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    list(APPEND CLIENT_SRC "DaemonLinux.cpp")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+    list(APPEND CLIENT_SRC "DaemonLinux.cpp")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    list(APPEND CLIENT_SRC "DaemonLinux.cpp")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+    list(APPEND CLIENT_SRC "DaemonLinux.cpp")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    list(APPEND CLIENT_SRC "DaemonWin32.cpp")
+    list(APPEND CLIENT_SRC "Win32Service.cpp")
+endif()
+
+if(WITH_BINARY)
+    add_executable(${CLIENT_NAME} ${CLIENT_SRC})
+    if(NOT MSVC) # FIXME: incremental linker file name (.ilk) collision for dll & exe
+        set_target_properties(${CLIENT_NAME} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}")
+        if(WITH_STATIC)
+            set_target_properties(${CLIENT_NAME} PROPERTIES LINK_FLAGS "-static" )
+        endif()
+    endif()
+
+    if(WITH_HARDENING AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        set_target_properties(${CLIENT_NAME} PROPERTIES LINK_FLAGS "-z relro -z now")
+    endif()
+
+    # 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)
+    if(${LAST_Boost_LIBRARIES} MATCHES ".*pthread.*")
+        list(REMOVE_AT Boost_LIBRARIES -1)
+    endif()
+    target_link_libraries(
+        ${CLIENT_NAME} ${CORE_NAME}
+        ${DL_LIB} ${Boost_LIBRARIES} ${CRYPTO++_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
+    )
+
+    install(TARGETS
+        ${CLIENT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    )
+    if(MSVC)
+        install(FILES
+            $<TARGET_PDB_FILE:${CLIENT_NAME}> DESTINATION "bin" CONFIGURATIONS DEBUG
+        )
+    endif()
+endif()

client/ClientContext.cpp

@@ -0,0 +1,365 @@
+#include <fstream>
+#include <iostream>
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ini_parser.hpp>
+#include "util/util.h"
+#include "util/Log.h"
+#include "Identity.h"
+#include "ClientContext.h"
+
+namespace i2p
+{
+namespace client
+{
+    ClientContext context;  
+
+    ClientContext::ClientContext (): m_SharedLocalDestination (nullptr),
+        m_HttpProxy (nullptr), m_SocksProxy (nullptr), m_SamBridge (nullptr), 
+        m_BOBCommandChannel (nullptr), m_I2PControlService (nullptr)
+    {
+    }
+    
+    ClientContext::~ClientContext () 
+    {
+        delete m_HttpProxy;
+        delete m_SocksProxy;
+        delete m_SamBridge;
+        delete m_BOBCommandChannel;
+        delete m_I2PControlService;
+    }
+    
+    void ClientContext::Start ()
+    {
+        if (!m_SharedLocalDestination)
+        {   
+            m_SharedLocalDestination = CreateNewLocalDestination (); // non-public, DSA
+            m_Destinations[m_SharedLocalDestination->GetIdentity ().GetIdentHash ()] = m_SharedLocalDestination;
+            m_SharedLocalDestination->Start ();
+        }
+
+        std::shared_ptr<ClientDestination> localDestination;    
+        // proxies  
+        std::string proxyKeys = i2p::util::config::GetArg("-proxykeys", "");
+        if (proxyKeys.length () > 0)
+            localDestination = LoadLocalDestination (proxyKeys, false);
+        m_HttpProxy = new i2p::proxy::HTTPProxy(
+            i2p::util::config::GetArg("-httpproxyaddress", "127.0.0.1"),
+            i2p::util::config::GetArg("-httpproxyport", 4446),
+            localDestination
+        );
+        m_HttpProxy->Start();
+        LogPrint("HTTP Proxy started");
+        m_SocksProxy = new i2p::proxy::SOCKSProxy(
+            i2p::util::config::GetArg("-socksproxyaddress", "127.0.0.1"),
+            i2p::util::config::GetArg("-socksproxyport", 4447),
+            localDestination
+        );
+        m_SocksProxy->Start();
+        LogPrint("SOCKS Proxy Started");
+    
+        // I2P tunnels
+        std::string ircDestination = i2p::util::config::GetArg("-ircdest", "");
+        if (ircDestination.length () > 0) // ircdest is presented
+        {
+            localDestination = nullptr;
+            std::string ircKeys = i2p::util::config::GetArg("-irckeys", "");    
+            if (ircKeys.length () > 0)
+                localDestination = LoadLocalDestination (ircKeys, false);
+            auto ircPort = i2p::util::config::GetArg("-ircport", 6668);
+            auto ircTunnel = new I2PClientTunnel(
+                ircDestination, i2p::util::config::GetArg("-ircaddress", "127.0.0.1"),
+                ircPort, localDestination
+            );
+            ircTunnel->Start ();
+            // TODO: allow muliple tunnels on the same port (but on a different address)
+            m_ClientTunnels.insert(std::make_pair(
+                ircPort, std::unique_ptr<I2PClientTunnel>(ircTunnel)
+            ));
+            LogPrint("IRC tunnel started");
+        }   
+        std::string eepKeys = i2p::util::config::GetArg("-eepkeys", "");
+        if (eepKeys.length () > 0) // eepkeys file is presented
+        {
+            localDestination = LoadLocalDestination (eepKeys, true);
+            auto serverTunnel = new I2PServerTunnel (i2p::util::config::GetArg("-eepaddress", "127.0.0.1"),
+                i2p::util::config::GetArg("-eepport", 80), localDestination);
+            serverTunnel->Start ();
+            m_ServerTunnels.insert (std::make_pair(localDestination->GetIdentHash (), std::unique_ptr<I2PServerTunnel>(serverTunnel)));
+            LogPrint("Server tunnel started");
+        }
+        ReadTunnels ();
+
+        // SAM
+        int samPort = i2p::util::config::GetArg("-samport", 0);
+        if (samPort)
+        {
+            m_SamBridge = new SAMBridge(
+                i2p::util::config::GetArg("-samaddress", "127.0.0.1"), samPort
+            );
+            m_SamBridge->Start ();
+            LogPrint("SAM bridge started");
+        } 
+
+        // BOB
+        int bobPort = i2p::util::config::GetArg("-bobport", 0);
+        if (bobPort)
+        {
+            m_BOBCommandChannel = new BOBCommandChannel(
+                i2p::util::config::GetArg("-bobaddress", "127.0.0.1"), bobPort
+            );
+            m_BOBCommandChannel->Start ();
+            LogPrint("BOB command channel started");
+        } 
+
+        // I2P Control
+        int i2pcontrolPort = i2p::util::config::GetArg("-i2pcontrolport", 0);
+        if(i2pcontrolPort) {
+            m_I2PControlService = new i2pcontrol::I2PControlService(
+                i2p::util::config::GetArg("-i2pcontroladdress", "127.0.0.1"),
+                i2pcontrolPort,
+                i2p::util::config::GetArg(
+                    "-i2pcontrolpassword", i2pcontrol::constants::DEFAULT_PASSWORD
+                )
+            );
+            m_I2PControlService->Start();
+            LogPrint("I2PControl started");
+        }
+        m_AddressBook.Start (m_SharedLocalDestination.get());
+    }
+        
+    void ClientContext::Stop ()
+    {
+        m_HttpProxy->Stop();
+        delete m_HttpProxy;
+        m_HttpProxy = nullptr;
+        LogPrint("HTTP Proxy stopped");
+        m_SocksProxy->Stop();
+        delete m_SocksProxy;
+        m_SocksProxy = nullptr;
+        LogPrint("SOCKS Proxy stopped");
+        for (auto& it: m_ClientTunnels)
+        {
+            it.second->Stop ();
+            LogPrint("I2P client tunnel on port ", it.first, " stopped");   
+        }
+        m_ClientTunnels.clear ();   
+        for (auto& it: m_ServerTunnels)
+        {
+            it.second->Stop ();
+            LogPrint("I2P server tunnel stopped");  
+        }
+        m_ServerTunnels.clear ();   
+        if (m_SamBridge)
+        {
+            m_SamBridge->Stop ();
+            delete m_SamBridge; 
+            m_SamBridge = nullptr;
+            LogPrint("SAM bridge stopped"); 
+        }       
+        if (m_BOBCommandChannel)
+        {
+            m_BOBCommandChannel->Stop ();
+            delete m_BOBCommandChannel; 
+            m_BOBCommandChannel = nullptr;
+            LogPrint("BOB command channel stopped");    
+        }           
+        if (m_I2PControlService)
+        {
+            m_I2PControlService->Stop ();
+            delete m_I2PControlService; 
+            m_I2PControlService = nullptr;
+            LogPrint("I2PControl stopped"); 
+        }   
+        m_AddressBook.Stop ();      
+        for (auto it: m_Destinations)
+            it.second->Stop ();
+        m_Destinations.clear ();
+        m_SharedLocalDestination = nullptr; 
+    }   
+    
+    std::shared_ptr<ClientDestination> ClientContext::LoadLocalDestination (const std::string& filename, bool isPublic)
+    {
+        i2p::data::PrivateKeys keys;
+        std::string fullPath = i2p::util::filesystem::GetFullPath (filename);
+        std::ifstream s(fullPath.c_str (), std::ifstream::binary);
+        if (s.is_open ())   
+        {   
+            s.seekg (0, std::ios::end);
+            size_t len = s.tellg();
+            s.seekg (0, std::ios::beg);
+            uint8_t * buf = new uint8_t[len];
+            s.read ((char *)buf, len);
+            keys.FromBuffer (buf, len);
+            delete[] buf;
+            LogPrint ("Local address ", m_AddressBook.ToAddress(keys.GetPublic ().GetIdentHash ()), " loaded");
+        }   
+        else
+        {
+            LogPrint ("Can't open file ", fullPath, " Creating new one");
+            keys = i2p::data::PrivateKeys::CreateRandomKeys (i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA256_P256); 
+            std::ofstream f (fullPath, std::ofstream::binary | std::ofstream::out);
+            size_t len = keys.GetFullLen ();
+            uint8_t * buf = new uint8_t[len];
+            len = keys.ToBuffer (buf, len);
+            f.write ((char *)buf, len);
+            delete[] buf;
+            
+            LogPrint ("New private keys file ", fullPath, " for ", m_AddressBook.ToAddress(keys.GetPublic ().GetIdentHash ()), " created");
+        }   
+
+        std::shared_ptr<ClientDestination> localDestination = nullptr;  
+        std::unique_lock<std::mutex> l(m_DestinationsMutex);    
+        auto it = m_Destinations.find (keys.GetPublic ().GetIdentHash ()); 
+        if (it != m_Destinations.end ())
+        {
+            LogPrint (eLogWarning, "Local destination ",  m_AddressBook.ToAddress(keys.GetPublic ().GetIdentHash ()), " alreday exists");
+            localDestination = it->second;
+        }
+        else
+        {
+            localDestination = std::make_shared<ClientDestination> (keys, isPublic);
+            m_Destinations[localDestination->GetIdentHash ()] = localDestination;
+            localDestination->Start ();
+        }
+        return localDestination;
+    }
+
+    std::shared_ptr<ClientDestination> ClientContext::CreateNewLocalDestination (bool isPublic, i2p::data::SigningKeyType sigType,
+        const std::map<std::string, std::string> * params)
+    {
+        i2p::data::PrivateKeys keys = i2p::data::PrivateKeys::CreateRandomKeys (sigType);
+        auto localDestination = std::make_shared<ClientDestination> (keys, isPublic, params);
+        std::unique_lock<std::mutex> l(m_DestinationsMutex);
+        m_Destinations[localDestination->GetIdentHash ()] = localDestination;
+        localDestination->Start ();
+        return localDestination;
+    }
+
+    void ClientContext::DeleteLocalDestination (std::shared_ptr<ClientDestination> destination)
+    {
+        if (!destination) return;
+        auto it = m_Destinations.find (destination->GetIdentHash ());
+        if (it != m_Destinations.end ())
+        {
+            auto d = it->second;
+            {
+                std::unique_lock<std::mutex> l(m_DestinationsMutex);
+                m_Destinations.erase (it);
+            }   
+            d->Stop ();
+        }
+    }
+
+    std::shared_ptr<ClientDestination> ClientContext::CreateNewLocalDestination (const i2p::data::PrivateKeys& keys, bool isPublic,
+        const std::map<std::string, std::string> * params)
+    {
+        auto it = m_Destinations.find (keys.GetPublic ().GetIdentHash ());
+        if (it != m_Destinations.end ())
+        {
+            LogPrint ("Local destination ", m_AddressBook.ToAddress(keys.GetPublic ().GetIdentHash ()), " exists");
+            if (!it->second->IsRunning ())
+            {   
+                it->second->Start ();
+                return it->second;
+            }   
+            return nullptr;
+        }   
+        auto localDestination = std::make_shared<ClientDestination> (keys, isPublic, params);
+        std::unique_lock<std::mutex> l(m_DestinationsMutex);
+        m_Destinations[keys.GetPublic ().GetIdentHash ()] = localDestination;
+        localDestination->Start ();
+        return localDestination;
+    }
+    
+    std::shared_ptr<ClientDestination> ClientContext::FindLocalDestination (const i2p::data::IdentHash& destination) const
+    {
+        auto it = m_Destinations.find (destination);
+        if (it != m_Destinations.end ())
+            return it->second;
+        return nullptr;
+    }   
+
+    void ClientContext::ReadTunnels ()
+    {
+        boost::property_tree::ptree pt;
+        std::string pathTunnelsConfigFile = i2p::util::filesystem::GetTunnelsConfigFile().string();
+        try {
+            boost::property_tree::read_ini(
+                pathTunnelsConfigFile,
+                pt
+            );
+        } catch(const std::exception& ex) {
+            LogPrint(eLogWarning, "Can't read ", pathTunnelsConfigFile, ": ", ex.what ());
+            return;
+        }
+            
+        int numClientTunnels = 0, numServerTunnels = 0;
+        for(auto& section: pt) {
+            std::string name = section.first;           
+            try {
+                std::string type = section.second.get<std::string> (I2P_TUNNELS_SECTION_TYPE);
+                if(type == I2P_TUNNELS_SECTION_TYPE_CLIENT) {
+                    // mandatory params
+                    std::string dest = section.second.get<std::string> (I2P_CLIENT_TUNNEL_DESTINATION);
+                    int port = section.second.get<int> (I2P_CLIENT_TUNNEL_PORT);
+                    // optional params
+                    std::string address = section.second.get(
+                        I2P_CLIENT_TUNNEL_ADDRESS, "127.0.0.1"
+                    );
+                    std::string keys = section.second.get(I2P_CLIENT_TUNNEL_KEYS, "");
+                    int destinationPort = section.second.get(I2P_CLIENT_TUNNEL_DESTINATION_PORT, 0);
+
+                    std::shared_ptr<ClientDestination> localDestination = nullptr;
+                    if(keys.length () > 0)
+                        localDestination = LoadLocalDestination (keys, false);
+
+                    auto clientTunnel = new I2PClientTunnel(
+                        dest, address, port, localDestination, destinationPort
+                    );
+                    // TODO: allow multiple tunnels on the same port (but on a different address)
+                    if(m_ClientTunnels.insert(std::make_pair(port, std::unique_ptr<I2PClientTunnel>(clientTunnel))).second)
+                        clientTunnel->Start ();
+                    else
+                        LogPrint (eLogError, "I2P client tunnel with port ", port, " already exists");
+                    numClientTunnels++;
+                } else if(type == I2P_TUNNELS_SECTION_TYPE_SERVER || type == I2P_TUNNELS_SECTION_TYPE_HTTP)
+                {   
+                    // mandatory params
+                    std::string host = section.second.get<std::string> (I2P_SERVER_TUNNEL_HOST);
+                    int port = section.second.get<int> (I2P_SERVER_TUNNEL_PORT);
+                    std::string keys = section.second.get<std::string> (I2P_SERVER_TUNNEL_KEYS);
+                    // optional params
+                    int inPort = section.second.get (I2P_SERVER_TUNNEL_INPORT, 0);
+                    std::string accessList = section.second.get (I2P_SERVER_TUNNEL_ACCESS_LIST, "");                    
+
+                    auto localDestination = LoadLocalDestination (keys, true);
+                    I2PServerTunnel * serverTunnel = (type == I2P_TUNNELS_SECTION_TYPE_HTTP) ? new I2PServerTunnelHTTP (host, port, localDestination, inPort) : new I2PServerTunnel (host, port, localDestination, inPort);
+                    if (accessList.length () > 0) {
+                        std::set<i2p::data::IdentHash> idents;
+                        size_t pos = 0, comma;
+                        do {
+                            comma = accessList.find (',', pos);
+                            i2p::data::IdentHash ident;
+                            ident.FromBase32 (accessList.substr (pos, comma != std::string::npos ? comma - pos : std::string::npos));   
+                            idents.insert (ident);
+                            pos = comma + 1;
+                        } while (comma != std::string::npos);
+                        serverTunnel->SetAccessList (idents);
+                    }
+                    if (m_ServerTunnels.insert (std::make_pair (localDestination->GetIdentHash (), std::unique_ptr<I2PServerTunnel>(serverTunnel))).second)
+                        serverTunnel->Start ();
+                    else
+                        LogPrint (eLogError, "I2P server tunnel for destination ",   m_AddressBook.ToAddress(localDestination->GetIdentHash ()), " already exists");    
+                    numServerTunnels++;
+                } else
+                    LogPrint (eLogWarning, "Unknown section type=", type, " of ", name, " in ", pathTunnelsConfigFile);
+                
+            } catch (const std::exception& ex) {
+                LogPrint (eLogError, "Can't read tunnel ", name, " params: ", ex.what ());
+            }
+        }   
+        LogPrint (eLogInfo, numClientTunnels, " I2P client tunnels created");
+        LogPrint (eLogInfo, numServerTunnels, " I2P server tunnels created");
+    }   
+}       
+}   

client/ClientContext.h

@@ -0,0 +1,86 @@
+#ifndef CLIENT_CONTEXT_H__
+#define CLIENT_CONTEXT_H__
+
+#include <map>
+#include <mutex>
+#include <memory>
+#include "Destination.h"
+#include "HTTPProxy.h"
+#include "SOCKS.h"
+#include "I2PTunnel.h"
+#include "SAM.h"
+#include "BOB.h"
+#include "AddressBook.h"
+#include "i2pcontrol/I2PControlServer.h"
+
+namespace i2p
+{
+namespace client
+{
+    const char I2P_TUNNELS_SECTION_TYPE[] = "type";
+    const char I2P_TUNNELS_SECTION_TYPE_CLIENT[] = "client";
+    const char I2P_TUNNELS_SECTION_TYPE_SERVER[] = "server";
+    const char I2P_TUNNELS_SECTION_TYPE_HTTP[] = "http";
+    const char I2P_CLIENT_TUNNEL_PORT[] = "port";
+    const char I2P_CLIENT_TUNNEL_ADDRESS[] = "address";
+    const char I2P_CLIENT_TUNNEL_DESTINATION[] = "destination";
+    const char I2P_CLIENT_TUNNEL_KEYS[] = "keys";
+    const char I2P_CLIENT_TUNNEL_DESTINATION_PORT[] = "destinationport";    
+    const char I2P_SERVER_TUNNEL_HOST[] = "host";   
+    const char I2P_SERVER_TUNNEL_PORT[] = "port";
+    const char I2P_SERVER_TUNNEL_KEYS[] = "keys";
+    const char I2P_SERVER_TUNNEL_INPORT[] = "inport";
+    const char I2P_SERVER_TUNNEL_ACCESS_LIST[] = "accesslist";      
+
+    class ClientContext
+    {
+        public:
+
+            ClientContext ();
+            ~ClientContext ();
+
+            void Start ();
+            void Stop ();
+
+            std::shared_ptr<ClientDestination> GetSharedLocalDestination () const { return m_SharedLocalDestination; };
+            std::shared_ptr<ClientDestination> CreateNewLocalDestination (bool isPublic = false, i2p::data::SigningKeyType sigType = i2p::data::SIGNING_KEY_TYPE_DSA_SHA1,
+                const std::map<std::string, std::string> * params = nullptr); // transient
+            std::shared_ptr<ClientDestination> CreateNewLocalDestination (const i2p::data::PrivateKeys& keys, bool isPublic = true, 
+                const std::map<std::string, std::string> * params = nullptr);
+            void DeleteLocalDestination (std::shared_ptr<ClientDestination> destination);
+            std::shared_ptr<ClientDestination> FindLocalDestination (const i2p::data::IdentHash& destination) const;        
+            std::shared_ptr<ClientDestination> LoadLocalDestination (const std::string& filename, bool isPublic);
+
+            AddressBook& GetAddressBook () { return m_AddressBook; };
+            const SAMBridge * GetSAMBridge () const { return m_SamBridge; };
+        
+        private:
+
+            void ReadTunnels ();
+    
+        private:
+
+            std::mutex m_DestinationsMutex;
+            std::map<i2p::data::IdentHash, std::shared_ptr<ClientDestination> > m_Destinations;
+            std::shared_ptr<ClientDestination>  m_SharedLocalDestination;   
+
+            AddressBook m_AddressBook;
+
+            i2p::proxy::HTTPProxy * m_HttpProxy;
+            i2p::proxy::SOCKSProxy * m_SocksProxy;
+            std::map<int, std::unique_ptr<I2PClientTunnel> > m_ClientTunnels; // port->tunnel
+            std::map<i2p::data::IdentHash, std::unique_ptr<I2PServerTunnel> > m_ServerTunnels; // destination->tunnel
+            SAMBridge * m_SamBridge;
+            BOBCommandChannel * m_BOBCommandChannel;
+            i2pcontrol::I2PControlService * m_I2PControlService;
+
+        public:
+            // for HTTP
+            const decltype(m_Destinations)& GetDestinations () const { return m_Destinations; };
+    };
+    
+    extern ClientContext context;   
+}       
+}   
+
+#endif

client/Daemon.cpp

@@ -0,0 +1,157 @@
+#include <thread>
+
+#include "Daemon.h"
+
+#include "util/Log.h"
+#include "version.h"
+#include "transport/Transports.h"
+#include "transport/NTCPSession.h"
+#include "RouterInfo.h"
+#include "RouterContext.h"
+#include "tunnel/Tunnel.h"
+#include "NetworkDatabase.h"
+#include "Garlic.h"
+#include "util/util.h"
+#include "Streaming.h"
+#include "Destination.h"
+#include "HTTPServer.h"
+#include "ClientContext.h"
+
+namespace i2p
+{
+    namespace util
+    {
+        class Daemon_Singleton::Daemon_Singleton_Private
+        {
+        public:
+            Daemon_Singleton_Private() : httpServer(nullptr)
+            {};
+            ~Daemon_Singleton_Private() 
+            {
+                delete httpServer;
+            };
+
+            i2p::util::HTTPServer *httpServer;
+        };
+
+        Daemon_Singleton::Daemon_Singleton() : running(1), d(*new Daemon_Singleton_Private()) {};
+        Daemon_Singleton::~Daemon_Singleton() {
+            delete &d;
+        };
+
+        bool Daemon_Singleton::IsService () const
+        {
+#ifndef _WIN32
+            return i2p::util::config::GetArg("-service", 0);
+#else
+            return false;
+#endif
+        }
+
+        bool Daemon_Singleton::init(int argc, char* argv[])
+        {
+            i2p::util::config::OptionParser(argc, argv);
+            i2p::context.Init ();
+
+            LogPrint("\n\n\n\ni2pd starting\n");
+            LogPrint("Version ", VERSION);
+            LogPrint("data directory: ", i2p::util::filesystem::GetDataDir().string());
+            i2p::util::filesystem::ReadConfigFile(
+                i2p::util::config::mapArgs, i2p::util::config::mapMultiArgs
+            );
+
+            if(i2p::util::config::HasArg("-install")) {
+                try {
+                    i2p::util::filesystem::InstallFiles();
+                    LogPrint("Successfully installed all files.");
+                } catch(const std::runtime_error& e) {
+                    LogPrint(eLogError, "Failed to install: ", e.what());
+                    return false;
+                }
+            }
+
+            isDaemon = i2p::util::config::GetArg("-daemon", 0);
+            isLogging = i2p::util::config::GetArg("-log", 1);
+
+            int port = i2p::util::config::GetArg("-port", 0);
+            if (port)
+                i2p::context.UpdatePort (port);                 
+            const char * host = i2p::util::config::GetCharArg("-host", "");
+            if (host && host[0])
+                i2p::context.UpdateAddress (boost::asio::ip::address::from_string (host));  
+
+            i2p::context.SetSupportsV6 (i2p::util::config::GetArg("-v6", 0));
+            i2p::context.SetFloodfill (i2p::util::config::GetArg("-floodfill", 0));
+            auto bandwidth = i2p::util::config::GetArg("-bandwidth", "");
+            if (bandwidth.length () > 0)
+            {
+                if (bandwidth[0] > 'L')
+                    i2p::context.SetHighBandwidth ();
+                else
+                    i2p::context.SetLowBandwidth ();
+            }   
+
+            LogPrint("CMD parameters:");
+            for (int i = 0; i < argc; ++i)
+                LogPrint(i, "  ", argv[i]);
+
+            return true;
+        }
+            
+        bool Daemon_Singleton::start()
+        {
+            // initialize log           
+            if (isLogging)
+            {
+                if (isDaemon)
+                {
+                    std::string logfile_path = IsService () ? "/var/log" : i2p::util::filesystem::GetDataDir().string();
+#ifndef _WIN32
+                    logfile_path.append("/i2pd.log");
+#else
+                    logfile_path.append("\\i2pd.log");
+#endif
+                    StartLog (logfile_path);
+                }
+                else
+                    StartLog (""); // write to stdout
+            }
+            d.httpServer = new i2p::util::HTTPServer(
+                i2p::util::config::GetArg("-httpaddress", "127.0.0.1"),
+                i2p::util::config::GetArg("-httpport", 7070)
+            );
+            d.httpServer->Start();
+            LogPrint("HTTP Server started");
+            i2p::data::netdb.Start();
+            LogPrint("NetDB started");
+            i2p::transport::transports.Start();
+            LogPrint("Transports started");
+            i2p::tunnel::tunnels.Start();
+            LogPrint("Tunnels started");
+            i2p::client::context.Start ();
+            LogPrint("Client started");
+            return true;
+        }
+
+        bool Daemon_Singleton::stop()
+        {
+            LogPrint("Shutdown started.");
+            i2p::client::context.Stop();
+            LogPrint("Client stopped");
+            i2p::tunnel::tunnels.Stop();
+            LogPrint("Tunnels stopped");
+            i2p::transport::transports.Stop();
+            LogPrint("Transports stopped");
+            i2p::data::netdb.Stop();
+            LogPrint("NetDB stopped");
+            d.httpServer->Stop();
+            LogPrint("HTTP Server stopped");
+
+            StopLog ();
+
+            delete d.httpServer; d.httpServer = nullptr;
+
+            return true;
+        }
+    }
+}

client/Daemon.h

@@ -0,0 +1,73 @@
+#pragma once
+#include <string>
+
+#ifdef _WIN32
+#define Daemon i2p::util::DaemonWin32::Instance()
+#else
+#define Daemon i2p::util::DaemonLinux::Instance()
+#endif
+
+namespace i2p
+{
+    namespace util
+    {
+        class Daemon_Singleton_Private;
+        class Daemon_Singleton
+        {
+        public:
+            virtual bool init(int argc, char* argv[]);
+            virtual bool start();
+            virtual bool stop();
+
+            int isLogging;
+            int isDaemon;
+            
+            int running;
+
+        protected:
+            Daemon_Singleton();
+            virtual ~Daemon_Singleton();
+
+            bool IsService () const;                
+
+            // d-pointer for httpServer, httpProxy, etc.
+            class Daemon_Singleton_Private;
+            Daemon_Singleton_Private &d;
+        };
+
+#ifdef _WIN32
+        class DaemonWin32 : public Daemon_Singleton
+        {
+        public:
+            static DaemonWin32& Instance()
+            {
+                static DaemonWin32 instance;
+                return instance;
+            }
+
+            virtual bool init(int argc, char* argv[]);
+            virtual bool start();
+            virtual bool stop();
+        };
+#else
+        class DaemonLinux : public Daemon_Singleton
+        {
+        public:
+            DaemonLinux() = default;
+
+            static DaemonLinux& Instance()
+            {
+                static DaemonLinux instance;
+                return instance;
+            }
+
+            virtual bool start();
+            virtual bool stop();
+         private:
+                std::string pidfile;
+                int pidFilehandle;
+
+        };
+#endif
+    }
+}

client/DaemonLinux.cpp

@@ -0,0 +1,119 @@
+#include "Daemon.h"
+
+#ifndef _WIN32
+
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include "util/Log.h"
+#include "util/util.h"
+
+
+void handle_signal(int sig)
+{
+    switch (sig)
+    {
+    case SIGHUP:
+        if (i2p::util::config::GetArg("daemon", 0) == 1)
+        {
+            static bool first=true;
+            if (first)
+            {
+                first=false;
+                return;
+            }
+        }
+        LogPrint("Reloading config.");
+        i2p::util::filesystem::ReadConfigFile(i2p::util::config::mapArgs, i2p::util::config::mapMultiArgs);
+        break;
+    case SIGABRT:
+    case SIGTERM:
+    case SIGINT:
+        Daemon.running = 0; // Exit loop
+        break;
+    }
+}
+
+
+namespace i2p
+{
+    namespace util
+    {
+        bool DaemonLinux::start()
+        {
+            if (isDaemon == 1)
+            {
+                pid_t pid;
+                pid = fork();
+                if (pid > 0) // parent
+                    ::exit (EXIT_SUCCESS);
+
+                if (pid < 0) // error
+                    return false;
+
+                // child
+                umask(0);
+                int sid = setsid();
+                if (sid < 0)
+                {
+                    LogPrint("Error, could not create process group.");
+                    return false;
+                }
+                std::string d(i2p::util::filesystem::GetDataDir().string ()); // make a copy
+                chdir(d.c_str());
+
+                // close stdin/stdout/stderr descriptors
+                ::close (0);
+                ::open ("/dev/null", O_RDWR);
+                ::close (1);
+                ::open ("/dev/null", O_RDWR);   
+                ::close (2);
+                ::open ("/dev/null", O_RDWR);
+            }
+
+            // Pidfile
+            pidfile = IsService () ? "/var/run" : i2p::util::filesystem::GetDataDir().string();
+            pidfile.append("/i2pd.pid");
+            pidFilehandle = open(pidfile.c_str(), O_RDWR | O_CREAT, 0600);
+            if (pidFilehandle == -1)
+            {
+                LogPrint("Error, could not create pid file (", pidfile, ")\nIs an instance already running?");
+                return false;
+            }
+            if (lockf(pidFilehandle, F_TLOCK, 0) == -1)
+            {
+                LogPrint("Error, could not lock pid file (", pidfile, ")\nIs an instance already running?");
+                return false;
+            }
+            char pid[10];
+            sprintf(pid, "%d\n", getpid());
+            write(pidFilehandle, pid, strlen(pid));
+
+            // Signal handler
+            struct sigaction sa;
+            sa.sa_handler = handle_signal;
+            sigemptyset(&sa.sa_mask);
+            sa.sa_flags = SA_RESTART;
+            sigaction(SIGHUP, &sa, 0);
+            sigaction(SIGABRT, &sa, 0);
+            sigaction(SIGTERM, &sa, 0);
+            sigaction(SIGINT, &sa, 0);
+
+            return Daemon_Singleton::start();
+        }
+
+        bool DaemonLinux::stop()
+        {
+            close(pidFilehandle);
+            unlink(pidfile.c_str());
+
+            return Daemon_Singleton::stop();            
+        }
+
+    }
+}
+
+#endif

client/DaemonWin32.cpp

@@ -0,0 +1,83 @@
+#include "Daemon.h"
+#include "util/util.h"
+#include "util/Log.h"
+
+#ifdef _WIN32
+
+#include "Win32Service.h"
+
+namespace i2p
+{
+    namespace util
+    {
+        bool DaemonWin32::init(int argc, char* argv[])
+        {
+            setlocale(LC_CTYPE, "");
+            SetConsoleCP(1251);
+            SetConsoleOutputCP(1251);
+            setlocale(LC_ALL, "Russian");
+
+            if (!Daemon_Singleton::init(argc, argv)) return false;
+            if (I2PService::isService())
+                isDaemon = 1;
+            else
+                isDaemon = 0;
+
+            std::string serviceControl = i2p::util::config::GetArg("-service", "none");
+            if (serviceControl == "install")
+            {
+                InstallService(
+                    SERVICE_NAME,               // Name of service
+                    SERVICE_DISPLAY_NAME,       // Name to display
+                    SERVICE_START_TYPE,         // Service start type
+                    SERVICE_DEPENDENCIES,       // Dependencies
+                    SERVICE_ACCOUNT,            // Service running account
+                    SERVICE_PASSWORD            // Password of the account
+                    );
+                exit(0);
+            }
+            else if (serviceControl == "remove")
+            {
+                UninstallService(SERVICE_NAME);
+                exit(0);
+            }
+            else if (serviceControl != "none")
+            {
+                printf(" --service=install  to install the service.\n");
+                printf(" --service=remove   to remove the service.\n");
+            }
+            
+            if (isDaemon == 1)
+            {
+                LogPrint("Service session");
+                I2PService service(SERVICE_NAME);
+                if (!I2PService::Run(service))
+                {
+                    LogPrint("Service failed to run w/err 0x%08lx\n", GetLastError());
+                    exit(EXIT_FAILURE);
+                }
+                exit(EXIT_SUCCESS);
+            }
+            else
+                LogPrint("User session");
+
+            return true;
+        }
+        bool DaemonWin32::start()
+        {
+            setlocale(LC_CTYPE, "");
+            SetConsoleCP(1251);
+            SetConsoleOutputCP(1251);
+            setlocale(LC_ALL, "Russian");
+
+            return Daemon_Singleton::start();
+        }
+
+        bool DaemonWin32::stop()
+        {
+            return Daemon_Singleton::stop();
+        }
+    }
+}
+
+#endif

client/HTTPProxy.cpp

@@ -0,0 +1,299 @@
+#include <cstring>
+#include <cassert>
+#include <boost/lexical_cast.hpp>
+#include <boost/regex.hpp>
+#include <string>
+#include <atomic>
+#include "HTTPProxy.h"
+#include "util/util.h"
+#include "Identity.h"
+#include "Streaming.h"
+#include "Destination.h"
+#include "ClientContext.h"
+#include "util/I2PEndian.h"
+#include "I2PTunnel.h"
+
+namespace i2p
+{
+namespace proxy
+{
+    static const size_t http_buffer_size = 8192;
+    class HTTPProxyHandler: public i2p::client::I2PServiceHandler, public std::enable_shared_from_this<HTTPProxyHandler> 
+    {
+        private:
+            enum state 
+            {
+                GET_METHOD,
+                GET_HOSTNAME,
+                GET_HTTPV,
+                GET_HTTPVNL, //TODO: fallback to finding Host: header if needed
+                DONE
+            };
+
+            void EnterState(state nstate);
+            bool HandleData(uint8_t *http_buff, std::size_t len);
+            void HandleSockRecv(const boost::system::error_code & ecode, std::size_t bytes_transfered);
+            void Terminate();
+            void AsyncSockRead();
+            void HTTPRequestFailed(/*std::string message*/);
+            void ExtractRequest();
+            bool ValidateHTTPRequest();
+            void HandleJumpServices();
+            bool CreateHTTPRequest(uint8_t *http_buff, std::size_t len);
+            void SentHTTPFailed(const boost::system::error_code & ecode);
+            void HandleStreamRequestComplete (std::shared_ptr<i2p::stream::Stream> stream);
+
+            uint8_t m_http_buff[http_buffer_size];
+            std::shared_ptr<boost::asio::ip::tcp::socket> m_sock;
+            std::string m_request; //Data left to be sent
+            std::string m_url; //URL
+            std::string m_method; //Method
+            std::string m_version; //HTTP version
+            std::string m_address; //Address
+            std::string m_path; //Path
+            int m_port; //Port
+            state m_state;//Parsing state
+
+        public:
+
+            HTTPProxyHandler(HTTPProxyServer * parent, std::shared_ptr<boost::asio::ip::tcp::socket> sock) : 
+                I2PServiceHandler(parent), m_sock(sock)
+                { EnterState(GET_METHOD); }
+            ~HTTPProxyHandler() { Terminate(); }
+            void Handle () { AsyncSockRead(); }
+    };
+
+    void HTTPProxyHandler::AsyncSockRead()
+    {
+        LogPrint(eLogDebug,"--- HTTP Proxy async sock read");
+        if(m_sock) {
+            m_sock->async_receive(boost::asio::buffer(m_http_buff, http_buffer_size),
+                        std::bind(&HTTPProxyHandler::HandleSockRecv, shared_from_this(),
+                                std::placeholders::_1, std::placeholders::_2));
+        } else {
+            LogPrint(eLogError,"--- HTTP Proxy no socket for read");
+        }
+    }
+
+    void HTTPProxyHandler::Terminate() {
+        if (Kill()) return;
+        if (m_sock) 
+        {
+            LogPrint(eLogDebug,"--- HTTP Proxy close sock");
+            m_sock->close();
+            m_sock = nullptr;
+        }
+        Done(shared_from_this());
+    }
+
+    /* All hope is lost beyond this point */
+    //TODO: handle this appropriately
+    void HTTPProxyHandler::HTTPRequestFailed(/*HTTPProxyHandler::errTypes error*/)
+    {
+        static std::string response = "HTTP/1.0 500 Internal Server Error\r\nContent-type: text/html\r\nContent-length: 0\r\n";
+        boost::asio::async_write(*m_sock, boost::asio::buffer(response,response.size()),
+                     std::bind(&HTTPProxyHandler::SentHTTPFailed, shared_from_this(), std::placeholders::_1));
+    }
+
+    void HTTPProxyHandler::EnterState(HTTPProxyHandler::state nstate) 
+    {
+        m_state = nstate;
+    }
+
+    void HTTPProxyHandler::ExtractRequest()
+    {
+        LogPrint(eLogDebug,"--- HTTP Proxy method is: ", m_method, "\nRequest is: ", m_url);
+        std::string server="";
+        std::string port="80";
+        boost::regex rHTTP("http://(.*?)(:(\\d+))?(/.*)");
+        boost::smatch m;
+        std::string path;
+        if(boost::regex_search(m_url, m, rHTTP, boost::match_extra)) 
+        {
+            server=m[1].str();
+            if (m[2].str() != "")  port=m[3].str();
+            path=m[4].str();
+        }
+        LogPrint(eLogDebug,"--- HTTP Proxy server is: ",server, " port is: ", port, "\n path is: ",path);
+        m_address = server;
+        m_port = boost::lexical_cast<int>(port);
+        m_path = path;
+    }
+
+    bool HTTPProxyHandler::ValidateHTTPRequest() 
+    {
+        if ( m_version != "HTTP/1.0" && m_version != "HTTP/1.1" ) 
+        {
+            LogPrint(eLogError,"--- HTTP Proxy unsupported version: ", m_version);
+            HTTPRequestFailed(); //TODO: send right stuff
+            return false;
+        }
+        return true;
+    }
+
+    void HTTPProxyHandler::HandleJumpServices() 
+    {
+        static const char * helpermark1 = "?i2paddresshelper=";
+        static const char * helpermark2 = "&i2paddresshelper=";
+        size_t addressHelperPos1 = m_path.rfind (helpermark1);
+        size_t addressHelperPos2 = m_path.rfind (helpermark2);
+        size_t addressHelperPos;
+        if (addressHelperPos1 == std::string::npos)
+        {
+            if (addressHelperPos2 == std::string::npos)
+                return; //Not a jump service
+            else
+                addressHelperPos = addressHelperPos2;
+        }
+        else
+        {
+            if (addressHelperPos2 == std::string::npos)
+                addressHelperPos = addressHelperPos1;
+            else if ( addressHelperPos1 > addressHelperPos2 )
+                addressHelperPos = addressHelperPos1;
+            else
+                addressHelperPos = addressHelperPos2;
+        }
+        auto base64 = m_path.substr (addressHelperPos + strlen(helpermark1));
+        base64 = i2p::util::http::urlDecode(base64); //Some of the symbols may be urlencoded
+        LogPrint (eLogDebug,"Jump service for ", m_address, " found at ", base64, ". Inserting to address book");
+        //TODO: this is very dangerous and broken. We should ask the user before doing anything see http://pastethis.i2p/raw/pn5fL4YNJL7OSWj3Sc6N/
+        //TODO: we could redirect the user again to avoid dirtiness in the browser
+        i2p::client::context.GetAddressBook ().InsertAddress (m_address, base64);
+        m_path.erase(addressHelperPos);
+    }
+
+    bool HTTPProxyHandler::CreateHTTPRequest(uint8_t *http_buff, std::size_t len) 
+    {
+        ExtractRequest(); //TODO: parse earlier
+        if (!ValidateHTTPRequest()) return false;
+        HandleJumpServices();
+        m_request = m_method;
+        m_request.push_back(' ');
+        m_request += m_path;
+        m_request.push_back(' ');
+        m_request += m_version;
+        m_request.push_back('\r');
+        m_request.push_back('\n');
+        m_request.append("Connection: close\r\n");
+        m_request.append(reinterpret_cast<const char *>(http_buff),len);
+        return true;
+    }
+
+    bool HTTPProxyHandler::HandleData(uint8_t *http_buff, std::size_t len)
+    {
+        assert(len); // This should always be called with a least a byte left to parse
+        while (len > 0) 
+        {
+            //TODO: fallback to finding Host: header if needed
+            switch (m_state) 
+            {
+                case GET_METHOD:
+                    switch (*http_buff) 
+                    {
+                        case ' ': EnterState(GET_HOSTNAME); break;
+                        default: m_method.push_back(*http_buff); break;
+                    }
+                break;
+                case GET_HOSTNAME:
+                    switch (*http_buff) 
+                    {
+                        case ' ': EnterState(GET_HTTPV); break;
+                        default: m_url.push_back(*http_buff); break;
+                    }
+                break;
+                case GET_HTTPV:
+                    switch (*http_buff) 
+                    {
+                        case '\r': EnterState(GET_HTTPVNL); break;
+                        default: m_version.push_back(*http_buff); break;
+                    }
+                break;
+                case GET_HTTPVNL:
+                    switch (*http_buff) 
+                    {
+                        case '\n': EnterState(DONE); break;
+                        default:
+                            LogPrint(eLogError,"--- HTTP Proxy rejected invalid request ending with: ", ((int)*http_buff));
+                            HTTPRequestFailed(); //TODO: add correct code
+                            return false;
+                    }
+                break;
+                default:
+                    LogPrint(eLogError,"--- HTTP Proxy invalid state: ", m_state);
+                    HTTPRequestFailed(); //TODO: add correct code 500
+                    return false;
+            }
+            http_buff++;
+            len--;
+            if (m_state == DONE)
+                return CreateHTTPRequest(http_buff,len);
+        }
+        return true;
+    }
+
+    void HTTPProxyHandler::HandleSockRecv(const boost::system::error_code & ecode, std::size_t len)
+    {
+        LogPrint(eLogDebug,"--- HTTP Proxy sock recv: ", len);
+        if(ecode) 
+        {
+            LogPrint(eLogWarning," --- HTTP Proxy sock recv got error: ", ecode);
+                        Terminate();
+            return;
+        }
+
+        if (HandleData(m_http_buff, len)) 
+        {
+            if (m_state == DONE) 
+            {
+                LogPrint(eLogInfo,"--- HTTP Proxy requested: ", m_url);
+                GetOwner()->CreateStream (std::bind (&HTTPProxyHandler::HandleStreamRequestComplete,
+                        shared_from_this(), std::placeholders::_1), m_address, m_port);
+            } 
+            else 
+                AsyncSockRead();
+        }
+
+    }
+
+    void HTTPProxyHandler::SentHTTPFailed(const boost::system::error_code & ecode)
+    {
+        if (!ecode)
+            Terminate();
+        else 
+        {
+            LogPrint (eLogError,"--- HTTP Proxy Closing socket after sending failure because: ", ecode.message ());
+            Terminate();
+        }
+    }
+
+    void HTTPProxyHandler::HandleStreamRequestComplete (std::shared_ptr<i2p::stream::Stream> stream)
+    {
+        if (stream) 
+        {
+            if (Kill()) return;
+            LogPrint (eLogInfo,"--- HTTP Proxy New I2PTunnel connection");
+            auto connection = std::make_shared<i2p::client::I2PTunnelConnection>(GetOwner(), m_sock, stream);
+            GetOwner()->AddHandler (connection);
+            connection->I2PConnect (reinterpret_cast<const uint8_t*>(m_request.data()), m_request.size());
+            Done(shared_from_this());
+        } 
+        else 
+        {
+            LogPrint (eLogError,"--- HTTP Proxy Issue when creating the stream, check the previous warnings for more info.");
+            HTTPRequestFailed(); // TODO: Send correct error message host unreachable
+        }
+    }
+
+    HTTPProxyServer::HTTPProxyServer(const std::string& address, int port, std::shared_ptr<i2p::client::ClientDestination> localDestination): 
+        TCPIPAcceptor(address, port, localDestination ? localDestination : i2p::client::context.GetSharedLocalDestination ()) 
+    {
+    }
+    
+    std::shared_ptr<i2p::client::I2PServiceHandler> HTTPProxyServer::CreateHandler(std::shared_ptr<boost::asio::ip::tcp::socket> socket)
+    {
+        return std::make_shared<HTTPProxyHandler> (this, socket);
+    }
+
+}
+}

client/HTTPProxy.h

@@ -0,0 +1,32 @@
+#ifndef HTTP_PROXY_H__
+#define HTTP_PROXY_H__
+
+#include <memory>
+#include <set>
+#include <boost/asio.hpp>
+#include <mutex>
+#include "I2PService.h"
+#include "Destination.h"
+
+namespace i2p
+{
+namespace proxy
+{
+    class HTTPProxyServer: public i2p::client::TCPIPAcceptor
+    {
+        public:
+
+            HTTPProxyServer(const std::string& address, int port, std::shared_ptr<i2p::client::ClientDestination> localDestination = nullptr);
+            ~HTTPProxyServer() {};
+
+        protected:
+            // Implements TCPIPAcceptor
+            std::shared_ptr<i2p::client::I2PServiceHandler> CreateHandler(std::shared_ptr<boost::asio::ip::tcp::socket> socket);
+            const char* GetName() { return "HTTP Proxy"; }
+    };
+
+    typedef HTTPProxyServer HTTPProxy;
+}
+}
+
+#endif

client/HTTPServer.cpp

@@ -0,0 +1,264 @@
+#include <boost/bind.hpp>
+#include <ctime>
+#include <fstream>
+#include "util/Log.h"
+#include "util/util.h"
+#include "util/I2PEndian.h"
+#include "HTTPServer.h"
+
+namespace i2p {
+namespace util {
+
+HTTPConnection::HTTPConnection(boost::asio::ip::tcp::socket* socket,
+ std::shared_ptr<client::i2pcontrol::I2PControlSession> session)
+    : m_Socket(socket), m_BufferLen(0), m_Request(), m_Reply(), m_Session(session)
+{
+    
+}
+
+void HTTPConnection::Terminate()
+{
+    m_Socket->close();
+}
+
+void HTTPConnection::Receive()
+{
+    m_Socket->async_read_some(
+        boost::asio::buffer(m_Buffer, HTTP_CONNECTION_BUFFER_SIZE), std::bind(
+            &HTTPConnection::HandleReceive, shared_from_this(),
+            std::placeholders::_1, std::placeholders::_2
+        )
+    );
+}
+
+void HTTPConnection::HandleReceive(const boost::system::error_code& e, std::size_t nb_bytes)
+{
+    if(!e) {
+        m_Buffer[nb_bytes] = 0;
+        m_BufferLen = nb_bytes;
+        const std::string data = std::string(m_Buffer, m_Buffer + m_BufferLen);
+        if(!m_Request.hasData()) // New request
+            m_Request = i2p::util::http::Request(data);
+        else 
+            m_Request.update(data);
+
+        if(m_Request.isComplete()) {
+            RunRequest();
+            m_Request.clear();
+        } else {
+            Receive();
+        }
+    } else if(e != boost::asio::error::operation_aborted)
+        Terminate();
+}
+
+void HTTPConnection::RunRequest()
+{
+    try {
+      if(m_Request.getMethod() == "GET")
+          return HandleRequest();
+      if(m_Request.getHeader("Content-Type").find("application/json") != std::string::npos)
+          return HandleI2PControlRequest();
+    } catch(...) {
+        // Ignore the error for now, probably Content-Type doesn't exist
+        // Could also be invalid json data
+    }
+    // Unsupported method
+    m_Reply = i2p::util::http::Response(502, "");
+    SendReply();
+}
+
+void HTTPConnection::ExtractParams(const std::string& str, std::map<std::string, std::string>& params)
+{
+    if(str[0] != '&') return;
+    size_t pos = 1, end;
+    do
+    {
+        end = str.find('&', pos);
+        std::string param = str.substr(pos, end - pos);
+        LogPrint(param);
+        size_t e = param.find('=');
+        if(e != std::string::npos)
+            params[param.substr(0, e)] = param.substr(e+1);
+        pos = end + 1;
+    }   
+    while(end != std::string::npos);
+}
+
+void HTTPConnection::HandleWriteReply(const boost::system::error_code& e)
+{
+    if(e != boost::asio::error::operation_aborted) {
+        boost::system::error_code ignored_ec;
+        m_Socket->shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored_ec);
+        Terminate();
+    }
+}
+
+void HTTPConnection::Send404Reply()
+{
+    try {
+        const std::string error_page = "404.html";
+        m_Reply = i2p::util::http::Response(404, GetFileContents(error_page, true));
+        m_Reply.setHeader("Content-Type", i2p::util::http::getMimeType(error_page));
+    } catch(const std::runtime_error&) {
+        // Failed to load 404.html, assume the webui is incorrectly installed
+        m_Reply = i2p::util::http::Response(404,
+            "<!DOCTYPE HTML><html>"
+            "<head><title>Error: 404 - webui not installed</title></head><body>"
+                "<p>It looks like your webui installation is broken.</p>"
+                "<p>Run the following command to (re)install it:</p>"
+                "<pre>./i2pd --install=/path/to/webui</pre>"
+                "<p>Or from a directory containing a folder named webui:</p>"
+                "<pre>./i2pd --install</pre>"
+                "<p>The webui folder should come with the binaries.</p>"
+            "</body></html>"
+        );
+    }
+    SendReply();
+}
+
+std::string HTTPConnection::GetFileContents(const std::string& filename, bool preprocess) const
+{
+    boost::system::error_code e;
+
+     // Use canonical to avoid .. or . in path
+    const boost::filesystem::path address = boost::filesystem::canonical(
+        i2p::util::filesystem::GetWebuiDataDir() / filename, e
+    );
+
+    const std::string address_str = address.string();
+    
+    std::ifstream ifs(address_str, std::ios_base::in | std::ios_base::binary);
+    if(e || !ifs || !isAllowed(address_str))
+        throw std::runtime_error("Cannot load " + address_str + ".");
+
+    std::string str;
+    ifs.seekg(0, ifs.end);
+    str.resize(ifs.tellg());
+    ifs.seekg(0, ifs.beg);
+    ifs.read(&str[0], str.size());
+    ifs.close();
+    
+    if(preprocess)
+        return i2p::util::http::preprocessContent(str, address.parent_path().string());
+    else
+        return str;
+}
+
+void HTTPConnection::HandleRequest()
+{
+
+    std::string uri = m_Request.getUri();
+    if(uri == "/")
+        uri = "index.html";
+
+    try {
+        m_Reply = i2p::util::http::Response(200, GetFileContents(uri, true));
+        m_Reply.setHeader("Content-Type", i2p::util::http::getMimeType(uri) + "; charset=UTF-8");
+        SendReply();
+    } catch(const std::runtime_error&) {
+        // Cannot open the file for some reason, send 404
+        Send404Reply();
+    }
+}
+
+void HTTPConnection::HandleI2PControlRequest()
+{
+    std::stringstream ss(m_Request.getContent());
+    const client::i2pcontrol::I2PControlSession::Response rsp = m_Session->handleRequest(ss);
+    m_Reply = i2p::util::http::Response(200, rsp.toJsonString());
+    m_Reply.setHeader("Content-Type", "application/json");
+    SendReply();
+}
+
+bool HTTPConnection::isAllowed(const std::string& address) const
+{
+    const std::size_t pos_dot = address.find_last_of('.');
+    const std::size_t pos_slash = address.find_last_of('/');
+    if(pos_dot == std::string::npos || pos_dot == address.size() - 1)
+        return false;
+    if(pos_slash != std::string::npos && pos_dot < pos_slash)
+        return false;
+    return true;
+}
+
+void HTTPConnection::SendReply()
+{
+    // we need the date header to be compliant with HTTP 1.1
+    std::time_t time_now = std::time(nullptr);
+    char time_buff[128];
+    if(std::strftime(time_buff, sizeof(time_buff), "%a, %d %b %Y %H:%M:%S GMT", std::gmtime(&time_now)) ) {
+        m_Reply.setHeader("Date", std::string(time_buff));
+        m_Reply.setContentLength();
+    }
+    boost::asio::async_write(
+        *m_Socket, boost::asio::buffer(m_Reply.toString()),
+        std::bind(&HTTPConnection::HandleWriteReply, shared_from_this(), std::placeholders::_1)
+    );
+}
+
+HTTPServer::HTTPServer(const std::string& address, int port):
+    m_Thread(nullptr), m_Work(m_Service),
+    m_Acceptor(m_Service, boost::asio::ip::tcp::endpoint(
+        boost::asio::ip::address::from_string(address), port)
+    ),
+    m_NewSocket(nullptr),
+    m_Session(std::make_shared<client::i2pcontrol::I2PControlSession>(m_Service))
+{
+
+}
+
+HTTPServer::~HTTPServer()
+{
+    Stop();
+}
+
+void HTTPServer::Start()
+{
+    m_Thread = new std::thread(std::bind(&HTTPServer::Run, this));
+    m_Acceptor.listen();
+    m_Session->start();
+    Accept();
+}
+
+void HTTPServer::Stop()
+{
+    m_Session->stop();
+    m_Acceptor.close();
+    m_Service.stop();
+    if(m_Thread)
+    {
+        m_Thread->join();
+        delete m_Thread;
+        m_Thread = nullptr;
+    }
+}
+
+void HTTPServer::Run()
+{
+    m_Service.run();
+}
+
+void HTTPServer::Accept()
+{
+    m_NewSocket = new boost::asio::ip::tcp::socket(m_Service);
+    m_Acceptor.async_accept(*m_NewSocket, boost::bind(&HTTPServer::HandleAccept, this,
+        boost::asio::placeholders::error));
+}
+
+void HTTPServer::HandleAccept(const boost::system::error_code& ecode)
+{
+    if(!ecode) {
+        CreateConnection(m_NewSocket);
+        Accept();
+    }
+}
+
+void HTTPServer::CreateConnection(boost::asio::ip::tcp::socket* m_NewSocket)
+{
+    auto conn = std::make_shared<HTTPConnection>(m_NewSocket, m_Session);
+    conn->Receive();
+}
+
+}
+}

client/HTTPServer.h

@@ -0,0 +1,88 @@
+#ifndef HTTP_SERVER_H__
+#define HTTP_SERVER_H__
+
+#include <sstream>
+#include <thread>
+#include <memory>
+#include <boost/asio.hpp>
+#include <boost/array.hpp>
+#include "i2pcontrol/I2PControl.h"
+#include "util/HTTP.h"
+
+namespace i2p {
+namespace util {
+
+const size_t HTTP_CONNECTION_BUFFER_SIZE = 8192;    
+const int HTTP_DESTINATION_REQUEST_TIMEOUT = 10; // in seconds
+
+class HTTPConnection: public std::enable_shared_from_this<HTTPConnection> {
+public:
+
+    HTTPConnection(boost::asio::ip::tcp::socket* socket,
+        std::shared_ptr<i2p::client::i2pcontrol::I2PControlSession> session);
+
+    ~HTTPConnection() { delete m_Socket; }
+    void Receive();
+    
+private:
+
+    void Terminate();
+    void HandleReceive(const boost::system::error_code& ecode, std::size_t bytes_transferred);
+    void RunRequest();
+    void HandleWriteReply(const boost::system::error_code& ecode);
+    void SendReply();
+
+    void Send404Reply();
+
+    /*
+     * @throw std::runtime_error when the file is not accessible
+     */
+    std::string GetFileContents(const std::string& filename, bool preprocess) const;
+
+    void HandleRequest();
+    void HandleI2PControlRequest();
+    void ExtractParams(const std::string& str, std::map<std::string, std::string>& params);
+    
+    bool isAllowed(const std::string& address) const;
+private:
+    boost::asio::ip::tcp::socket* m_Socket;
+    char m_Buffer[HTTP_CONNECTION_BUFFER_SIZE + 1];
+    size_t m_BufferLen;
+    util::http::Request m_Request;
+    util::http::Response m_Reply;
+    std::shared_ptr<i2p::client::i2pcontrol::I2PControlSession> m_Session;
+};
+
+class HTTPServer {
+public:
+
+    HTTPServer(const std::string& address, int port);
+    virtual ~HTTPServer();
+
+    void Start();
+    void Stop();
+
+private:
+
+    void Run();
+    void Accept();
+    void HandleAccept(const boost::system::error_code& ecode);
+    
+private:
+
+    std::thread * m_Thread;
+    boost::asio::io_service m_Service;
+    boost::asio::io_service::work m_Work;
+    boost::asio::ip::tcp::acceptor m_Acceptor;
+    boost::asio::ip::tcp::socket * m_NewSocket;
+    std::shared_ptr<i2p::client::i2pcontrol::I2PControlSession> m_Session;
+
+protected:
+    void CreateConnection(boost::asio::ip::tcp::socket* m_NewSocket);
+};
+}
+}
+
+#endif
+
+

client/I2PService.cpp

@@ -0,0 +1,79 @@
+#include "Destination.h"
+#include "Identity.h"
+#include "ClientContext.h"
+#include "I2PService.h"
+
+
+namespace i2p
+{
+namespace client
+{
+    static const i2p::data::SigningKeyType I2P_SERVICE_DEFAULT_KEY_TYPE = i2p::data::SIGNING_KEY_TYPE_ECDSA_SHA256_P256;
+
+    I2PService::I2PService (std::shared_ptr<ClientDestination> localDestination):
+        m_LocalDestination (localDestination ? localDestination :
+                    i2p::client::context.CreateNewLocalDestination (false, I2P_SERVICE_DEFAULT_KEY_TYPE))
+    {
+    }
+    
+    I2PService::I2PService (i2p::data::SigningKeyType kt):
+        m_LocalDestination (i2p::client::context.CreateNewLocalDestination (false, kt))
+    {
+    }
+    
+    void I2PService::CreateStream (StreamRequestComplete streamRequestComplete, const std::string& dest, int port) {
+        assert(streamRequestComplete);
+        i2p::data::IdentHash identHash;
+        if (i2p::client::context.GetAddressBook ().GetIdentHash (dest, identHash))
+            m_LocalDestination->CreateStream (streamRequestComplete, identHash, port);
+        else
+        {
+            LogPrint (eLogWarning, "Remote destination ", dest, " not found");
+            streamRequestComplete (nullptr);
+        }
+    }
+
+    void TCPIPAcceptor::Start ()
+    {
+        m_Acceptor.listen ();
+        Accept ();
+    }
+
+    void TCPIPAcceptor::Stop ()
+    {
+        m_Acceptor.close();
+        m_Timer.cancel ();
+        ClearHandlers();
+    }
+
+    void TCPIPAcceptor::Accept ()
+    {
+        auto newSocket = std::make_shared<boost::asio::ip::tcp::socket> (GetService ());
+        m_Acceptor.async_accept (*newSocket, std::bind (&TCPIPAcceptor::HandleAccept, this,
+            std::placeholders::_1, newSocket));
+    }
+
+    void TCPIPAcceptor::HandleAccept (const boost::system::error_code& ecode, std::shared_ptr<boost::asio::ip::tcp::socket> socket)
+    {
+        if (!ecode)
+        {
+            LogPrint(eLogDebug,"--- ",GetName()," accepted");
+            auto handler = CreateHandler(socket);
+            if (handler) 
+            {
+                AddHandler(handler);
+                handler->Handle();
+            } 
+            else 
+                socket->close();
+            Accept();
+        }
+        else
+        {
+            if (ecode != boost::asio::error::operation_aborted)
+                LogPrint (eLogError,"--- ",GetName()," Closing socket on accept because: ", ecode.message ());
+        }
+    }
+
+}
+}

client/I2PService.h

@@ -0,0 +1,107 @@
+#ifndef I2PSERVICE_H__
+#define I2PSERVICE_H__
+
+#include <atomic>
+#include <mutex>
+#include <unordered_set>
+#include <memory>
+#include <boost/asio.hpp>
+#include "Destination.h"
+#include "Identity.h"
+
+namespace i2p
+{
+namespace client
+{
+    class I2PServiceHandler;
+    class I2PService
+    {
+        public:
+            I2PService (std::shared_ptr<ClientDestination> localDestination  = nullptr);
+            I2PService (i2p::data::SigningKeyType kt);
+            virtual ~I2PService () { ClearHandlers (); }
+
+            inline void AddHandler (std::shared_ptr<I2PServiceHandler> conn)
+            {
+                std::unique_lock<std::mutex> l(m_HandlersMutex);
+                m_Handlers.insert(conn);
+            }
+            inline void RemoveHandler (std::shared_ptr<I2PServiceHandler> conn)
+            {
+                std::unique_lock<std::mutex> l(m_HandlersMutex);
+                m_Handlers.erase(conn);
+            }
+            inline void ClearHandlers ()
+            {
+                std::unique_lock<std::mutex> l(m_HandlersMutex);
+                m_Handlers.clear();
+            }
+
+            inline std::shared_ptr<ClientDestination> GetLocalDestination () { return m_LocalDestination; }
+            inline void SetLocalDestination (std::shared_ptr<ClientDestination> dest) { m_LocalDestination = dest; }
+            void CreateStream (StreamRequestComplete streamRequestComplete, const std::string& dest, int port = 0);
+
+            inline boost::asio::io_service& GetService () { return m_LocalDestination->GetService (); }
+
+            virtual void Start () = 0;
+            virtual void Stop () = 0;
+
+            virtual const char* GetName() { return "Generic I2P Service"; }
+        private:
+
+            std::shared_ptr<ClientDestination> m_LocalDestination;
+            std::unordered_set<std::shared_ptr<I2PServiceHandler> > m_Handlers;
+            std::mutex m_HandlersMutex;
+    };
+
+    /*Simple interface for I2PHandlers, allows detection of finalization amongst other things */
+    class I2PServiceHandler
+    {
+        public:
+            I2PServiceHandler(I2PService * parent) : m_Service(parent), m_Dead(false) { }
+            virtual ~I2PServiceHandler() { }
+            //If you override this make sure you call it from the children
+            virtual void Handle() {}; //Start handling the socket
+        protected:
+            // Call when terminating or handing over to avoid race conditions
+            inline bool Kill () { return m_Dead.exchange(true); }
+            // Call to know if the handler is dead
+            inline bool Dead () { return m_Dead; }
+            // Call when done to clean up (make sure Kill is called first)
+            inline void Done (std::shared_ptr<I2PServiceHandler> me) { if(m_Service) m_Service->RemoveHandler(me); }
+            // Call to talk with the owner
+            inline I2PService * GetOwner() { return m_Service; }
+        private:
+            I2PService *m_Service;
+            std::atomic<bool> m_Dead; //To avoid cleaning up multiple times
+    };
+
+    /* TODO: support IPv6 too */
+    //This is a service that listens for connections on the IP network and interacts with I2P
+    class TCPIPAcceptor: public I2PService
+    {
+        public:
+            TCPIPAcceptor(const std::string& address, int port, std::shared_ptr<ClientDestination> localDestination = nullptr)
+                : I2PService(localDestination), m_Acceptor(GetService(), boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(address), port)),
+                  m_Timer (GetService()) {}
+            TCPIPAcceptor(const std::string& address, int port, i2p::data::SigningKeyType kt)
+                : I2PService(kt), m_Acceptor(GetService(), boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(address), port)),
+                  m_Timer(GetService()) {}
+            virtual ~TCPIPAcceptor () { TCPIPAcceptor::Stop(); }
+            //If you override this make sure you call it from the children
+            void Start ();
+            //If you override this make sure you call it from the children
+            void Stop ();
+        protected:
+            virtual std::shared_ptr<I2PServiceHandler> CreateHandler(std::shared_ptr<boost::asio::ip::tcp::socket> socket) = 0;
+            virtual const char* GetName() { return "Generic TCP/IP accepting daemon"; }
+        private:
+            void Accept();
+            void HandleAccept(const boost::system::error_code& ecode, std::shared_ptr<boost::asio::ip::tcp::socket> socket);
+            boost::asio::ip::tcp::acceptor m_Acceptor;
+            boost::asio::deadline_timer m_Timer;
+    };
+}
+}
+
+#endif

client/I2PTunnel.cpp

@@ -0,0 +1,405 @@
+#include <cassert>
+#include "util/Log.h"
+#include "Destination.h"
+#include "ClientContext.h"
+#include "I2PTunnel.h"
+
+namespace i2p
+{
+namespace client
+{
+    I2PTunnelConnection::I2PTunnelConnection (I2PService * owner, std::shared_ptr<boost::asio::ip::tcp::socket> socket,
+        std::shared_ptr<const i2p::data::LeaseSet> leaseSet, int port): 
+        I2PServiceHandler(owner), m_Socket (socket), m_RemoteEndpoint (socket->remote_endpoint ()),
+        m_IsQuiet (true)
+    {
+        m_Stream = GetOwner()->GetLocalDestination ()->CreateStream (leaseSet, port);
+    }   
+
+    I2PTunnelConnection::I2PTunnelConnection (I2PService * owner,
+        std::shared_ptr<boost::asio::ip::tcp::socket> socket, std::shared_ptr<i2p::stream::Stream> stream):
+        I2PServiceHandler(owner), m_Socket (socket), m_Stream (stream),
+        m_RemoteEndpoint (socket->remote_endpoint ()), m_IsQuiet (true)
+    {
+    }
+
+    I2PTunnelConnection::I2PTunnelConnection (I2PService * owner, std::shared_ptr<i2p::stream::Stream> stream,
+        std::shared_ptr<boost::asio::ip::tcp::socket> socket, const boost::asio::ip::tcp::endpoint& target, bool quiet):
+        I2PServiceHandler(owner), m_Socket (socket), m_Stream (stream),
+        m_RemoteEndpoint (target), m_IsQuiet (quiet)
+    {
+    }
+
+    I2PTunnelConnection::~I2PTunnelConnection ()
+    {
+    }   
+
+    void I2PTunnelConnection::I2PConnect (const uint8_t * msg, size_t len)
+    {
+        if (m_Stream)
+        {
+            if (msg)
+                m_Stream->Send (msg, len); // connect and send
+            else    
+                m_Stream->Send (m_Buffer, 0); // connect
+        }
+        StreamReceive ();
+        Receive ();
+    }
+        
+    void I2PTunnelConnection::Connect ()
+    {
+        if (m_Socket)
+            m_Socket->async_connect (m_RemoteEndpoint, std::bind (&I2PTunnelConnection::HandleConnect,
+                shared_from_this (), std::placeholders::_1));
+    }   
+        
+    void I2PTunnelConnection::Terminate ()
+    {
+        if (Kill()) return;
+        if (m_Stream)
+        {
+            m_Stream->Close ();
+            m_Stream.reset ();
+        }   
+        m_Socket->close ();
+        Done(shared_from_this ());
+    }           
+
+    void I2PTunnelConnection::Receive ()
+    {
+        m_Socket->async_read_some (boost::asio::buffer(m_Buffer, I2P_TUNNEL_CONNECTION_BUFFER_SIZE),                
+            std::bind(&I2PTunnelConnection::HandleReceived, shared_from_this (), 
+            std::placeholders::_1, std::placeholders::_2));
+    }   
+    
+    void I2PTunnelConnection::HandleReceived (const boost::system::error_code& ecode, std::size_t bytes_transferred)
+    {
+        if (ecode)
+        {
+            LogPrint ("I2PTunnel read error: ", ecode.message ());
+            if (ecode != boost::asio::error::operation_aborted)
+                Terminate ();
+        }
+        else
+        {   
+            if (m_Stream)
+            {   
+                auto s = shared_from_this ();
+                m_Stream->AsyncSend (m_Buffer, bytes_transferred,
+                    [s](const boost::system::error_code& ecode)
+                    {
+                        if (!ecode)
+                            s->Receive ();
+                        else
+                            s->Terminate ();
+                    });
+            }   
+        }
+    }   
+
+    void I2PTunnelConnection::HandleWrite (const boost::system::error_code& ecode)
+    {
+        if (ecode)
+        {
+            LogPrint ("I2PTunnel write error: ", ecode.message ());
+            if (ecode != boost::asio::error::operation_aborted)
+                Terminate ();
+        }
+        else
+            StreamReceive ();
+    }
+
+    void I2PTunnelConnection::StreamReceive ()
+    {
+        if (m_Stream)
+            m_Stream->AsyncReceive (boost::asio::buffer (m_StreamBuffer, I2P_TUNNEL_CONNECTION_BUFFER_SIZE),
+                std::bind (&I2PTunnelConnection::HandleStreamReceive, shared_from_this (),
+                    std::placeholders::_1, std::placeholders::_2),
+                I2P_TUNNEL_CONNECTION_MAX_IDLE);
+    }   
+
+    void I2PTunnelConnection::HandleStreamReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred)
+    {
+        if (ecode)
+        {
+            LogPrint ("I2PTunnel stream read error: ", ecode.message ());
+            if (ecode != boost::asio::error::operation_aborted)
+                Terminate ();
+        }
+        else
+            Write (m_StreamBuffer, bytes_transferred);
+    }
+
+    void I2PTunnelConnection::Write (const uint8_t * buf, size_t len)
+    {
+        m_Socket->async_send (boost::asio::buffer (buf, len),
+            std::bind (&I2PTunnelConnection::HandleWrite, shared_from_this (), std::placeholders::_1));
+    }
+
+    void I2PTunnelConnection::HandleConnect (const boost::system::error_code& ecode)
+    {
+        if (ecode)
+        {
+            LogPrint ("I2PTunnel connect error: ", ecode.message ());
+            Terminate ();
+        }
+        else
+        {
+            LogPrint ("I2PTunnel connected");
+            if (m_IsQuiet)
+                StreamReceive ();
+            else
+            {
+                // send destination first like received from I2P
+                std::string dest = m_Stream->GetRemoteIdentity ().ToBase64 ();
+                dest += "\n";
+                memcpy (m_StreamBuffer, dest.c_str (), dest.size ());
+                HandleStreamReceive (boost::system::error_code (), dest.size ());
+            }   
+            Receive (); 
+        }
+    }
+
+    I2PTunnelConnectionHTTP::I2PTunnelConnectionHTTP (I2PService * owner, std::shared_ptr<i2p::stream::Stream> stream,
+        std::shared_ptr<boost::asio::ip::tcp::socket> socket, 
+        const boost::asio::ip::tcp::endpoint& target, const std::string& host):
+        I2PTunnelConnection (owner, stream, socket, target), m_Host (host), m_HeaderSent (false)
+    {
+    }
+
+    void I2PTunnelConnectionHTTP::Write (const uint8_t * buf, size_t len)
+    {
+        if (m_HeaderSent)
+            I2PTunnelConnection::Write (buf, len);
+        else
+        {   
+            m_InHeader.clear ();
+            m_InHeader.write ((const char *)buf, len);
+            std::string line;
+            bool endOfHeader = false;
+            while (!endOfHeader)
+            {
+                std::getline(m_InHeader, line);
+                if (!m_InHeader.fail ())
+                {
+                    if (line.find ("Host:") != std::string::npos)
+                        m_OutHeader << "Host: " << m_Host << "\r\n";
+                    else
+                        m_OutHeader << line << "\n";
+                    if (line == "\r") endOfHeader = true;
+                }
+                else
+                    break;
+            }
+
+            if (endOfHeader)
+            {
+                m_OutHeader << m_InHeader.str (); // data right after header
+                m_HeaderSent = true;
+                I2PTunnelConnection::Write ((uint8_t *)m_OutHeader.str ().c_str (), m_OutHeader.str ().length ());
+            }
+        }   
+    }
+
+    /* This handler tries to stablish a connection with the desired server and dies if it fails to do so */
+    class I2PClientTunnelHandler: public I2PServiceHandler, public std::enable_shared_from_this<I2PClientTunnelHandler>
+    {
+        public:
+            I2PClientTunnelHandler (I2PClientTunnel * parent, i2p::data::IdentHash destination,
+                int destinationPort, std::shared_ptr<boost::asio::ip::tcp::socket> socket):
+                I2PServiceHandler(parent), m_DestinationIdentHash(destination), 
+                m_DestinationPort (destinationPort), m_Socket(socket) {};
+            void Handle();
+            void Terminate();
+        private:
+            void HandleStreamRequestComplete (std::shared_ptr<i2p::stream::Stream> stream);
+            i2p::data::IdentHash m_DestinationIdentHash;
+            int m_DestinationPort;
+            std::shared_ptr<boost::asio::ip::tcp::socket> m_Socket;
+    };
+
+    void I2PClientTunnelHandler::Handle()
+    {
+        GetOwner()->GetLocalDestination ()->CreateStream ( 
+            std::bind (&I2PClientTunnelHandler::HandleStreamRequestComplete, shared_from_this(), std::placeholders::_1), 
+            m_DestinationIdentHash, m_DestinationPort);
+    }
+
+    void I2PClientTunnelHandler::HandleStreamRequestComplete (std::shared_ptr<i2p::stream::Stream> stream)
+    {
+        if (stream)
+        {
+            if (Kill()) return;
+            LogPrint (eLogInfo,"New I2PTunnel connection");
+            auto connection = std::make_shared<I2PTunnelConnection>(GetOwner(), m_Socket, stream);
+            GetOwner()->AddHandler (connection);
+            connection->I2PConnect ();
+            Done(shared_from_this());
+        }
+        else
+        {
+            LogPrint (eLogError,"I2P Client Tunnel Issue when creating the stream, check the previous warnings for more info.");
+            Terminate();
+        }
+    }
+
+    void I2PClientTunnelHandler::Terminate()
+    {
+        if (Kill()) return;
+        if (m_Socket)
+        {
+            m_Socket->close();
+            m_Socket = nullptr;
+        }
+        Done(shared_from_this());
+    }
+
+    I2PClientTunnel::I2PClientTunnel(
+        const std::string& destination, const std::string& address, int port,
+        std::shared_ptr<ClientDestination> localDestination, int destinationPort
+    )
+        : TCPIPAcceptor(address, port, localDestination), m_Destination(destination),
+          m_DestinationIdentHash(nullptr), m_DestinationPort(destinationPort)
+    {}  
+
+    void I2PClientTunnel::Start ()
+    {
+        TCPIPAcceptor::Start ();
+        GetIdentHash();
+    }
+
+    void I2PClientTunnel::Stop ()
+    {
+        TCPIPAcceptor::Stop();
+        auto *originalIdentHash = m_DestinationIdentHash;
+        m_DestinationIdentHash = nullptr;
+        delete originalIdentHash;
+    }
+
+    /* HACK: maybe we should create a caching IdentHash provider in AddressBook */
+    const i2p::data::IdentHash * I2PClientTunnel::GetIdentHash ()
+    {
+        if (!m_DestinationIdentHash)
+        {
+            i2p::data::IdentHash identHash;
+            if (i2p::client::context.GetAddressBook ().GetIdentHash (m_Destination, identHash))
+                m_DestinationIdentHash = new i2p::data::IdentHash (identHash);
+            else
+                LogPrint (eLogWarning,"Remote destination ", m_Destination, " not found");
+        }
+        return m_DestinationIdentHash;
+    }
+
+    std::shared_ptr<I2PServiceHandler> I2PClientTunnel::CreateHandler(std::shared_ptr<boost::asio::ip::tcp::socket> socket)
+    {
+        const i2p::data::IdentHash *identHash = GetIdentHash();
+        if (identHash)
+            return  std::make_shared<I2PClientTunnelHandler>(this, *identHash, m_DestinationPort, socket);
+        else
+            return nullptr;
+    }
+
+    I2PServerTunnel::I2PServerTunnel (const std::string& address, int port, 
+        std::shared_ptr<ClientDestination> localDestination, int inport): 
+        I2PService (localDestination), m_Address (address), m_Port (port), m_IsAccessList (false)
+    {
+        m_PortDestination = localDestination->CreateStreamingDestination (inport > 0 ? inport : port);
+    }
+    
+    void I2PServerTunnel::Start ()
+    {
+        m_Endpoint.port (m_Port);   
+        boost::system::error_code ec;
+        auto addr = boost::asio::ip::address::from_string (m_Address, ec);
+        if (!ec)    
+        {
+            m_Endpoint.address (addr);
+            Accept ();
+        }
+        else
+        {
+            auto resolver = std::make_shared<boost::asio::ip::tcp::resolver>(GetService ());
+            resolver->async_resolve (boost::asio::ip::tcp::resolver::query (m_Address, ""), 
+                std::bind (&I2PServerTunnel::HandleResolve, this, 
+                    std::placeholders::_1, std::placeholders::_2, resolver));
+        }   
+    }
+
+    void I2PServerTunnel::Stop ()
+    {
+        ClearHandlers ();
+    }   
+
+    void I2PServerTunnel::HandleResolve (const boost::system::error_code& ecode, boost::asio::ip::tcp::resolver::iterator it, 
+        std::shared_ptr<boost::asio::ip::tcp::resolver> )
+    {   
+        if (!ecode)
+        {   
+            auto addr = (*it).endpoint ().address ();
+            LogPrint (eLogInfo, "server tunnel ", (*it).host_name (), " has been resolved to ", addr);  
+            m_Endpoint.address (addr);
+            Accept ();  
+        }   
+        else
+            LogPrint (eLogError, "Unable to resolve server tunnel address: ", ecode.message ());
+    }
+
+    void I2PServerTunnel::SetAccessList (const std::set<i2p::data::IdentHash>& accessList)
+    {
+        m_AccessList = accessList;
+        m_IsAccessList = true;      
+    }
+
+    void I2PServerTunnel::Accept ()
+    {
+        if (m_PortDestination)
+            m_PortDestination->SetAcceptor (std::bind (&I2PServerTunnel::HandleAccept, this, std::placeholders::_1));
+
+        auto localDestination = GetLocalDestination (); 
+        if (localDestination)
+        {
+            if (!localDestination->IsAcceptingStreams ()) // set it as default if not set yet
+                localDestination->AcceptStreams (std::bind (&I2PServerTunnel::HandleAccept, this, std::placeholders::_1));
+        }
+        else
+            LogPrint ("Local destination not set for server tunnel");
+    }
+
+    void I2PServerTunnel::HandleAccept (std::shared_ptr<i2p::stream::Stream> stream)
+    {
+        if (stream)
+        {   
+            if (m_IsAccessList)
+            {
+                if (!m_AccessList.count (stream->GetRemoteIdentity ().GetIdentHash ()))
+                {
+                    LogPrint (eLogWarning, "Address ", stream->GetRemoteIdentity ().GetIdentHash ().ToBase32 (), " is not in white list. Incoming connection dropped");
+                    stream->Close ();
+                    return;
+                }
+            }
+            CreateI2PConnection (stream);
+        }   
+    }
+
+    void I2PServerTunnel::CreateI2PConnection (std::shared_ptr<i2p::stream::Stream> stream)
+    {
+        auto conn = std::make_shared<I2PTunnelConnection> (this, stream, std::make_shared<boost::asio::ip::tcp::socket> (GetService ()), GetEndpoint ());
+        AddHandler (conn);
+        conn->Connect ();
+    }
+
+    I2PServerTunnelHTTP::I2PServerTunnelHTTP (const std::string& address, int port, std::shared_ptr<ClientDestination> localDestination, int inport):
+        I2PServerTunnel (address, port, localDestination, inport)
+    {
+    }
+
+    void I2PServerTunnelHTTP::CreateI2PConnection (std::shared_ptr<i2p::stream::Stream> stream)
+    {
+        auto conn = std::make_shared<I2PTunnelConnectionHTTP> (this, stream, std::make_shared<boost::asio::ip::tcp::socket> (GetService ()), GetEndpoint (), GetAddress ());
+        AddHandler (conn);
+        conn->Connect ();
+    }
+}       
+}   

client/I2PTunnel.h

@@ -0,0 +1,156 @@
+#ifndef I2PTUNNEL_H__
+#define I2PTUNNEL_H__
+
+#include <inttypes.h>
+#include <string>
+#include <set>
+#include <memory>
+#include <sstream>
+#include <boost/asio.hpp>
+#include "Identity.h"
+#include "Destination.h"
+#include "Streaming.h"
+#include "I2PService.h"
+
+namespace i2p
+{
+namespace client
+{
+    const size_t I2P_TUNNEL_CONNECTION_BUFFER_SIZE = 8192;
+    const int I2P_TUNNEL_CONNECTION_MAX_IDLE = 3600; // in seconds  
+    const int I2P_TUNNEL_DESTINATION_REQUEST_TIMEOUT = 10; // in seconds
+
+
+    class I2PTunnelConnection: public I2PServiceHandler, public std::enable_shared_from_this<I2PTunnelConnection>
+    {
+        public:
+
+            I2PTunnelConnection (I2PService * owner, std::shared_ptr<boost::asio::ip::tcp::socket> socket,
+                std::shared_ptr<const i2p::data::LeaseSet> leaseSet, int port = 0); // to I2P
+            I2PTunnelConnection (I2PService * owner, std::shared_ptr<boost::asio::ip::tcp::socket> socket,
+                std::shared_ptr<i2p::stream::Stream> stream); // to I2P using simplified API 
+            I2PTunnelConnection (I2PService * owner, std::shared_ptr<i2p::stream::Stream> stream,  std::shared_ptr<boost::asio::ip::tcp::socket> socket, 
+                const boost::asio::ip::tcp::endpoint& target, bool quiet = true); // from I2P
+            ~I2PTunnelConnection ();
+            void I2PConnect (const uint8_t * msg = nullptr, size_t len = 0);
+            void Connect ();
+            
+        protected:
+
+            void Terminate ();  
+
+            void Receive ();
+            void HandleReceived (const boost::system::error_code& ecode, std::size_t bytes_transferred);    
+            virtual void Write (const uint8_t * buf, size_t len); // can be overloaded
+            void HandleWrite (const boost::system::error_code& ecode);  
+
+            void StreamReceive ();
+            void HandleStreamReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred);
+            void HandleConnect (const boost::system::error_code& ecode);
+
+        private:
+
+            uint8_t m_Buffer[I2P_TUNNEL_CONNECTION_BUFFER_SIZE], m_StreamBuffer[I2P_TUNNEL_CONNECTION_BUFFER_SIZE];
+            std::shared_ptr<boost::asio::ip::tcp::socket> m_Socket;
+            std::shared_ptr<i2p::stream::Stream> m_Stream;
+            boost::asio::ip::tcp::endpoint m_RemoteEndpoint;
+            bool m_IsQuiet; // don't send destination
+    };
+
+    class I2PTunnelConnectionHTTP: public I2PTunnelConnection
+    {
+        public:
+            
+            I2PTunnelConnectionHTTP (I2PService * owner, std::shared_ptr<i2p::stream::Stream> stream,
+                std::shared_ptr<boost::asio::ip::tcp::socket> socket, 
+                const boost::asio::ip::tcp::endpoint& target, const std::string& host); 
+
+        protected:
+
+            void Write (const uint8_t * buf, size_t len);
+
+        private:
+        
+            std::string m_Host;
+            std::stringstream m_InHeader, m_OutHeader;
+            bool m_HeaderSent;
+    };
+
+    class I2PClientTunnel: public TCPIPAcceptor
+    {
+        protected:
+
+            // Implements TCPIPAcceptor
+            std::shared_ptr<I2PServiceHandler> CreateHandler(std::shared_ptr<boost::asio::ip::tcp::socket> socket);
+            const char* GetName() { return "I2P Client Tunnel"; }
+
+        public:
+
+            I2PClientTunnel(
+                const std::string& destination, const std::string& address, int port,
+                std::shared_ptr<ClientDestination> localDestination, int destinationPort = 0
+            );
+            ~I2PClientTunnel () {}
+    
+            void Start ();
+            void Stop ();
+
+        private:
+
+            const i2p::data::IdentHash * GetIdentHash ();
+
+            std::string m_Destination;
+            const i2p::data::IdentHash * m_DestinationIdentHash;
+            int m_DestinationPort;  
+    };  
+
+    class I2PServerTunnel: public I2PService
+    {
+        public:
+
+            I2PServerTunnel (const std::string& address, int port, 
+                std::shared_ptr<ClientDestination> localDestination, int inport = 0);   
+
+            void Start ();
+            void Stop ();
+
+            void SetAccessList (const std::set<i2p::data::IdentHash>& accessList); 
+
+            const std::string& GetAddress() const { return m_Address; }
+            int GetPort () const { return m_Port; };
+            const boost::asio::ip::tcp::endpoint& GetEndpoint () const { return m_Endpoint; }
+
+        private:
+
+            void HandleResolve (const boost::system::error_code& ecode, boost::asio::ip::tcp::resolver::iterator it, 
+                std::shared_ptr<boost::asio::ip::tcp::resolver> resolver);
+
+            void Accept ();
+            void HandleAccept (std::shared_ptr<i2p::stream::Stream> stream);
+            virtual void CreateI2PConnection (std::shared_ptr<i2p::stream::Stream> stream);
+
+        private:
+
+            std::string m_Address;
+            int m_Port;
+            boost::asio::ip::tcp::endpoint m_Endpoint;  
+            std::shared_ptr<i2p::stream::StreamingDestination> m_PortDestination;
+            std::set<i2p::data::IdentHash> m_AccessList;
+            bool m_IsAccessList;            
+    };
+
+    class I2PServerTunnelHTTP: public I2PServerTunnel
+    {
+        public:
+
+            I2PServerTunnelHTTP (const std::string& address, int port, 
+                std::shared_ptr<ClientDestination> localDestination, int inport = 0);   
+
+        private:
+
+            void CreateI2PConnection (std::shared_ptr<i2p::stream::Stream> stream); 
+    };
+}
+}   
+
+#endif

client/SAM.cpp

@@ -0,0 +1,941 @@
+#include <string.h>
+#include <stdio.h>
+#ifdef _MSC_VER
+#include <stdlib.h>
+#endif
+#include <boost/lexical_cast.hpp>
+#include "util/base64.h"
+#include "Identity.h"
+#include "util/Log.h"
+#include "Destination.h"
+#include "ClientContext.h"
+#include "SAM.h"
+
+namespace i2p
+{
+namespace client
+{
+    SAMSocket::SAMSocket (SAMBridge& owner): 
+        m_Owner (owner), m_Socket (m_Owner.GetService ()), m_Timer (m_Owner.GetService ()),
+        m_BufferOffset (0), m_SocketType (eSAMSocketTypeUnknown), m_IsSilent (false), 
+        m_Stream (nullptr), m_Session (nullptr)
+    {
+    }
+
+    SAMSocket::~SAMSocket ()
+    {
+        Terminate ();
+    }   
+
+    void SAMSocket::CloseStream ()
+    {
+        if (m_Stream)
+        {   
+            m_Stream->Close ();
+            m_Stream.reset ();
+        }   
+    }   
+        
+    void SAMSocket::Terminate ()
+    {
+        CloseStream ();
+        
+        switch (m_SocketType)
+        {
+            case eSAMSocketTypeUDPForward:
+            case eSAMSocketTypeSession:
+                m_Owner.CloseSession (m_ID);
+            break;
+            case eSAMSocketTypeStream:
+            {
+                if (m_Session)
+                    m_Session->sockets.remove (shared_from_this ());
+                break;
+            }
+            case eSAMSocketTypeAcceptor:
+            {
+                if (m_Session)
+                {
+                    m_Session->sockets.remove (shared_from_this ());
+                    m_Session->localDestination->StopAcceptingStreams ();
+                }
+                break;
+            }
+            default:
+                ;
+        }
+        m_SocketType = eSAMSocketTypeTerminated;
+        m_Socket.close ();
+    }
+
+    void SAMSocket::ReceiveHandshake ()
+    {
+        m_Socket.async_read_some (boost::asio::buffer(m_Buffer, SAM_SOCKET_BUFFER_SIZE),                
+            std::bind(&SAMSocket::HandleHandshakeReceived, shared_from_this (), 
+            std::placeholders::_1, std::placeholders::_2));
+    }
+
+    void SAMSocket::HandleHandshakeReceived (const boost::system::error_code& ecode, std::size_t bytes_transferred)
+    {
+        if (ecode)
+        {
+            LogPrint ("SAM handshake read error: ", ecode.message ());
+            if (ecode != boost::asio::error::operation_aborted)
+                Terminate ();
+        }
+        else
+        {   
+            m_Buffer[bytes_transferred] = 0;
+            char * eol = (char *)memchr (m_Buffer, '\n', bytes_transferred);
+            if (eol)
+                *eol = 0;
+            LogPrint ("SAM handshake ", m_Buffer);
+            char * separator = strchr (m_Buffer, ' ');
+            if (separator)
+            {
+                separator = strchr (separator + 1, ' ');    
+                if (separator) 
+                    *separator = 0;
+            }
+
+            if (!strcmp (m_Buffer, SAM_HANDSHAKE))
+            {
+                std::string version("3.0");
+                // try to find MIN and MAX, 3.0 if not found
+                if (separator)
+                {
+                    separator++;
+                    std::map<std::string, std::string> params;
+                    ExtractParams (separator, params);
+                    auto it = params.find (SAM_PARAM_MAX);
+                    // TODO: check MIN as well
+                    if (it != params.end ())
+                        version = it->second;
+                }
+                if (version[0] == '3') // we support v3 (3.0 and 3.1) only
+                {
+#ifdef _MSC_VER
+                    size_t l = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_HANDSHAKE_REPLY, version.c_str ());
+#else       
+                    size_t l = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_HANDSHAKE_REPLY, version.c_str ());
+#endif
+                    boost::asio::async_write (m_Socket, boost::asio::buffer (m_Buffer, l), boost::asio::transfer_all (),
+                        std::bind(&SAMSocket::HandleHandshakeReplySent, shared_from_this (), 
+                        std::placeholders::_1, std::placeholders::_2));
+                }   
+                else
+                    SendMessageReply (SAM_HANDSHAKE_I2P_ERROR, strlen (SAM_HANDSHAKE_I2P_ERROR), true);
+            }
+            else
+            {
+                LogPrint ("SAM handshake mismatch");
+                Terminate ();
+            }
+        }
+    }
+
+    void SAMSocket::HandleHandshakeReplySent (const boost::system::error_code& ecode, std::size_t)
+    {
+        if (ecode)
+        {
+            LogPrint ("SAM handshake reply send error: ", ecode.message ());
+            if (ecode != boost::asio::error::operation_aborted)
+                Terminate ();
+        }
+        else
+        {
+            m_Socket.async_read_some (boost::asio::buffer(m_Buffer, SAM_SOCKET_BUFFER_SIZE),                
+                std::bind(&SAMSocket::HandleMessage, shared_from_this (), 
+                std::placeholders::_1, std::placeholders::_2)); 
+        }   
+    }
+
+    void SAMSocket::SendMessageReply (const char * msg, size_t len, bool close)
+    {
+        if (!m_IsSilent) 
+            boost::asio::async_write (m_Socket, boost::asio::buffer (msg, len), boost::asio::transfer_all (),
+                std::bind(&SAMSocket::HandleMessageReplySent, shared_from_this (), 
+                std::placeholders::_1, std::placeholders::_2, close));
+        else
+        {
+            if (close)
+                Terminate ();
+            else
+                Receive (); 
+        }       
+    }
+
+    void SAMSocket::HandleMessageReplySent (const boost::system::error_code& ecode, std::size_t, bool close)
+    {
+        if (ecode)
+        {
+            LogPrint ("SAM reply send error: ", ecode.message ());
+            if (ecode != boost::asio::error::operation_aborted)
+                Terminate ();
+        }
+        else
+        {
+            if (close)
+                Terminate ();
+            else
+                Receive (); 
+        }   
+    }
+
+    void SAMSocket::HandleMessage (const boost::system::error_code& ecode, std::size_t bytes_transferred)
+    {
+        if (ecode)
+        {
+            LogPrint ("SAM read error: ", ecode.message ());
+            if (ecode != boost::asio::error::operation_aborted)
+                Terminate ();
+        }
+        else
+        {
+            bytes_transferred += m_BufferOffset;
+            m_BufferOffset = 0;
+            m_Buffer[bytes_transferred] = 0;
+            char * eol = (char *)memchr (m_Buffer, '\n', bytes_transferred);
+            if (eol)
+            {
+                *eol = 0;
+                char * separator = strchr (m_Buffer, ' ');
+                if (separator)
+                {
+                    separator = strchr (separator + 1, ' ');    
+                    if (separator) 
+                        *separator = 0;
+                    else
+                        separator = eol;
+
+                    if (!strcmp (m_Buffer, SAM_SESSION_CREATE))
+                        ProcessSessionCreate (separator + 1, bytes_transferred - (separator - m_Buffer) - 1);
+                    else if (!strcmp (m_Buffer, SAM_STREAM_CONNECT))
+                        ProcessStreamConnect (separator + 1, bytes_transferred - (separator - m_Buffer) - 1);
+                    else if (!strcmp (m_Buffer, SAM_STREAM_ACCEPT))
+                        ProcessStreamAccept (separator + 1, bytes_transferred - (separator - m_Buffer) - 1);
+                    else if (!strcmp (m_Buffer, SAM_DEST_GENERATE))
+                        ProcessDestGenerate ();
+                    else if (!strcmp (m_Buffer, SAM_NAMING_LOOKUP))
+                        ProcessNamingLookup (separator + 1, bytes_transferred - (separator - m_Buffer) - 1);
+                    else if (!strcmp (m_Buffer, SAM_DATAGRAM_SEND))
+                    {
+                        size_t len = bytes_transferred - (separator - m_Buffer) - 1;
+                        size_t processed = ProcessDatagramSend (separator + 1, len, eol + 1);
+                        if (processed < len)
+                        {
+                            m_BufferOffset = len - processed;
+                            if (processed > 0)
+                                memmove (m_Buffer, separator + 1 + processed, m_BufferOffset);
+                            else
+                            {
+                                // restore string back
+                                *separator = ' ';
+                                *eol = '\n';
+                            }
+                        }   
+                        // since it's SAM v1 reply is not expected
+                        Receive ();
+                    }
+                    else        
+                    {   
+                        LogPrint (eLogError, "SAM unexpected message ", m_Buffer);      
+                        Terminate ();
+                    }
+                }
+                else
+                {
+                    LogPrint (eLogError, "SAM malformed message ", m_Buffer);
+                    Terminate ();
+                }
+            }
+            else
+            {   
+                LogPrint (eLogWarning, "SAM incomplete message ", bytes_transferred);
+                m_BufferOffset = bytes_transferred;
+                // try to receive remaining message
+                Receive ();
+            }
+        }
+    }
+
+    void SAMSocket::ProcessSessionCreate (char * buf, size_t)
+    {
+        LogPrint ("SAM session create: ", buf);
+        std::map<std::string, std::string> params;
+        ExtractParams (buf, params);
+        std::string& style = params[SAM_PARAM_STYLE]; 
+        std::string& id = params[SAM_PARAM_ID];
+        std::string& destination = params[SAM_PARAM_DESTINATION];
+        m_ID = id; 
+        if (m_Owner.FindSession (id))
+        {
+            // session exists
+            SendMessageReply (SAM_SESSION_CREATE_DUPLICATED_ID, strlen(SAM_SESSION_CREATE_DUPLICATED_ID), true);
+            return;
+        }
+
+        // create destination   
+        m_Session = m_Owner.CreateSession (id, destination == SAM_VALUE_TRANSIENT ? "" : destination, &params); 
+        if (m_Session)
+        {
+            m_SocketType = eSAMSocketTypeSession;
+            if (style == SAM_VALUE_DATAGRAM)
+            {
+                auto dest = m_Session->localDestination->CreateDatagramDestination ();
+                auto portitr = params.find(SAM_PARAM_PORT);
+                
+                if ( portitr != params.end() ) {
+                    // port parameter set, this means they want to do UDP forward
+                    auto port = boost::lexical_cast<int> (portitr->second);
+                    // XXX: have default host configurable?
+                    std::string host = "127.0.0.1";
+                    
+                    auto hostitr = params.find(SAM_PARAM_HOST);
+                    if ( hostitr != params.end() ) {
+                        // host parameter set use that instead of loopback
+                        host = hostitr->second;
+                    }
+                    // set forward address
+                    m_udpForward = boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string(host), port);
+                    // we are now a udp forward socket
+                    m_SocketType = eSAMSocketTypeUDPForward;
+                }
+                dest->SetReceiver (std::bind (&SAMSocket::HandleI2PDatagramReceive, shared_from_this (), 
+                                              std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5));
+                 
+            }
+
+            if (m_Session->localDestination->IsReady ())
+                SendSessionCreateReplyOk ();
+            else
+            {
+                m_Timer.expires_from_now (boost::posix_time::seconds(SAM_SESSION_READINESS_CHECK_INTERVAL));
+                m_Timer.async_wait (std::bind (&SAMSocket::HandleSessionReadinessCheckTimer,
+                    shared_from_this (), std::placeholders::_1));   
+            }
+        }
+        else
+            SendMessageReply (SAM_SESSION_CREATE_DUPLICATED_DEST, strlen(SAM_SESSION_CREATE_DUPLICATED_DEST), true);
+    }
+
+    void SAMSocket::HandleSessionReadinessCheckTimer (const boost::system::error_code& ecode)
+    {
+        if (ecode != boost::asio::error::operation_aborted)
+        {
+            if (m_Session->localDestination->IsReady ())
+                SendSessionCreateReplyOk ();
+            else
+            {
+                m_Timer.expires_from_now (boost::posix_time::seconds(SAM_SESSION_READINESS_CHECK_INTERVAL));
+                m_Timer.async_wait (std::bind (&SAMSocket::HandleSessionReadinessCheckTimer,
+                    shared_from_this (), std::placeholders::_1));
+            }   
+        }
+    }
+
+    void SAMSocket::SendSessionCreateReplyOk ()
+    {
+        uint8_t buf[1024];
+        char priv[1024];
+        size_t l = m_Session->localDestination->GetPrivateKeys ().ToBuffer (buf, 1024);
+        size_t l1 = i2p::util::ByteStreamToBase64 (buf, l, priv, 1024);
+        priv[l1] = 0;
+#ifdef _MSC_VER
+        size_t l2 = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_SESSION_CREATE_REPLY_OK, priv);
+#else       
+        size_t l2 = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_SESSION_CREATE_REPLY_OK, priv);
+#endif
+        SendMessageReply (m_Buffer, l2, false);
+    }
+
+    void SAMSocket::ProcessStreamConnect (char * buf, size_t)
+    {
+        LogPrint (eLogDebug, "SAM stream connect: ", buf);
+        std::map<std::string, std::string> params;
+        ExtractParams (buf, params);
+        std::string& id = params[SAM_PARAM_ID];
+        std::string& destination = params[SAM_PARAM_DESTINATION];
+        std::string& silent = params[SAM_PARAM_SILENT];
+        if (silent == SAM_VALUE_TRUE) m_IsSilent = true;    
+        m_ID = id;
+        m_Session = m_Owner.FindSession (id);
+        if (m_Session)
+        {
+            i2p::data::IdentityEx dest;
+            size_t len = dest.FromBase64(destination);
+            if (len > 0)
+            {
+                context.GetAddressBook().InsertAddress(dest);
+                auto leaseSet = m_Session->localDestination->FindLeaseSet(dest.GetIdentHash());
+                if (leaseSet)
+                    Connect(leaseSet);
+                else
+                {
+                    m_Session->localDestination->RequestDestination(dest.GetIdentHash(),
+                        std::bind(&SAMSocket::HandleConnectLeaseSetRequestComplete,
+                        shared_from_this(), std::placeholders::_1));
+                }
+            }
+            else
+                SendMessageReply(SAM_SESSION_STATUS_INVALID_KEY, strlen(SAM_SESSION_STATUS_INVALID_KEY), true);
+        }
+        else
+            SendMessageReply (SAM_STREAM_STATUS_INVALID_ID, strlen(SAM_STREAM_STATUS_INVALID_ID), true);        
+    }
+
+    void SAMSocket::Connect (std::shared_ptr<const i2p::data::LeaseSet> remote)
+    {
+        m_SocketType = eSAMSocketTypeStream;
+        m_Session->sockets.push_back (shared_from_this ());
+        m_Stream = m_Session->localDestination->CreateStream (remote);
+        m_Stream->Send ((uint8_t *)m_Buffer, 0); // connect
+        I2PReceive ();          
+        SendMessageReply (SAM_STREAM_STATUS_OK, strlen(SAM_STREAM_STATUS_OK), false);
+    }
+
+    void SAMSocket::HandleConnectLeaseSetRequestComplete (std::shared_ptr<i2p::data::LeaseSet> leaseSet)
+    {
+        if (leaseSet)
+            Connect (leaseSet);
+        else
+        {
+            LogPrint ("SAM destination to connect not found");
+            SendMessageReply (SAM_STREAM_STATUS_CANT_REACH_PEER, strlen(SAM_STREAM_STATUS_CANT_REACH_PEER), true);
+        }
+    }
+
+    void SAMSocket::ProcessStreamAccept (char * buf, size_t)
+    {
+        LogPrint (eLogDebug, "SAM stream accept: ", buf);
+        std::map<std::string, std::string> params;
+        ExtractParams (buf, params);
+        std::string& id = params[SAM_PARAM_ID];
+        std::string& silent = params[SAM_PARAM_SILENT];
+        if (silent == SAM_VALUE_TRUE) m_IsSilent = true;    
+        m_ID = id;
+        m_Session = m_Owner.FindSession (id);
+        if (m_Session)
+        {
+            if (!m_Session->localDestination->IsAcceptingStreams ())
+            {
+                m_SocketType = eSAMSocketTypeAcceptor;
+                m_Session->sockets.push_back (shared_from_this ());
+                m_Session->localDestination->AcceptStreams (std::bind (&SAMSocket::HandleI2PAccept, shared_from_this (), std::placeholders::_1));
+                SendMessageReply (SAM_STREAM_STATUS_OK, strlen(SAM_STREAM_STATUS_OK), false);
+            }
+            else
+                SendMessageReply (SAM_STREAM_STATUS_I2P_ERROR, strlen(SAM_STREAM_STATUS_I2P_ERROR), true);
+        }   
+        else
+            SendMessageReply (SAM_STREAM_STATUS_INVALID_ID, strlen(SAM_STREAM_STATUS_INVALID_ID), true);
+    }
+
+    size_t SAMSocket::ProcessDatagramSend (char * buf, size_t len, const char * data)
+    {
+        LogPrint (eLogDebug, "SAM datagram send: ", buf, " ", len);
+        std::map<std::string, std::string> params;
+        ExtractParams (buf, params);
+        size_t size = boost::lexical_cast<int>(params[SAM_PARAM_SIZE]), offset = data - buf;
+        if (offset + size <= len)
+        {   
+            if (m_Session)
+            {   
+                auto d = m_Session->localDestination->GetDatagramDestination ();
+                if (d)
+                {
+                    i2p::data::IdentityEx dest;
+                    dest.FromBase64 (params[SAM_PARAM_DESTINATION]);
+                    d->SendDatagramTo ((const uint8_t *)data, size, dest.GetIdentHash ());
+                }
+                else
+                    LogPrint (eLogError, "SAM missing datagram destination");
+            }
+            else
+                LogPrint (eLogError, "SAM session is not created from DATAGRAM SEND");
+        }   
+        else
+        {
+            LogPrint (eLogWarning, "SAM sent datagram size ", size, " exceeds buffer ", len - offset);
+            return 0; // try to receive more
+        }   
+        return offset + size;
+    }   
+        
+    void SAMSocket::ProcessDestGenerate ()
+    {
+        LogPrint (eLogDebug, "SAM dest generate");
+        auto keys = i2p::data::PrivateKeys::CreateRandomKeys ();
+#ifdef _MSC_VER
+        size_t len = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_DEST_REPLY, 
+            keys.GetPublic ().ToBase64 ().c_str (), keys.ToBase64 ().c_str ()); 
+#else                                   
+        size_t len = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_DEST_REPLY, 
+            keys.GetPublic ().ToBase64 ().c_str (), keys.ToBase64 ().c_str ());
+#endif
+        SendMessageReply (m_Buffer, len, false);
+    }
+
+    void SAMSocket::ProcessNamingLookup (char * buf, size_t)
+    {
+        LogPrint (eLogDebug, "SAM naming lookup: ", buf);
+        std::map<std::string, std::string> params;
+        ExtractParams (buf, params);
+        std::string& name = params[SAM_PARAM_NAME];
+        i2p::data::IdentityEx identity;
+        i2p::data::IdentHash ident;
+        if (name == "ME")
+            SendNamingLookupReply (m_Session->localDestination->GetIdentity ());
+        else if (context.GetAddressBook ().GetAddress (name, identity))
+            SendNamingLookupReply (identity);
+        else if (m_Session && m_Session->localDestination &&
+            context.GetAddressBook ().GetIdentHash (name, ident))
+        {
+            auto leaseSet = m_Session->localDestination->FindLeaseSet (ident);
+            if (leaseSet)
+                SendNamingLookupReply (leaseSet->GetIdentity ());
+            else
+                m_Session->localDestination->RequestDestination (ident, 
+                    std::bind (&SAMSocket::HandleNamingLookupLeaseSetRequestComplete,
+                    shared_from_this (), std::placeholders::_1, ident));    
+        }   
+        else 
+        {
+            LogPrint ("SAM naming failed. Unknown address ", name);
+#ifdef _MSC_VER
+            size_t len = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_NAMING_REPLY_INVALID_KEY, name.c_str());
+#else               
+            size_t len = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_NAMING_REPLY_INVALID_KEY, name.c_str());
+#endif
+            SendMessageReply (m_Buffer, len, false);
+        }
+    }   
+
+    void  SAMSocket::HandleNamingLookupLeaseSetRequestComplete (std::shared_ptr<i2p::data::LeaseSet> leaseSet, i2p::data::IdentHash ident)
+    {
+        if (leaseSet)
+        {   
+            context.GetAddressBook ().InsertAddress (leaseSet->GetIdentity ());
+            SendNamingLookupReply (leaseSet->GetIdentity ());
+        }   
+        else
+        {
+            LogPrint (eLogInfo, "SAM naming lookup failed. LeaseSet for ", ident.ToBase32 (), " not found");
+#ifdef _MSC_VER
+            size_t len = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_NAMING_REPLY_INVALID_KEY, 
+                context.GetAddressBook ().ToAddress (ident).c_str());
+#else               
+            size_t len = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_NAMING_REPLY_INVALID_KEY,
+                context.GetAddressBook ().ToAddress (ident).c_str());
+#endif
+            SendMessageReply (m_Buffer, len, false);
+        }
+    }   
+        
+    void SAMSocket::SendNamingLookupReply (const i2p::data::IdentityEx& identity)
+    {
+        auto base64 = identity.ToBase64 ();
+#ifdef _MSC_VER
+        size_t l = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_NAMING_REPLY, base64.c_str ());     
+#else           
+        size_t l = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_NAMING_REPLY, base64.c_str ());
+#endif
+        SendMessageReply (m_Buffer, l, false);
+    }
+
+    void SAMSocket::ExtractParams (char * buf, std::map<std::string, std::string>& params)
+    {
+        char * separator;   
+        do
+        {
+            separator = strchr (buf, ' ');
+            if (separator) *separator = 0;
+            char * value = strchr (buf, '=');
+            if (value)
+            {
+                *value = 0;
+                value++;
+                params[buf] = value;
+            }   
+            buf = separator + 1;
+        }
+        while (separator);
+    }   
+
+    void SAMSocket::Receive ()
+    {
+        if (m_BufferOffset >= SAM_SOCKET_BUFFER_SIZE)
+        {
+            LogPrint (eLogError, "Buffer is full. Terminate");
+            Terminate ();
+            return;
+        }
+        m_Socket.async_read_some (boost::asio::buffer(m_Buffer + m_BufferOffset, SAM_SOCKET_BUFFER_SIZE - m_BufferOffset),                
+            std::bind((m_SocketType == eSAMSocketTypeStream) ? &SAMSocket::HandleReceived : &SAMSocket::HandleMessage,
+            shared_from_this (), std::placeholders::_1, std::placeholders::_2));
+    }
+
+    void SAMSocket::HandleReceived (const boost::system::error_code& ecode, std::size_t bytes_transferred)
+    {
+        if (ecode)
+        {
+            LogPrint ("SAM read error: ", ecode.message ());
+            if (ecode != boost::asio::error::operation_aborted)
+                Terminate ();
+        }
+        else
+        {
+            if (m_Stream)
+            {   
+                auto s = shared_from_this ();
+                m_Stream->AsyncSend ((uint8_t *)m_Buffer, bytes_transferred,
+                    [s](const boost::system::error_code& ecode)
+                    {
+                        if (!ecode)
+                            s->Receive ();
+                        else
+                            s->Terminate ();
+                    });
+            }   
+        }
+    }
+
+    void SAMSocket::I2PReceive ()
+    {
+        if (m_Stream)
+            m_Stream->AsyncReceive (boost::asio::buffer (m_StreamBuffer, SAM_SOCKET_BUFFER_SIZE),
+                std::bind (&SAMSocket::HandleI2PReceive, shared_from_this (),
+                    std::placeholders::_1, std::placeholders::_2),
+                SAM_SOCKET_CONNECTION_MAX_IDLE);
+    }   
+
+    void SAMSocket::HandleI2PReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred)
+    {
+        if (ecode)
+        {
+            LogPrint ("SAM stream read error: ", ecode.message ());
+            if (ecode != boost::asio::error::operation_aborted)
+                Terminate ();
+        }
+        else
+        {
+            boost::asio::async_write (m_Socket, boost::asio::buffer (m_StreamBuffer, bytes_transferred),
+                std::bind (&SAMSocket::HandleWriteI2PData, shared_from_this (), std::placeholders::_1));
+        }
+    }
+
+    void SAMSocket::HandleWriteI2PData (const boost::system::error_code& ecode)
+    {
+        if (ecode)
+        {
+            LogPrint ("SAM socket write error: ", ecode.message ());
+            if (ecode != boost::asio::error::operation_aborted)
+                Terminate ();
+        }
+        else
+            I2PReceive ();
+    }
+
+    void SAMSocket::HandleI2PAccept (std::shared_ptr<i2p::stream::Stream> stream)
+    {
+        if (stream)
+        {
+            LogPrint ("SAM incoming I2P connection for session ", m_ID);
+            m_Stream = stream;
+            context.GetAddressBook ().InsertAddress (stream->GetRemoteIdentity ());
+            auto session = m_Owner.FindSession (m_ID);
+            if (session)    
+                session->localDestination->StopAcceptingStreams (); 
+            m_SocketType = eSAMSocketTypeStream;
+            if (!m_IsSilent)
+            {
+                // send remote peer address
+                uint8_t ident[1024];
+                size_t l = stream->GetRemoteIdentity ().ToBuffer (ident, 1024);
+                size_t l1 = i2p::util::ByteStreamToBase64 (ident, l, (char *)m_StreamBuffer, SAM_SOCKET_BUFFER_SIZE);
+                m_StreamBuffer[l1] = '\n';
+                HandleI2PReceive (boost::system::error_code (), l1 +1); // we send identity like it has been received from stream
+            }   
+            else
+                I2PReceive ();
+        }
+        else
+            LogPrint (eLogInfo, "SAM I2P acceptor has been reset");
+    }   
+
+    void SAMSocket::HandleI2PDatagramReceive (const i2p::data::IdentityEx& from, uint16_t, uint16_t, const uint8_t * buf, size_t len)
+    {
+        LogPrint (eLogDebug, "SAM datagram received ", len);
+        if (m_SocketType == eSAMSocketTypeUDPForward)
+        {
+            // use the bridge to forward it via udp
+            m_Owner.ForwardUDP(m_udpForward, from, buf, len); 
+        } else {
+            auto base64 = from.ToBase64 ();
+            // use the session socket
+#ifdef _MSC_VER
+            size_t l = sprintf_s ((char *)m_StreamBuffer, SAM_SOCKET_BUFFER_SIZE, SAM_DATAGRAM_RECEIVED, base64.c_str (), len);     
+#else           
+            size_t l = snprintf ((char *)m_StreamBuffer, SAM_SOCKET_BUFFER_SIZE, SAM_DATAGRAM_RECEIVED, base64.c_str (), len);  
+#endif
+            if (len < SAM_SOCKET_BUFFER_SIZE - l)   
+            {   
+                memcpy (m_StreamBuffer + l, buf, len);
+                boost::asio::async_write (m_Socket, boost::asio::buffer (m_StreamBuffer, len + l),
+                                          std::bind (&SAMSocket::HandleWriteI2PData, shared_from_this (), std::placeholders::_1));
+            }
+            else
+                LogPrint (eLogWarning, "SAM received datagram size ", len," exceeds buffer");
+        }
+    }
+
+    SAMSession::SAMSession (std::shared_ptr<ClientDestination> dest):
+        localDestination (dest)
+    {
+    }
+        
+    SAMSession::~SAMSession ()
+    {
+        for (auto it: sockets)
+            it->SetSocketType (eSAMSocketTypeTerminated);
+        i2p::client::context.DeleteLocalDestination (localDestination);
+    }
+
+    void SAMSession::CloseStreams ()
+    {
+        for (auto it: sockets)
+        {   
+            it->CloseStream ();
+            it->SetSocketType (eSAMSocketTypeTerminated);
+        }   
+        sockets.clear ();
+    }
+
+    SAMBridge::SAMBridge(const std::string& address, int port)
+        : m_IsRunning (false), m_Thread (nullptr),
+          m_Acceptor(m_Service, boost::asio::ip::tcp::endpoint(
+            boost::asio::ip::address::from_string(address), port)
+          ),
+          m_DatagramEndpoint(boost::asio::ip::address::from_string(address), port - 1),
+          m_DatagramSocket(m_Service, m_DatagramEndpoint),
+          m_Forward(nullptr)
+    {
+    }
+
+    SAMBridge::~SAMBridge ()
+    {
+        if (m_IsRunning)
+            Stop ();
+    }   
+
+    void SAMBridge::Start ()
+    {
+        Accept ();
+        ReceiveDatagram ();
+        m_IsRunning = true;
+        m_Thread = new std::thread (std::bind (&SAMBridge::Run, this));
+    }
+
+    void SAMBridge::Stop ()
+    {
+        m_IsRunning = false;
+        m_Acceptor.cancel ();
+        for (auto it: m_Sessions)
+            delete it.second;
+        m_Sessions.clear ();
+        m_Service.stop ();
+        if (m_Thread)
+        {   
+            m_Thread->join (); 
+            delete m_Thread;
+            m_Thread = nullptr;
+        }   
+    }
+
+    void SAMBridge::Run () 
+    { 
+        while (m_IsRunning)
+        {
+            try
+            {   
+                m_Service.run ();
+            }
+            catch (std::exception& ex)
+            {
+                LogPrint ("SAM: ", ex.what ());
+            }   
+        }   
+    }
+
+    void SAMBridge::Accept ()
+    {
+        auto newSocket = std::make_shared<SAMSocket> (*this);
+        m_Acceptor.async_accept (newSocket->GetSocket (), std::bind (&SAMBridge::HandleAccept, this,
+            std::placeholders::_1, newSocket));
+    }
+
+    void SAMBridge::HandleAccept(const boost::system::error_code& ecode, std::shared_ptr<SAMSocket> socket)
+    {
+        if (!ecode)
+        {
+            boost::system::error_code ec;
+            auto ep = socket->GetSocket ().remote_endpoint (ec);
+            if (!ec)
+            {   
+                LogPrint ("New SAM connection from ", ep);
+                socket->ReceiveHandshake ();
+            }
+            else
+                LogPrint (eLogError, "SAM connection from error ", ec.message ());
+        }
+        else
+            LogPrint ("SAM accept error: ",  ecode.message ());
+
+        if (ecode != boost::asio::error::operation_aborted)
+            Accept ();
+    }
+
+    SAMSession * SAMBridge::CreateSession (const std::string& id, const std::string& destination, 
+        const std::map<std::string, std::string> * params)
+    {
+        std::shared_ptr<ClientDestination> localDestination = nullptr; 
+        if (destination != "")
+        {
+            i2p::data::PrivateKeys keys;
+            keys.FromBase64 (destination);
+            localDestination = i2p::client::context.CreateNewLocalDestination (keys, true, params);
+        }
+        else // transient
+        {
+            // extract signature type
+            i2p::data::SigningKeyType signatureType = i2p::data::SIGNING_KEY_TYPE_DSA_SHA1;
+            if (params)
+            {
+                auto it = params->find (SAM_PARAM_SIGNATURE_TYPE);
+                if (it != params->end ())
+                    // TODO: extract string values  
+                    signatureType = boost::lexical_cast<int> (it->second);
+            }
+            localDestination = i2p::client::context.CreateNewLocalDestination (true, signatureType, params); 
+        }
+        if (localDestination)
+        {
+            std::unique_lock<std::mutex> l(m_SessionsMutex);
+            auto ret = m_Sessions.insert (std::pair<std::string, SAMSession *>(id, new SAMSession (localDestination)));
+            if (!ret.second)
+                LogPrint ("Session ", id, " already exists");
+            return ret.first->second;
+        }
+        return nullptr;
+    }
+
+    void SAMBridge::CloseSession (const std::string& id)
+    {
+        std::unique_lock<std::mutex> l(m_SessionsMutex);
+        auto it = m_Sessions.find (id);
+        if (it != m_Sessions.end ())
+        {
+            auto session = it->second;
+            session->localDestination->StopAcceptingStreams ();
+            session->CloseStreams ();
+            m_Sessions.erase (it);
+            delete session;
+        }
+    }
+
+    SAMSession * SAMBridge::FindSession (const std::string& id) const
+    {
+        std::unique_lock<std::mutex> l(m_SessionsMutex);
+        auto it = m_Sessions.find (id);
+        if (it != m_Sessions.end ())
+            return it->second;
+        return nullptr;
+    }
+
+    void SAMBridge::ReceiveDatagram ()
+    {
+        m_DatagramSocket.async_receive_from (
+            boost::asio::buffer (m_DatagramReceiveBuffer, i2p::datagram::MAX_DATAGRAM_SIZE), 
+            m_SenderEndpoint,
+            std::bind (&SAMBridge::HandleReceivedDatagram, this, std::placeholders::_1, std::placeholders::_2)); 
+    }
+
+    void SAMBridge::HandleReceivedDatagram (const boost::system::error_code& ecode, std::size_t bytes_transferred)
+    {
+        if (!ecode)
+        {
+            m_DatagramReceiveBuffer[bytes_transferred] = 0;
+            char * eol = strchr ((char *)m_DatagramReceiveBuffer, '\n');
+            *eol = 0; eol++;
+            size_t payloadLen = bytes_transferred - ((uint8_t *)eol - m_DatagramReceiveBuffer); 
+            LogPrint ("SAM datagram received ", m_DatagramReceiveBuffer," size=", payloadLen);
+            char * sessionID = strchr ((char *)m_DatagramReceiveBuffer, ' ');
+            if (sessionID)
+            {
+                sessionID++;
+                char * destination = strchr (sessionID, ' ');
+                if (destination)
+                {
+                    *destination = 0; destination++;
+                    auto session = FindSession (sessionID);
+                    if (session)
+                    {   
+                        i2p::data::IdentityEx dest;
+                        dest.FromBase64 (destination);
+                        session->localDestination->GetDatagramDestination ()->
+                            SendDatagramTo ((uint8_t *)eol, payloadLen, dest.GetIdentHash ());
+                    }   
+                    else
+                        LogPrint ("Session ", sessionID, " not found");
+                }
+                else
+                    LogPrint ("Missing destination key");
+            }
+            else
+                LogPrint ("Missing sessionID");
+            ReceiveDatagram ();
+        }
+        else
+            LogPrint ("SAM datagram receive error: ", ecode.message ());
+    }
+
+    void SAMBridge::ForwardUDP(const boost::asio::ip::udp::endpoint & to_ep, const i2p::data::IdentityEx& from, const uint8_t * buff, size_t bufflen)
+    {
+
+        if (m_Forward)
+        {
+            // drop, we are already trying to send
+            LogPrint(eLogWarning, "Dropping a forwarded datagram");
+        } else {
+            auto base64 = from.ToBase64();
+            auto b64_size = base64.size();
+            std::size_t forward_len = bufflen + sizeof(char) + b64_size;
+            m_Forward = new uint8_t[forward_len];
+            // make datagram
+            memcpy(m_Forward, base64.c_str(), b64_size);
+            memset(m_Forward + b64_size, 10, 1);
+            memcpy(m_Forward + b64_size + 1, buff, bufflen);
+            // async sendto
+            m_DatagramSocket.async_send_to(
+                boost::asio::buffer(m_Forward, forward_len),
+                to_ep,
+                std::bind(&SAMBridge::HandleForwardedUDP, this, std::placeholders::_1, std::placeholders::_2));
+        }
+            
+    }
+
+    void SAMBridge::HandleForwardedUDP(const boost::system::error_code& ecode, std::size_t bytes_transferred)
+    {
+        if(!ecode)
+        {
+            LogPrint("Forwarded ", bytes_transferred, "B");
+        }
+        if(m_Forward)
+        {
+            delete [] m_Forward;
+            m_Forward = nullptr;
+        }
+    }
+    
+}
+}

client/SAM.h

@@ -0,0 +1,201 @@
+#ifndef SAM_H__
+#define SAM_H__
+
+#include <inttypes.h>
+#include <string>
+#include <map>
+#include <list>
+#include <thread>
+#include <mutex>
+#include <memory>
+#include <boost/asio.hpp>
+#include "Identity.h"
+#include "LeaseSet.h"
+#include "Streaming.h"
+#include "Destination.h"
+
+namespace i2p
+{
+namespace client
+{
+    const size_t SAM_SOCKET_BUFFER_SIZE = 8192;
+    const int SAM_SOCKET_CONNECTION_MAX_IDLE = 3600; // in seconds
+    const int SAM_SESSION_READINESS_CHECK_INTERVAL = 20; // in seconds  
+    const char SAM_HANDSHAKE[] = "HELLO VERSION";
+    const char SAM_HANDSHAKE_REPLY[] = "HELLO REPLY RESULT=OK VERSION=%s\n";
+    const char SAM_HANDSHAKE_I2P_ERROR[] = "HELLO REPLY RESULT=I2P_ERROR\n";    
+    const char SAM_SESSION_CREATE[] = "SESSION CREATE";
+    const char SAM_SESSION_CREATE_REPLY_OK[] = "SESSION STATUS RESULT=OK DESTINATION=%s\n";
+    const char SAM_SESSION_CREATE_DUPLICATED_ID[] = "SESSION STATUS RESULT=DUPLICATED_ID\n";
+    const char SAM_SESSION_CREATE_DUPLICATED_DEST[] = "SESSION STATUS RESULT=DUPLICATED_DEST\n";    
+    const char SAM_SESSION_STATUS_INVALID_KEY[] = "SESSION STATUS RESULT=INVALID_KEY\n";
+    const char SAM_STREAM_CONNECT[] = "STREAM CONNECT";
+    const char SAM_STREAM_STATUS_OK[] = "STREAM STATUS RESULT=OK\n";
+    const char SAM_STREAM_STATUS_INVALID_ID[] = "STREAM STATUS RESULT=INVALID_ID\n";
+    const char SAM_STREAM_STATUS_CANT_REACH_PEER[] = "STREAM STATUS RESULT=CANT_REACH_PEER\n";
+    const char SAM_STREAM_STATUS_I2P_ERROR[] = "STREAM STATUS RESULT=I2P_ERROR\n";
+    const char SAM_STREAM_ACCEPT[] = "STREAM ACCEPT";   
+    const char SAM_DATAGRAM_SEND[] = "DATAGRAM SEND";
+    const char SAM_DEST_GENERATE[] = "DEST GENERATE";
+    const char SAM_DEST_REPLY[] = "DEST REPLY PUB=%s PRIV=%s\n";    
+    const char SAM_DEST_REPLY_I2P_ERROR[] = "DEST REPLY RESULT=I2P_ERROR\n";
+    const char SAM_NAMING_LOOKUP[] = "NAMING LOOKUP";
+    const char SAM_NAMING_REPLY[] = "NAMING REPLY RESULT=OK NAME=ME VALUE=%s\n";
+    const char SAM_DATAGRAM_RECEIVED[] = "DATAGRAM RECEIVED DESTINATION=%s SIZE=%lu\n"; 
+    const char SAM_NAMING_REPLY_INVALID_KEY[] = "NAMING REPLY RESULT=INVALID_KEY NAME=%s\n";
+    const char SAM_NAMING_REPLY_KEY_NOT_FOUND[] = "NAMING REPLY RESULT=INVALID_KEY_NOT_FOUND NAME=%s\n";
+    const char SAM_PARAM_MIN[] = "MIN"; 
+    const char SAM_PARAM_MAX[] = "MAX";             
+    const char SAM_PARAM_STYLE[] = "STYLE";     
+    const char SAM_PARAM_ID[] = "ID";   
+    const char SAM_PARAM_SILENT[] = "SILENT";
+    const char SAM_PARAM_DESTINATION[] = "DESTINATION"; 
+    const char SAM_PARAM_NAME[] = "NAME";
+    const char SAM_PARAM_SIGNATURE_TYPE[] = "SIGNATURE_TYPE";   
+    const char SAM_PARAM_SIZE[] = "SIZE";
+    const char SAM_PARAM_FORWARD[] = "FORWARD";
+    const char SAM_PARAM_HOST[] = "HOST";
+    const char SAM_PARAM_PORT[] = "PORT";
+    const char SAM_VALUE_TRANSIENT[] = "TRANSIENT"; 
+    const char SAM_VALUE_STREAM[] = "STREAM";
+    const char SAM_VALUE_DATAGRAM[] = "DATAGRAM";
+    const char SAM_VALUE_RAW[] = "RAW";
+    const char SAM_VALUE_TRUE[] = "true";   
+    const char SAM_VALUE_FALSE[] = "false"; 
+
+    enum SAMSocketType
+    {
+        eSAMSocketTypeUnknown,
+        eSAMSocketTypeSession,
+        eSAMSocketTypeStream,
+        eSAMSocketTypeAcceptor,
+        eSAMSocketTypeUDPForward,
+        eSAMSocketTypeTerminated,
+    };
+
+    class SAMBridge;
+    struct SAMSession;
+    class SAMSocket: public std::enable_shared_from_this<SAMSocket>
+    {
+        public:
+
+            SAMSocket (SAMBridge& owner);
+            ~SAMSocket ();          
+            void CloseStream (); // TODO: implement it better   
+
+            boost::asio::ip::tcp::socket& GetSocket () { return m_Socket; };
+            void ReceiveHandshake ();
+            void SetSocketType (SAMSocketType socketType) { m_SocketType = socketType; };
+            SAMSocketType GetSocketType () const { return m_SocketType; };
+
+        private:
+
+            void Terminate ();  
+            void HandleHandshakeReceived (const boost::system::error_code& ecode, std::size_t bytes_transferred);
+            void HandleHandshakeReplySent (const boost::system::error_code& ecode, std::size_t bytes_transferred);
+            void HandleMessage (const boost::system::error_code& ecode, std::size_t bytes_transferred);
+            void SendMessageReply (const char * msg, size_t len, bool close);           
+            void HandleMessageReplySent (const boost::system::error_code& ecode, std::size_t bytes_transferred, bool close);
+            void Receive ();
+            void HandleReceived (const boost::system::error_code& ecode, std::size_t bytes_transferred);
+
+            void I2PReceive (); 
+            void HandleI2PReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred);
+            void HandleI2PAccept (std::shared_ptr<i2p::stream::Stream> stream);
+            void HandleWriteI2PData (const boost::system::error_code& ecode);
+            void HandleI2PDatagramReceive (const i2p::data::IdentityEx& from, uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len);
+
+            void ProcessSessionCreate (char * buf, size_t len);
+            void ProcessStreamConnect (char * buf, size_t len);
+            void ProcessStreamAccept (char * buf, size_t len);
+            void ProcessDestGenerate ();
+            void ProcessNamingLookup (char * buf, size_t len);
+            size_t ProcessDatagramSend (char * buf, size_t len, const char * data); // from SAM 1.0 
+            void ExtractParams (char * buf, std::map<std::string, std::string>& params);
+
+            void Connect (std::shared_ptr<const i2p::data::LeaseSet> remote);
+            void HandleConnectLeaseSetRequestComplete (std::shared_ptr<i2p::data::LeaseSet> leaseSet);
+            void SendNamingLookupReply (const i2p::data::IdentityEx& identity);
+            void HandleNamingLookupLeaseSetRequestComplete (std::shared_ptr<i2p::data::LeaseSet> leaseSet, i2p::data::IdentHash ident);
+            void HandleSessionReadinessCheckTimer (const boost::system::error_code& ecode);
+            void SendSessionCreateReplyOk ();
+
+        private:
+
+            SAMBridge& m_Owner;
+            boost::asio::ip::udp::endpoint m_udpForward;
+            boost::asio::ip::tcp::socket m_Socket;
+            boost::asio::deadline_timer m_Timer;
+            char m_Buffer[SAM_SOCKET_BUFFER_SIZE + 1];
+            size_t m_BufferOffset;
+            uint8_t m_StreamBuffer[SAM_SOCKET_BUFFER_SIZE];
+            SAMSocketType m_SocketType;
+            std::string m_ID; // nickname
+            bool m_IsSilent;
+            std::shared_ptr<i2p::stream::Stream> m_Stream;
+            SAMSession * m_Session;
+    };  
+
+    struct SAMSession
+    {
+        std::shared_ptr<ClientDestination> localDestination;
+        std::list<std::shared_ptr<SAMSocket> > sockets;
+        
+        SAMSession (std::shared_ptr<ClientDestination> dest);       
+        ~SAMSession ();
+
+        void CloseStreams ();
+    };
+
+    class SAMBridge
+    {
+        public:
+
+            SAMBridge(const std::string& address, int port);
+            ~SAMBridge ();
+
+            void Start ();
+            void Stop ();
+            
+            boost::asio::io_service& GetService () { return m_Service; };
+            SAMSession * CreateSession (const std::string& id, const std::string& destination, // empty string  means transient
+                const std::map<std::string, std::string> * params);
+            void CloseSession (const std::string& id);
+            SAMSession * FindSession (const std::string& id) const;
+
+            // forward a datagram to a udp endpoint
+            void ForwardUDP(const boost::asio::ip::udp::endpoint & to_ep, const i2p::data::IdentityEx& from, const uint8_t * buff, size_t bufflen);
+      
+        private:
+
+            void Run ();
+
+            void Accept ();
+            void HandleAccept(const boost::system::error_code& ecode, std::shared_ptr<SAMSocket> socket);
+
+            void ReceiveDatagram ();
+            void HandleReceivedDatagram (const boost::system::error_code& ecode, std::size_t bytes_transferred);
+            void HandleForwardedUDP(const boost::system::error_code& ecode, std::size_t bytes_transferrted);
+      
+        private:
+
+            bool m_IsRunning;
+            std::thread * m_Thread; 
+            boost::asio::io_service m_Service;
+            boost::asio::ip::tcp::acceptor m_Acceptor;
+            boost::asio::ip::udp::endpoint m_DatagramEndpoint, m_SenderEndpoint;
+            boost::asio::ip::udp::socket m_DatagramSocket;
+            mutable std::mutex m_SessionsMutex;
+            std::map<std::string, SAMSession *> m_Sessions;
+            uint8_t m_DatagramReceiveBuffer[i2p::datagram::MAX_DATAGRAM_SIZE+1];
+            uint8_t * m_Forward; // current buffer to forward or nullptr if there is none to forward now
+        public:
+
+            // for HTTP
+            const decltype(m_Sessions)& GetSessions () const { return m_Sessions; };
+    };      
+}
+}
+
+#endif
+

client/SOCKS.cpp

@@ -0,0 +1,577 @@
+#include <cstring>
+#include <cassert>
+#include <string>
+#include <atomic>
+#include "SOCKS.h"
+#include "Identity.h"
+#include "Streaming.h"
+#include "Destination.h"
+#include "ClientContext.h"
+#include "util/I2PEndian.h"
+#include "I2PTunnel.h"
+
+namespace i2p
+{
+namespace proxy
+{
+    static const size_t socks_buffer_size = 8192;
+    static const size_t max_socks_hostname_size = 255; // Limit for socks5 and bad idea to traverse
+
+    struct SOCKSDnsAddress 
+    {
+        uint8_t size;
+        char value[max_socks_hostname_size];
+        void FromString (std::string str) 
+        {
+            size = str.length();
+            if (str.length() > max_socks_hostname_size) size = max_socks_hostname_size;
+            memcpy(value,str.c_str(),size);
+        }
+        std::string ToString() { return std::string(value, size); }
+        void push_back (char c) { value[size++] = c; }
+    };
+
+    class SOCKSServer;
+    class SOCKSHandler: public i2p::client::I2PServiceHandler, public std::enable_shared_from_this<SOCKSHandler> 
+    {
+        private:
+            enum state 
+            {
+                GET_SOCKSV,
+                GET_COMMAND,
+                GET_PORT,
+                GET_IPV4,
+                GET4_IDENT,
+                GET4A_HOST,
+                GET5_AUTHNUM,
+                GET5_AUTH,
+                GET5_REQUESTV,
+                GET5_GETRSV,
+                GET5_GETADDRTYPE,
+                GET5_IPV6,
+                GET5_HOST_SIZE,
+                GET5_HOST,
+                DONE
+            };
+            enum authMethods 
+            {
+                AUTH_NONE = 0, //No authentication, skip to next step
+                AUTH_GSSAPI = 1, //GSSAPI authentication
+                AUTH_USERPASSWD = 2, //Username and password
+                AUTH_UNACCEPTABLE = 0xff //No acceptable method found
+            };
+            enum addrTypes 
+            {
+                ADDR_IPV4 = 1, //IPv4 address (4 octets)
+                ADDR_DNS = 3, // DNS name (up to 255 octets)
+                ADDR_IPV6 = 4 //IPV6 address (16 octets)
+            };
+            enum errTypes 
+            {
+                SOCKS5_OK = 0, // No error for SOCKS5
+                SOCKS5_GEN_FAIL = 1, // General server failure
+                SOCKS5_RULE_DENIED = 2, // Connection disallowed by ruleset
+                SOCKS5_NET_UNREACH = 3, // Network unreachable
+                SOCKS5_HOST_UNREACH = 4, // Host unreachable
+                SOCKS5_CONN_REFUSED = 5, // Connection refused by the peer
+                SOCKS5_TTL_EXPIRED = 6, // TTL Expired
+                SOCKS5_CMD_UNSUP = 7, // Command unsupported
+                SOCKS5_ADDR_UNSUP = 8, // Address type unsupported
+                SOCKS4_OK = 90, // No error for SOCKS4
+                SOCKS4_FAIL = 91, // Failed establishing connecting or not allowed
+                SOCKS4_IDENTD_MISSING = 92, // Couldn't connect to the identd server
+                SOCKS4_IDENTD_DIFFER = 93 // The ID reported by the application and by identd differ
+            };
+            enum cmdTypes 
+            {
+                CMD_CONNECT = 1, // TCP Connect
+                CMD_BIND = 2, // TCP Bind
+                CMD_UDP = 3 // UDP associate
+            };
+            enum socksVersions 
+            {
+                SOCKS4 = 4, // SOCKS4
+                SOCKS5 = 5 // SOCKS5
+            };
+            union address 
+            {
+                uint32_t ip;
+                SOCKSDnsAddress dns;
+                uint8_t ipv6[16];
+            };
+
+            void EnterState(state nstate, uint8_t parseleft = 1);
+            bool HandleData(uint8_t *sock_buff, std::size_t len);
+            bool ValidateSOCKSRequest();
+            void HandleSockRecv(const boost::system::error_code & ecode, std::size_t bytes_transfered);
+            void Terminate();
+            void AsyncSockRead();
+            boost::asio::const_buffers_1 GenerateSOCKS5SelectAuth(authMethods method);
+            boost::asio::const_buffers_1 GenerateSOCKS4Response(errTypes error, uint32_t ip, uint16_t port);
+            boost::asio::const_buffers_1 GenerateSOCKS5Response(errTypes error, addrTypes type, const address &addr, uint16_t port);
+            bool Socks5ChooseAuth();
+            void SocksRequestFailed(errTypes error);
+            void SocksRequestSuccess();
+            void SentSocksFailed(const boost::system::error_code & ecode);
+            void SentSocksDone(const boost::system::error_code & ecode);
+            void SentSocksResponse(const boost::system::error_code & ecode);
+            void HandleStreamRequestComplete (std::shared_ptr<i2p::stream::Stream> stream);
+
+            uint8_t m_sock_buff[socks_buffer_size];
+            std::shared_ptr<boost::asio::ip::tcp::socket> m_sock;
+            std::shared_ptr<i2p::stream::Stream> m_stream;
+            uint8_t *m_remaining_data; //Data left to be sent
+            uint8_t m_response[7+max_socks_hostname_size];
+            address m_address; //Address
+            std::size_t m_remaining_data_len; //Size of the data left to be sent
+            uint32_t m_4aip; //Used in 4a requests
+            uint16_t m_port;
+            uint8_t m_command;
+            uint8_t m_parseleft; //Octets left to parse
+            authMethods m_authchosen; //Authentication chosen
+            addrTypes m_addrtype; //Address type chosen
+            socksVersions m_socksv; //Socks version
+            cmdTypes m_cmd; // Command requested
+            state m_state;
+
+        public:
+            SOCKSHandler(SOCKSServer * parent, std::shared_ptr<boost::asio::ip::tcp::socket> sock) :
+                I2PServiceHandler(parent), m_sock(sock), m_stream(nullptr),
+                m_authchosen(AUTH_UNACCEPTABLE), m_addrtype(ADDR_IPV4)
+                { m_address.ip = 0; EnterState(GET_SOCKSV); }
+            ~SOCKSHandler() { Terminate(); }
+            void Handle() { AsyncSockRead(); }
+    };
+
+    void SOCKSHandler::AsyncSockRead()
+    {
+        LogPrint(eLogDebug,"--- SOCKS async sock read");
+        if(m_sock)
+            m_sock->async_receive(boost::asio::buffer(m_sock_buff, socks_buffer_size),
+                        std::bind(&SOCKSHandler::HandleSockRecv, shared_from_this(),
+                                std::placeholders::_1, std::placeholders::_2));
+        else 
+            LogPrint(eLogError,"--- SOCKS no socket for read");
+    }
+
+    void SOCKSHandler::Terminate() 
+    {
+        if (Kill()) return;
+        if (m_sock) 
+        {
+            LogPrint(eLogDebug,"--- SOCKS close sock");
+            m_sock->close();
+            m_sock = nullptr;
+        }
+        if (m_stream) 
+        {
+            LogPrint(eLogDebug,"--- SOCKS close stream");
+            m_stream.reset ();
+        }
+        Done(shared_from_this());
+    }
+
+    boost::asio::const_buffers_1 SOCKSHandler::GenerateSOCKS4Response(SOCKSHandler::errTypes error, uint32_t ip, uint16_t port)
+    {
+        assert(error >= SOCKS4_OK);
+        m_response[0] = '\x00'; //Version
+        m_response[1] = error; //Response code
+        htobe16buf(m_response+2,port); //Port
+        htobe32buf(m_response+4,ip); //IP
+        return boost::asio::const_buffers_1(m_response,8);
+    }
+
+    boost::asio::const_buffers_1 SOCKSHandler::GenerateSOCKS5Response(SOCKSHandler::errTypes error, SOCKSHandler::addrTypes type, const SOCKSHandler::address &addr, uint16_t port)
+    {
+        size_t size = 6;
+        assert(error <= SOCKS5_ADDR_UNSUP);
+        m_response[0] = '\x05'; //Version
+        m_response[1] = error; //Response code
+        m_response[2] = '\x00'; //RSV
+        m_response[3] = type; //Address type
+        switch (type) 
+        {
+            case ADDR_IPV4:
+                size = 10;
+                htobe32buf(m_response+4,addr.ip);
+                break;
+            case ADDR_IPV6:
+                size = 22;
+                memcpy(m_response+4,addr.ipv6, 16);
+                break;
+            case ADDR_DNS:
+                size = 7+addr.dns.size;
+                m_response[4] = addr.dns.size;
+                memcpy(m_response+5,addr.dns.value, addr.dns.size);
+                break;
+        }
+        htobe16buf(m_response+size-2,port); //Port
+        return boost::asio::const_buffers_1(m_response,size);
+    }
+
+    bool SOCKSHandler::Socks5ChooseAuth()
+    {
+        m_response[0] = '\x05'; //Version
+        m_response[1] = m_authchosen; //Response code
+        boost::asio::const_buffers_1 response(m_response,2);
+        if (m_authchosen == AUTH_UNACCEPTABLE) 
+        {
+            LogPrint(eLogWarning,"--- SOCKS5 authentication negotiation failed");
+            boost::asio::async_write(*m_sock, response, std::bind(&SOCKSHandler::SentSocksFailed,
+                                          shared_from_this(), std::placeholders::_1));
+            return false;
+        } 
+        else 
+        {
+            LogPrint(eLogDebug,"--- SOCKS5 choosing authentication method: ", m_authchosen);
+            boost::asio::async_write(*m_sock, response, std::bind(&SOCKSHandler::SentSocksResponse,
+                                          shared_from_this(), std::placeholders::_1));
+            return true;
+        }
+    }
+
+    /* All hope is lost beyond this point */
+    void SOCKSHandler::SocksRequestFailed(SOCKSHandler::errTypes error)
+    {
+        boost::asio::const_buffers_1 response(nullptr,0);
+        assert(error != SOCKS4_OK && error != SOCKS5_OK);
+        switch (m_socksv) 
+        {
+            case SOCKS4:
+                LogPrint(eLogWarning,"--- SOCKS4 failed: ", error);
+                if (error < SOCKS4_OK) error = SOCKS4_FAIL; //Transparently map SOCKS5 errors
+                response = GenerateSOCKS4Response(error, m_4aip, m_port);
+            break;
+            case SOCKS5:
+                LogPrint(eLogWarning,"--- SOCKS5 failed: ", error);
+                response = GenerateSOCKS5Response(error, m_addrtype, m_address, m_port);
+            break;
+        }
+        boost::asio::async_write(*m_sock, response, std::bind(&SOCKSHandler::SentSocksFailed,
+                                      shared_from_this(), std::placeholders::_1));
+    }
+
+    void SOCKSHandler::SocksRequestSuccess()
+    {
+        boost::asio::const_buffers_1 response(nullptr,0);
+        //TODO: this should depend on things like the command type and callbacks may change
+        switch (m_socksv) 
+        {
+            case SOCKS4:
+                LogPrint(eLogInfo,"--- SOCKS4 connection success");
+                response = GenerateSOCKS4Response(SOCKS4_OK, m_4aip, m_port);
+            break;
+            case SOCKS5:
+                LogPrint(eLogInfo,"--- SOCKS5 connection success");
+                auto s = i2p::client::context.GetAddressBook().ToAddress(GetOwner()->GetLocalDestination()->GetIdentHash());
+                address ad; ad.dns.FromString(s);
+                //HACK only 16 bits passed in port as SOCKS5 doesn't allow for more
+                response = GenerateSOCKS5Response(SOCKS5_OK, ADDR_DNS, ad, m_stream->GetRecvStreamID());
+            break;
+        }
+        boost::asio::async_write(*m_sock, response, std::bind(&SOCKSHandler::SentSocksDone,
+                                      shared_from_this(), std::placeholders::_1));
+    }
+
+    void SOCKSHandler::EnterState(SOCKSHandler::state nstate, uint8_t parseleft) {
+        switch (nstate) 
+        {
+            case GET_PORT: parseleft = 2; break;
+            case GET_IPV4: m_addrtype = ADDR_IPV4; m_address.ip = 0; parseleft = 4; break;
+            case GET4_IDENT: m_4aip = m_address.ip; break;
+            case GET4A_HOST:
+            case GET5_HOST: m_addrtype = ADDR_DNS; m_address.dns.size = 0; break;
+            case GET5_IPV6: m_addrtype = ADDR_IPV6; parseleft = 16; break;
+            default:;
+        }
+        m_parseleft = parseleft;
+        m_state = nstate;
+    }
+
+    bool SOCKSHandler::ValidateSOCKSRequest() 
+    {
+        if ( m_cmd != CMD_CONNECT ) 
+        {
+            //TODO: we need to support binds and other shit!
+            LogPrint(eLogError,"--- SOCKS unsupported command: ", m_cmd);
+            SocksRequestFailed(SOCKS5_CMD_UNSUP);
+            return false;
+        }
+        //TODO: we may want to support other address types!
+        if ( m_addrtype != ADDR_DNS ) 
+        {
+            switch (m_socksv) 
+            {
+                case SOCKS5:
+                    LogPrint(eLogError,"--- SOCKS5 unsupported address type: ", m_addrtype);
+                break;
+                case SOCKS4:
+                    LogPrint(eLogError,"--- SOCKS4a rejected because it's actually SOCKS4");
+                break;
+            }
+            SocksRequestFailed(SOCKS5_ADDR_UNSUP);
+            return false;
+        }
+        //TODO: we may want to support other domains
+        if(m_addrtype == ADDR_DNS && m_address.dns.ToString().find(".i2p") == std::string::npos) 
+        {
+            LogPrint(eLogError,"--- SOCKS invalid hostname: ", m_address.dns.ToString());
+            SocksRequestFailed(SOCKS5_ADDR_UNSUP);
+            return false;
+        }
+        return true;
+    }
+
+    bool SOCKSHandler::HandleData(uint8_t *sock_buff, std::size_t len)
+    {
+        assert(len); // This should always be called with a least a byte left to parse
+        while (len > 0) 
+        {
+            switch (m_state) 
+            {
+                case GET_SOCKSV:
+                    m_socksv = (SOCKSHandler::socksVersions) *sock_buff;
+                    switch (*sock_buff) 
+                    {
+                        case SOCKS4:
+                            EnterState(GET_COMMAND); //Initialize the parser at the right position
+                        break;
+                        case SOCKS5:
+                            EnterState(GET5_AUTHNUM); //Initialize the parser at the right position
+                        break;
+                        default:
+                            LogPrint(eLogError,"--- SOCKS rejected invalid version: ", ((int)*sock_buff));
+                            Terminate();
+                            return false;
+                    }
+                break;
+                case GET5_AUTHNUM:
+                    EnterState(GET5_AUTH, *sock_buff);
+                break;
+                case GET5_AUTH:
+                    m_parseleft --;
+                    if (*sock_buff == AUTH_NONE)
+                        m_authchosen = AUTH_NONE;
+                    if ( m_parseleft == 0 ) 
+                    {
+                        if (!Socks5ChooseAuth()) return false;
+                        EnterState(GET5_REQUESTV);
+                    }
+                break;
+                case GET_COMMAND:
+                    switch (*sock_buff) 
+                    {
+                        case CMD_CONNECT:
+                        case CMD_BIND:
+                        break;
+                        case CMD_UDP:
+                            if (m_socksv == SOCKS5) break;
+                        default:
+                            LogPrint(eLogError,"--- SOCKS invalid command: ", ((int)*sock_buff));
+                            SocksRequestFailed(SOCKS5_GEN_FAIL);
+                            return false;
+                    }
+                    m_cmd = (SOCKSHandler::cmdTypes)*sock_buff;
+                    switch (m_socksv) 
+                    {
+                        case SOCKS5: EnterState(GET5_GETRSV); break;
+                        case SOCKS4: EnterState(GET_PORT); break;
+                    }
+                break;
+                case GET_PORT:
+                    m_port = (m_port << 8)|((uint16_t)*sock_buff);
+                    m_parseleft--;
+                    if (m_parseleft == 0) 
+                    {
+                        switch (m_socksv) 
+                        {
+                            case SOCKS5: EnterState(DONE); break;
+                            case SOCKS4: EnterState(GET_IPV4); break;
+                        }
+                    }
+                break;
+                case GET_IPV4:
+                    m_address.ip = (m_address.ip << 8)|((uint32_t)*sock_buff);
+                    m_parseleft--;
+                    if (m_parseleft == 0) 
+                    {
+                        switch (m_socksv) 
+                        {
+                            case SOCKS5: EnterState(GET_PORT); break;
+                            case SOCKS4: EnterState(GET4_IDENT); m_4aip = m_address.ip; break;
+                        }
+                    }
+                break;
+                case GET4_IDENT:
+                    if (!*sock_buff) 
+                    {
+                        if( m_4aip == 0 || m_4aip > 255 )
+                            EnterState(DONE);
+                        else
+                            EnterState(GET4A_HOST);
+                    }
+                break;
+                case GET4A_HOST:
+                    if (!*sock_buff) 
+                    {
+                        EnterState(DONE);
+                        break;
+                    }
+                    if (m_address.dns.size >= max_socks_hostname_size) 
+                    {
+                        LogPrint(eLogError,"--- SOCKS4a destination is too large");
+                        SocksRequestFailed(SOCKS4_FAIL);
+                        return false;
+                    }
+                    m_address.dns.push_back(*sock_buff);
+                break;
+                case GET5_REQUESTV:
+                    if (*sock_buff != SOCKS5) 
+                    {
+                        LogPrint(eLogError,"--- SOCKS5 rejected unknown request version: ", ((int)*sock_buff));
+                        SocksRequestFailed(SOCKS5_GEN_FAIL);
+                        return false;
+                    }
+                    EnterState(GET_COMMAND);
+                break;
+                case GET5_GETRSV:
+                    if ( *sock_buff != 0 ) 
+                    {
+                        LogPrint(eLogError,"--- SOCKS5 unknown reserved field: ", ((int)*sock_buff));
+                        SocksRequestFailed(SOCKS5_GEN_FAIL);
+                        return false;
+                    }
+                    EnterState(GET5_GETADDRTYPE);
+                break;
+                case GET5_GETADDRTYPE:
+                    switch (*sock_buff) 
+                    {
+                        case ADDR_IPV4: EnterState(GET_IPV4); break;
+                        case ADDR_IPV6: EnterState(GET5_IPV6); break;
+                        case ADDR_DNS : EnterState(GET5_HOST_SIZE); break;
+                        default:
+                            LogPrint(eLogError,"--- SOCKS5 unknown address type: ", ((int)*sock_buff));
+                            SocksRequestFailed(SOCKS5_GEN_FAIL);
+                            return false;
+                    }
+                break;
+                case GET5_IPV6:
+                    m_address.ipv6[16-m_parseleft] = *sock_buff;
+                    m_parseleft--;
+                    if (m_parseleft == 0) EnterState(GET_PORT);
+                break;
+                case GET5_HOST_SIZE:
+                    EnterState(GET5_HOST, *sock_buff);
+                break;
+                case GET5_HOST:
+                    m_address.dns.push_back(*sock_buff);
+                    m_parseleft--;
+                    if (m_parseleft == 0) EnterState(GET_PORT);
+                break;
+                default:
+                    LogPrint(eLogError,"--- SOCKS parse state?? ", m_state);
+                    Terminate();
+                    return false;
+            }
+            sock_buff++;
+            len--;
+            if (m_state == DONE) 
+            {
+                m_remaining_data_len = len;
+                m_remaining_data = sock_buff;
+                return ValidateSOCKSRequest();
+            }
+        }
+        return true;
+    }
+
+    void SOCKSHandler::HandleSockRecv(const boost::system::error_code & ecode, std::size_t len)
+    {
+        LogPrint(eLogDebug,"--- SOCKS sock recv: ", len);
+        if(ecode) 
+        {
+            LogPrint(eLogWarning," --- SOCKS sock recv got error: ", ecode);
+            Terminate();
+            return;
+        }
+
+        if (HandleData(m_sock_buff, len)) 
+        {
+            if (m_state == DONE) 
+            {
+                LogPrint(eLogInfo,"--- SOCKS requested ", m_address.dns.ToString(), ":" , m_port);
+                GetOwner()->CreateStream ( std::bind (&SOCKSHandler::HandleStreamRequestComplete,
+                        shared_from_this(), std::placeholders::_1), m_address.dns.ToString(), m_port);
+            } 
+            else
+                AsyncSockRead();
+        }
+    }
+
+    void SOCKSHandler::SentSocksFailed(const boost::system::error_code & ecode)
+    {
+        if (!ecode) 
+            Terminate();
+        else 
+        {
+            LogPrint (eLogError,"--- SOCKS Closing socket after sending failure because: ", ecode.message ());
+            Terminate();
+        }
+    }
+
+    void SOCKSHandler::SentSocksDone(const boost::system::error_code & ecode)
+    {
+        if (!ecode) 
+        {
+            if (Kill()) return;
+            LogPrint (eLogInfo,"--- SOCKS New I2PTunnel connection");
+            auto connection = std::make_shared<i2p::client::I2PTunnelConnection>(GetOwner(), m_sock, m_stream);
+            GetOwner()->AddHandler (connection);
+            connection->I2PConnect (m_remaining_data,m_remaining_data_len);
+            Done(shared_from_this());
+        }
+        else
+        {
+            LogPrint (eLogError,"--- SOCKS Closing socket after completion reply because: ", ecode.message ());
+            Terminate();
+        }
+    }
+
+    void SOCKSHandler::SentSocksResponse(const boost::system::error_code & ecode)
+    {
+        if (ecode) 
+        {
+            LogPrint (eLogError,"--- SOCKS Closing socket after sending reply because: ", ecode.message ());
+            Terminate();
+        }
+    }
+
+    void SOCKSHandler::HandleStreamRequestComplete (std::shared_ptr<i2p::stream::Stream> stream)
+    {
+        if (stream) 
+        {
+            m_stream = stream;
+            SocksRequestSuccess();
+        } 
+        else 
+        {
+            LogPrint (eLogError,"--- SOCKS Issue when creating the stream, check the previous warnings for more info.");
+            SocksRequestFailed(SOCKS5_HOST_UNREACH);
+        }
+    }
+
+    SOCKSServer::SOCKSServer(const std::string& address, int port, std::shared_ptr<i2p::client::ClientDestination> localDestination)
+        : TCPIPAcceptor(
+            address, port,
+            localDestination ? localDestination : i2p::client::context.GetSharedLocalDestination()
+        ) 
+    {
+    }
+    
+    std::shared_ptr<i2p::client::I2PServiceHandler> SOCKSServer::CreateHandler(std::shared_ptr<boost::asio::ip::tcp::socket> socket)
+    {
+        return std::make_shared<SOCKSHandler> (this, socket);
+    }
+
+}
+}