2.14.0

NTCP SOCKS/HTTP Proxy support

.gitignore

@@ -1,5 +1,5 @@
 # i2pd
-obj/*.o
+*.o
 router.info
 router.keys
 i2p
@@ -249,3 +249,9 @@ docs/generated
 
 # gdb files
 .gdb_history
+
+# cmake makefile
+build/Makefile
+
+# debian stuff
+.pc/

ChangeLog

@@ -1,6 +1,17 @@
 # for this file format description,
 # see https://github.com/olivierlacan/keep-a-changelog
 
+## [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

Makefile

@@ -7,6 +7,10 @@ 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
@@ -17,24 +21,23 @@ USE_UPNP	:= no
 
 ifeq ($(WEBSOCKETS),1)
 	NEEDED_CXXFLAGS += -DWITH_EVENTS
-	DAEMON_SRC += Websocket.cpp
 endif
 
 ifeq ($(UNAME),Darwin)
-	DAEMON_SRC += DaemonLinux.cpp
+	DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
 	ifeq ($(HOMEBREW),1)
 		include Makefile.homebrew
 	else
 		include Makefile.osx
 	endif
 else ifeq ($(shell echo $(UNAME) | $(GREP) -Ec '(Free|Open)BSD'),1)
-	DAEMON_SRC += DaemonLinux.cpp
+	DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
 	include Makefile.bsd
 else ifeq ($(UNAME),Linux)
-	DAEMON_SRC += DaemonLinux.cpp
+	DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
 	include Makefile.linux
-else # win32 mingw
+else
-	DAEMON_SRC += DaemonWin32.cpp Win32/Win32Service.cpp Win32/Win32App.cpp
+	DAEMON_SRC += Win32/DaemonWin32.cpp Win32/Win32Service.cpp Win32/Win32App.cpp
 	include Makefile.mingw
 endif
 
@@ -42,11 +45,16 @@ 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)
@@ -70,7 +78,7 @@ obj/%.o: %.cpp
 
 DAEMON_OBJS += $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC))
 $(I2PD): $(DAEMON_OBJS) $(ARLIB) $(ARLIB_CLIENT)
-	$(CXX) -o $@ $^ $(LDLIBS) $(LDFLAGS)
+	$(CXX) -o $@ $^ $(LDFLAGS) $(LDLIBS)
 
 $(SHLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
 ifneq ($(USE_STATIC),yes)

Makefile.homebrew

@@ -9,9 +9,9 @@ LDFLAGS = -L${SSLROOT}/lib -L${BOOSTROOT}/lib
 LDLIBS = -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
 
 ifeq ($(USE_UPNP),yes)
-  LDFLAGS += -ldl
+	LDFLAGS += -ldl
-  CXXFLAGS += -DUSE_UPNP
+	CXXFLAGS += -DUSE_UPNP
-  LDLIBS += -lminiupnpc
+	LDLIBS += -lminiupnpc
 endif
 
 # OSX Notes
@@ -20,7 +20,7 @@ endif
 # Found no good way to detect it from command line. TODO: Might be some osx sysinfo magic
 # note from psi: 2009 macbook does not have aesni
 #ifeq ($(USE_AESNI),yes)
-#  CXXFLAGS += -maes -DAESNI
+#	CXXFLAGS += -maes -DAESNI
 #endif
 
 # Disabled, since it will be the default make rule. I think its better

Makefile.linux

@@ -31,27 +31,27 @@ 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
+	LIBDIR := /usr/lib
-  LDLIBS  = $(LIBDIR)/libboost_system.a
+	LDLIBS  = $(LIBDIR)/libboost_system.a
-  LDLIBS += $(LIBDIR)/libboost_date_time.a
+	LDLIBS += $(LIBDIR)/libboost_date_time.a
-  LDLIBS += $(LIBDIR)/libboost_filesystem.a
+	LDLIBS += $(LIBDIR)/libboost_filesystem.a
-  LDLIBS += $(LIBDIR)/libboost_program_options.a
+	LDLIBS += $(LIBDIR)/libboost_program_options.a
-  LDLIBS += $(LIBDIR)/libssl.a
+	LDLIBS += $(LIBDIR)/libssl.a
-  LDLIBS += $(LIBDIR)/libcrypto.a
+	LDLIBS += $(LIBDIR)/libcrypto.a
-  LDLIBS += $(LIBDIR)/libz.a
+	LDLIBS += $(LIBDIR)/libz.a
-  LDLIBS += -lpthread -static-libstdc++ -static-libgcc -lrt -ldl
+	LDLIBS += -lpthread -static-libstdc++ -static-libgcc -lrt -ldl
-  USE_AESNI := no
+	USE_AESNI := no
 else
-  LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
+	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
+	CXXFLAGS += -DUSE_UPNP
 ifeq ($(USE_STATIC),yes)
-  LDLIBS += $(LIBDIR)/libminiupnpc.a
+	LDLIBS += $(LIBDIR)/libminiupnpc.a
 else
-  LDLIBS += -lminiupnpc
+	LDLIBS += -lminiupnpc
 endif
 endif
 

Makefile.mingw

@@ -4,31 +4,29 @@ WINDRES = windres
 CXXFLAGS = -Os -D_MT -DWIN32 -D_WINDOWS -DWIN32_LEAN_AND_MEAN
 NEEDED_CXXFLAGS = -std=c++11
 BOOST_SUFFIX = -mt
-INCFLAGS = -I/usr/include/ -I/usr/local/include/
+INCFLAGS = -I/usr/include/ -I/usr/local/include/ -I. -Idaemon
-LDFLAGS = -Wl,-rpath,/usr/local/lib \
+LDFLAGS = -Wl,-rpath,/usr/local/lib -Wl,-Bstatic -static-libgcc -static-libstdc++ -L/usr/local/lib
-  -L/usr/local/lib 
 
 # UPNP Support
 ifeq ($(USE_UPNP),yes)
-  CXXFLAGS += -DUSE_UPNP -DMINIUPNP_STATICLIB
+	CXXFLAGS += -DUSE_UPNP -DMINIUPNP_STATICLIB
-  LDLIBS = -Wl,-Bstatic -lminiupnpc	
+	LDLIBS = -lminiupnpc
 endif
 
 LDLIBS += \
-  -Wl,-Bstatic -lboost_system$(BOOST_SUFFIX) \
+	-lboost_system$(BOOST_SUFFIX) \
-  -Wl,-Bstatic -lboost_date_time$(BOOST_SUFFIX) \
+	-lboost_date_time$(BOOST_SUFFIX) \
-  -Wl,-Bstatic -lboost_filesystem$(BOOST_SUFFIX) \
+	-lboost_filesystem$(BOOST_SUFFIX) \
-  -Wl,-Bstatic -lboost_program_options$(BOOST_SUFFIX) \
+	-lboost_program_options$(BOOST_SUFFIX) \
-  -Wl,-Bstatic -lssl \
+	-lssl \
-  -Wl,-Bstatic -lcrypto \
+	-lcrypto \
-  -Wl,-Bstatic -lz \
+	-lz \
-  -Wl,-Bstatic -lwsock32 \
+	-lwsock32 \
-  -Wl,-Bstatic -lws2_32 \
+	-lws2_32 \
-  -Wl,-Bstatic -lgdi32 \
+	-lgdi32 \
-  -Wl,-Bstatic -liphlpapi \
+	-liphlpapi \
-  -static-libgcc -static-libstdc++ \
+	-lstdc++ \
-  -Wl,-Bstatic -lstdc++ \
+	-lpthread
-  -Wl,-Bstatic -lpthread
 
 ifeq ($(USE_WIN32_APP), yes)
 	CXXFLAGS += -DWIN32_APP
@@ -50,7 +48,7 @@ endif
 
 ifeq ($(USE_ASLR),yes)
 	LDFLAGS += -Wl,--nxcompat -Wl,--high-entropy-va \
-      -Wl,--dynamicbase,--export-all-symbols
+	-Wl,--dynamicbase,--export-all-symbols
 endif
 
 obj/%.o : %.rc

README.md

@@ -65,8 +65,9 @@ BTC: 1K7Ds6KUeR8ya287UC4rYTjvC96vXyZbDY
 ZEC: t1cTckLuXsr1dwVrK4NDzfhehss4NvMadAJ  
 DASH: Xw8YUrQpYzP9tZBmbjqxS3M97Q7v3vJKUF   
 LTC: LKQirrYrDeTuAPnpYq5y7LVKtywfkkHi59  
-ANC: AQJYweYYUqM1nVfLqfoSMpUMfzxvS4Xd7z  
 DOGE: DNXLQKziRPAsD9H3DFNjk4fLQrdaSX893Y  
+ANC: AQJYweYYUqM1nVfLqfoSMpUMfzxvS4Xd7z   
+GST: GbD2JSQHBHCKLa9WTHmigJRpyFgmBj4woG  
 
 License
 -------

Win32/Resource.rc2

@@ -6,7 +6,7 @@
 #error this file is not editable by Microsoft Visual C++
 #endif //APSTUDIO_INVOKED
 
-#include "../version.h"
+#include "../libi2pd/version.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //

Win32/Win32App.cpp

@@ -1,13 +1,13 @@
 #include <string.h>
 #include <windows.h>
 #include <shellapi.h>
-#include "../ClientContext.h"
+#include "ClientContext.h"
-#include "../Config.h"
+#include "Config.h"
-#include "../NetDb.h"
+#include "NetDb.hpp"
-#include "../RouterContext.h"
+#include "RouterContext.h"
-#include "../Transports.h"
+#include "Transports.h"
-#include "../Tunnel.h"
+#include "Tunnel.h"
-#include "../version.h"
+#include "version.h"
 #include "resource.h"
 #include "Win32App.h"
 #include <stdio.h>

Win32/Win32Service.cpp

@@ -7,8 +7,8 @@
 #include <strsafe.h>
 #include <windows.h>
 
-#include "../Daemon.h"
+#include "Daemon.h"
-#include "../Log.h"
+#include "Log.h"
 
 I2PService *I2PService::s_service = NULL;
 

Win32/i2pd.vcxproj

@@ -83,7 +83,7 @@
     <ClInclude Include="..\LittleBigEndian.h" />
     <ClInclude Include="..\Log.h" />
 	<ClInclude Include="..\NetDbRequests.h" />
-    <ClInclude Include="..\NetDb.h" />
+    <ClInclude Include="..\NetDb.hpp" />
     <ClInclude Include="..\NTCPSession.h" />
     <ClInclude Include="..\Queue.h" />
 	<ClInclude Include="..\Profiling.h" />

Win32/i2pd.vcxproj.filters

@@ -158,7 +158,7 @@
     <ClInclude Include="..\Log.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\NetDb.h">
+    <ClInclude Include="..\NetDb.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\NTCPSession.h">

Win32/installer.iss

@@ -1,5 +1,5 @@
 #define I2Pd_AppName "i2pd"
-#define I2Pd_ver "2.13.0"
+#define I2Pd_ver "2.14.0"
 #define I2Pd_Publisher "PurpleI2P"
 
 [Setup]

android/.gitignore

@@ -1,6 +1,7 @@
 gen
 tests
 .idea
+ant.properties
 local.properties
 build.sh
 bin

android/AndroidManifest.xml

@@ -2,8 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.purplei2p.i2pd"
       android:versionCode="1"
-      android:versionName="2.13.0">
+      android:versionName="2.14.0"
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
+	  android:installLocation="auto">
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="25"/>
 	<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"/>

android/build.xml

@@ -93,5 +93,4 @@
     -->
     <!-- version-tag: 1 -->
     <import file="${sdk.dir}/tools/ant/build.xml" />
-
 </project>

android/jni/Android.mk

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := i2pd
 LOCAL_CPP_FEATURES := rtti exceptions
-LOCAL_C_INCLUDES += $(IFADDRS_PATH) ../..
+LOCAL_C_INCLUDES += $(IFADDRS_PATH) $(LIB_SRC_PATH) $(LIB_CLIENT_SRC_PATH) $(DAEMON_SRC_PATH)
 LOCAL_STATIC_LIBRARIES := \
 	boost_system \
 	boost_date_time \
@@ -12,58 +12,13 @@ LOCAL_STATIC_LIBRARIES := \
 	miniupnpc
 LOCAL_LDLIBS := -lz
 
-LOCAL_SRC_FILES := DaemonAndroid.cpp i2pd_android.cpp \
+LOCAL_SRC_FILES := DaemonAndroid.cpp i2pd_android.cpp $(IFADDRS_PATH)/ifaddrs.c \
-	$(IFADDRS_PATH)/ifaddrs.c \
+	$(wildcard $(LIB_SRC_PATH)/*.cpp)\
-    ../../HTTPServer.cpp ../../I2PControl.cpp ../../Daemon.cpp ../../Config.cpp \
+	$(wildcard $(LIB_CLIENT_SRC_PATH)/*.cpp)\
-    ../../AddressBook.cpp \
+	$(DAEMON_SRC_PATH)/Daemon.cpp \
-    ../../api.cpp \
+	$(DAEMON_SRC_PATH)/UPnP.cpp \
-    ../../Base.cpp \
+	$(DAEMON_SRC_PATH)/HTTPServer.cpp \
-    ../../BOB.cpp \
+	$(DAEMON_SRC_PATH)/I2PControl.cpp
-    ../../ClientContext.cpp \
-    ../../Crypto.cpp \
-    ../../Datagram.cpp \
-    ../../Destination.cpp \
-    ../../Family.cpp \
-    ../../FS.cpp \
-    ../../Garlic.cpp \
-    ../../Gzip.cpp \
-    ../../HTTP.cpp \
-    ../../HTTPProxy.cpp \
-    ../../I2CP.cpp \
-    ../../I2NPProtocol.cpp \
-    ../../I2PEndian.cpp \
-    ../../I2PService.cpp \
-    ../../I2PTunnel.cpp \
-    ../../Identity.cpp \
-    ../../LeaseSet.cpp \
-    ../../Log.cpp \
-    ../../NetDb.cpp \
-    ../../NetDbRequests.cpp \
-    ../../NTCPSession.cpp \
-    ../../Profiling.cpp \
-    ../../Reseed.cpp \
-    ../../RouterContext.cpp \
-    ../../RouterInfo.cpp \
-    ../../SAM.cpp \
-    ../../Signature.cpp \
-    ../../SOCKS.cpp \
-    ../../SSU.cpp \
-    ../../SSUData.cpp \
-    ../../SSUSession.cpp \
-    ../../Streaming.cpp \
-    ../../TransitTunnel.cpp \
-    ../../Transports.cpp \
-    ../../Tunnel.cpp \
-    ../../TunnelEndpoint.cpp \
-    ../../TunnelGateway.cpp \
-    ../../TunnelPool.cpp \
-	../../Timestamp.cpp \
-	../../Event.cpp \
-	../../Gost.cpp \
-	../../WebSocks.cpp \
-../../BloomFilter.cpp \
-    ../../util.cpp \
-     ../../i2pd.cpp ../../UPnP.cpp
 
 include $(BUILD_SHARED_LIBRARY)
 

android/jni/Application.mk

@@ -3,7 +3,7 @@
 #APP_ABI := x86
 APP_ABI := armeabi-v7a
 #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-9
+APP_PLATFORM := android-14
 
 # http://stackoverflow.com/a/21386866/529442 http://stackoverflow.com/a/15616255/529442 to enable c++11 support in Eclipse
 NDK_TOOLCHAIN_VERSION := 4.9
@@ -25,8 +25,15 @@ APP_OPTIM  := debug
 # 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
+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,5 +1,5 @@
 #include "DaemonAndroid.h"
-#include "../../Daemon.h"
+#include "Daemon.h"
 #include <iostream>
 #include <boost/exception/diagnostic_information.hpp>
 #include <boost/exception_ptr.hpp>
@@ -191,4 +191,3 @@ namespace android
 	}
 }
 }
-

android/jni/i2pd_android.cpp

@@ -3,8 +3,8 @@
 #include <jni.h>
 #include "org_purplei2p_i2pd_I2PD_JNI.h"
 #include "DaemonAndroid.h"
-#include "../../RouterContext.h"
+#include "RouterContext.h"
-#include "../../Transports.h"
+#include "Transports.h"
 
 JNIEXPORT jstring JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_getABICompiledWith
   (JNIEnv * env, jclass clazz) {

android/libs/.gitignore

@@ -1 +0,0 @@
-armeabi-v7a

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

@@ -6,7 +6,6 @@ import android.app.Service;
 import android.content.Intent;
 import android.os.Binder;
 import android.os.IBinder;
-import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 
 public class ForegroundService extends Service {
@@ -72,7 +71,7 @@ public class ForegroundService extends Service {
                 new Intent(this, I2PD.class), 0);
 
         // Set the info for the views that show in the notification panel.
-        Notification notification = new NotificationCompat.Builder(this)
+        Notification notification = new Notification.Builder(this)
                 .setSmallIcon(R.drawable.itoopie_notification_icon)  // the status icon
                 .setTicker(text)  // the status text
                 .setWhen(System.currentTimeMillis())  // the time stamp

appveyor.yml

@@ -1,4 +1,4 @@
-version: 2.12.{build}
+version: 2.14.{build}
 pull_requests:
   do_not_increment_build_number: true
 branches:

build/CMakeLists.txt

@@ -8,6 +8,7 @@ project ( "i2pd" )
 
 # 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)
@@ -25,44 +26,51 @@ option(WITH_WEBSOCKETS "Build with websocket ui" OFF)
 set ( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
 set ( CMAKE_SOURCE_DIR ".." )
 
+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
-  "${CMAKE_SOURCE_DIR}/BloomFilter.cpp"
+  "${LIBI2PD_SRC_DIR}/BloomFilter.cpp"
-  "${CMAKE_SOURCE_DIR}/Config.cpp"
+  "${LIBI2PD_SRC_DIR}/Config.cpp"
-  "${CMAKE_SOURCE_DIR}/Crypto.cpp"
+  "${LIBI2PD_SRC_DIR}/Crypto.cpp"
-  "${CMAKE_SOURCE_DIR}/Garlic.cpp"
+  "${LIBI2PD_SRC_DIR}/Garlic.cpp"
-  "${CMAKE_SOURCE_DIR}/Gzip.cpp"
+  "${LIBI2PD_SRC_DIR}/Gzip.cpp"
-  "${CMAKE_SOURCE_DIR}/I2NPProtocol.cpp"
+  "${LIBI2PD_SRC_DIR}/HTTP.cpp"
-  "${CMAKE_SOURCE_DIR}/Identity.cpp"
+  "${LIBI2PD_SRC_DIR}/I2NPProtocol.cpp"
-  "${CMAKE_SOURCE_DIR}/LeaseSet.cpp"
+  "${LIBI2PD_SRC_DIR}/Identity.cpp"
-  "${CMAKE_SOURCE_DIR}/FS.cpp"
+  "${LIBI2PD_SRC_DIR}/LeaseSet.cpp"
-  "${CMAKE_SOURCE_DIR}/Log.cpp"
+  "${LIBI2PD_SRC_DIR}/FS.cpp"
-  "${CMAKE_SOURCE_DIR}/NTCPSession.cpp"
+  "${LIBI2PD_SRC_DIR}/Log.cpp"
-  "${CMAKE_SOURCE_DIR}/NetDbRequests.cpp"	
+  "${LIBI2PD_SRC_DIR}/NTCPSession.cpp"
-  "${CMAKE_SOURCE_DIR}/NetDb.cpp"
+  "${LIBI2PD_SRC_DIR}/NetDbRequests.cpp"
-  "${CMAKE_SOURCE_DIR}/Profiling.cpp"
+  "${LIBI2PD_SRC_DIR}/NetDb.cpp"
-  "${CMAKE_SOURCE_DIR}/Reseed.cpp"
+  "${LIBI2PD_SRC_DIR}/Profiling.cpp"
-  "${CMAKE_SOURCE_DIR}/RouterContext.cpp"
+  "${LIBI2PD_SRC_DIR}/Reseed.cpp"
-  "${CMAKE_SOURCE_DIR}/RouterInfo.cpp"
+  "${LIBI2PD_SRC_DIR}/RouterContext.cpp"
-  "${CMAKE_SOURCE_DIR}/SSU.cpp"
+  "${LIBI2PD_SRC_DIR}/RouterInfo.cpp"
-  "${CMAKE_SOURCE_DIR}/SSUData.cpp"
+  "${LIBI2PD_SRC_DIR}/SSU.cpp"
-  "${CMAKE_SOURCE_DIR}/SSUSession.cpp"
+  "${LIBI2PD_SRC_DIR}/SSUData.cpp"
-  "${CMAKE_SOURCE_DIR}/Streaming.cpp"
+  "${LIBI2PD_SRC_DIR}/SSUSession.cpp"
-  "${CMAKE_SOURCE_DIR}/Destination.cpp"	
+  "${LIBI2PD_SRC_DIR}/Streaming.cpp"
-  "${CMAKE_SOURCE_DIR}/TransitTunnel.cpp"
+  "${LIBI2PD_SRC_DIR}/Destination.cpp"
-  "${CMAKE_SOURCE_DIR}/Tunnel.cpp"
+  "${LIBI2PD_SRC_DIR}/TransitTunnel.cpp"
-  "${CMAKE_SOURCE_DIR}/TunnelGateway.cpp"
+  "${LIBI2PD_SRC_DIR}/Tunnel.cpp"
-  "${CMAKE_SOURCE_DIR}/Transports.cpp"
+  "${LIBI2PD_SRC_DIR}/TunnelGateway.cpp"
-  "${CMAKE_SOURCE_DIR}/TunnelEndpoint.cpp"
+  "${LIBI2PD_SRC_DIR}/Transports.cpp"
-  "${CMAKE_SOURCE_DIR}/TunnelPool.cpp"
+  "${LIBI2PD_SRC_DIR}/TunnelEndpoint.cpp"
-  "${CMAKE_SOURCE_DIR}/Base.cpp"
+  "${LIBI2PD_SRC_DIR}/TunnelPool.cpp"
-  "${CMAKE_SOURCE_DIR}/util.cpp"
+  "${LIBI2PD_SRC_DIR}/Base.cpp"
-  "${CMAKE_SOURCE_DIR}/Datagram.cpp"
+  "${LIBI2PD_SRC_DIR}/util.cpp"
-  "${CMAKE_SOURCE_DIR}/Family.cpp"
+  "${LIBI2PD_SRC_DIR}/Datagram.cpp"
-  "${CMAKE_SOURCE_DIR}/Signature.cpp"
+  "${LIBI2PD_SRC_DIR}/Family.cpp"
-  "${CMAKE_SOURCE_DIR}/Timestamp.cpp"	
+  "${LIBI2PD_SRC_DIR}/Signature.cpp"
-  "${CMAKE_SOURCE_DIR}/api.cpp"
+  "${LIBI2PD_SRC_DIR}/Timestamp.cpp"
-  "${CMAKE_SOURCE_DIR}/Event.cpp"
+  "${LIBI2PD_SRC_DIR}/api.cpp"
-  "${CMAKE_SOURCE_DIR}/Gost.cpp"	
+  "${LIBI2PD_SRC_DIR}/Event.cpp"
+  "${LIBI2PD_SRC_DIR}/Gost.cpp"
 )
 
 if (WITH_WEBSOCKETS)
@@ -89,30 +97,32 @@ install(TARGETS libi2pd
 # install(EXPORT libi2pd DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 set (CLIENT_SRC
-  "${CMAKE_SOURCE_DIR}/AddressBook.cpp"
+  "${LIBI2PD_CLIENT_SRC_DIR}/AddressBook.cpp"
-  "${CMAKE_SOURCE_DIR}/BOB.cpp"	
+  "${LIBI2PD_CLIENT_SRC_DIR}/BOB.cpp"
-  "${CMAKE_SOURCE_DIR}/ClientContext.cpp"
+  "${LIBI2PD_CLIENT_SRC_DIR}/ClientContext.cpp"
-  "${CMAKE_SOURCE_DIR}/I2PTunnel.cpp"
+  "${LIBI2PD_CLIENT_SRC_DIR}/MatchedDestination.cpp"
-  "${CMAKE_SOURCE_DIR}/I2PService.cpp"
+  "${LIBI2PD_CLIENT_SRC_DIR}/I2PTunnel.cpp"
-  "${CMAKE_SOURCE_DIR}/SAM.cpp"
+  "${LIBI2PD_CLIENT_SRC_DIR}/I2PService.cpp"
-  "${CMAKE_SOURCE_DIR}/SOCKS.cpp"
+  "${LIBI2PD_CLIENT_SRC_DIR}/SAM.cpp"
-  "${CMAKE_SOURCE_DIR}/HTTP.cpp"
+  "${LIBI2PD_CLIENT_SRC_DIR}/SOCKS.cpp"
-  "${CMAKE_SOURCE_DIR}/HTTPProxy.cpp"
+  "${LIBI2PD_CLIENT_SRC_DIR}/HTTPProxy.cpp"
-  "${CMAKE_SOURCE_DIR}/I2CP.cpp"
+  "${LIBI2PD_CLIENT_SRC_DIR}/I2CP.cpp"
-  "${CMAKE_SOURCE_DIR}/WebSocks.cpp"
+  "${LIBI2PD_CLIENT_SRC_DIR}/WebSocks.cpp"
-  )
+)
 
 if(WITH_WEBSOCKETS)
-  list (APPEND CLIENT_SRC "${CMAKE_SOURCE_DIR}/Websocket.cpp")
+  list (APPEND CLIENT_SRC "${LIBI2PD_CLIENT_SRC_DIR}/Websocket.cpp")
 endif ()
 add_library(i2pdclient ${CLIENT_SRC})
 
+set(DAEMON_SRC_DIR ../daemon)
+
 set (DAEMON_SRC
-  "${CMAKE_SOURCE_DIR}/Daemon.cpp"
+  "${DAEMON_SRC_DIR}/Daemon.cpp"
-  "${CMAKE_SOURCE_DIR}/HTTPServer.cpp"
+  "${DAEMON_SRC_DIR}/HTTPServer.cpp"
-  "${CMAKE_SOURCE_DIR}/I2PControl.cpp"
+  "${DAEMON_SRC_DIR}/I2PControl.cpp"
-  "${CMAKE_SOURCE_DIR}/i2pd.cpp"
+  "${DAEMON_SRC_DIR}/i2pd.cpp"
-  "${CMAKE_SOURCE_DIR}/UPnP.cpp"
+  "${DAEMON_SRC_DIR}/UPnP.cpp"
 )
 
 if (WITH_MESHNET)
@@ -177,22 +187,22 @@ endif ()
 
 # compiler flags customization (by system)
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/DaemonLinux.cpp")
+  list (APPEND DAEMON_SRC "${DAEMON_SRC_DIR}/UnixDaemon.cpp")
   # "'sleep_for' is not a member of 'std::this_thread'" in gcc 4.7/4.8
   add_definitions( "-D_GLIBCXX_USE_NANOSLEEP=1" )
 elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/DaemonLinux.cpp")
+  list (APPEND DAEMON_SRC "${DAEMON_SRC_DIR}/UnixDaemon.cpp")
   # "'sleep_for' is not a member of 'std::this_thread'" in gcc 4.7/4.8
   add_definitions( "-D_GLIBCXX_USE_NANOSLEEP=1" )
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/DaemonLinux.cpp")
+    list (APPEND DAEMON_SRC "${DAEMON_SRC_DIR}/UnixDaemon.cpp")
-elseif (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+  elseif (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/DaemonLinux.cpp")
+      list (APPEND DAEMON_SRC "${DAEMON_SRC_DIR}/UnixDaemon.cpp")
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR MSYS)
+    elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR MSYS)
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/DaemonWin32.cpp")
+        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}/DaemonWin32.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")
@@ -204,6 +214,10 @@ if (WITH_AESNI)
   add_definitions ( -DAESNI )
 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" )
@@ -274,7 +288,7 @@ endif ()
 
 if (WITH_PCH)
   include_directories(BEFORE ${CMAKE_BINARY_DIR})
-  add_library(stdafx STATIC "${CMAKE_SOURCE_DIR}/stdafx.cpp")
+  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
@@ -290,10 +304,10 @@ if (WITH_PCH)
     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}/../stdafx.h -o ${CMAKE_BINARY_DIR}/stdafx.h.gch
+      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 stdafx.h)
+    target_compile_options(libi2pd PRIVATE -include libi2pd/stdafx.h)
-    target_compile_options(i2pdclient PRIVATE -include stdafx.h)
+    target_compile_options(i2pdclient PRIVATE -include libi2pd/stdafx.h)
   endif()
   target_link_libraries(libi2pd stdafx)
 endif()
@@ -370,6 +384,7 @@ message(STATUS "Compiler path      : ${CMAKE_CXX_COMPILER}")
 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}")
@@ -401,7 +416,7 @@ if (WITH_BINARY)
     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 stdafx.h)
+      target_compile_options("${PROJECT_NAME}" PRIVATE -include libi2pd/stdafx.h)
     endif()
   endif()
 
@@ -452,7 +467,7 @@ install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICENSE"
   OPTIONAL                      # for local builds only!
   )
 
-file(GLOB_RECURSE I2PD_SOURCES "../*.cpp" "../build" "../Win32" "../Makefile*")
+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
@@ -461,7 +476,7 @@ install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source)
 #   PATTERN "*.cpp"
 #   )
 
-file(GLOB I2PD_HEADERS "../*.h")
+file(GLOB I2PD_HEADERS "../libi2pd/*.h" "../libi2pd_client/*.h" "../daemon/*.h")
 install(FILES ${I2PD_HEADERS} DESTINATION src/ COMPONENT Headers)
 # install(DIRECTORY ../ DESTINATION src/
 #   # OPTIONAL
@@ -474,7 +489,7 @@ 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 ../version.h version_h)
+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}")

contrib/i2pd.conf

@@ -64,12 +64,13 @@ ipv6 = false
 # nat = true
 
 ## Bandwidth configuration
-## L limit bandwidth to 32Kbs/sec, O - to 256Kbs/sec, P - to 2048Kbs/sec,
+## L limit bandwidth to 32KBs/sec, O - to 256KBs/sec, P - to 2048KBs/sec,
 ## X - unlimited
 ## Default is X for floodfill, L for regular node
 # bandwidth = L
 
-## Router will not accept transit tunnels at startup
+## Router will not accept transit tunnels, disabling transit traffic completely
+## (default = false)
 # notransit = true
 
 ## Router will be floodfill
@@ -141,7 +142,7 @@ port = 4447
 
 [sam]
 ## Uncomment and set to 'true' to enable SAM Bridge
-# enabled = false
+enabled = true
 ## Address and port service will listen on
 # address = 127.0.0.1
 # port = 7656

contrib/tunnels.conf

@@ -1,4 +1,4 @@
-[IRC]
+[IRC-IRC2P]
 type = client
 address = 127.0.0.1
 port = 6668
@@ -6,6 +6,14 @@ 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
@@ -22,12 +30,4 @@ keys = irc-keys.dat
 #destinationport = 110
 #keys = pop3-keys.dat
 
-#[MTN]
-#type = client
-#address = 127.0.0.1
-#port = 8998
-#destination = mtn.i2p-projekt.i2p
-#destinationport = 4691
-#keys = mtn-keys.dat
-
 # see more examples in /usr/share/doc/i2pd/configuration.md.gz

daemon/Daemon.cpp

@@ -14,7 +14,7 @@
 #include "RouterContext.h"
 #include "Tunnel.h"
 #include "HTTP.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Garlic.h"
 #include "Streaming.h"
 #include "Destination.h"
@@ -115,6 +115,12 @@ namespace i2p
 			}
 
 			LogPrint(eLogInfo,	"i2pd v", VERSION, " starting");
+#ifdef AESNI
+			LogPrint(eLogInfo,	"AESNI enabled");
+#endif
+#if defined(__AVX__)
+			LogPrint(eLogInfo,	"AVX enabled"); 
+#endif
 			LogPrint(eLogDebug, "FS: main config file: ", config);
 			LogPrint(eLogDebug, "FS: data directory: ", datadir);
 
@@ -189,6 +195,9 @@ namespace i2p
 				i2p::context.SetBandwidth (i2p::data::CAPS_FLAG_LOW_BANDWIDTH2);
 			}
 
+			int shareRatio; i2p::config::GetOption("share", shareRatio);
+			i2p::context.SetShareRatio (shareRatio);
+
 			std::string family; i2p::config::GetOption("family", family);
 			i2p::context.SetFamily (family);
 			if (family.length () > 0)
@@ -260,6 +269,7 @@ namespace i2p
 			LogPrint(eLogInfo, "Daemon: starting Transports");
 			if(!ssu) LogPrint(eLogInfo, "Daemon: ssu disabled");
 			if(!ntcp) LogPrint(eLogInfo, "Daemon: ntcp disabled");
+
 			i2p::transport::transports.Start(ntcp, ssu);
 			if (i2p::transport::transports.IsBoundNTCP() || i2p::transport::transports.IsBoundSSU()) {
 				LogPrint(eLogInfo, "Daemon: Transports started");

daemon/HTTPServer.cpp

@@ -11,9 +11,8 @@
 #include "Log.h"
 #include "Config.h"
 #include "Tunnel.h"
-#include "TransitTunnel.h"
 #include "Transports.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "HTTP.h"
 #include "LeaseSet.h"
 #include "Destination.h"
@@ -109,6 +108,18 @@ namespace http {
 		s << seconds << " seconds";
 	}
 
+	static void ShowTraffic (std::stringstream& s, uint64_t bytes)
+	{
+		s << std::fixed << std::setprecision(2);
+		auto numKBytes = (double) bytes / 1024;
+		if (numKBytes < 1024)
+			s << numKBytes << " KiB";
+		else if (numKBytes < 1024 * 1024)
+			s << numKBytes / 1024 << " MiB";
+		else
+			s << numKBytes / 1024 / 1024 << " GiB";
+	}
+
 	static void ShowTunnelDetails (std::stringstream& s, enum i2p::tunnel::TunnelState eState, int bytes)
 	{
 		std::string state;
@@ -212,24 +223,14 @@ namespace http {
 			s << "<b>Family:</b> " << family << "<br>\r\n";
 		s << "<b>Tunnel creation success rate:</b> " << i2p::tunnel::tunnels.GetTunnelCreationSuccessRate () << "%<br>\r\n";
 		s << "<b>Received:</b> ";
-		s << std::fixed << std::setprecision(2);
+		ShowTraffic (s, i2p::transport::transports.GetTotalReceivedBytes ());
-		auto numKBytesReceived = (double) i2p::transport::transports.GetTotalReceivedBytes () / 1024;
-		if (numKBytesReceived < 1024)
-			s << numKBytesReceived << " KiB";
-		else if (numKBytesReceived < 1024 * 1024)
-			s << numKBytesReceived / 1024 << " MiB";
-		else
-			s << numKBytesReceived / 1024 / 1024 << " GiB";
 		s << " (" << (double) i2p::transport::transports.GetInBandwidth () / 1024 << " KiB/s)<br>\r\n";
 		s << "<b>Sent:</b> ";
-		auto numKBytesSent = (double) i2p::transport::transports.GetTotalSentBytes () / 1024;
+		ShowTraffic (s, i2p::transport::transports.GetTotalSentBytes ());
-		if (numKBytesSent < 1024)
-			s << numKBytesSent << " KiB";
-		else if (numKBytesSent < 1024 * 1024)
-			s << numKBytesSent / 1024 << " MiB";
-		else
-			s << numKBytesSent / 1024 / 1024 << " GiB";
 		s << " (" << (double) i2p::transport::transports.GetOutBandwidth () / 1024 << " KiB/s)<br>\r\n";
+		s << "<b>Transit:</b> ";
+		ShowTraffic (s, i2p::transport::transports.GetTotalTransitTransmittedBytes ());
+		s << " (" << (double) i2p::transport::transports.GetTransitBandwidth () / 1024 << " KiB/s)<br>\r\n";		
 		s << "<b>Data path:</b> " << i2p::fs::GetDataDir() << "<br>\r\n";
 		s << "<div class='slide'\r\n><label for='slide1'>Hidden content. Press on text to see.</label>\r\n<input type='checkbox' id='slide1'/>\r\n<p class='content'>\r\n";
 		s << "<b>Router Ident:</b> " << i2p::context.GetRouterInfo().GetIdentHashBase64() << "<br>\r\n";

daemon/I2PControl.cpp

@@ -17,7 +17,7 @@
 #include "FS.h"
 #include "Log.h"
 #include "Config.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "RouterContext.h"
 #include "Daemon.h"
 #include "Tunnel.h"

daemon/UPnP.cpp

@@ -10,7 +10,7 @@
 
 #include "RouterContext.h"
 #include "UPnP.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "util.h"
 #include "RouterInfo.h"
 #include "Config.h"

debian/changelog

@@ -1,3 +1,12 @@
+i2pd (2.14.0-1) unstable; urgency=low
+
+  * updated to version 2.14.0/0.9.30
+  * updated debian/control
+  * renamed logrotate to i2pd.logrotate
+  * fixed init.d script
+
+ -- orignal <orignal@i2pmail.org>  Thu, 1 Jun 2017 14:00:00 +0000
+
 i2pd (2.13.0-1) unstable; urgency=low
 
   * updated to version 2.13.0/0.9.29
@@ -5,7 +14,7 @@ i2pd (2.13.0-1) unstable; urgency=low
   * renamed logrotate to i2pd.logrotate
   * fixed init.d script
 
- -- orignal <orignal@i2pmail.org>  Tue, 6 Apr 2017 14:00:00 +0000
+ -- orignal <orignal@i2pmail.org>  Thu, 6 Apr 2017 14:00:00 +0000
 
 i2pd (2.12.0-1) unstable; urgency=low
 

debian/control

@@ -2,7 +2,7 @@ Source: i2pd
 Section: net
 Priority: optional
 Maintainer: R4SAS <r4sas@i2pmail.org>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), gcc (>= 4.7) | clang (>= 3.3), libboost-system-dev (>= 1.46), libboost-date-time-dev, libboost-filesystem-dev, libboost-program-options-dev, libminiupnpc-dev, libssl-dev
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), gcc (>= 4.7) | clang (>= 3.3), libboost-system-dev (>= 1.46), libboost-date-time-dev, libboost-filesystem-dev, libboost-program-options-dev, libminiupnpc-dev, libssl-dev, zlib1g-dev
 Standards-Version: 3.9.6
 Homepage: http://i2pd.website/
 Vcs-Git: git://github.com/PurpleI2P/i2pd.git
@@ -13,7 +13,7 @@ Architecture: any
 Pre-Depends: adduser
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: tor, privoxy
-Description: i2pd is a full-featured C++ implementation of I2P client.
+Description: A full-featured C++ implementation of I2P client.
  I2P (Invisible Internet Protocol) is a universal anonymous network layer. All
  communications over I2P are anonymous and end-to-end encrypted, participants
  don't reveal their real IP addresses.

debian/i2pd.upstart

@@ -6,4 +6,6 @@ stop on runlevel [016] or unmounting-filesystem
 # these can be overridden in /etc/init/i2pd.override
 env LOGFILE="/var/log/i2pd/i2pd.log"
 
+expect fork
+
 exec /usr/sbin/i2pd --daemon --service --log=file --logfile=$LOGFILE

filelist.mk

@@ -1,17 +1,22 @@
-LIB_SRC = \
+#LIB_SRC = \
-  BloomFilter.cpp Gzip.cpp Crypto.cpp Datagram.cpp Garlic.cpp I2NPProtocol.cpp LeaseSet.cpp \
+#  BloomFilter.cpp Gzip.cpp Crypto.cpp Datagram.cpp Garlic.cpp I2NPProtocol.cpp LeaseSet.cpp \
-  Log.cpp NTCPSession.cpp NetDb.cpp NetDbRequests.cpp Profiling.cpp \
+#  Log.cpp NTCPSession.cpp NetDb.cpp NetDbRequests.cpp Profiling.cpp \
-  Reseed.cpp RouterContext.cpp RouterInfo.cpp Signature.cpp SSU.cpp \
+#  Reseed.cpp RouterContext.cpp RouterInfo.cpp Signature.cpp SSU.cpp \
-  SSUSession.cpp SSUData.cpp Streaming.cpp Identity.cpp TransitTunnel.cpp \
+#  SSUSession.cpp SSUData.cpp Streaming.cpp Identity.cpp TransitTunnel.cpp \
-  Transports.cpp Tunnel.cpp TunnelEndpoint.cpp TunnelPool.cpp TunnelGateway.cpp \
+#  Transports.cpp Tunnel.cpp TunnelEndpoint.cpp TunnelPool.cpp TunnelGateway.cpp \
-  Destination.cpp Base.cpp I2PEndian.cpp FS.cpp Config.cpp Family.cpp \
+#  Destination.cpp Base.cpp I2PEndian.cpp FS.cpp Config.cpp Family.cpp \
-  Config.cpp HTTP.cpp Timestamp.cpp util.cpp api.cpp Event.cpp Gost.cpp
+#  Config.cpp HTTP.cpp Timestamp.cpp util.cpp api.cpp Event.cpp Gost.cpp
 
-LIB_CLIENT_SRC = \
+LIB_SRC = $(wildcard $(LIB_SRC_DIR)/*.cpp)
-	AddressBook.cpp BOB.cpp ClientContext.cpp I2PTunnel.cpp I2PService.cpp \
+
-	SAM.cpp SOCKS.cpp HTTPProxy.cpp I2CP.cpp WebSocks.cpp
+#LIB_CLIENT_SRC = \
+#	AddressBook.cpp BOB.cpp ClientContext.cpp I2PTunnel.cpp I2PService.cpp MatchedDestination.cpp \
+#	SAM.cpp SOCKS.cpp HTTPProxy.cpp I2CP.cpp WebSocks.cpp
+
+LIB_CLIENT_SRC = $(wildcard $(LIB_CLIENT_SRC_DIR)/*.cpp)
 
 # also: Daemon{Linux,Win32}.cpp will be added later
-DAEMON_SRC = \
+#DAEMON_SRC = \
-	HTTPServer.cpp I2PControl.cpp UPnP.cpp Daemon.cpp i2pd.cpp
+#	HTTPServer.cpp I2PControl.cpp UPnP.cpp Daemon.cpp i2pd.cpp
 
+DAEMON_SRC = $(wildcard $(DAEMON_SRC_DIR)/*.cpp)

libi2pd/Config.cpp

@@ -53,9 +53,11 @@ namespace config {
       ("service",   value<bool>()->zero_tokens()->default_value(false), "Router will use system folders like '/var/lib/i2pd'")
       ("notransit", value<bool>()->zero_tokens()->default_value(false), "Router will not accept transit tunnels at startup")
       ("floodfill", value<bool>()->zero_tokens()->default_value(false), "Router will be floodfill")
-      ("bandwidth", value<std::string>()->default_value(""), "Bandwidth limit: integer in kbps or letters: L (32), O (256), P (2048), X (>9000)")
+      ("bandwidth", value<std::string>()->default_value(""), "Bandwidth limit: integer in KBps or letters: L (32), O (256), P (2048), X (>9000)")
+	  ("share",	value<int>()->default_value(100), "Limit of transit traffic from max bandwidth in percents. (default: 100")
       ("ntcp", value<bool>()->zero_tokens()->default_value(true), "Enable NTCP transport")
       ("ssu", value<bool>()->zero_tokens()->default_value(true), "Enable SSU transport")
+			("ntcpproxy", value<std::string>()->default_value(""), "proxy url for ntcp transport")
 #ifdef _WIN32
       ("svcctl",    value<std::string>()->default_value(""),     "Windows service management ('install' or 'remove')")
       ("insomnia", value<bool>()->zero_tokens()->default_value(false), "Prevent system from sleeping")
@@ -94,6 +96,7 @@ namespace config {
 	  ("httpproxy.latency.min",    value<std::string>()->default_value("0"),  "HTTP proxy min latency for tunnels")
 	  ("httpproxy.latency.max",   value<std::string>()->default_value("0"),  "HTTP proxy max latency for tunnels")
 			("httpproxy.outproxy", value<std::string>()->default_value(""), "HTTP proxy upstream out proxy url")
+	  ("httpproxy.addresshelper",   value<bool>()->default_value(true),                         "Enable or disable addresshelper")
       ;
 
     options_description socksproxy("SOCKS Proxy options");
@@ -115,7 +118,7 @@ namespace config {
 
     options_description sam("SAM bridge options");
     sam.add_options()
-      ("sam.enabled",         value<bool>()->default_value(false),                        "Enable or disable SAM Application bridge")
+      ("sam.enabled",         value<bool>()->default_value(true),                        "Enable or disable SAM Application bridge")
       ("sam.address",         value<std::string>()->default_value("127.0.0.1"),           "SAM listen address")
       ("sam.port",            value<uint16_t>()->default_value(7656),                     "SAM listen port")
       ;
@@ -185,8 +188,8 @@ namespace config {
 	    "https://reseed.atomike.ninja/,"
 	    "https://reseed.memcpy.io/,"
 	    "https://reseed.onion.im/,"
-	    "https://itoopie.atomike.ninja/,"
+	    "https://itoopie.atomike.ninja/"
-		"https://randomrng.ddns.net/"	                                                      
+//		"https://randomrng.ddns.net/"	   // dead
 		),  "Reseed URLs, separated by comma")
 	  ;
 

libi2pd/Datagram.cpp

@@ -255,9 +255,11 @@ namespace datagram
 			}
 			if(m_CurrentRemoteLease && m_CurrentRemoteLease->ExpiresWithin(DATAGRAM_SESSION_LEASE_HANDOVER_WINDOW)) {
 				// bad lease, switch to next one
+				if(m_RemoteLeaseSet && m_RemoteLeaseSet->IsExpired())
+					m_RemoteLeaseSet = m_LocalDestination->FindLeaseSet(m_RemoteIdent);
 				if(m_RemoteLeaseSet) {
 					auto ls = m_RemoteLeaseSet->GetNonExpiredLeasesExcluding([&](const i2p::data::Lease& l) -> bool {
-							return l.tunnelGateway == m_CurrentRemoteLease->tunnelGateway;
+							return l.tunnelID == m_CurrentRemoteLease->tunnelID;
 					});
 					auto sz = ls.size();
 					if (sz) {
@@ -278,7 +280,7 @@ namespace datagram
 				m_CurrentOutboundTunnel = m_LocalDestination->GetTunnelPool()->GetNextOutboundTunnel(m_CurrentOutboundTunnel);
 			}
 			// switch lease if bad
-			if(m_CurrentRemoteLease == nullptr || m_CurrentRemoteLease->ExpiresWithin(DATAGRAM_SESSION_LEASE_HANDOVER_WINDOW)) {
+			if(m_CurrentRemoteLease && m_CurrentRemoteLease->ExpiresWithin(DATAGRAM_SESSION_LEASE_HANDOVER_WINDOW)) {
 				if(!m_RemoteLeaseSet) {
 					m_RemoteLeaseSet = m_LocalDestination->FindLeaseSet(m_RemoteIdent);
 				}
@@ -299,6 +301,17 @@ namespace datagram
 					LogPrint(eLogWarning, "DatagramSession: no remote lease set found for ", m_RemoteIdent.ToBase32());
 					return nullptr;
 				}
+			} else if (!m_CurrentRemoteLease) {
+				if(!m_RemoteLeaseSet) m_RemoteLeaseSet = m_LocalDestination->FindLeaseSet(m_RemoteIdent);
+				if (m_RemoteLeaseSet)
+				{
+					auto ls = m_RemoteLeaseSet->GetNonExpiredLeases();
+					auto sz = ls.size();
+					if (sz) {
+						auto idx = rand() % sz;
+						m_CurrentRemoteLease = ls[idx];
+					}
+				}
 			}
 			path->outboundTunnel = m_CurrentOutboundTunnel;
 			path->remoteLease = m_CurrentRemoteLease;
@@ -346,7 +359,7 @@ namespace datagram
 
 	void DatagramSession::ScheduleFlushSendQueue()
 	{
-		boost::posix_time::milliseconds dlt(100);
+		boost::posix_time::milliseconds dlt(10);
 		m_SendQueueTimer.expires_from_now(dlt);
 		auto self = shared_from_this();
 		m_SendQueueTimer.async_wait([self](const boost::system::error_code & ec) { if(ec) return; self->FlushSendQueue(); });

libi2pd/Datagram.h

@@ -26,7 +26,7 @@ namespace datagram
 	// milliseconds interval a routing path is used before switching
 	const uint64_t DATAGRAM_SESSION_PATH_SWITCH_INTERVAL = 20 * 60 * 1000;
 	// milliseconds before lease expire should we try switching leases
-	const uint64_t DATAGRAM_SESSION_LEASE_HANDOVER_WINDOW = 10 * 1000;
+	const uint64_t DATAGRAM_SESSION_LEASE_HANDOVER_WINDOW = 30 * 1000;
 	// milliseconds fudge factor for leases handover
 	const uint64_t DATAGRAM_SESSION_LEASE_HANDOVER_FUDGE = 1000;
 	// milliseconds minimum time between path switches
@@ -103,7 +103,7 @@ namespace datagram
 		public:
 
 
-			DatagramDestination (std::shared_ptr<i2p::client::ClientDestination> owner);
+    DatagramDestination (std::shared_ptr<i2p::client::ClientDestination> owner);
 			~DatagramDestination ();
 
     	void SendDatagramTo (const uint8_t * payload, size_t len, const i2p::data::IdentHash & ident, uint16_t fromPort = 0, uint16_t toPort = 0);
@@ -147,4 +147,3 @@ namespace datagram
 }
 
 #endif
-

libi2pd/Destination.cpp

@@ -4,7 +4,7 @@
 #include "Log.h"
 #include "FS.h"
 #include "Timestamp.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Destination.h"
 #include "util.h"
 

libi2pd/Destination.h

@@ -17,7 +17,7 @@
 #include "Crypto.h"
 #include "LeaseSet.h"
 #include "Garlic.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Streaming.h"
 #include "Datagram.h"
 
@@ -175,8 +175,8 @@ namespace client
 			ClientDestination (const i2p::data::PrivateKeys& keys, bool isPublic, const std::map<std::string, std::string> * params = nullptr);
 			~ClientDestination ();
 
-			bool Start ();
+			virtual bool Start ();
-			bool Stop ();
+			virtual bool Stop ();
 
 			const i2p::data::PrivateKeys& GetPrivateKeys () const { return m_Keys; };
 			void Sign (const uint8_t * buf, int len, uint8_t * signature) const { m_Keys.Sign (buf, len, signature); };

libi2pd/Garlic.cpp

@@ -437,17 +437,18 @@ namespace garlic
 		if (it != m_Tags.end ())
 		{
 			// tag found. Use AES
+			auto decryption = it->second;
+			m_Tags.erase (it); // tag might be used only once	
 			if (length >= 32)
 			{	
 				uint8_t iv[32]; // IV is first 16 bytes
 				SHA256(buf, 32, iv);
-				it->second->SetIV (iv);
+				decryption->SetIV (iv);
-				it->second->Decrypt (buf + 32, length - 32, buf + 32);
+				decryption->Decrypt (buf + 32, length - 32, buf + 32);
-				HandleAESBlock (buf + 32, length - 32, it->second, msg->from);
+				HandleAESBlock (buf + 32, length - 32, decryption, msg->from);
 			}	
 			else
 				LogPrint (eLogWarning, "Garlic: message length ", length, " is less than 32 bytes");
-			m_Tags.erase (it); // tag might be used only once	
 		}
 		else
 		{

libi2pd/Gost.cpp

@@ -323,7 +323,7 @@ namespace crypto
 			for (int i = 63; i >= 0; i--)
 			{
 				uint16_t sum = buf[i] + other.buf[i] + carry;
-				ret.buf[i] = sum & 0xFF;
+				ret.buf[i] = sum;
 				carry = sum >> 8;
 			}	
 			return ret;
@@ -333,6 +333,7 @@ namespace crypto
 		{
 			for (int i = 63; i >= 0; i--)
 			{
+				if (!c) return;	
 				c += buf[i];
 				buf[i] = c;
 				c >>= 8;		
@@ -438,5 +439,92 @@ namespace crypto
 		memset (iv, 0, 64);
 		H (iv, buf, len, digest);
 	}
+
+	// reverse order
+	struct GOSTR3411_2012_CTX
+	{
+		GOST3411Block h, N, s, m;
+		size_t len;
+		bool is512;
+	};
+	
+	GOSTR3411_2012_CTX * GOSTR3411_2012_CTX_new ()
+	{
+		return new GOSTR3411_2012_CTX;
+	}
+
+	void GOSTR3411_2012_CTX_free (GOSTR3411_2012_CTX * ctx)
+	{
+		delete ctx;
+	}
+
+	void GOSTR3411_2012_CTX_Init (GOSTR3411_2012_CTX * ctx, bool is512)
+	{
+		uint8_t iv[64];
+		memset (iv, is512 ? 0 : 1, 64);
+		memcpy (ctx->h.buf, iv, 64);
+		memset (ctx->N.buf, 0, 64);
+		memset (ctx->s.buf, 0, 64);
+		ctx->len = 0;
+		ctx->is512 = is512;
+	}
+
+	void GOSTR3411_2012_CTX_Update (const uint8_t * buf, size_t len, GOSTR3411_2012_CTX * ctx)
+	{
+		if (!len) return;
+		if (ctx->len > 0) // something left from buffer
+		{
+			size_t l = 64 - ctx->len;
+			if (len < l) l = len;
+			for (size_t i = 0; i < l; i++)
+				ctx->m.buf[ctx->len + i] = buf[l-i-1]; // invert	 
+			ctx->len += l; len -= l; buf += l;
+
+			ctx->h = gN (ctx->N, ctx->h, ctx->m);
+			ctx->N.Add (512);
+			ctx->s = ctx->m + ctx->s;
+		}
+		while (len >= 64)
+		{
+			for (size_t i = 0; i < 64; i++)
+				ctx->m.buf[i] = buf[63-i]; // invert	
+			len -= 64; buf += 64;
+			ctx->h = gN (ctx->N, ctx->h, ctx->m);
+			ctx->N.Add (512);
+			ctx->s = ctx->m + ctx->s;
+		}
+		if (len > 0) // carry remaining
+		{
+			for (size_t i = 0; i < len; i++)
+				ctx->m.buf[i] = buf[len-i-1]; // invert
+		}
+		ctx->len = len;
+	}
+
+	void GOSTR3411_2012_CTX_Finish (uint8_t * digest, GOSTR3411_2012_CTX * ctx)
+	{
+		GOST3411Block m;	
+		size_t padding = 64 - ctx->len;
+		if (padding)
+		{
+			memset (m.buf, 0, padding - 1);
+			m.buf[padding - 1] = 1;
+		}
+		memcpy (m.buf + padding, ctx->m.buf, ctx->len);
+
+		ctx->h = gN (ctx->N, ctx->h, m);
+		ctx->N.Add (ctx->len*8);	
+		ctx->s = m + ctx->s;
+	
+		GOST3411Block N0;
+		memset (N0.buf, 0, 64);
+		ctx->h = gN (N0, ctx->h, ctx->N);
+		ctx->h = gN (N0, ctx->h, ctx->s);
+		
+		size_t sz = ctx->is512 ? 64 : 32;
+		for (size_t i = 0; i < sz; i++)
+			digest[i] = ctx->h.buf[sz - i - 1];
+	}
+
 }
 }

libi2pd/Gost.h

@@ -45,8 +45,17 @@ namespace crypto
 
 	std::unique_ptr<GOSTR3410Curve>& GetGOSTR3410Curve (GOSTR3410ParamSet paramSet);
 
+// Big Endian
 	void GOSTR3411_2012_256 (const uint8_t * buf, size_t len, uint8_t * digest);
 	void GOSTR3411_2012_512 (const uint8_t * buf, size_t len, uint8_t * digest);	
+
+// Little Endian
+	struct GOSTR3411_2012_CTX;
+	GOSTR3411_2012_CTX * GOSTR3411_2012_CTX_new ();
+	void GOSTR3411_2012_CTX_Init (GOSTR3411_2012_CTX * ctx, bool is512 = true);
+	void GOSTR3411_2012_CTX_Update (const uint8_t * buf, size_t len, GOSTR3411_2012_CTX * ctx);
+	void GOSTR3411_2012_CTX_Finish (uint8_t * digest, GOSTR3411_2012_CTX * ctx);	
+	void GOSTR3411_2012_CTX_free (GOSTR3411_2012_CTX * ctx);
 }
 }
 

libi2pd/I2NPProtocol.cpp

@@ -6,7 +6,7 @@
 #include "I2PEndian.h"
 #include "Timestamp.h"
 #include "RouterContext.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Tunnel.h"
 #include "Transports.h"
 #include "Garlic.h"
@@ -332,7 +332,8 @@ namespace i2p
 				// replace record to reply			
 				if (i2p::context.AcceptsTunnels () && 
 					i2p::tunnel::tunnels.GetTransitTunnels ().size () <= g_MaxNumTransitTunnels &&
-					!i2p::transport::transports.IsBandwidthExceeded ())
+					!i2p::transport::transports.IsBandwidthExceeded () &&
+					!i2p::transport::transports.IsTransitBandwidthExceeded ())
 				{	
 					auto transitTunnel = i2p::tunnel::CreateTransitTunnel (
 							bufbe32toh (clearText + BUILD_REQUEST_RECORD_RECEIVE_TUNNEL_OFFSET), 

libi2pd/I2NPProtocol.h

@@ -209,6 +209,7 @@ namespace tunnel
 
 	std::shared_ptr<I2NPMessage> NewI2NPMessage ();
 	std::shared_ptr<I2NPMessage> NewI2NPShortMessage ();
+	std::shared_ptr<I2NPMessage> NewI2NPTunnelMessage ();
 	std::shared_ptr<I2NPMessage> NewI2NPMessage (size_t len);
 	
 	std::shared_ptr<I2NPMessage> CreateI2NPMessage (I2NPMessageType msgType, const uint8_t * buf, size_t len, uint32_t replyMsgID = 0);	

libi2pd/LeaseSet.cpp

@@ -3,7 +3,7 @@
 #include "Crypto.h"
 #include "Log.h"
 #include "Timestamp.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Tunnel.h"
 #include "LeaseSet.h"
 

libi2pd/LeaseSet.h

@@ -30,7 +30,8 @@ namespace data
 		bool ExpiresWithin( const uint64_t t, const uint64_t fudge = 1000 ) const {
 			auto expire = i2p::util::GetMillisecondsSinceEpoch ();
 			if(fudge) expire += rand() % fudge;
-			return endDate - expire >= t;
+			if (endDate < expire) return true;
+			return (endDate - expire) < t;
 		}
 	};	
 

libi2pd/NTCPSession.cpp

@@ -10,8 +10,9 @@
 #include "I2NPProtocol.h"
 #include "RouterContext.h"
 #include "Transports.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "NTCPSession.h"
+#include "HTTP.h"
 #ifdef WITH_EVENTS
 #include "Event.h"
 #endif
@@ -116,7 +117,7 @@ namespace transport
 			m_Establisher->phase1.HXxorHI[i] ^= ident[i];
 
 		boost::asio::async_write (m_Socket, boost::asio::buffer (&m_Establisher->phase1, sizeof (NTCPPhase1)), boost::asio::transfer_all (),
-        	std::bind(&NTCPSession::HandlePhase1Sent, shared_from_this (), std::placeholders::_1, std::placeholders::_2));
+			std::bind(&NTCPSession::HandlePhase1Sent, shared_from_this (), std::placeholders::_1, std::placeholders::_2));
 	}
 
 	void NTCPSession::ServerLogin ()
@@ -132,7 +133,7 @@ namespace transport
 	{
 		(void) bytes_transferred;
 		if (ecode)
-        {
+		{
 			LogPrint (eLogInfo, "NTCP: couldn't send Phase 1 message: ", ecode.message ());
 			if (ecode != boost::asio::error::operation_aborted)
 				Terminate ();
@@ -149,7 +150,7 @@ namespace transport
 	{
 		(void) bytes_transferred;
 		if (ecode)
-        {
+		{
 			LogPrint (eLogInfo, "NTCP: phase 1 read error: ", ecode.message ());
 			if (ecode != boost::asio::error::operation_aborted)
 				Terminate ();
@@ -185,10 +186,10 @@ namespace transport
 					s->CreateAESKey (s->m_Establisher->phase1.pubKey);
 				}).share ();
 			m_Server.GetService ().post ([s, keyCreated]()
-				{  
+			{
-					keyCreated.get (); 
+				keyCreated.get ();
-					s->SendPhase2 ();
+				s->SendPhase2 ();
-				});
+			});
 #endif
 		}
 	}
@@ -210,7 +211,7 @@ namespace transport
 
 		m_Encryption.Encrypt ((uint8_t *)&m_Establisher->phase2.encrypted, sizeof(m_Establisher->phase2.encrypted), (uint8_t *)&m_Establisher->phase2.encrypted);
 		boost::asio::async_write (m_Socket, boost::asio::buffer (&m_Establisher->phase2, sizeof (NTCPPhase2)), boost::asio::transfer_all (),
-        	std::bind(&NTCPSession::HandlePhase2Sent, shared_from_this (), std::placeholders::_1, std::placeholders::_2, tsB));
+					std::bind(&NTCPSession::HandlePhase2Sent, shared_from_this (), std::placeholders::_1, std::placeholders::_2, tsB));
 
 	}
 
@@ -218,7 +219,7 @@ namespace transport
 	{
 		(void) bytes_transferred;
 		if (ecode)
-        {
+		{
 			LogPrint (eLogInfo, "NTCP: Couldn't send Phase 2 message: ", ecode.message ());
 			if (ecode != boost::asio::error::operation_aborted)
 				Terminate ();
@@ -235,7 +236,7 @@ namespace transport
 	{
 		(void) bytes_transferred;
 		if (ecode)
-        {
+		{
 			LogPrint (eLogInfo, "NTCP: Phase 2 read error: ", ecode.message (), ". Wrong ident assumed");
 			if (ecode != boost::asio::error::operation_aborted)
 			{
@@ -318,20 +319,20 @@ namespace transport
 		s.Insert (m_Establisher->phase1.pubKey, 256); // x
 		s.Insert (m_Establisher->phase2.pubKey, 256); // y
 		s.Insert (m_RemoteIdentity->GetIdentHash (), 32); // ident
- 		s.Insert (tsA);	// tsA
+		s.Insert (tsA);	// tsA
 		s.Insert (m_Establisher->phase2.encrypted.timestamp, 4); // tsB
 		s.Sign (keys, buf);
 
 		m_Encryption.Encrypt(m_ReceiveBuffer, len, m_ReceiveBuffer);
 		boost::asio::async_write (m_Socket, boost::asio::buffer (m_ReceiveBuffer, len), boost::asio::transfer_all (),
-        	std::bind(&NTCPSession::HandlePhase3Sent, shared_from_this (), std::placeholders::_1, std::placeholders::_2, tsA));				
+			std::bind(&NTCPSession::HandlePhase3Sent, shared_from_this (), std::placeholders::_1, std::placeholders::_2, tsA));
 	}
 
 	void NTCPSession::HandlePhase3Sent (const boost::system::error_code& ecode, std::size_t bytes_transferred, uint32_t tsA)
 	{
 		(void) bytes_transferred;
 		if (ecode)
-        {
+		{
 			LogPrint (eLogInfo, "NTCP: Couldn't send Phase 3 message: ", ecode.message ());
 			if (ecode != boost::asio::error::operation_aborted)
 				Terminate ();
@@ -351,7 +352,7 @@ namespace transport
 	void NTCPSession::HandlePhase3Received (const boost::system::error_code& ecode, std::size_t bytes_transferred, uint32_t tsB)
 	{
 		if (ecode)
-        {
+		{
 			LogPrint (eLogInfo, "NTCP: Phase 3 read error: ", ecode.message ());
 			if (ecode != boost::asio::error::operation_aborted)
 				Terminate ();
@@ -389,7 +390,7 @@ namespace transport
 	void NTCPSession::HandlePhase3ExtraReceived (const boost::system::error_code& ecode, std::size_t bytes_transferred, uint32_t tsB, size_t paddingLen)
 	{
 		if (ecode)
-        {
+		{
 			LogPrint (eLogInfo, "NTCP: Phase 3 extra read error: ", ecode.message ());
 			if (ecode != boost::asio::error::operation_aborted)
 				Terminate ();
@@ -444,21 +445,21 @@ namespace transport
 		s.Insert (tsA); // tsA
 		s.Insert (tsB); // tsB
 		auto& keys = i2p::context.GetPrivateKeys ();
- 		auto signatureLen = keys.GetPublic ()->GetSignatureLen ();
+		auto signatureLen = keys.GetPublic ()->GetSignatureLen ();
 		s.Sign (keys, m_ReceiveBuffer);
 		size_t paddingSize = signatureLen & 0x0F; // %16
 		if (paddingSize > 0) signatureLen += (16 - paddingSize);
 		m_Encryption.Encrypt (m_ReceiveBuffer, signatureLen, m_ReceiveBuffer);
 
 		boost::asio::async_write (m_Socket, boost::asio::buffer (m_ReceiveBuffer, signatureLen), boost::asio::transfer_all (),
-        	std::bind(&NTCPSession::HandlePhase4Sent, shared_from_this (), std::placeholders::_1, std::placeholders::_2));
+			std::bind(&NTCPSession::HandlePhase4Sent, shared_from_this (), std::placeholders::_1, std::placeholders::_2));
 	}
 
 	void NTCPSession::HandlePhase4Sent (const boost::system::error_code& ecode,  std::size_t bytes_transferred)
 	{
 		(void) bytes_transferred;
 		if (ecode)
-        {
+		{
 			LogPrint (eLogWarning, "NTCP: Couldn't send Phase 4 message: ", ecode.message ());
 			if (ecode != boost::asio::error::operation_aborted)
 				Terminate ();
@@ -478,7 +479,7 @@ namespace transport
 	void NTCPSession::HandlePhase4Received (const boost::system::error_code& ecode, std::size_t bytes_transferred, uint32_t tsA)
 	{
 		if (ecode)
-        {
+		{
 			LogPrint (eLogError, "NTCP: Phase 4 read error: ", ecode.message (), ". Check your clock");
 			if (ecode != boost::asio::error::operation_aborted)
 			{
@@ -673,13 +674,13 @@ namespace transport
 			m_NextMessage = nullptr;
 		}
 		return true;
- 	}	
+	}
 
 	void NTCPSession::Send (std::shared_ptr<i2p::I2NPMessage> msg)
 	{
 		m_IsSending = true;
 		boost::asio::async_write (m_Socket, CreateMsgBuffer (msg), boost::asio::transfer_all (),
-        	std::bind(&NTCPSession::HandleSent, shared_from_this (), std::placeholders::_1, std::placeholders::_2, std::vector<std::shared_ptr<I2NPMessage> >{ msg }));	
+			std::bind(&NTCPSession::HandleSent, shared_from_this (), std::placeholders::_1, std::placeholders::_2, std::vector<std::shared_ptr<I2NPMessage> >{ msg }));
 	}
 
 	boost::asio::const_buffers_1 NTCPSession::CreateMsgBuffer (std::shared_ptr<I2NPMessage> msg)
@@ -726,7 +727,7 @@ namespace transport
 		for (const auto& it: msgs)
 			bufs.push_back (CreateMsgBuffer (it));
 		boost::asio::async_write (m_Socket, bufs, boost::asio::transfer_all (),
-        	std::bind(&NTCPSession::HandleSent, shared_from_this (), std::placeholders::_1, std::placeholders::_2, msgs));
+			std::bind(&NTCPSession::HandleSent, shared_from_this (), std::placeholders::_1, std::placeholders::_2, msgs));
 	}
 
 	void NTCPSession::HandleSent (const boost::system::error_code& ecode, std::size_t bytes_transferred, std::vector<std::shared_ptr<I2NPMessage> > msgs)
@@ -734,7 +735,7 @@ namespace transport
 		(void) msgs;
 		m_IsSending = false;
 		if (ecode)
-        {
+		{
 			LogPrint (eLogWarning, "NTCP: Couldn't send msgs: ", ecode.message ());
 			// we shouldn't call Terminate () here, because HandleReceive takes care
 			// TODO: 'delete this' statement in Terminate () must be eliminated later
@@ -788,7 +789,8 @@ namespace transport
 //-----------------------------------------
 	NTCPServer::NTCPServer ():
 		m_IsRunning (false), m_Thread (nullptr), m_Work (m_Service),
-		m_TerminationTimer (m_Service), m_NTCPAcceptor (nullptr), m_NTCPV6Acceptor (nullptr)
+		m_TerminationTimer (m_Service), m_NTCPAcceptor (nullptr), m_NTCPV6Acceptor (nullptr),
+		m_ProxyType(eNoProxy), m_Resolver(m_Service), m_ProxyEndpoint(nullptr)
 	{
 	}
 
@@ -803,48 +805,63 @@ namespace transport
 		{
 			m_IsRunning = true;
 			m_Thread = new std::thread (std::bind (&NTCPServer::Run, this));
-			// create acceptors
+			// we are using a proxy, don't create any acceptors
-			auto& addresses = context.GetRouterInfo ().GetAddresses ();
+			if(UsingProxy())
-			for (const auto& address: addresses)
 			{
-				if (!address) continue;
+				// TODO: resolve proxy until it is resolved
-				if (address->transportStyle == i2p::data::RouterInfo::eTransportNTCP)
+				boost::asio::ip::tcp::resolver::query q(m_ProxyAddress, std::to_string(m_ProxyPort));
+				boost::system::error_code e;
+				auto itr = m_Resolver.resolve(q, e);
+				if(e)
 				{
-					if (address->host.is_v4())
+					LogPrint(eLogError, "NTCP: Failed to resolve proxy ", e.message());
+				}
+				else
+				{
+					m_ProxyEndpoint = new boost::asio::ip::tcp::endpoint(*itr);
+				}
+			}
+			else
+			{
+				// create acceptors
+				auto& addresses = context.GetRouterInfo ().GetAddresses ();
+				for (const auto& address: addresses)
+				{
+					if (!address) continue;
+					if (address->transportStyle == i2p::data::RouterInfo::eTransportNTCP)
 					{
-						try
+						if (address->host.is_v4())
 						{
-							m_NTCPAcceptor = new boost::asio::ip::tcp::acceptor (m_Service,
+							try
-								boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), address->port));
+							{
-						} catch ( std::exception & ex ) {
+								m_NTCPAcceptor = new boost::asio::ip::tcp::acceptor (m_Service, boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), address->port));
-							/** fail to bind ip4 */
+							} catch ( std::exception & ex ) {
-							LogPrint(eLogError, "NTCP: Failed to bind to ip4 port ",address->port, ex.what());
+								/** fail to bind ip4 */
-							continue;
+								LogPrint(eLogError, "NTCP: Failed to bind to ip4 port ",address->port, ex.what());
+								continue;
+							}
+
+							LogPrint (eLogInfo, "NTCP: Start listening TCP port ", address->port);
+							auto conn = std::make_shared<NTCPSession>(*this);
+							m_NTCPAcceptor->async_accept(conn->GetSocket (), std::bind (&NTCPServer::HandleAccept, this, conn, std::placeholders::_1));
 						}
-						
+						else if (address->host.is_v6() && context.SupportsV6 ())
-						LogPrint (eLogInfo, "NTCP: Start listening TCP port ", address->port);
-						auto conn = std::make_shared<NTCPSession>(*this);
-						m_NTCPAcceptor->async_accept(conn->GetSocket (), std::bind (&NTCPServer::HandleAccept, this, 
-							conn, std::placeholders::_1));	
-					}
-					else if (address->host.is_v6() && context.SupportsV6 ())
-					{
-						m_NTCPV6Acceptor = new boost::asio::ip::tcp::acceptor (m_Service);							
-						try
 						{
-							m_NTCPV6Acceptor->open (boost::asio::ip::tcp::v6());
+							m_NTCPV6Acceptor = new boost::asio::ip::tcp::acceptor (m_Service);
-							m_NTCPV6Acceptor->set_option (boost::asio::ip::v6_only (true));
+							try
+							{
+								m_NTCPV6Acceptor->open (boost::asio::ip::tcp::v6());
+								m_NTCPV6Acceptor->set_option (boost::asio::ip::v6_only (true));
+								m_NTCPV6Acceptor->bind (boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v6(), address->port));
+								m_NTCPV6Acceptor->listen ();
 
-							m_NTCPV6Acceptor->bind (boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v6(), address->port));
+								LogPrint (eLogInfo, "NTCP: Start listening V6 TCP port ", address->port);
-							m_NTCPV6Acceptor->listen ();
+								auto conn = std::make_shared<NTCPSession> (*this);
-							
+								m_NTCPV6Acceptor->async_accept(conn->GetSocket (), std::bind (&NTCPServer::HandleAcceptV6, this, conn, std::placeholders::_1));
-							LogPrint (eLogInfo, "NTCP: Start listening V6 TCP port ", address->port);
+							} catch ( std::exception & ex ) {
-							auto conn = std::make_shared<NTCPSession> (*this);
+								LogPrint(eLogError, "NTCP: failed to bind to ip6 port ", address->port);
-							m_NTCPV6Acceptor->async_accept(conn->GetSocket (), std::bind (&NTCPServer::HandleAcceptV6,
+								continue;
-								this, conn, std::placeholders::_1));
+							}
-						} catch ( std::exception & ex ) {
-							LogPrint(eLogError, "NTCP: failed to bind to ip6 port ", address->port);
-							continue;
 						}
 					}
 				}
@@ -869,14 +886,14 @@ namespace transport
 		{
 			m_IsRunning = false;
 			m_TerminationTimer.cancel ();
-		  	if (m_NTCPAcceptor)
+			if (m_NTCPAcceptor)
 			{
-		    	delete m_NTCPAcceptor;
+					delete m_NTCPAcceptor;
 				m_NTCPAcceptor = nullptr;
 			}
-		  	if (m_NTCPV6Acceptor)
+			if (m_NTCPV6Acceptor)
 			{
-		    	delete m_NTCPV6Acceptor;
+				delete m_NTCPV6Acceptor;
 				m_NTCPV6Acceptor = nullptr;
 			}
 			m_Service.stop ();
@@ -886,6 +903,11 @@ namespace transport
 				delete m_Thread;
 				m_Thread = nullptr;
 			}
+			if(m_ProxyEndpoint)
+			{
+				delete m_ProxyEndpoint;
+				m_ProxyEndpoint = nullptr;
+			}
 		}
 	}
 
@@ -956,7 +978,7 @@ namespace transport
 
 		if (error != boost::asio::error::operation_aborted)
 		{
-    		conn = std::make_shared<NTCPSession> (*this);
+			conn = std::make_shared<NTCPSession> (*this);
 			m_NTCPAcceptor->async_accept(conn->GetSocket (), std::bind (&NTCPServer::HandleAccept, this,
 				conn, std::placeholders::_1));
 		}
@@ -983,31 +1005,56 @@ namespace transport
 
 		if (error != boost::asio::error::operation_aborted)
 		{
-    		conn = std::make_shared<NTCPSession> (*this);
+			conn = std::make_shared<NTCPSession> (*this);
 			m_NTCPV6Acceptor->async_accept(conn->GetSocket (), std::bind (&NTCPServer::HandleAcceptV6, this,
 				conn, std::placeholders::_1));
 		}
 	}
 
-	void NTCPServer::Connect (const boost::asio::ip::address& address, int port, std::shared_ptr<NTCPSession> conn)
+	void NTCPServer::Connect(const boost::asio::ip::address & address, uint16_t port, std::shared_ptr<NTCPSession> conn)
 	{
 		LogPrint (eLogDebug, "NTCP: Connecting to ", address ,":",  port);
-		m_Service.post([=]()
+		m_Service.post([=]() {
-		{       
 			if (this->AddNTCPSession (conn))
 			{
+
 				auto timer = std::make_shared<boost::asio::deadline_timer>(m_Service);
 				timer->expires_from_now (boost::posix_time::seconds(NTCP_CONNECT_TIMEOUT));
-				timer->async_wait ([conn](const boost::system::error_code& ecode)
+				timer->async_wait ([conn](const boost::system::error_code& ecode) {
+					if (ecode != boost::asio::error::operation_aborted)
 					{
-						if (ecode != boost::asio::error::operation_aborted)
+						LogPrint (eLogInfo, "NTCP: Not connected in ", NTCP_CONNECT_TIMEOUT, " seconds");
-						{
+						conn->Terminate ();
-							LogPrint (eLogInfo, "NTCP: Not connected in ", NTCP_CONNECT_TIMEOUT, " seconds");
+					}
-							conn->Terminate ();
+				});
-						}
+				conn->GetSocket ().async_connect (boost::asio::ip::tcp::endpoint (address, port), std::bind (&NTCPServer::HandleConnect, this, std::placeholders::_1, conn, timer));
-					});   
+			}
-				conn->GetSocket ().async_connect (boost::asio::ip::tcp::endpoint (address, port), 
+		});
-					std::bind (&NTCPServer::HandleConnect, this, std::placeholders::_1, conn, timer));
+	}
+
+	void NTCPServer::ConnectWithProxy (const std::string& host, uint16_t port, RemoteAddressType addrtype, std::shared_ptr<NTCPSession> conn)
+	{
+		if(m_ProxyEndpoint == nullptr)
+		{
+			return;
+		}
+		m_Service.post([=]() {
+			if (this->AddNTCPSession (conn))
+			{
+
+				auto timer = std::make_shared<boost::asio::deadline_timer>(m_Service);
+				auto timeout = NTCP_CONNECT_TIMEOUT * 5;
+				conn->SetTerminationTimeout(timeout * 2);
+				timer->expires_from_now (boost::posix_time::seconds(timeout));
+				timer->async_wait ([conn, timeout](const boost::system::error_code& ecode) {
+					if (ecode != boost::asio::error::operation_aborted)
+					{
+						LogPrint (eLogInfo, "NTCP: Not connected in ", timeout, " seconds");
+						i2p::data::netdb.SetUnreachable (conn->GetRemoteIdentity ()->GetIdentHash (), true);
+						conn->Terminate ();
+					}
+				});
+				conn->GetSocket ().async_connect (*m_ProxyEndpoint, std::bind (&NTCPServer::HandleProxyConnect, this, std::placeholders::_1, conn, timer, host, port, addrtype));
 			}
 		});
 	}
@@ -1016,7 +1063,7 @@ namespace transport
 	{
 		timer->cancel ();
 		if (ecode)
-        {
+		{
 			LogPrint (eLogInfo, "NTCP: Connect error ", ecode.message ());
 			if (ecode != boost::asio::error::operation_aborted)
 				i2p::data::netdb.SetUnreachable (conn->GetRemoteIdentity ()->GetIdentHash (), true);
@@ -1031,6 +1078,191 @@ namespace transport
 		}
 	}
 
+	void NTCPServer::UseProxy(ProxyType proxytype, const std::string & addr, uint16_t port)
+	{
+		m_ProxyType = proxytype;
+		m_ProxyAddress = addr;
+		m_ProxyPort = port;
+	}
+
+	void NTCPServer::HandleProxyConnect(const boost::system::error_code& ecode, std::shared_ptr<NTCPSession> conn, std::shared_ptr<boost::asio::deadline_timer> timer, const std::string & host, uint16_t port, RemoteAddressType addrtype)
+	{
+		if(ecode)
+		{
+			LogPrint(eLogWarning, "NTCP: failed to connect to proxy ", ecode.message());
+			timer->cancel();
+			conn->Terminate();
+			return;
+		}
+		if(m_ProxyType == eSocksProxy)
+		{
+			// TODO: support username/password auth etc
+			uint8_t buff[3] = {0x05, 0x01, 0x00};
+			boost::asio::async_write(conn->GetSocket(), boost::asio::buffer(buff, 3), boost::asio::transfer_all(), [=] (const boost::system::error_code & ec, std::size_t transferred) {
+				(void) transferred;
+				if(ec)
+				{
+					LogPrint(eLogWarning, "NTCP: socks5 write error ", ec.message());
+				}
+			});
+			uint8_t readbuff[2];
+			boost::asio::async_read(conn->GetSocket(), boost::asio::buffer(readbuff, 2), [=](const boost::system::error_code & ec, std::size_t transferred) {
+				if(ec)
+				{
+					LogPrint(eLogError, "NTCP: socks5 read error ", ec.message());
+					timer->cancel();
+					conn->Terminate();
+					return;
+				}
+				else if(transferred == 2)
+				{
+					if(readbuff[1] == 0x00)
+					{
+						AfterSocksHandshake(conn, timer, host, port, addrtype);
+						return;
+					}
+					else if (readbuff[1] == 0xff)
+					{
+						LogPrint(eLogError, "NTCP: socks5 proxy rejected authentication");
+						timer->cancel();
+						conn->Terminate();
+						return;
+					}
+				}
+				LogPrint(eLogError, "NTCP: socks5 server gave invalid response");
+				timer->cancel();
+				conn->Terminate();
+			});
+		}
+		else if(m_ProxyType == eHTTPProxy)
+		{
+			i2p::http::HTTPReq req;
+			req.method = "CONNECT";
+			req.version ="HTTP/1.1";
+			if(addrtype == eIP6Address)
+				req.uri = "[" + host + "]:" + std::to_string(port);
+			else
+				req.uri = host + ":" + std::to_string(port);
+
+			boost::asio::streambuf writebuff;
+			std::ostream out(&writebuff);
+			out << req.to_string();
+
+			boost::asio::async_write(conn->GetSocket(), writebuff.data(), boost::asio::transfer_all(), [=](const boost::system::error_code & ec, std::size_t transferred) {
+				(void) transferred;
+				if(ec)
+					LogPrint(eLogError, "NTCP: http proxy write error ", ec.message());
+			});
+
+			boost::asio::streambuf * readbuff = new boost::asio::streambuf;
+			boost::asio::async_read_until(conn->GetSocket(), *readbuff, "\r\n\r\n", [=] (const boost::system::error_code & ec, std::size_t transferred) {
+				if(ec)
+				{
+					LogPrint(eLogError, "NTCP: http proxy read error ", ec.message());
+					timer->cancel();
+					conn->Terminate();
+				}
+				else
+				{
+					readbuff->commit(transferred);
+					i2p::http::HTTPRes res;
+					if(res.parse(boost::asio::buffer_cast<const char*>(readbuff->data()), readbuff->size()) > 0)
+					{
+						if(res.code == 200)
+						{
+							timer->cancel();
+							conn->ClientLogin();
+							delete readbuff;
+							return;
+						}
+						else
+						{
+							LogPrint(eLogError, "NTCP: http proxy rejected request ", res.code);
+						}
+					}
+					else
+						LogPrint(eLogError, "NTCP: http proxy gave malformed response");
+					timer->cancel();
+					conn->Terminate();
+					delete readbuff;
+				}
+			});
+		}
+		else
+			LogPrint(eLogError, "NTCP: unknown proxy type, invalid state");
+	}
+
+	void NTCPServer::AfterSocksHandshake(std::shared_ptr<NTCPSession> conn, std::shared_ptr<boost::asio::deadline_timer> timer, const std::string & host, uint16_t port, RemoteAddressType addrtype)
+	{
+
+		// build request
+		size_t sz = 0;
+		uint8_t buff[256];
+		uint8_t readbuff[256];
+		buff[0] = 0x05;
+		buff[1] = 0x01;
+		buff[2] = 0x00;
+
+		if(addrtype == eIP4Address)
+		{
+			buff[3] = 0x01;
+			auto addr = boost::asio::ip::address::from_string(host).to_v4();
+			auto addrbytes = addr.to_bytes();
+			auto addrsize = addrbytes.size();
+			memcpy(buff+4, addrbytes.data(), addrsize);
+		}
+		else if (addrtype == eIP6Address)
+		{
+			buff[3] = 0x04;
+			auto addr = boost::asio::ip::address::from_string(host).to_v6();
+			auto addrbytes = addr.to_bytes();
+			auto addrsize = addrbytes.size();
+			memcpy(buff+4, addrbytes.data(), addrsize);
+		}
+		else if (addrtype == eHostname)
+		{
+			buff[3] = 0x03;
+			size_t addrsize = host.size();
+			sz = addrsize + 1 + 4;
+			if (2 + sz > sizeof(buff))
+			{
+				// too big
+				return;
+			}
+			buff[4] = (uint8_t) addrsize;
+			memcpy(buff+4, host.c_str(), addrsize);
+		}
+		htobe16buf(buff+sz, port);
+		sz += 2;
+		boost::asio::async_write(conn->GetSocket(), boost::asio::buffer(buff, sz), boost::asio::transfer_all(), [=](const boost::system::error_code & ec, std::size_t written) {
+			if(ec)
+			{
+				LogPrint(eLogError, "NTCP: failed to write handshake to socks proxy ", ec.message());
+				return;
+			}
+		});
+
+		boost::asio::async_read(conn->GetSocket(), boost::asio::buffer(readbuff, sz), [=](const boost::system::error_code & e, std::size_t transferred) {
+			if(e)
+			{
+				LogPrint(eLogError, "NTCP: socks proxy read error ", e.message());
+			}
+			else if(transferred == sz)
+			{
+				if( readbuff[1] == 0x00)
+				{
+					timer->cancel();
+					conn->ClientLogin();
+					return;
+				}
+			}
+			if(!e)
+				i2p::data::netdb.SetUnreachable (conn->GetRemoteIdentity ()->GetIdentHash (), true);
+			timer->cancel();
+			conn->Terminate();
+		});
+	}
+
 	void NTCPServer::ScheduleTermination ()
 	{
 		m_TerminationTimer.expires_from_now (boost::posix_time::seconds(NTCP_TERMINATION_CHECK_TIMEOUT));
@@ -1045,15 +1277,14 @@ namespace transport
 			auto ts = i2p::util::GetSecondsSinceEpoch ();
 			// established
 			for (auto& it: m_NTCPSessions)
- 				if (it.second->IsTerminationTimeoutExpired (ts))
+				if (it.second->IsTerminationTimeoutExpired (ts))
 				{
 					auto session = it.second;
 					// Termniate modifies m_NTCPSession, so we postpone it
-					m_Service.post ([session] 
+					m_Service.post ([session] {
-						{ 
 							LogPrint (eLogDebug, "NTCP: No activity for ", session->GetTerminationTimeout (), " seconds");
 							session->Terminate ();
-						});	
+					});
 				}
 			// pending
 			for (auto it = m_PendingIncomingSessions.begin (); it != m_PendingIncomingSessions.end ();)

libi2pd/NTCPSession.h

@@ -131,6 +131,21 @@ namespace transport
 	{
 		public:
 
+			enum RemoteAddressType
+			{
+				eIP4Address,
+				eIP6Address,
+				eHostname
+			};
+
+			enum ProxyType
+			{
+				eNoProxy,
+				eSocksProxy,
+				eHTTPProxy
+			};
+
+
 			NTCPServer ();
 			~NTCPServer ();
 
@@ -140,10 +155,15 @@ namespace transport
 			bool AddNTCPSession (std::shared_ptr<NTCPSession> session);
 			void RemoveNTCPSession (std::shared_ptr<NTCPSession> session);
 			std::shared_ptr<NTCPSession> FindNTCPSession (const i2p::data::IdentHash& ident);
-			void Connect (const boost::asio::ip::address& address, int port, std::shared_ptr<NTCPSession> conn);
+			void ConnectWithProxy (const std::string& addr, uint16_t port, RemoteAddressType addrtype, std::shared_ptr<NTCPSession> conn);
+			void Connect(const boost::asio::ip::address & address, uint16_t port, std::shared_ptr<NTCPSession> conn);
 
-      		bool IsBoundV4() const { return m_NTCPAcceptor != nullptr; };
+			bool IsBoundV4() const { return m_NTCPAcceptor != nullptr; };
-      		bool IsBoundV6() const { return m_NTCPV6Acceptor != nullptr; };
+			bool IsBoundV6() const { return m_NTCPV6Acceptor != nullptr; };
+			bool NetworkIsReady() const { return IsBoundV4() || IsBoundV6() ||	UsingProxy(); };
+			bool UsingProxy() const { return m_ProxyType != eNoProxy; };
+
+			void UseProxy(ProxyType proxy, const std::string & address, uint16_t port);
 
 			boost::asio::io_service& GetService () { return m_Service; };
 
@@ -155,6 +175,9 @@ namespace transport
 
 			void HandleConnect (const boost::system::error_code& ecode, std::shared_ptr<NTCPSession> conn, std::shared_ptr<boost::asio::deadline_timer> timer);
 
+			void HandleProxyConnect(const boost::system::error_code& ecode, std::shared_ptr<NTCPSession> conn, std::shared_ptr<boost::asio::deadline_timer> timer, const std::string & host, uint16_t port, RemoteAddressType adddrtype);
+			void AfterSocksHandshake(std::shared_ptr<NTCPSession> conn, std::shared_ptr<boost::asio::deadline_timer> timer, const std::string & host, uint16_t port, RemoteAddressType adddrtype);
+
 			// timer
 			void ScheduleTermination ();
 			void HandleTerminationTimer (const boost::system::error_code& ecode);
@@ -170,6 +193,11 @@ namespace transport
 			std::map<i2p::data::IdentHash, std::shared_ptr<NTCPSession> > m_NTCPSessions; // access from m_Thread only
 			std::list<std::shared_ptr<NTCPSession> > m_PendingIncomingSessions;
 
+			ProxyType m_ProxyType;
+			std::string m_ProxyAddress;
+			uint16_t m_ProxyPort;
+			boost::asio::ip::tcp::resolver m_Resolver;
+			boost::asio::ip::tcp::endpoint * m_ProxyEndpoint;
 		public:
 
 			// for HTTP/I2PControl

libi2pd/NetDb.cpp

@@ -13,7 +13,7 @@
 #include "Transports.h"
 #include "RouterContext.h"
 #include "Garlic.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "Config.h"
 
 using namespace i2p::transport;

libi2pd/NetDb.hpp

@@ -1,6 +1,6 @@
 #ifndef NETDB_H__
 #define NETDB_H__
-
+// this file is called NetDb.hpp to resolve conflict with libc's netdb.h on case insensitive fs
 #include <inttypes.h>
 #include <set>
 #include <map>

libi2pd/NetDbRequests.cpp

@@ -1,7 +1,7 @@
 #include "Log.h"
 #include "I2NPProtocol.h"
 #include "Transports.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "NetDbRequests.h"
 
 namespace i2p

libi2pd/Reseed.cpp

@@ -14,7 +14,7 @@
 #include "FS.h"
 #include "Log.h"
 #include "Identity.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "HTTP.h"
 #include "util.h"
 #include "Config.h"

libi2pd/RouterContext.cpp

@@ -3,7 +3,7 @@
 #include "Crypto.h"
 #include "Timestamp.h"
 #include "I2NPProtocol.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "FS.h"
 #include "util.h"
 #include "version.h"
@@ -17,8 +17,8 @@ namespace i2p
 
 	RouterContext::RouterContext ():
 		m_LastUpdateTime (0), m_AcceptsTunnels (true), m_IsFloodfill (false), 
-		m_StartupTime (0), m_Status (eRouterStatusOK), m_Error (eRouterErrorNone),
+		m_StartupTime (0), m_ShareRatio (100), m_Status (eRouterStatusOK), 
-		m_NetID (I2PD_NET_ID)
+		m_Error (eRouterErrorNone), m_NetID (I2PD_NET_ID)
 	{
 	}
 
@@ -246,6 +246,13 @@ namespace i2p
 		else                   { SetBandwidth('K'); }
 	}
 
+	void RouterContext::SetShareRatio (int percents)
+	{
+		if (percents < 0) percents = 0;
+		if (percents > 100) percents = 100;
+		m_ShareRatio = percents;
+	}
+
 	bool RouterContext::IsUnreachable () const
 	{
 		return m_RouterInfo.GetCaps () & i2p::data::RouterInfo::eUnreachable;

libi2pd/RouterContext.h

@@ -54,6 +54,7 @@ namespace i2p
 			uint32_t GetStartupTime () const { return m_StartupTime; };
 			uint64_t GetLastUpdateTime () const { return m_LastUpdateTime; };
 			uint64_t GetBandwidthLimit () const { return m_BandwidthLimit; };
+			uint64_t GetTransitBandwidthLimit () const { return (m_BandwidthLimit*m_ShareRatio)/100LL; };
 			RouterStatus GetStatus () const { return m_Status; };
 			void SetStatus (RouterStatus status);
 			RouterError GetError () const { return m_Error; };
@@ -74,6 +75,7 @@ namespace i2p
 			std::string GetFamily () const;
 			void SetBandwidth (int limit); /* in kilobytes */
 			void SetBandwidth (char L); /* by letter */
+			void SetShareRatio (int percents); // 0 - 100
 			bool AcceptsTunnels () const { return m_AcceptsTunnels; };
 			void SetAcceptsTunnels (bool acceptsTunnels) { m_AcceptsTunnels = acceptsTunnels; };
 			bool SupportsV6 () const { return m_RouterInfo.IsV6 (); };
@@ -116,7 +118,8 @@ namespace i2p
 			uint64_t m_LastUpdateTime;
 			bool m_AcceptsTunnels, m_IsFloodfill;
 			uint64_t m_StartupTime; // in seconds since epoch
-			uint32_t m_BandwidthLimit; // allowed bandwidth
+			uint64_t m_BandwidthLimit; // allowed bandwidth
+			int m_ShareRatio;
 			RouterStatus m_Status;
 			RouterError m_Error;
 			int m_NetID;

libi2pd/RouterInfo.cpp

@@ -12,7 +12,7 @@
 #include "Base.h"
 #include "Timestamp.h"
 #include "Log.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "RouterContext.h"
 #include "RouterInfo.h"
 
@@ -264,6 +264,8 @@ namespace data
 						introducer.iTag = boost::lexical_cast<uint32_t>(value);
 					else if (!strcmp (key, "ikey"))
 						Base64ToByteStream (value, strlen (value), introducer.iKey, 32);
+					else if (!strcmp (key, "iexp"))
+						introducer.iExp = boost::lexical_cast<uint32_t>(value);
 				}
 				if (!s) return;
 			}	
@@ -478,6 +480,18 @@ namespace data
 						properties << ';';
 						i++;
 					}	
+					i = 0;
+					for (const auto& introducer: address.ssu->introducers)
+					{
+						if (introducer.iExp) // expiration is specified
+						{
+							WriteString ("iexp" + boost::lexical_cast<std::string>(i), properties);
+							properties << '=';
+							WriteString (boost::lexical_cast<std::string>(introducer.iExp), properties);
+							properties << ';';
+						}
+						i++;
+					}	
 				}	
 				// write intro key
 				WriteString ("key", properties);

libi2pd/RouterInfo.h

@@ -73,10 +73,12 @@ namespace data
 			typedef Tag<32> IntroKey; // should be castable to MacKey and AESKey
 			struct Introducer			
 			{
+				Introducer (): iExp (0) {};
 				boost::asio::ip::address iHost;
 				int iPort;
 				IntroKey iKey;
 				uint32_t iTag;
+				uint32_t iExp;
 			};
 
 			struct SSUExt

libi2pd/SSU.cpp

@@ -3,7 +3,7 @@
 #include "Log.h"
 #include "Timestamp.h"
 #include "RouterContext.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "SSU.h"
 
 namespace i2p

libi2pd/SSUData.cpp

@@ -2,7 +2,7 @@
 #include <boost/bind.hpp>
 #include "Log.h"
 #include "Timestamp.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "SSU.h"
 #include "SSUData.h"
 #ifdef WITH_EVENTS

libi2pd/SSUSession.cpp

@@ -4,7 +4,7 @@
 #include "Timestamp.h"
 #include "RouterContext.h"
 #include "Transports.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "SSU.h"
 #include "SSUSession.h"