2.14.0

NTCP SOCKS/HTTP Proxy support

.gitignore

@@ -1,5 +1,5 @@
 # i2pd
-obj/*.o
+*.o
 router.info
 router.keys
 i2p
@@ -8,6 +8,7 @@ netDb
 /i2pd
 /libi2pd.a
 /libi2pdclient.a
+i2pd.exe
 
 
 # Autotools
@@ -239,10 +240,18 @@ pip-log.txt
 docs/_build
 /androidIdea/
 
+# Doxygen
+docs/generated
 
 # emacs files
 *~
 *\#*
 
 # gdb files
-.gdb_history
+.gdb_history
+
+# cmake makefile
+build/Makefile
+
+# debian stuff
+.pc/

ChangeLog

@@ -1,6 +1,70 @@
 # 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
+- 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

Datagram.cpp

@@ -1,446 +0,0 @@
-#include <string.h>
-#include <vector>
-#include "Crypto.h"
-#include "Log.h"
-#include "TunnelBase.h"
-#include "RouterContext.h"
-#include "Destination.h"
-#include "Datagram.h"
-
-namespace i2p
-{
-namespace datagram
-{
-	DatagramDestination::DatagramDestination (std::shared_ptr<i2p::client::ClientDestination> owner): 
-		m_Owner (owner.get()),
-		m_Receiver (nullptr)
-	{
-		m_Identity.FromBase64 (owner->GetIdentity()->ToBase64());
-	}
-	
-	DatagramDestination::~DatagramDestination ()
-	{
-		m_Sessions.clear();
-	}
-	
-	void DatagramDestination::SendDatagramTo (const uint8_t * payload, size_t len, const i2p::data::IdentHash& ident, uint16_t fromPort, uint16_t toPort)
-	{
-		auto owner = m_Owner;
-		std::vector<uint8_t> v(MAX_DATAGRAM_SIZE);
-		uint8_t * buf = v.data();
-		auto identityLen = m_Identity.ToBuffer (buf, MAX_DATAGRAM_SIZE);
-		uint8_t * signature = buf + identityLen;
-		auto signatureLen = m_Identity.GetSignatureLen ();
-		uint8_t * buf1 = signature + signatureLen;
-		size_t headerLen = identityLen + signatureLen;
-		
-		memcpy (buf1, payload, len);	
-		if (m_Identity.GetSigningKeyType () == i2p::data::SIGNING_KEY_TYPE_DSA_SHA1)
-		{
-			uint8_t hash[32];	
-			SHA256(buf1, len, hash);
-			owner->Sign (hash, 32, signature);
-		}
-		else
-			owner->Sign (buf1, len, signature);
-
-		auto msg = CreateDataMessage (buf, len + headerLen, fromPort, toPort);
-		auto session = ObtainSession(ident);
-		session->SendMsg(msg);
-	}
-
-
-	void DatagramDestination::HandleDatagram (uint16_t fromPort, uint16_t toPort,uint8_t * const &buf, size_t len)
-	{
-		i2p::data::IdentityEx identity;
-		size_t identityLen = identity.FromBuffer (buf, len);
-		const uint8_t * signature = buf + identityLen;
-		size_t headerLen = identityLen + identity.GetSignatureLen ();
-
-		bool verified = false;
-		if (identity.GetSigningKeyType () == i2p::data::SIGNING_KEY_TYPE_DSA_SHA1)
-		{
-			uint8_t hash[32];
-			SHA256(buf + headerLen, len - headerLen, hash);
-			verified = identity.Verify (hash, 32, signature);
-		}	
-		else	
-			verified = identity.Verify (buf + headerLen, len - headerLen, signature);
-				
-		if (verified)
-		{
-			auto r = FindReceiver(toPort);
-			if(r)
-				r(identity, fromPort, toPort, buf + headerLen, len -headerLen);
-			else
-				LogPrint (eLogWarning, "DatagramDestination: no receiver for port ", toPort);
-		}
-		else
-			LogPrint (eLogWarning, "Datagram signature verification failed");	
-	}
-
-	DatagramDestination::Receiver DatagramDestination::FindReceiver(uint16_t port)
-	{
-		std::lock_guard<std::mutex> lock(m_ReceiversMutex);
-		Receiver r = m_Receiver;
-		auto itr = m_ReceiversByPorts.find(port);
-		if (itr != m_ReceiversByPorts.end())
-			r = itr->second;
-		return r;
-	}
-
-	void DatagramDestination::HandleDataMessagePayload (uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len)
-	{
-		// unzip it
-		uint8_t uncompressed[MAX_DATAGRAM_SIZE];
-		size_t uncompressedLen = m_Inflator.Inflate (buf, len, uncompressed, MAX_DATAGRAM_SIZE);
-		if (uncompressedLen)
-			HandleDatagram (fromPort, toPort, uncompressed, uncompressedLen);
-	}
-
-	std::shared_ptr<I2NPMessage> DatagramDestination::CreateDataMessage (const uint8_t * payload, size_t len, uint16_t fromPort, uint16_t toPort)
-	{
-		auto msg = NewI2NPMessage ();
-		uint8_t * buf = msg->GetPayload ();
-		buf += 4; // reserve for length
-		size_t size = m_Deflator.Deflate (payload, len, buf, msg->maxLen - msg->len);
-		if (size)
-		{
-			htobe32buf (msg->GetPayload (), size); // length
-			htobe16buf (buf + 4, fromPort); // source port
-			htobe16buf (buf + 6, toPort); // destination port 
-			buf[9] = i2p::client::PROTOCOL_TYPE_DATAGRAM; // datagram protocol
-			msg->len += size + 4; 
-			msg->FillI2NPMessageHeader (eI2NPData);
-		}	
-		else
-			msg = nullptr;
-		return msg;
-	}
-
-	void DatagramDestination::CleanUp ()
-	{			
-		if (m_Sessions.empty ()) return;
-		auto now = i2p::util::GetMillisecondsSinceEpoch();
-		LogPrint(eLogDebug, "DatagramDestination: clean up sessions");
-		std::unique_lock<std::mutex> lock(m_SessionsMutex);
-		// for each session ...
-		for (auto it = m_Sessions.begin (); it != m_Sessions.end (); ) 
-		{
-			// check if expired
-			if (now - it->second->LastActivity() >= DATAGRAM_SESSION_MAX_IDLE)
-			{
-				LogPrint(eLogInfo, "DatagramDestination: expiring idle session with ", it->first.ToBase32());
-				it = m_Sessions.erase (it); // we are expired
-			}
-			else
-				it++;
-		}
-	}
-	
-	std::shared_ptr<DatagramSession> DatagramDestination::ObtainSession(const i2p::data::IdentHash & ident)
-	{
-		std::shared_ptr<DatagramSession> session = nullptr;
-		std::lock_guard<std::mutex> lock(m_SessionsMutex);
-		auto itr = m_Sessions.find(ident);
-		if (itr == m_Sessions.end()) {
-			// not found, create new session
-			session = std::make_shared<DatagramSession>(m_Owner, ident);
-			m_Sessions[ident] = session;
-		} else {
-			session = itr->second;
-		}
-		return session;
-	}
-
-	std::shared_ptr<DatagramSession::Info> DatagramDestination::GetInfoForRemote(const i2p::data::IdentHash & remote)
-	{
-		std::lock_guard<std::mutex> lock(m_SessionsMutex);
-		for ( auto & item : m_Sessions)
-		{
-			if(item.first == remote) return std::make_shared<DatagramSession::Info>(item.second->GetSessionInfo());
-		}
-		return nullptr;
-	}
-	
-	DatagramSession::DatagramSession(i2p::client::ClientDestination * localDestination,
-		const i2p::data::IdentHash & remoteIdent) :
-		m_LocalDestination(localDestination),
-		m_RemoteIdentity(remoteIdent),
-		m_LastUse(i2p::util::GetMillisecondsSinceEpoch ()),
-		m_LastPathChange(0),
-		m_LastSuccess(0)
-	{
-	}
-
-	void DatagramSession::SendMsg(std::shared_ptr<I2NPMessage> msg)
-	{
-		// we used this session
-		m_LastUse = i2p::util::GetMillisecondsSinceEpoch();
-		// schedule send
-		m_LocalDestination->GetService().post(std::bind(&DatagramSession::HandleSend, this, msg));
-	}
-
-	DatagramSession::Info DatagramSession::GetSessionInfo() const
-	{
-		if(!m_RoutingSession)
-			return DatagramSession::Info(nullptr, nullptr, m_LastUse, m_LastSuccess);
-		
-		auto routingPath = m_RoutingSession->GetSharedRoutingPath();
-		if (!routingPath)
-			return DatagramSession::Info(nullptr, nullptr, m_LastUse, m_LastSuccess);
-		auto lease = routingPath->remoteLease;
-		auto tunnel = routingPath->outboundTunnel;
-		if(lease)
-		{
-			if(tunnel)
-				return DatagramSession::Info(lease->tunnelGateway, tunnel->GetEndpointIdentHash(), m_LastUse, m_LastSuccess);
-			else
-				return DatagramSession::Info(lease->tunnelGateway, nullptr, m_LastUse, m_LastSuccess);
-		}
-		else if(tunnel)
-			return DatagramSession::Info(nullptr, tunnel->GetEndpointIdentHash(), m_LastUse, m_LastSuccess);
-		else
-			return DatagramSession::Info(nullptr, nullptr, m_LastUse, m_LastSuccess);
-	}
-	
-	void DatagramSession::HandleSend(std::shared_ptr<I2NPMessage> msg)
-	{
-		if(!m_RoutingSession)
-		{
-			// try to get one
-			if(m_RemoteLeaseSet) m_RoutingSession = m_LocalDestination->GetRoutingSession(m_RemoteLeaseSet, true);
-			else
-			{
-				UpdateLeaseSet(msg);
-				return;
-			}
-		}
-		// do we have a routing session?
-		if(m_RoutingSession)
-		{
-			// should we switch paths?
-			if(ShouldUpdateRoutingPath ())
-			{
-				LogPrint(eLogDebug, "DatagramSession: try getting new routing path");
-				// try switching paths
-				auto path = GetNextRoutingPath();
-				if(path)
-					UpdateRoutingPath (path);
-				else
-					ResetRoutingPath();
-			}
-			auto routingPath = m_RoutingSession->GetSharedRoutingPath ();
-			// make sure we have a routing path
-			if (routingPath)
-			{
-				auto outboundTunnel = routingPath->outboundTunnel;
-				if (outboundTunnel)
-				{
-					if(outboundTunnel->IsEstablished())
-					{
-						m_LastSuccess = i2p::util::GetMillisecondsSinceEpoch ();
-						// we have a routing path and routing session and the outbound tunnel we are using is good
-						// wrap message with routing session and send down routing path's outbound tunnel wrapped for the IBGW
-						auto m = m_RoutingSession->WrapSingleMessage(msg);
-						routingPath->outboundTunnel->SendTunnelDataMsg({i2p::tunnel::TunnelMessageBlock{
-							i2p::tunnel::eDeliveryTypeTunnel,
-							routingPath->remoteLease->tunnelGateway, routingPath->remoteLease->tunnelID,
-							m
-						}});
-						return;
-					}
-				}
-			}
-		}
-		auto now = i2p::util::GetMillisecondsSinceEpoch ();
-		// if this path looks dead reset the routing path since we didn't seem to be able to get a path in time
-		if (m_LastPathChange && now - m_LastPathChange >= DATAGRAM_SESSION_PATH_TIMEOUT ) ResetRoutingPath();
-		UpdateLeaseSet(msg);
-		
-	}
-
-	void DatagramSession::UpdateRoutingPath(const std::shared_ptr<i2p::garlic::GarlicRoutingPath> & path)
-	{
-		if(m_RoutingSession == nullptr && m_RemoteLeaseSet)
-			m_RoutingSession = m_LocalDestination->GetRoutingSession(m_RemoteLeaseSet, true);
-		if(!m_RoutingSession) return;
-		// set routing path and update time we last updated the routing path
-		m_RoutingSession->SetSharedRoutingPath (path);
-		m_LastPathChange = i2p::util::GetMillisecondsSinceEpoch ();
-	}
-
-	bool DatagramSession::ShouldUpdateRoutingPath() const
-	{
-		bool dead = m_RoutingSession == nullptr || m_RoutingSession->GetSharedRoutingPath () == nullptr;
-		auto now = i2p::util::GetMillisecondsSinceEpoch ();
-		// we need to rotate paths becuase the routing path is too old
-		// if (now - m_LastPathChange >= DATAGRAM_SESSION_PATH_SWITCH_INTERVAL) return true;
-		// too fast switching paths
-		if (now - m_LastPathChange < DATAGRAM_SESSION_PATH_MIN_LIFETIME ) return false;
-		// our path looks dead so we need to rotate paths
-		if (now - m_LastSuccess >= DATAGRAM_SESSION_PATH_TIMEOUT) return !dead;
-		// if we have a routing session and routing path we don't need to switch paths
-		return dead;
-	}
-
-
-	bool DatagramSession::ShouldSwitchLease() const
-	{
-		std::shared_ptr<i2p::garlic::GarlicRoutingPath> routingPath = nullptr;
-		std::shared_ptr<const i2p::data::Lease> currentLease = nullptr;
-		if(m_RoutingSession)
-			routingPath = m_RoutingSession->GetSharedRoutingPath ();
-		if(routingPath)
-			currentLease = routingPath->remoteLease;
-		if(currentLease) // if we have a lease return true if it's about to expire otherwise return false
-			return currentLease->ExpiresWithin( DATAGRAM_SESSION_LEASE_HANDOVER_WINDOW, DATAGRAM_SESSION_LEASE_HANDOVER_FUDGE );
-		// we have no current lease, we should switch
-		return currentLease == nullptr;
-	}
-	
-	std::shared_ptr<i2p::garlic::GarlicRoutingPath> DatagramSession::GetNextRoutingPath()
-	{
-		std::shared_ptr<i2p::tunnel::OutboundTunnel> outboundTunnel = nullptr;
-		std::shared_ptr<i2p::garlic::GarlicRoutingPath> routingPath = nullptr;
-		// get existing routing path if we have one
-		if(m_RoutingSession)
-			routingPath = m_RoutingSession->GetSharedRoutingPath();
-		// do we have an existing outbound tunnel and routing path?
-		if(routingPath && routingPath->outboundTunnel)
-		{
-			// is the outbound tunnel we are using good?
-			if (routingPath->outboundTunnel->IsEstablished())
-			{
-				// ya so let's stick with it
-				outboundTunnel = routingPath->outboundTunnel;
-			}
-			else
-				outboundTunnel = m_LocalDestination->GetTunnelPool()->GetNextOutboundTunnel(routingPath->outboundTunnel); // no so we'll switch outbound tunnels
-		}
-		// do we have an outbound tunnel that works already ?
-		if(!outboundTunnel)
-			outboundTunnel = m_LocalDestination->GetTunnelPool()->GetNextOutboundTunnel(); // no, let's get a new outbound tunnel as we probably just started
-
-		if(outboundTunnel)
-		{
-			std::shared_ptr<const i2p::data::Lease> lease = nullptr;
-			// should we switch leases ?
-			if (ShouldSwitchLease ())
-			{
-				// yes, get next available lease
-				lease = GetNextLease();
-			}
-			else if (routingPath)
-			{
-				if(routingPath->remoteLease)
-				{
-					if(routingPath->remoteLease->ExpiresWithin(DATAGRAM_SESSION_LEASE_HANDOVER_WINDOW, DATAGRAM_SESSION_LEASE_HANDOVER_FUDGE))
-						lease = GetNextLease();
-					else
-						lease = routingPath->remoteLease;
-				}
-			}
-			else
-				lease = GetNextLease();
-			if(lease)
-			{
-				// we have a valid lease to use and an outbound tunnel
-				// create new routing path
-				uint32_t now = i2p::util::GetSecondsSinceEpoch();
-				routingPath = std::make_shared<i2p::garlic::GarlicRoutingPath>(i2p::garlic::GarlicRoutingPath{
-					outboundTunnel,
-					lease,
-					0,
-					now,
-					0
-				});
-			}
-			else // we don't have a new routing path to give
-				routingPath = nullptr;
-		}
-		return routingPath;
-	}
-
-	void DatagramSession::ResetRoutingPath()
-	{
-		if(m_RoutingSession)
-		{
-			auto routingPath = m_RoutingSession->GetSharedRoutingPath();
-			if(routingPath && routingPath->remoteLease) // we have a remote lease already specified and a routing path
-			{
-				// get outbound tunnel on this path
-				auto outboundTunnel = routingPath->outboundTunnel;
-				// is this outbound tunnel there and established 
-				if (outboundTunnel && outboundTunnel->IsEstablished())
-					m_InvalidIBGW.push_back(routingPath->remoteLease->tunnelGateway); // yes, let's mark remote lease as dead because the outbound tunnel seems fine
-			}
-			// reset the routing path
-			UpdateRoutingPath(nullptr);
-		}
-	}
-
-	std::shared_ptr<const i2p::data::Lease> DatagramSession::GetNextLease()
-	{
-		auto now = i2p::util::GetMillisecondsSinceEpoch ();
-		std::shared_ptr<const i2p::data::Lease> next = nullptr;
-		if(m_RemoteLeaseSet)
-		{
-			std::vector<i2p::data::IdentHash> exclude;
-			for(const auto & ident : m_InvalidIBGW)
-				exclude.push_back(ident);
-			// find get all leases that are not in our ban list and are not going to expire within our lease set handover window + fudge
-			auto leases = m_RemoteLeaseSet->GetNonExpiredLeasesExcluding( [&exclude, now] (const i2p::data::Lease & l) -> bool {
-				if(exclude.size())
-				{
-					auto end = std::end(exclude);
-					return std::find_if(exclude.begin(), end, [l, now] ( const i2p::data::IdentHash & ident) -> bool {
-							return ident == l.tunnelGateway;
-						}) != end;
-				}
-				else
-					return false;
-			});
-			if(leases.size())
-			{
-				// pick random valid next lease
-				uint32_t idx = rand() % leases.size();
-				next = leases[idx];
-			}
-			else
-				LogPrint(eLogWarning, "DatagramDestination: no leases to use");
-		}
-		return next;
-	}
-	
-	void DatagramSession::UpdateLeaseSet(std::shared_ptr<I2NPMessage> msg)
-	{
-		LogPrint(eLogInfo, "DatagramSession: updating lease set");
-		m_LocalDestination->RequestDestination(m_RemoteIdentity, std::bind(&DatagramSession::HandleGotLeaseSet, this, std::placeholders::_1, msg));
-	}
-
-	void DatagramSession::HandleGotLeaseSet(std::shared_ptr<const i2p::data::LeaseSet> remoteIdent, std::shared_ptr<I2NPMessage> msg)
-	{
-		if(remoteIdent)
-		{
-			// update routing session
-			if(m_RoutingSession)
-				m_RoutingSession = nullptr;
-			m_RoutingSession = m_LocalDestination->GetRoutingSession(remoteIdent, true);
-			// clear invalid IBGW as we have a new lease set
-			m_InvalidIBGW.clear();
-			m_RemoteLeaseSet = remoteIdent;
-			// update routing path
-			auto path = GetNextRoutingPath();
-			if (path)
-				UpdateRoutingPath(path);
-			else
-				ResetRoutingPath();
-			// send the message that was queued if it was provided
-			if(msg)
-				HandleSend(msg);
-		}
-	}
-}
-}
-

Dockerfile

@@ -0,0 +1,54 @@
+FROM alpine:latest
+
+MAINTAINER Mikal Villa <mikal@sigterm.no>
+
+ENV GIT_BRANCH="master"
+ENV I2PD_PREFIX="/opt/i2pd-${GIT_BRANCH}"
+ENV PATH=${I2PD_PREFIX}/bin:$PATH
+
+ENV GOSU_VERSION=1.7
+ENV GOSU_SHASUM="34049cfc713e8b74b90d6de49690fa601dc040021980812b2f1f691534be8a50  /usr/local/bin/gosu"
+
+RUN mkdir /user && adduser -S -h /user i2pd && chown -R i2pd:nobody /user
+
+
+#
+# Each RUN is a layer, adding the dependencies and building i2pd in one layer takes around 8-900Mb, so to keep the 
+# image under 20mb we need to remove all the build dependencies in the same "RUN" / layer.
+#
+
+# 1. install deps, clone and build. 
+# 2. strip binaries. 
+# 3. Purge all dependencies and other unrelated packages, including build directory. 
+RUN apk --no-cache --virtual build-dependendencies add make gcc g++ libtool boost-dev build-base openssl-dev openssl git \
+    && mkdir -p /tmp/build \
+    && cd /tmp/build && git clone -b ${GIT_BRANCH} https://github.com/PurpleI2P/i2pd.git \
+    && cd i2pd \
+    && make -j4 \
+    && mkdir -p ${I2PD_PREFIX}/bin \
+    && mv i2pd ${I2PD_PREFIX}/bin/ \
+    && cd ${I2PD_PREFIX}/bin \
+    && strip i2pd \
+    && rm -fr /tmp/build && apk --purge del build-dependendencies build-base fortify-headers boost-dev zlib-dev openssl-dev \
+    boost-python3 python3 gdbm boost-unit_test_framework boost-python linux-headers boost-prg_exec_monitor \
+    boost-serialization boost-signals boost-wave boost-wserialization boost-math boost-graph boost-regex git pcre \
+    libtool g++ gcc pkgconfig
+
+# 2. Adding required libraries to run i2pd to ensure it will run.
+RUN apk --no-cache add boost-filesystem boost-system boost-program_options boost-date_time boost-thread boost-iostreams openssl musl-utils libstdc++
+
+# Gosu is a replacement for su/sudo in docker and not a backdoor :) See https://github.com/tianon/gosu
+RUN wget -O /usr/local/bin/gosu https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64 \
+    && echo "${GOSU_SHASUM}" | sha256sum -c && chmod +x /usr/local/bin/gosu
+
+COPY entrypoint.sh /entrypoint.sh
+
+RUN chmod a+x /entrypoint.sh
+RUN echo "export PATH=${PATH}" >> /etc/profile
+
+VOLUME [ "/var/lib/i2pd" ]
+
+EXPOSE 7070 4444 4447 7656 2827 7654 7650
+
+ENTRYPOINT [ "/entrypoint.sh" ]
+

Event.cpp

@@ -1,32 +0,0 @@
-#include "Event.h"
-#include "Log.h"
-
-namespace i2p
-{
-	namespace event
-	{
-#ifdef WITH_EVENTS
-		EventCore core;
-#endif
-
-		void EventCore::SetListener(EventListener * l)
-		{
-			m_listener = l;
-			LogPrint(eLogInfo, "Event: listener set");
-		}
-
-		void EventCore::QueueEvent(const EventType & ev)
-		{
-			if(m_listener)
-				m_listener->HandleEvent(ev);
-		}
-	}
-}
-
-void EmitEvent(const EventType & e)
-{
-#ifdef WITH_EVENTS
-	i2p::event::core.QueueEvent(e);
-#endif
-}
-

Event.h

@@ -1,37 +0,0 @@
-#ifndef EVENT_H__
-#define EVENT_H__
-#include <map>
-#include <string>
-#include <memory>
-
-#include <boost/asio.hpp>
-
-typedef std::map<std::string, std::string> EventType;
-
-namespace i2p
-{
-	namespace event
-	{
-		class EventListener	 {
-		public:
-			virtual ~EventListener() {};
-			virtual void HandleEvent(const EventType & ev) = 0;
-		};
-
-		class EventCore
-		{
-		public:
-			void QueueEvent(const EventType & ev);
-			void SetListener(EventListener * l);
-			
-		private:
-			EventListener * m_listener = nullptr;
-		};
-#ifdef WITH_EVENTS		
-		extern EventCore core;
-#endif
-	}
-}
-void EmitEvent(const EventType & ev);
-
-#endif

HTTPProxy.cpp

@@ -1,345 +0,0 @@
-#include <cstring>
-#include <cassert>
-#include <string>
-#include <atomic>
-#include <memory>
-#include <set>
-#include <boost/asio.hpp>
-#include <mutex>
-
-#include "I2PService.h"
-#include "Destination.h"
-#include "HTTPProxy.h"
-#include "util.h"
-#include "Identity.h"
-#include "Streaming.h"
-#include "Destination.h"
-#include "ClientContext.h"
-#include "I2PEndian.h"
-#include "I2PTunnel.h"
-#include "Config.h"
-#include "HTTP.h"
-
-namespace i2p {
-namespace proxy {
-	std::map<std::string, std::string> jumpservices = {
-		{ "inr.i2p",    "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/search/?q=" },
-		{ "stats.i2p",  "http://7tbay5p4kzeekxvyvbf6v7eauazemsnnl2aoyqhg5jzpr5eke7tq.b32.i2p/cgi-bin/jump.cgi?a=" },
-	};
-
-	static const char *pageHead =
-		"<head>\r\n"
-		"  <title>I2Pd HTTP proxy</title>\r\n"
-		"  <style type=\"text/css\">\r\n"
-		"    body { font: 100%/1.5em sans-serif; margin: 0; padding: 1.5em; background: #FAFAFA; color: #103456; }\r\n"
-		"    .header { font-size: 2.5em; text-align: center; margin: 1.5em 0; color: #894C84; }\r\n"
-		"  </style>\r\n"
-		"</head>\r\n"
-	;
-
-	bool str_rmatch(std::string & str, const char *suffix) {
-		auto pos = str.rfind (suffix);
-		if (pos == std::string::npos)
-			return false; /* not found */
-		if (str.length() == (pos + std::strlen(suffix)))
-			return true; /* match */
-		return false;
-	}
-
-	class HTTPReqHandler: public i2p::client::I2PServiceHandler, public std::enable_shared_from_this<HTTPReqHandler>
-	{
-		private:
-
-			bool HandleRequest();
-			void HandleSockRecv(const boost::system::error_code & ecode, std::size_t bytes_transfered);
-			void Terminate();
-			void AsyncSockRead();
-			bool ExtractAddressHelper(i2p::http::URL & url, std::string & b64);
-			void SanitizeHTTPRequest(i2p::http::HTTPReq & req);
-			void SentHTTPFailed(const boost::system::error_code & ecode);
-			void HandleStreamRequestComplete (std::shared_ptr<i2p::stream::Stream> stream);
-			/* error helpers */
-			void GenericProxyError(const char *title, const char *description);
-			void GenericProxyInfo(const char *title, const char *description);
-			void HostNotFound(std::string & host);
-			void SendProxyError(std::string & content);
-
-			uint8_t m_recv_chunk[8192];
-			std::string m_recv_buf; // from client
-			std::string m_send_buf; // to upstream
-			std::shared_ptr<boost::asio::ip::tcp::socket> m_sock;
-
-		public:
-
-			HTTPReqHandler(HTTPProxy * parent, std::shared_ptr<boost::asio::ip::tcp::socket> sock) :
-				I2PServiceHandler(parent), m_sock(sock) {}
-			~HTTPReqHandler() { Terminate(); }
-			void Handle () { AsyncSockRead(); } /* overload */
-	};
-
-	void HTTPReqHandler::AsyncSockRead()
-	{
-		LogPrint(eLogDebug, "HTTPProxy: async sock read");
-		if (!m_sock) {
-			LogPrint(eLogError, "HTTPProxy: no socket for read");
-			return;
-		}
-		m_sock->async_read_some(boost::asio::buffer(m_recv_chunk, sizeof(m_recv_chunk)),
-					std::bind(&HTTPReqHandler::HandleSockRecv, shared_from_this(),
-							std::placeholders::_1, std::placeholders::_2));
-	}
-
-	void HTTPReqHandler::Terminate() {
-		if (Kill()) return;
-		if (m_sock) 
-		{
-			LogPrint(eLogDebug, "HTTPProxy: close sock");
-			m_sock->close();
-			m_sock = nullptr;
-		}
-		Done(shared_from_this());
-	}
-
-	void HTTPReqHandler::GenericProxyError(const char *title, const char *description) {
-		std::stringstream ss;
-		ss << "<h1>Proxy error: " << title << "</h1>\r\n";
-		ss << "<p>" << description << "</p>\r\n";
-		std::string content = ss.str();
-		SendProxyError(content);
-	}
-
-	void HTTPReqHandler::GenericProxyInfo(const char *title, const char *description) {
-		std::stringstream ss;
-		ss << "<h1>Proxy info: " << title << "</h1>\r\n";
-		ss << "<p>" << description << "</p>\r\n";
-		std::string content = ss.str();
-		SendProxyError(content);
-	}
-
-	void HTTPReqHandler::HostNotFound(std::string & host) {
-		std::stringstream ss;
-		ss << "<h1>Proxy error: Host not found</h1>\r\n"
-		   << "<p>Remote host not found in router's addressbook</p>\r\n"
-		   << "<p>You may try to find this host on jumpservices below:</p>\r\n"
-		   << "<ul>\r\n";
-		for (const auto& js : jumpservices) {
-			ss << "  <li><a href=\"" << js.second << host << "\">" << js.first << "</a></li>\r\n";
-		}
-		ss << "</ul>\r\n";
-		std::string content = ss.str();
-		SendProxyError(content);
-	}
-
-	void HTTPReqHandler::SendProxyError(std::string & content)
-	{
-		i2p::http::HTTPRes res;
-		res.code = 500;
-		res.add_header("Content-Type", "text/html; charset=UTF-8");
-		res.add_header("Connection", "close");
-		std::stringstream ss;
-		ss << "<html>\r\n" << pageHead
-		   << "<body>" << content << "</body>\r\n"
-		   << "</html>\r\n";
-		res.body = ss.str();
-		std::string response = res.to_string();
-		boost::asio::async_write(*m_sock, boost::asio::buffer(response),
-					 std::bind(&HTTPReqHandler::SentHTTPFailed, shared_from_this(), std::placeholders::_1));
-	}
-
-	bool HTTPReqHandler::ExtractAddressHelper(i2p::http::URL & url, std::string & b64)
-	{
-		const char *param = "i2paddresshelper=";
-		std::size_t pos = url.query.find(param);
-		std::size_t len = std::strlen(param);
-		std::map<std::string, std::string> params;
-
-		if (pos == std::string::npos)
-			return false; /* not found */
-		if (!url.parse_query(params))
-			return false;
-
-		std::string value = params["i2paddresshelper"];
-		len += value.length();
-		b64 = i2p::http::UrlDecode(value);
-		url.query.replace(pos, len, "");
-		return true;
-	}
-
-	void HTTPReqHandler::SanitizeHTTPRequest(i2p::http::HTTPReq & req)
-	{
-		/* drop common headers */
-		req.del_header("Referer");
-		req.del_header("Via");
-		req.del_header("Forwarded");
-		/* drop proxy-disclosing headers */
-		std::vector<std::string> toErase;
-		for (const auto& it : req.headers) {
-			if (it.first.compare(0, 12, "X-Forwarded-") == 0) {
-				toErase.push_back(it.first);
-			} else if (it.first.compare(0, 6, "Proxy-") == 0) {
-				toErase.push_back(it.first);
-			} else {
-				/* allow */
-			}
-		}
-		for (const auto& header : toErase) {
-			req.headers.erase(header);
-		}
-		/* replace headers */
-		req.add_header("Connection", "close", true); /* keep-alive conns not supported yet */
-		req.add_header("User-Agent", "MYOB/6.66 (AN/ON)", true); /* privacy */
-	}
-
-	/**
-	 * @brief Try to parse request from @a m_recv_buf
-	 *   If parsing success, rebuild request and store to @a m_send_buf
-	 * with remaining data tail
-	 * @return true on processed request or false if more data needed
-	 */
-	bool HTTPReqHandler::HandleRequest()
-	{
-		i2p::http::HTTPReq req;
-		i2p::http::URL url;
-		std::string b64;
-		int req_len = 0;
-
-		req_len = req.parse(m_recv_buf);
-
-		if (req_len == 0)
-			return false; /* need more data */
-
-		if (req_len < 0) {
-			LogPrint(eLogError, "HTTPProxy: unable to parse request");
-			GenericProxyError("Invalid request", "Proxy unable to parse your request");
-			return true; /* parse error */
-		}
-
-		/* parsing success, now let's look inside request */
-		LogPrint(eLogDebug, "HTTPProxy: requested: ", req.uri);
-		url.parse(req.uri);
-
-		if (ExtractAddressHelper(url, b64)) {
-			i2p::client::context.GetAddressBook ().InsertAddress (url.host, b64);
-			LogPrint (eLogInfo, "HTTPProxy: added b64 from addresshelper for ", url.host);
-			std::string full_url = url.to_string();
-			std::stringstream ss;
-			ss << "Host " << url.host << " added to router's addressbook from helper. "
-			   << "Click <a href=\"" << full_url << "\">here</a> to proceed.";
-			GenericProxyInfo("Addresshelper found", ss.str().c_str());
-			return true; /* request processed */
-		}
-
-		SanitizeHTTPRequest(req);
-
-		std::string dest_host = url.host;
-		uint16_t    dest_port = url.port;
-		/* always set port, even if missing in request */
-		if (!dest_port) {
-			dest_port = (url.schema == "https") ? 443 : 80;
-		}
-		/* detect dest_host, set proper 'Host' header in upstream request */
-		auto h = req.headers.find("Host");
-		if (dest_host != "") {
-			/* absolute url, replace 'Host' header */
-			std::string h = dest_host;
-			if (dest_port != 0 && dest_port != 80)
-				h += ":" + std::to_string(dest_port);
-			req.add_header("Host", h, true);
-		} else if (h != req.headers.end()) {
-			/* relative url and 'Host' header provided. transparent proxy mode? */
-			i2p::http::URL u;
-			std::string t = "http://" + h->second;
-			u.parse(t);
-			dest_host = u.host;
-			dest_port = u.port;
-		} else {
-			/* relative url and missing 'Host' header */
-			GenericProxyError("Invalid request", "Can't detect destination host from request");
-			return true;
-		}
-
-		/* check dest_host really exists and inside I2P network */
-		i2p::data::IdentHash identHash;
-		if (str_rmatch(dest_host, ".i2p")) {
-			if (!i2p::client::context.GetAddressBook ().GetIdentHash (dest_host, identHash)) {
-				HostNotFound(dest_host);
-				return true; /* request processed */
-			}
-			/* TODO: outproxy handler here */
-		} else {
-			LogPrint (eLogWarning, "HTTPProxy: outproxy failure for ", dest_host, ": not implemented yet");
-			std::string message = "Host" + dest_host + "not inside I2P network, but outproxy support not implemented yet";
-			GenericProxyError("Outproxy failure", message.c_str());
-			return true;
-		}
-
-		/* make relative url */
-		url.schema = "";
-		url.host   = "";
-		req.uri = url.to_string();
-
-		/* drop original request from recv buffer */
-		m_recv_buf.erase(0, req_len);
-		/* build new buffer from modified request and data from original request */
-		m_send_buf = req.to_string();
-		m_send_buf.append(m_recv_buf);
-		/* connect to destination */
-		LogPrint(eLogDebug, "HTTPProxy: connecting to host ", dest_host, ":", dest_port);
-		GetOwner()->CreateStream (std::bind (&HTTPReqHandler::HandleStreamRequestComplete,
-			shared_from_this(), std::placeholders::_1), dest_host, dest_port);
-		return true;
-	}
-
-	/* will be called after some data received from client */
-	void HTTPReqHandler::HandleSockRecv(const boost::system::error_code & ecode, std::size_t len)
-	{
-		LogPrint(eLogDebug, "HTTPProxy: sock recv: ", len, " bytes, recv buf: ", m_recv_buf.length(), ", send buf: ", m_send_buf.length());
-		if(ecode) 
-		{
-			LogPrint(eLogWarning, "HTTPProxy: sock recv got error: ", ecode);
-			Terminate();
-			return;
-		}
-
-		m_recv_buf.append(reinterpret_cast<const char *>(m_recv_chunk), len);
-		if (HandleRequest()) {
-			m_recv_buf.clear();
-			return;
-		}
-		AsyncSockRead();
-	}
-
-	void HTTPReqHandler::SentHTTPFailed(const boost::system::error_code & ecode)
-	{
-		if (ecode)
-			LogPrint (eLogError, "HTTPProxy: Closing socket after sending failure because: ", ecode.message ());
-		Terminate();
-	}
-
-	void HTTPReqHandler::HandleStreamRequestComplete (std::shared_ptr<i2p::stream::Stream> stream)
-	{
-		if (!stream) {
-			LogPrint (eLogError, "HTTPProxy: error when creating the stream, check the previous warnings for more info");
-			GenericProxyError("Host is down", "Can't create connection to requested host, it may be down");
-			return;
-		}
-		if (Kill())
-			return;
-		LogPrint (eLogDebug, "HTTPProxy: Created new I2PTunnel stream, sSID=", stream->GetSendStreamID(), ", rSID=", stream->GetRecvStreamID());
-		auto connection = std::make_shared<i2p::client::I2PTunnelConnection>(GetOwner(), m_sock, stream);
-		GetOwner()->AddHandler (connection);
-		connection->I2PConnect (reinterpret_cast<const uint8_t*>(m_send_buf.data()), m_send_buf.length());
-		Done (shared_from_this());
-	}
-
-	HTTPProxy::HTTPProxy(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> HTTPProxy::CreateHandler(std::shared_ptr<boost::asio::ip::tcp::socket> socket)
-	{
-		return std::make_shared<HTTPReqHandler> (this, socket);
-	}
-} // http
-} // i2p

Makefile

@@ -7,33 +7,37 @@ 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_STATIC := no
-USE_MESHNET := no
-USE_UPNP   := no
+USE_AESNI	:= yes
+USE_AVX		:= yes
+USE_STATIC	:= no
+USE_MESHNET	:= no
+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
-	DAEMON_SRC += DaemonWin32.cpp Win32/Win32Service.cpp Win32/Win32App.cpp
+else
+	DAEMON_SRC += Win32/DaemonWin32.cpp Win32/Win32Service.cpp Win32/Win32App.cpp
 	include Makefile.mingw
 endif
 
@@ -41,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)
@@ -69,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,8 +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
-  CXXFLAGS += -DUSE_UPNP
+	LDFLAGS += -ldl
+	CXXFLAGS += -DUSE_UPNP
+	LDLIBS += -lminiupnpc
 endif
 
 # OSX Notes
@@ -19,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

@@ -1,5 +1,5 @@
 # set defaults instead redefine
-CXXFLAGS ?= -g -Wall -Wextra -Wno-unused-parameter -pedantic
+CXXFLAGS ?= -g -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-misleading-indentation
 INCFLAGS ?=
 
 ## NOTE: The NEEDED_CXXFLAGS are here so that custom CXXFLAGS can be specified at build time
@@ -12,7 +12,7 @@ INCFLAGS ?=
 # 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
+	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
@@ -31,36 +31,40 @@ 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
+	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
+	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
 
-IS_64 := $(shell $(CXX) -dumpmachine 2>&1 | $(GREP) -c "64")
 ifeq ($(USE_AESNI),yes)
-ifeq ($(IS_64),1)
 #check if AES-NI is supported by CPU
 ifneq ($(shell $(GREP) -c aes /proc/cpuinfo),0)
-	CPU_FLAGS = -maes -DAESNI
+	CPU_FLAGS += -maes -DAESNI
 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

@@ -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/
-LDFLAGS = -Wl,-rpath,/usr/local/lib \
-  -L/usr/local/lib 
+INCFLAGS = -I/usr/include/ -I/usr/local/include/ -I. -Idaemon
+LDFLAGS = -Wl,-rpath,/usr/local/lib -Wl,-Bstatic -static-libgcc -static-libstdc++ -L/usr/local/lib
 
-# UPNP Support 
+# UPNP Support
 ifeq ($(USE_UPNP),yes)
-  CXXFLAGS += -DUSE_UPNP -DMINIUPNP_STATICLIB
-  LDLIBS = -Wl,-Bstatic -lminiupnpc	
+	CXXFLAGS += -DUSE_UPNP -DMINIUPNP_STATICLIB
+	LDLIBS = -lminiupnpc
 endif
 
 LDLIBS += \
-  -Wl,-Bstatic -lboost_system$(BOOST_SUFFIX) \
-  -Wl,-Bstatic -lboost_date_time$(BOOST_SUFFIX) \
-  -Wl,-Bstatic -lboost_filesystem$(BOOST_SUFFIX) \
-  -Wl,-Bstatic -lboost_program_options$(BOOST_SUFFIX) \
-  -Wl,-Bstatic -lssl \
-  -Wl,-Bstatic -lcrypto \
-  -Wl,-Bstatic -lz \
-  -Wl,-Bstatic -lwsock32 \
-  -Wl,-Bstatic -lws2_32 \
-  -Wl,-Bstatic -lgdi32 \
-  -Wl,-Bstatic -liphlpapi \
-  -static-libgcc -static-libstdc++ \
-  -Wl,-Bstatic -lstdc++ \
-  -Wl,-Bstatic -lpthread
+	-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
@@ -39,14 +37,18 @@ endif
 
 # don't change following line to ifeq ($(USE_AESNI),yes) !!!
 ifeq ($(USE_AESNI),1)
-	CPU_FLAGS = -maes -DAESNI
+	CPU_FLAGS += -maes -DAESNI
 else
-	CPU_FLAGS = -msse
+	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
+	-Wl,--dynamicbase,--export-all-symbols
 endif
 
 obj/%.o : %.rc

Makefile.osx

@@ -1,21 +1,33 @@
 CXX = clang++
-CXXFLAGS = -g -Wall -std=c++11 -DMAC_OSX
+CXXFLAGS = -Os -Wall -std=c++11 -DMAC_OSX
 #CXXFLAGS = -g -O2 -Wall -std=c++11
-INCFLAGS = -I/usr/local/include -I/usr/local/ssl/include
-LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib -L/usr/local/ssl/lib
+INCFLAGS = -I/usr/local/include 
+LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib
+
+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
 
-# 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)
+ifeq ($(USE_AESNI),1)
   CXXFLAGS += -maes -DAESNI
+else
+  CXXFLAGS += -msse
+endif
+
+ifeq ($(USE_AVX),1)
+  CXXFLAGS += -mavx
 endif
 
 # Disabled, since it will be the default make rule. I think its better

README.md

@@ -17,6 +17,17 @@ 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)
@@ -34,7 +45,7 @@ i2pd from source on your OS.
 
 **Supported systems:**
 
-* Linux x86/x64  - [![Build Status](https://travis-ci.org/PurpleI2P/i2pd.svg?branch=openssl)](https://travis-ci.org/PurpleI2P/i2pd)  
+* GNU/Linux x86/x64  - [![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
 * FreeBSD
@@ -44,17 +55,19 @@ i2pd from source on your OS.
 Using i2pd
 ----------
 
-See [documentation](https://i2pd.readthedocs.io/en/latest/usage.html) and 
-[example config file](https://github.com/PurpleI2P/i2pd/blob/openssl/docs/i2pd.conf).
+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: 1K7Ds6KUeR8ya287UC4rYTjvC96vXyZbDY  
-DASH: Xw8YUrQpYzP9tZBmbjqxS3M97Q7v3vJKUF  
+BTC: 1K7Ds6KUeR8ya287UC4rYTjvC96vXyZbDY   
+ZEC: t1cTckLuXsr1dwVrK4NDzfhehss4NvMadAJ  
+DASH: Xw8YUrQpYzP9tZBmbjqxS3M97Q7v3vJKUF   
 LTC: LKQirrYrDeTuAPnpYq5y7LVKtywfkkHi59  
-ANC: AQJYweYYUqM1nVfLqfoSMpUMfzxvS4Xd7z  
-DOGE: DNXLQKziRPAsD9H3DFNjk4fLQrdaSX893Y 
+DOGE: DNXLQKziRPAsD9H3DFNjk4fLQrdaSX893Y  
+ANC: AQJYweYYUqM1nVfLqfoSMpUMfzxvS4Xd7z   
+GST: GbD2JSQHBHCKLa9WTHmigJRpyFgmBj4woG  
 
 License
 -------

UPnP.cpp

@@ -1,205 +0,0 @@
-#ifdef USE_UPNP
-#include <string>
-#include <thread>
-
-#include <boost/thread/thread.hpp>
-#include <boost/asio.hpp>
-#include <boost/bind.hpp>
-
-#include "Log.h"
-
-#include "RouterContext.h"
-#include "UPnP.h"
-#include "NetDb.h"
-#include "util.h"
-#include "RouterInfo.h"
-#include "Config.h"
-
-#include <miniupnpc/miniupnpc.h>
-#include <miniupnpc/upnpcommands.h>
-
-namespace i2p
-{
-namespace transport
-{
-    UPnP::UPnP () : m_IsRunning(false), m_Thread (nullptr), m_Timer (m_Service)
-    {
-    }
-
-    void UPnP::Stop ()
-    {
-		if (m_IsRunning)
-		{
-		    LogPrint(eLogInfo, "UPnP: stopping");
-			m_IsRunning = false;	
-			m_Timer.cancel ();
-			m_Service.stop ();
-		    if (m_Thread)
-		    {   
-		        m_Thread->join (); 
-		        m_Thread.reset (nullptr);
-		    }
-			CloseMapping ();
-		    Close ();
-		}
-    }
-
-    void UPnP::Start()
-    {
-		m_IsRunning = true;
-        LogPrint(eLogInfo, "UPnP: starting");
-		m_Service.post (std::bind (&UPnP::Discover, this));
-		std::unique_lock<std::mutex> l(m_StartedMutex);
-        m_Thread.reset (new std::thread (std::bind (&UPnP::Run, this)));
-		m_Started.wait_for (l, std::chrono::seconds (5)); // 5 seconds maximum
-    }
-    
-    UPnP::~UPnP ()
-    {
-		Stop ();
-    } 
-
-    void UPnP::Run ()
-    {
-		while (m_IsRunning)
-		{
-			try
-			{	
-				m_Service.run ();
-				// Discover failed
-				break; // terminate the thread
-			}
-			catch (std::exception& ex)
-			{
-				LogPrint (eLogError, "UPnP: runtime exception: ", ex.what ());
-				PortMapping ();
-			}	
-		}	
-    } 
-        
-    void UPnP::Discover ()
-    {
-        int nerror = 0;
-#if MINIUPNPC_API_VERSION >= 14
-        m_Devlist = upnpDiscover (2000, m_MulticastIf, m_Minissdpdpath, 0, 0, 2, &nerror);
-#else
-        m_Devlist = upnpDiscover (2000, m_MulticastIf, m_Minissdpdpath, 0, 0, &nerror);
-#endif
-		{
-			// notify satrting thread			
-			std::unique_lock<std::mutex> l(m_StartedMutex);
-			m_Started.notify_all ();
-		}	
-		
-        int r;
-        r = UPNP_GetValidIGD (m_Devlist, &m_upnpUrls, &m_upnpData, m_NetworkAddr, sizeof (m_NetworkAddr));
-        if (r == 1)
-        {
-            r = UPNP_GetExternalIPAddress (m_upnpUrls.controlURL, m_upnpData.first.servicetype, m_externalIPAddress);
-            if(r != UPNPCOMMAND_SUCCESS)
-            {
-                LogPrint (eLogError, "UPnP: UPNP_GetExternalIPAddress() returned ", r);
-                return;
-            }
-            else
-            {
-                if (!m_externalIPAddress[0])
-                {
-                    LogPrint (eLogError, "UPnP: GetExternalIPAddress() failed.");
-                    return;
-                }
-            }
-        }
-		else
-		{
-			 LogPrint (eLogError, "UPnP: GetValidIGD() failed.");
-             return;
-		}
-
-		// UPnP discovered	
-		LogPrint (eLogDebug, "UPnP: ExternalIPAddress is ", m_externalIPAddress);
-        i2p::context.UpdateAddress (boost::asio::ip::address::from_string (m_externalIPAddress));
-		// port mapping
-		PortMapping ();
-    }
-
-	void UPnP::PortMapping ()
-	{
-		const auto& a = context.GetRouterInfo().GetAddresses();
-		for (const auto& address : a)
-        {
-            if (!address->host.is_v6 ())
-            	TryPortMapping (address);
-        }
-		m_Timer.expires_from_now (boost::posix_time::minutes(20));	// every 20 minutes
-		m_Timer.async_wait ([this](const boost::system::error_code& ecode)
-			{ 
-				if (ecode != boost::asio::error::operation_aborted)	
-					PortMapping ();
-			});
-
-	}	
-
-	void UPnP::CloseMapping ()
-	{
-		const auto& a = context.GetRouterInfo().GetAddresses();
-		for (const auto& address : a)
-        {
-            if (!address->host.is_v6 ())
-            	CloseMapping (address);
-        }
-	}	
-
-    void UPnP::TryPortMapping (std::shared_ptr<i2p::data::RouterInfo::Address> address)
-    {
-        std::string strType (GetProto (address)), strPort (std::to_string (address->port));
-        int r;
-        std::string strDesc; i2p::config::GetOption("upnp.name", strDesc);
-        r = UPNP_AddPortMapping (m_upnpUrls.controlURL, m_upnpData.first.servicetype, strPort.c_str (), strPort.c_str (), m_NetworkAddr, strDesc.c_str (), strType.c_str (), 0, "0");
-        if (r!=UPNPCOMMAND_SUCCESS)
-        {
-            LogPrint (eLogError, "UPnP: AddPortMapping (", m_NetworkAddr, ":", strPort, ") failed with code ", r);
-            return;
-        }
-        else
-        {
-            LogPrint (eLogDebug, "UPnP: Port Mapping successful. (", m_NetworkAddr ,":", strPort, " type ", strType, " -> ", m_externalIPAddress ,":", strPort ,")");
-            return;
-        }
-    }
-
-    void UPnP::CloseMapping (std::shared_ptr<i2p::data::RouterInfo::Address> address)
-    {
-        std::string strType (GetProto (address)), strPort (std::to_string (address->port));
-        int r = 0;
-        r = UPNP_DeletePortMapping (m_upnpUrls.controlURL, m_upnpData.first.servicetype, strPort.c_str (), strType.c_str (), 0);
-        LogPrint (eLogError, "UPnP: DeletePortMapping() returned : ", r);
-    }
-
-    void UPnP::Close ()
-    {
-        freeUPNPDevlist (m_Devlist);
-        m_Devlist = 0;
-        FreeUPNPUrls (&m_upnpUrls);
-    }
-
-	std::string UPnP::GetProto (std::shared_ptr<i2p::data::RouterInfo::Address> address)
-	{
-		switch (address->transportStyle)
-        {
-            case i2p::data::RouterInfo::eTransportNTCP:
-                return "TCP";
-            break;
-            case i2p::data::RouterInfo::eTransportSSU:
-            default:
-                return "UDP";
-        }
-	}
-}
-}
-#else /* USE_UPNP */
-namespace i2p {
-namespace transport {
-}
-}
-#endif /* USE_UPNP */

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,9 +1,13 @@
 #include <string.h>
 #include <windows.h>
 #include <shellapi.h>
-#include "../Config.h"
-#include "../RouterContext.h"
-#include "../version.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 "Win32App.h"
 #include <stdio.h>
@@ -22,230 +26,332 @@
 #define WM_TRAYICON (WM_USER + 1)
 
 #define IDT_GRACEFUL_SHUTDOWN_TIMER 2100
+#define FRAME_UPDATE_TIMER 2101
 
 namespace i2p
 {
 namespace win32
 {
-    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, NULL, NULL);
-        InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_GRACEFUL_SHUTDOWN, "&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);
+	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, NULL, NULL);
+		InsertMenu (hPopup, -1, MF_BYPOSITION | MF_STRING, ID_GRACEFUL_SHUTDOWN, "&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;
-        }
+		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);
+		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);
-    }
+		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 running");
-        Shell_NotifyIcon(NIM_ADD, &nid );
-    }
+	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 running");
+		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 RemoveTrayIcon (HWND hWnd)
+	{
+		NOTIFYICONDATA nid;
+		nid.hWnd = hWnd;
+		nid.uID = ID_TRAY_ICON;
+		Shell_NotifyIcon (NIM_DELETE, &nid);
+	}
 
-    static LRESULT CALLBACK WndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-    {
-        switch (uMsg)
-        {
-            case WM_CREATE:
-            {
-                AddTrayIcon (hWnd);
-                break;
-            }
-            case WM_CLOSE:
-            {
-                RemoveTrayIcon (hWnd);
-                KillTimer (hWnd, IDT_GRACEFUL_SHUTDOWN_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_GRACEFUL_SHUTDOWN:
-                    {
-                        i2p::context.SetAcceptsTunnels (false);
-                        SetTimer (hWnd, IDT_GRACEFUL_SHUTDOWN_TIMER, 10*60*1000, nullptr); // 10 minutes
-                        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);
-                        return 0;
-                    }
-                }
-                break;
-            }
-            case WM_SYSCOMMAND:
-            {
-                switch (wParam)
-                {
-                    case SC_MINIMIZE:
-                    {
-                        ShowWindow(hWnd, SW_HIDE);
-                        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);
-                            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:
-            {
-                if (wParam == IDT_GRACEFUL_SHUTDOWN_TIMER)
-                {
-                    PostMessage (hWnd, WM_CLOSE, 0, 0); // exit
-                    return 0;
-                }
-                break;
-            }
-        }
-        return DefWindowProc( hWnd, uMsg, wParam, lParam);
-    }
+	static void ShowUptime (std::stringstream& s, int seconds)
+	{
+		int num;
 
-    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.lpszMenuName = NULL;
-        wclx.lpszClassName = I2PD_WIN32_CLASSNAME;
-        RegisterClassEx (&wclx);
-        // create new window
-        if (!CreateWindow(I2PD_WIN32_CLASSNAME, TEXT("i2pd"), WS_OVERLAPPEDWINDOW, 100, 100, 549, 738, NULL, NULL, hInst, NULL))
-        {
-            MessageBox(NULL, "Failed to create main window", TEXT("Warning!"), MB_ICONERROR | MB_OK | MB_TOPMOST);
-            return false;
-        }
-        return true;
-    }
+		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";
+	}
 
-    int RunWin32App ()
-    {
-        MSG msg;
-        while (GetMessage (&msg, NULL, 0, 0 ))
-        {
-            TranslateMessage (&msg);
-            DispatchMessage (&msg);
-        }
-        return msg.wParam;
-    }
+	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;
 
-    void StopWin32App ()
-    {
-         UnregisterClass (I2PD_WIN32_CLASSNAME, GetModuleHandle(NULL));
-    }
+		if (gbytes)
+			s << gbytes << " GB, ";
+		if (mbytes)
+			s << mbytes << " MB, ";
+		if (kbytes)
+			s << kbytes << " KB, ";
+		s << bytes << " Bytes\n";
+	}
 
-    bool GracefulShutdown ()
-    {
-        HWND hWnd = FindWindow (I2PD_WIN32_CLASSNAME, TEXT("i2pd"));
-        if (hWnd)
-            PostMessage (hWnd, WM_COMMAND, MAKEWPARAM(ID_GRACEFUL_SHUTDOWN, 0), 0);
-        return hWnd;
-    }
+	static void PrintMainWindowText (std::stringstream& s)
+	{
+		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 ());
+		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";
+	}
+
+	static LRESULT CALLBACK WndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+	{
+		switch (uMsg)
+		{
+			case WM_CREATE:
+			{
+				AddTrayIcon (hWnd);
+				break;
+			}
+			case WM_CLOSE:
+			{
+				RemoveTrayIcon (hWnd);
+				KillTimer (hWnd, FRAME_UPDATE_TIMER);
+				KillTimer (hWnd, IDT_GRACEFUL_SHUTDOWN_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_GRACEFUL_SHUTDOWN:
+					{
+						i2p::context.SetAcceptsTunnels (false);
+						SetTimer (hWnd, IDT_GRACEFUL_SHUTDOWN_TIMER, 10*60*1000, nullptr); // 10 minutes
+						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:
+			{
+				if (wParam == IDT_GRACEFUL_SHUTDOWN_TIMER)
+				{
+					PostMessage (hWnd, WM_CLOSE, 0, 0); // exit
+					return 0;
+				}
+				if (wParam == FRAME_UPDATE_TIMER)
+				{
+					InvalidateRect(hWnd, NULL, TRUE);
+				}
+				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;
+			}
+		}
+		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, 180, 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 ()
+	{
+		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;
+	}
 }
 }

Win32/Win32Service.cpp

@@ -7,8 +7,8 @@
 #include <strsafe.h>
 #include <windows.h>
 
-#include "../Daemon.h"
-#include "../Log.h"
+#include "Daemon.h"
+#include "Log.h"
 
 I2PService *I2PService::s_service = NULL;
 
@@ -100,7 +100,7 @@ I2PService::I2PService(PSTR pszServiceName,
 
 	m_fStopping = FALSE;
 
-	// Create a manual-reset event that is not signaled at first to indicate 
+	// Create a manual-reset event that is not signaled at first to indicate
 	// the stopped signal of the service.
 	m_hStoppedEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
 	if (m_hStoppedEvent == NULL)

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.10.1"
+#define I2Pd_ver "2.14.0"
 #define I2Pd_Publisher "PurpleI2P"
 
 [Setup]
@@ -28,9 +28,9 @@ AppUpdatesURL=https://github.com/PurpleI2P/i2pd/releases
 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: ..\docs\i2pd.conf; DestDir: {userappdata}\i2pd; Flags: onlyifdoesntexist
-Source: ..\docs\subscriptions.txt; DestDir: {userappdata}\i2pd; Flags: onlyifdoesntexist
-Source: ..\docs\tunnels.conf; DestDir: {userappdata}\i2pd; 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
 
 [Icons]

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.10.2">
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
+      android:versionName="2.14.0"
+	  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,108 +2,66 @@ 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-gcc-mt-1_53 \
-	boost_date_time-gcc-mt-1_53 \
-	boost_filesystem-gcc-mt-1_53 \
-	boost_program_options-gcc-mt-1_53 \
+	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 \
-    ../../HTTPServer.cpp ../../I2PControl.cpp ../../Daemon.cpp ../../Config.cpp \
-    ../../AddressBook.cpp \
-    ../../api.cpp \
-    ../../Base.cpp \
-    ../../BOB.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 \
-    ../../util.cpp \
-     ../../i2pd.cpp ../../UPnP.cpp
+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-gcc-mt-1_53
-LOCAL_SRC_FILES := $(BOOST_PATH)/boost_1_53_0/$(TARGET_ARCH_ABI)/lib/libboost_system-gcc-mt-1_53.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_53_0/include
+LOCAL_MODULE := boost_system
+LOCAL_SRC_FILES := $(BOOST_PATH)/boost_1_62_0/$(TARGET_ARCH_ABI)/lib/libboost_system.a
+LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_62_0/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
-LOCAL_MODULE := boost_date_time-gcc-mt-1_53
-LOCAL_SRC_FILES := $(BOOST_PATH)/boost_1_53_0/$(TARGET_ARCH_ABI)/lib/libboost_date_time-gcc-mt-1_53.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_53_0/include
+LOCAL_MODULE := boost_date_time
+LOCAL_SRC_FILES := $(BOOST_PATH)/boost_1_62_0/$(TARGET_ARCH_ABI)/lib/libboost_date_time.a
+LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_62_0/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
-LOCAL_MODULE := boost_filesystem-gcc-mt-1_53
-LOCAL_SRC_FILES := $(BOOST_PATH)/boost_1_53_0/$(TARGET_ARCH_ABI)/lib/libboost_filesystem-gcc-mt-1_53.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_53_0/include
+LOCAL_MODULE := boost_filesystem
+LOCAL_SRC_FILES := $(BOOST_PATH)/boost_1_62_0/$(TARGET_ARCH_ABI)/lib/libboost_filesystem.a
+LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_62_0/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
-LOCAL_MODULE := boost_program_options-gcc-mt-1_53
-LOCAL_SRC_FILES := $(BOOST_PATH)/boost_1_53_0/$(TARGET_ARCH_ABI)/lib/libboost_program_options-gcc-mt-1_53.a
-LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_53_0/include
+LOCAL_MODULE := boost_program_options
+LOCAL_SRC_FILES := $(BOOST_PATH)/boost_1_62_0/$(TARGET_ARCH_ABI)/lib/libboost_program_options.a
+LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/boost_1_62_0/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := crypto
-LOCAL_SRC_FILES := $(OPENSSL_PATH)/openssl-1.0.2/$(TARGET_ARCH_ABI)/lib/libcrypto.a
-LOCAL_EXPORT_C_INCLUDES := $(OPENSSL_PATH)/openssl-1.0.2/include
+LOCAL_SRC_FILES := $(OPENSSL_PATH)/openssl-1.1.0e/$(TARGET_ARCH_ABI)/lib/libcrypto.a
+LOCAL_EXPORT_C_INCLUDES := $(OPENSSL_PATH)/openssl-1.1.0e/include
 include $(PREBUILT_STATIC_LIBRARY)
 
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := ssl
-LOCAL_SRC_FILES := $(OPENSSL_PATH)/openssl-1.0.2/$(TARGET_ARCH_ABI)/lib/libssl.a
-LOCAL_EXPORT_C_INCLUDES := $(OPENSSL_PATH)/openssl-1.0.2/include
+LOCAL_SRC_FILES := $(OPENSSL_PATH)/openssl-1.1.0e/$(TARGET_ARCH_ABI)/lib/libssl.a
+LOCAL_EXPORT_C_INCLUDES := $(OPENSSL_PATH)/openssl-1.1.0e/include
 LOCAL_STATIC_LIBRARIES := crypto
 include $(PREBUILT_STATIC_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 "../../Transports.h"
+#include "RouterContext.h"
+#include "Transports.h"
 
 JNIEXPORT jstring JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_getABICompiledWith
   (JNIEnv * env, jclass clazz) {
@@ -59,8 +59,8 @@ JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_stopAcceptingTunnels
 }
 
 JNIEXPORT void JNICALL Java_org_purplei2p_i2pd_I2PD_1JNI_onNetworkStateChanged
-  (JNIEnv * env, jclass clazz, jboolean isConnected) 
+  (JNIEnv * env, jclass clazz, jboolean isConnected)
 {
 	bool isConnectedBool = (bool) isConnected;
-	i2p::transport::transports.SetOnline (isConnectedBool);	
+	i2p::transport::transports.SetOnline (isConnectedBool);
 }

android/libs/.gitignore

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

android/project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-24
+target=android-25

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
@@ -85,4 +84,4 @@ public class ForegroundService extends Service {
         //mNM.notify(NOTIFICATION, notification);
         startForeground(NOTIFICATION, notification);
     }
-}
+}

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.0.{build}
+version: 2.14.{build}
 pull_requests:
   do_not_increment_build_number: true
 branches:
@@ -8,190 +8,42 @@ skip_tags: true
 os: Visual Studio 2015
 shallow_clone: true
 clone_depth: 1
-init:
-- cmd: >-
-    mkdir \projects\instdir
 
-    rem Appveyor has win32 openssl pre-installed that is picked up erroneously even for 64-bit. Cleaning the mess... Should happen before restoring cache.
-
-    rem Might consider passing OPENSSL_ROOT_DIR
-
-    if exist \OpenSSL-Win32 rmdir /S /Q \OpenSSL-Win32
-
-    if exist \OpenSSL-Win64 rmdir /S /Q \OpenSSL-Win64
-
-    if exist \OpenSSL rmdir /S /Q \OpenSSL
 environment:
-  BOOST_ROOT: C:\Libraries\boost_1_59_0
-  MINIUPNPC: miniupnpc-1.9.20151026
-  OPENSSL: OpenSSL_1_0_2e
-  ZLIB: zlib-1.2.8
+  MSYS2_PATH_TYPE: inherit
+  CHERE_INVOKING: enabled_from_arguments
   matrix:
-  # - type: static
-  #   msvc: 14
-  #   x64: 0
-  # - type: static
-  #   variant: Release
-  #   # FIXME why is this necessary with Appveyor???
-  #   cmake: -DSSL_EAY=/mingw32/lib/libssl.a -DLIB_EAY=/mingw32/lib/libcrypto.a
-  - type: shared
-    variant: Release
-  - type: static
-    msvc: 12
-    x64: 1
-    variant: RelWithDebInfo
-  - type: static
-    msvc: 14
-    variant: RelWithDebInfo
-    cmake: -DWITH_PCH=ON
-  # - type: static
-  #   msvc: 12
-  # - type: shared
-  #   msvc: 14
-  #   variant: Debug
-  # - type: shared
-  #   variant: Release
-  #   cmake: -DWITH_PCH=ON
-  #   x64: 1
+  - MSYSTEM: MINGW64
+  - MSYSTEM: MINGW32
+
 install:
-- if not exist \projects\miniupnpc\ (
-    mkdir \projects\miniupnpc
-    && curl -sL http://miniupnp.free.fr/files/download.php?file=%MINIUPNPC%.tar.gz -o \projects\miniupnpc\%MINIUPNPC%.tar.gz
-  )
-- tar --strip-components=1 --directory=\projects\miniupnpc -xzf \projects\miniupnpc\%MINIUPNPC%.tar.gz
-- if not exist \projects\zlib\ (
-    mkdir \projects\zlib
-    && cd \projects\zlib
-    && curl -sLO http://zlib.net/%ZLIB%.tar.gz
-  )
-- tar --strip-components=1 --directory=\projects\zlib -xzf \projects\zlib\%ZLIB%.tar.gz
-- patch -p0 C:/projects/zlib/CMakeLists.txt %APPVEYOR_BUILD_FOLDER%/build/cmake-zlib-static.patch
-- patch -p0 C:/projects/zlib/CMakeLists.txt %APPVEYOR_BUILD_FOLDER%/build/cmake-zlib-amd64.patch
-- if "%type%" == "static" (
-    set "static=ON"
-    && set "boostlib=lib"
+- c:\msys64\usr\bin\bash -lc "pacman --noconfirm -Rns gcc-fortran gcc"
+- 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 (
-    set "static=OFF"
-    && set "dll=dll"
+    c:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-boost mingw-w64-i686-miniupnpc"
   )
-- if "%x64%"=="1" (
+
+- if "%MSYSTEM%" == "MINGW64" (
     set "bitness=64"
-    && set "openssl_target=VC-WIN64A"
-    && set "zlib_asm=-DAMD64=ON"
   ) else (
     set "bitness=32"
-    && set "openssl_target=VC-WIN32"
-    && set "zlib_asm=-DASM686=ON "-DCMAKE_ASM_MASM_FLAGS=/W0 /safeseh""
   )
-- C:\msys64\usr\bin\bash -lc "export PATH=/mingw%bitness%/bin:/usr/bin:. && cd /c/projects/miniupnpc && CC=gcc make -f Makefile.mingw init miniupnpc.dll > c:\projects\instdir\build_miniupnpc.log 2>&1 || cat c:\projects\instdir\build_miniupnpc.log"
-- set /a generator=%msvc%+2001
-- if defined msvc (
-    (
-      if "%x64%" == "1" (
-        call "C:\Program Files (x86)\Microsoft Visual Studio %msvc%.0\VC\vcvarsall.bat" amd64
-        && set "generator=Visual Studio %msvc% %generator% Win64"
-      ) else (
-        call "C:\Program Files (x86)\Microsoft Visual Studio %msvc%.0\VC\vcvarsall.bat" x86
-        && set "generator=Visual Studio %msvc% %generator%"
-      )
-    )
-    && set "zlib_root=C:/stage/zlib-Win%bitness%-vc%msvc%-%type%"
-    && if "%variant%" neq "Debug" (
-      set "boost_variant=variant=release"
-      && set "boostdbg=-gd"
-    )
-  ) else (
-    set "generator=Unix Makefiles"
-  )
-- if defined msvc if not exist %zlib_root% (
-    mkdir \projects\zlib-build
-    && cd \projects\zlib-build
-    && cmake ../zlib -G "%generator%" %zlib_asm% -DWITH_STATIC=%static% -DCMAKE_INSTALL_PREFIX=%zlib_root% > c:\projects\instdir\build_zlib.log
-    && cmake --build . --config Release --target INSTALL >> c:\projects\instdir\build_zlib.log
-    || type c:\projects\instdir\build_zlib.log
-  )
-- cmd: >-
-    rem cinst nasm
 
-    cd \projects
-
-    if not exist nasm-2.11.08-installer.exe curl --silent --location --remote-name http://www.nasm.us/pub/nasm/releasebuilds/2.11.08/win32/nasm-2.11.08-installer.exe
-
-    nasm-2.11.08-installer.exe /S
-
-    set "PATH=%PATH%;C:\Program Files (x86)\nasm"
-
-    if not exist %OPENSSL%.zip curl --silent --location --remote-name https://github.com/openssl/openssl/archive/%OPENSSL%.zip
-- cd %BOOST_ROOT%
-- if defined msvc if not exist "stage%bitness%\lib\%boostlib%boost_system-vc%msvc%0-mt%boostdbg%*" (
-    bootstrap > c:\projects\instdir\build_boost.log
-    && b2 toolset=msvc-%msvc%.0 %boost_variant% link=%type% runtime-link=%type% address-model=%bitness% --build-type=minimal --with-filesystem --with-program_options --with-date_time --stagedir=stage%bitness% >> c:\projects\instdir\build_boost.log
-    || type c:\projects\instdir\build_boost.log
-  )
-- if defined msvc if not exist C:\stage\OpenSSL-Win%bitness%-vc%msvc%-%type%\ (
-    cd \projects
-    && 7z x %OPENSSL%.zip > NUL
-    && cd openssl-%OPENSSL%
-    && perl Configure %openssl_target% no-rc2 no-rc4 no-rc5 no-idea no-bf no-cast no-whirlpool no-md2 no-md4 no-ripemd no-mdc2 no-camellia no-seed no-comp no-krb5 no-gmp no-rfc3779 no-ec2m no-ssl2 no-jpake no-srp no-sctp no-srtp --prefix=c:\stage\OpenSSL-Win%bitness%-vc%msvc%-%type% > c:\projects\instdir\build_openssl.log
-    && ( if "%x64%" == "1" ( ms\do_win64a >> c:\projects\instdir\build_openssl.log ) else ( ms\do_nasm >> c:\projects\instdir\build_openssl.log ) )
-    && nmake -f ms\nt%dll%.mak install >> c:\projects\instdir\build_openssl.log 2>&1
-    || type c:\projects\instdir\build_openssl.log
-  )
-- mklink /J \OpenSSL \stage\OpenSSL-Win%bitness%-vc%msvc%-%type%
-- rem already there: mingw-w64-i686-openssl mingw-w64-i686-gcc
-- if not defined msvc (
-    C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -Sy bash pacman pacman-mirrors msys2-runtime msys2-runtime-devel cmake"
-    && if "%x64%" == "1" (
-      C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-x86_64-openssl mingw-w64-x86_64-boost mingw-w64-x86_64-miniupnpc mingw-w64-x86_64-extra-cmake-modules"
-    ) else (
-      C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-i686-openssl mingw-w64-i686-boost mingw-w64-i686-miniupnpc mingw-w64-i686-extra-cmake-modules"
-    )
-  )
-cache:
-- C:\projects\%OPENSSL%.zip
-- C:\projects\nasm-2.11.08-installer.exe
-- C:\projects\miniupnpc\%MINIUPNPC%.tar.gz
-- C:\stage
-- '%BOOST_ROOT%\stage32'
-- '%BOOST_ROOT%\stage64'
-- C:\projects\zlib\%ZLIB%.tar.gz
 build_script:
 - cmd: >-
-    mkdir \projects\build
+    cd \projects\i2pd
 
-    rem FIXME use fixup_bundle in cmake
+    echo MSYSTEM = %MSYSTEM%, bitness = %bitness%
 
-    rem msbuild i2pd.sln /p:Configuration=Release
+- c:\msys64\usr\bin\bash -lc "make USE_UPNP=yes -j2"
+- 7z a -tzip -mx9 -mmt i2pd-mingw-win%bitness%.zip i2pd.exe
 
-    if defined variant ( set cmake_extra=-DCMAKE_BUILD_TYPE=%variant% && set "cmake_build=--config %variant%" )
-
-    echo "bitness=%bitness%; static=%static%; dll=%dll%; type=%type%; generator=%generator%; variant=%variant%; cmake=%cmake%; cmake_extra=%cmake_extra%"
-- if not defined msvc (
-    C:\msys64\usr\bin\bash -lc "export PATH=/mingw%bitness%/bin:/usr/bin && cd /c/projects/build && CC=/mingw%bitness%/bin/gcc.exe CXX=/mingw%bitness%/bin/g++.exe /usr/bin/cmake /c/projects/i2pd/build -G 'Unix Makefiles' -DWITH_AESNI=ON -DWITH_UPNP=ON %cmake% %cmake_extra% -DWITH_STATIC=%static% -DWITH_HARDENING=ON -DCMAKE_INSTALL_PREFIX:PATH=/c/projects/instdir -DCMAKE_FIND_ROOT_PATH=/mingw%bitness% && make install"
-    && 7z a -tzip -mx9 -mmt C:\projects\i2pd\i2pd-mingw-win%bitness%-%type%.zip C:\projects\instdir\* C:\msys64\mingw%bitness%\bin\zlib1.dll C:\msys64\mingw%bitness%\bin\*eay32.dll
-  )
-- rem We are fine with multiple generated configurations in MS solution. Will use later
-- if defined msvc (
-    cd \projects\build
-    && cmake ..\i2pd\build -G "%generator%" -DWITH_UPNP=ON %cmake% -DWITH_STATIC=%static% -DZLIB_ROOT=%zlib_root% -DBoost_LIBRARY_DIR:PATH=%BOOST_ROOT%/stage%bitness%/lib -DCMAKE_INSTALL_PREFIX:PATH=c:/projects/instdir
-    && cmake --build . %cmake_build% --target install
-    && 7z a -tzip -mx9 -mmt C:\projects\i2pd\i2pd-vc%msvc%-win%bitness%-%type%.zip C:\projects\instdir\*
-    && cmake --build . %cmake_build% --target package
-    && xcopy i2pd*win*.exe ..\i2pd\
-  )
 test: off
+
 artifacts:
-- path: i2pd-vc12-win64-static.zip
-- path: i2pd-vc12-win32-static.zip
-- path: i2pd-vc12-win64-shared.zip
-- path: i2pd-vc12-win32-shared.zip
-- path: i2pd-vc14-win64-static.zip
-- path: i2pd-vc14-win32-static.zip
-- path: i2pd-vc14-win64-shared.zip
-- path: i2pd-vc14-win32-shared.zip
-- path: i2pd-mingw-win64-static.zip
-- path: i2pd-mingw-win32-static.zip
-- path: i2pd-mingw-win64-shared.zip
-- path: i2pd-mingw-win32-shared.zip
-- path: i2pd-2.1.0-win64.exe
-- path: i2pd-2.1.0-win32.exe
+- path: i2pd-mingw-win*.zip

build/.gitignore

@@ -8,3 +8,6 @@
 /CPackConfig.cmake
 /CPackSourceConfig.cmake
 /install_manifest.txt
+# windows build script
+i2pd*.zip
+build*.log

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,48 +26,57 @@ 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}/Config.cpp"
-  "${CMAKE_SOURCE_DIR}/Crypto.cpp"
-  "${CMAKE_SOURCE_DIR}/Garlic.cpp"
-  "${CMAKE_SOURCE_DIR}/Gzip.cpp"
-  "${CMAKE_SOURCE_DIR}/I2NPProtocol.cpp"
-  "${CMAKE_SOURCE_DIR}/Identity.cpp"
-  "${CMAKE_SOURCE_DIR}/LeaseSet.cpp"
-  "${CMAKE_SOURCE_DIR}/FS.cpp"
-  "${CMAKE_SOURCE_DIR}/Log.cpp"
-  "${CMAKE_SOURCE_DIR}/NTCPSession.cpp"
-  "${CMAKE_SOURCE_DIR}/NetDbRequests.cpp"	
-  "${CMAKE_SOURCE_DIR}/NetDb.cpp"
-  "${CMAKE_SOURCE_DIR}/Profiling.cpp"
-  "${CMAKE_SOURCE_DIR}/Reseed.cpp"
-  "${CMAKE_SOURCE_DIR}/RouterContext.cpp"
-  "${CMAKE_SOURCE_DIR}/RouterInfo.cpp"
-  "${CMAKE_SOURCE_DIR}/SSU.cpp"
-  "${CMAKE_SOURCE_DIR}/SSUData.cpp"
-  "${CMAKE_SOURCE_DIR}/SSUSession.cpp"
-  "${CMAKE_SOURCE_DIR}/Streaming.cpp"
-  "${CMAKE_SOURCE_DIR}/Destination.cpp"	
-  "${CMAKE_SOURCE_DIR}/TransitTunnel.cpp"
-  "${CMAKE_SOURCE_DIR}/Tunnel.cpp"
-  "${CMAKE_SOURCE_DIR}/TunnelGateway.cpp"
-  "${CMAKE_SOURCE_DIR}/Transports.cpp"
-  "${CMAKE_SOURCE_DIR}/TunnelEndpoint.cpp"
-  "${CMAKE_SOURCE_DIR}/TunnelPool.cpp"
-  "${CMAKE_SOURCE_DIR}/Base.cpp"
-  "${CMAKE_SOURCE_DIR}/util.cpp"
-  "${CMAKE_SOURCE_DIR}/Datagram.cpp"
-  "${CMAKE_SOURCE_DIR}/Family.cpp"
-  "${CMAKE_SOURCE_DIR}/Signature.cpp"
-  "${CMAKE_SOURCE_DIR}/Timestamp.cpp"	
-  "${CMAKE_SOURCE_DIR}/api.cpp"
-  "${CMAKE_SOURCE_DIR}/Event.cpp"
+  "${LIBI2PD_SRC_DIR}/BloomFilter.cpp"
+  "${LIBI2PD_SRC_DIR}/Config.cpp"
+  "${LIBI2PD_SRC_DIR}/Crypto.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"
 )
 
 if (WITH_WEBSOCKETS)
   add_definitions(-DWITH_EVENTS)
   find_package(websocketpp REQUIRED)
-endif ()  
+endif ()
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR MSYS)
   list (APPEND LIBI2PD_SRC "${CMAKE_SOURCE_DIR}/I2PEndian.cpp")
@@ -87,29 +97,32 @@ install(TARGETS libi2pd
 # install(EXPORT libi2pd DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 set (CLIENT_SRC
-  "${CMAKE_SOURCE_DIR}/AddressBook.cpp"
-  "${CMAKE_SOURCE_DIR}/BOB.cpp"	
-  "${CMAKE_SOURCE_DIR}/ClientContext.cpp"
-  "${CMAKE_SOURCE_DIR}/I2PTunnel.cpp"
-  "${CMAKE_SOURCE_DIR}/I2PService.cpp"
-  "${CMAKE_SOURCE_DIR}/SAM.cpp"
-  "${CMAKE_SOURCE_DIR}/SOCKS.cpp"
-  "${CMAKE_SOURCE_DIR}/HTTP.cpp"
-  "${CMAKE_SOURCE_DIR}/HTTPProxy.cpp"
-  "${CMAKE_SOURCE_DIR}/I2CP.cpp"
-  )
+  "${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 "${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"
-  "${CMAKE_SOURCE_DIR}/HTTPServer.cpp"
-  "${CMAKE_SOURCE_DIR}/I2PControl.cpp"
-  "${CMAKE_SOURCE_DIR}/i2pd.cpp"
-  "${CMAKE_SOURCE_DIR}/UPnP.cpp"
+  "${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)
@@ -174,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")
-elseif (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/DaemonLinux.cpp")
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR MSYS)
-  list (APPEND DAEMON_SRC "${CMAKE_SOURCE_DIR}/DaemonWin32.cpp")
+    list (APPEND DAEMON_SRC "${DAEMON_SRC_DIR}/UnixDaemon.cpp")
+  elseif (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+      list (APPEND DAEMON_SRC "${DAEMON_SRC_DIR}/UnixDaemon.cpp")
+    elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows" 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}/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")
@@ -201,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" )
@@ -271,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
@@ -287,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(i2pdclient PRIVATE -include stdafx.h)
+    target_compile_options(libi2pd PRIVATE -include libi2pd/stdafx.h)
+    target_compile_options(i2pdclient PRIVATE -include libi2pd/stdafx.h)
   endif()
   target_link_libraries(libi2pd stdafx)
 endif()
@@ -354,7 +371,7 @@ include_directories( SYSTEM ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${ZLIB_
 # warn if for meshnet
 if (WITH_MESHNET)
   message(STATUS "Building for testnet")
-  message(WARNING "This build will NOT work on mainline i2p")  
+  message(WARNING "This build will NOT work on mainline i2p")
 endif()
 
 
@@ -367,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}")
@@ -398,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()
 
@@ -449,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
@@ -458,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
@@ -471,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}")

build/build_mingw.cmd

@@ -0,0 +1,62 @@
+@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 theese 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
+set MSYSTEM=MSYS
+
+REM detecting number of processors and subtract 1.
+set /a threads=%NUMBER_OF_PROCESSORS%-1
+
+REM we must work in root of repo
+cd ..
+
+echo Receiving latest commit and cleaning up...
+"%WD%bash" -lc "git pull && make clean" > build/build_git.log 2>&1
+echo.
+
+REM set to variable current commit hash
+FOR /F "usebackq" %%a IN (`%WD%bash -lc 'git describe --tags'`) DO (
+ set tag=%%a
+)
+
+REM starting building
+set MSYSTEM=MINGW32
+set bitness=32
+call :BUILDING
+echo.
+
+set MSYSTEM=MINGW64
+set bitness=64
+call :BUILDING
+echo.
+
+echo Build complete...
+pause
+exit /b 0
+
+:BUILDING
+echo Building i2pd %tag% for win%bitness%:
+echo Build AVX+AESNI...
+"%WD%bash" -lc "make USE_UPNP=yes USE_AVX=1 USE_AESNI=1 -j%threads% && zip -9 build/i2pd_%tag%_win%bitness%_mingw_avx_aesni.zip i2pd.exe && make clean" > build/build_win%bitness%_avx_aesni.log 2>&1
+echo Build AVX...
+"%WD%bash" -lc "make USE_UPNP=yes USE_AVX=1 -j%threads% && zip -9 build/i2pd_%tag%_win%bitness%_mingw_avx.zip i2pd.exe && make clean" > build/build_win%bitness%_avx.log 2>&1
+echo Build AESNI...
+"%WD%bash" -lc "make USE_UPNP=yes USE_AESNI=1 -j%threads% && zip -9 build/i2pd_%tag%_win%bitness%_mingw_aesni.zip i2pd.exe && make clean" > build/build_win%bitness%_aesni.log 2>&1
+echo Build without extensions...
+"%WD%bash" -lc "make USE_UPNP=yes -j%threads% && zip -9 build/i2pd_%tag%_win%bitness%_mingw.zip i2pd.exe && make clean" > build/build_win%bitness%.log 2>&1
+
+:EOF

build/docker/README.md

@@ -0,0 +1,34 @@
+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 automaticly forward the log to say, kibana or greylog without manual setup. :)
+
+
+

contrib/apparmor/usr.sbin.i2pd

@@ -0,0 +1,30 @@
+# Basic profile for i2pd 
+# Should work without modifications with Ubuntu/Debian packages
+# Author: Darknet Villain <supervillain@riseup.net>
+#
+#include <tunables/global>
+
+/usr/sbin/i2pd {
+  #include <abstractions/base>
+
+  network inet dgram,
+  network inet stream,
+  network inet6 dgram,
+  network inet6 stream,
+  network netlink raw,
+
+  /etc/gai.conf r,
+  /etc/host.conf r,
+  /etc/hosts r,
+  /etc/nsswitch.conf r,
+  /run/resolvconf/resolv.conf r,
+
+  # path specific (feel free to modify if you have another paths)
+  /etc/i2pd/** r,
+  /var/lib/i2pd/** rw,
+  /var/log/i2pd.log w,
+  /var/run/i2pd/i2pd.pid rw,
+  /usr/sbin/i2pd mr,
+
+
+}

contrib/certificates/reseed/cheezybudz_at_mail.i2p.crt

@@ -1,32 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFhTCCA22gAwIBAgIEeCJXkjANBgkqhkiG9w0BAQ0FADBzMQswCQYDVQQGEwJY
-WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt
-b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEcMBoGA1UEAwwTY2hlZXp5YnVkekBt
-YWlsLmkycDAeFw0xNDEyMTYyMTU3MTZaFw0yNDEyMTUyMTU3MTZaMHMxCzAJBgNV
-BAYTAlhYMQswCQYDVQQIEwJYWDELMAkGA1UEBxMCWFgxHjAcBgNVBAoTFUkyUCBB
-bm9ueW1vdXMgTmV0d29yazEMMAoGA1UECxMDSTJQMRwwGgYDVQQDDBNjaGVlenli
-dWR6QG1haWwuaTJwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgLkj
-Jsp8pjRi5N/JHHz+MXisgbI9G0vpd3yDhHvae3oF87iiQbxflcdcoH0l5RZL0cAn
-w4amhqoOk2qhf+NSAEkiPWhk7CzPBRwDExEM/gmHYLWXbfnoHGaEls9ORGuDlDmN
-hCFJVrxaZocIOi/7gZ4A+tC8wq+1aoe0Yhr381OW59w9AdUAWjBWibO3V59dEklL
-7HqfOc2v7AMKDLJWgPekj8ZbqA9lRxHM6Djtjz4d9QXeQa8j3xLXTX1QbkvJBBX1
-9Rzi/Nzv622lzoZ/Z/61jW7Bz+h9aJ6qp4on9K4ygUw/VduTOH/1ryQmw87x4MFQ
-Z/Y86lOl7XZxBjtpYpGQW/5LmBe2BCfWgIYe9N5ionNgAe5TNEIDngP9AvJmcTyF
-KcGgOgXQO9EeHEdgf4nC6RbGrb2sBtRjWJv5nOhHRG9tpwYkw/Zc5ZNHOymYpPMg
-wce3me+1psJFt+gXhDcvxpRgTZpXfz91K/nKt3+szcYFluqhJLi6nL1TmXQVn51X
-lGD1bcy1VUof+uKyb223JX5rm9WQ48GzUfy5cK4o+khEo0RLb21FwG5iJwVzhtoN
-xQS1TO6pwLn8Si1ePRwntzlOm8DPIwdUkPBQNJ9DDkcdVia2GgbVM6LH8lrukekq
-soYfwmOTsFRkGo04ujDI/IeMrl3zmJphyQkGx18CAwEAAaMhMB8wHQYDVR0OBBYE
-FJ2MHeHnfCpEuYvC/9eK2ML9ne2eMA0GCSqGSIb3DQEBDQUAA4ICAQA3XUS7Zw1i
-RJWPSu2oLzV7oTtIW5po2Gd5BL3oU6BvlK1zLw/z/soF/LopeHQudBYxYckyv4MG
-gTNS9fcKkVdhNyLI/R2S0nQ/VFhTzuvq8HnnTOpvopA/cXTQlgrhGB2ajIZMYsXe
-lei0V5H23etXTbYZWK6/IgoALk5vowde9lpJEIBhupIafqFg0tAo4LX07/eNxDOp
-nXrShsYhHNaRhglS+0Gqj1UK0WvgMJxQKJm/VLi7jx8vfRkqXs/b76XT+VMQuUJd
-l5llQwpOicQhX/ZTAO+iWrDaO7mz/ZDweLxnfWd3m2JwDJlE9K5l98zdcve96NRZ
-ePnK8vBoAPQ9iHhwFSC5GpirK1KmT/BDLjqEF3H/HgPdPWSh97AUFpBryEIdZk1q
-Czi9DCvwHNpbpI20Fo48+2N7sbvq4onZZqx5V0SjTj/9bHSSDwG9ok1JqWoZmRvo
-p4MIywAJowlvPNc++jSHT3R7segeNUi/UdYCmm70j1av+0aEknmvPtF6atsHJ22X
-5OMBhiPi1pudFWFJFWk4WOjrK/juwHHfHNgFVyziva4q6wPKrPno0gO5pCpfRUld
-QAoSPgo8LAB3dugt5Xfsuone2GhLi1SLQlWFJWHswd/ypWa0FB+xn6Edkc1noOWY
-06dwfEP/gTCAnSplLyrFWxnyHManBxq/bQ==
------END CERTIFICATE-----

contrib/certificates/reseed/hottuna_at_mail.i2p.crt

@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----

contrib/certificates/reseed/j_at_torontocrypto.org.crt

@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-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
------END CERTIFICATE-----

contrib/certificates/reseed/lazygravy_at_mail.i2p.crt

@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIFzTCCA7WgAwIBAgIQCnVoosrOolXsY+bR5kByeTANBgkqhkiG9w0BAQsFADBy
+MQswCQYDVQQGEwJYWDELMAkGA1UEBxMCWFgxCzAJBgNVBAkTAlhYMR4wHAYDVQQK
+ExVJMlAgQW5vbnltb3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEbMBkGA1UEAwwS
+bGF6eWdyYXZ5QG1haWwuaTJwMB4XDTE2MTIyNzE1NDEzNloXDTI2MTIyNzE1NDEz
+NlowcjELMAkGA1UEBhMCWFgxCzAJBgNVBAcTAlhYMQswCQYDVQQJEwJYWDEeMBwG
+A1UEChMVSTJQIEFub255bW91cyBOZXR3b3JrMQwwCgYDVQQLEwNJMlAxGzAZBgNV
+BAMMEmxhenlncmF2eUBtYWlsLmkycDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAN3q+0nUzz9+CBSoXUNf8K6kIc9zF+OP1NVBmOu3zTtkcEnhTtoDNXeU
+EV8DhlBhEACbPomA+szQ5zp3O3OYQc2NV50S7KKqlfn5LBBE3BL2grTeBxUMysDd
+0TlpxcHKwaog4TZtkHxeNO94F1vgeOkOnlpCQ6H3cMkPEGG3zu1A1ccgPiYO838/
+HNMkSF//VZJLOfPe1vmn9xTB7wZ0DLpEh12QZGg3irA+QDX5zy6Ffl+/Lp+L4tXT
+uPZUaC6CL6EABX4DvQcFrOtiWfkbi/ROgYCeTrYw1XbDHfPc+MBxGo1bX7JjnD0o
+mFFvo+PjxvWDmCad2TaITh6DwGEeWKu8NtJAyaO5p1ntauuWGB5Xzua4aMmIy7GT
+esHQkhW+5IooM0R5bZI8/KXo4Bj52bX5qv+oBiExc6PUUTLWyjoWHb7fKdddwGfc
+lUfniV/fw7/9ysIkQZcXLDCXR6O/nH9aGDZ7bxHedw4/LxAXYPfNojb5j7ZVa65o
+PWD5xuQfbE+95DdbnKjcjYiam4kjApe7YPwOhtoRJYSGAkrpIMfzFxCXgjTsi3Kw
+Ov+sYmBvWBK4ROWQZTgHei3x4FpAGWHCAeTeeQGKmWQ8tT7ZklWD9fBm3J/KXo7I
+WCxRW9oedItyqbRuAGxqaoaGSk6TtPVjyPIUExDp1dr4p1nM1TOLAgMBAAGjXzBd
+MA4GA1UdDwEB/wQEAwIChDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
+DwYDVR0TAQH/BAUwAwEB/zAbBgNVHQ4EFAQSbGF6eWdyYXZ5QG1haWwuaTJwMA0G
+CSqGSIb3DQEBCwUAA4ICAQA2fei/JajeQ7Rn0Hu3IhgF9FDXyxDfcS9Kp+gHE56A
+50VOtOcvAQabi/+lt5DqkiBwanj0Ti/ydFRyEmPo45+fUfFuCgXcofro8PGGqFEz
+rZGtknH/0hiGfhLR9yQXY8xFS4yvLZvuIcTHa9QPJg3tB9KeYQzF91NQVb5XAyE7
+O3RvollADTV31Xbhxjb7lgra6ff9dZQJE6xtlSk/mnhILjlW80+iPKuj3exBgbJv
+ktiR4ZT4xjh1ZgNJX5br86MZrhyyyGWwHWHS0e443eSrrmAPD69zxsfvhoikRX1z
+tDz0zB70DwS4pSbVrFuWaIAcbg36vWO8tYPBzV8iBB/tBTURGJjv6Q0EoI5GHmJi
+LOhU3B6xublv8Tcoc3tgMqI9STnWROtTiCS6LsWNSXhVpIZqvaiOEtPN4HyL33sf
+j5rfPq76gKrTloeLnwLGq0Rs94ScffYkBap3fQ/ALb87LQcwSN4EkObur5pcd7TS
+qNdanvCGK8v1UYVzH4l9jekPGsM5euohwAkIl1kZ6+tqGY/MTa7HwTTQyLDTco1t
+sPy6neN46+H5DYHADyU5H2G39Kk3WcLmPtfxlPDM6e73+47fJkXnmiaWM0Lrt80y
+Enng6bFGMZH01ZsqBk09H+Uswv8h7k69q9uWAS95KE0omCMVtIpoPZXTnRhe6mBC
++g==
+-----END CERTIFICATE-----

contrib/certificates/reseed/randomrng_at_mail.i2p.crt

@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+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
+Cw==
+-----END CERTIFICATE-----

contrib/certificates/ssl/download.xxlspeed.com.crt

@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDLDCCArKgAwIBAgIJAMOgj4vE9qpcMAoGCCqGSM49BAMEMIHTMQswCQYDVQQG
-EwJERTEeMBwGA1UECAwVZG93bmxvYWQueHhsc3BlZWQuY29tMR4wHAYDVQQHDBVk
-b3dubG9hZC54eGxzcGVlZC5jb20xHjAcBgNVBAoMFWRvd25sb2FkLnh4bHNwZWVk
-LmNvbTEeMBwGA1UECwwVZG93bmxvYWQueHhsc3BlZWQuY29tMR4wHAYDVQQDDBVk
-b3dubG9hZC54eGxzcGVlZC5jb20xJDAiBgkqhkiG9w0BCQEWFWRvd25sb2FkLnh4
-bHNwZWVkLmNvbTAeFw0xNTEyMzAxMTI4NDJaFw0yMTA2MjExMTI4NDJaMIHTMQsw
-CQYDVQQGEwJERTEeMBwGA1UECAwVZG93bmxvYWQueHhsc3BlZWQuY29tMR4wHAYD
-VQQHDBVkb3dubG9hZC54eGxzcGVlZC5jb20xHjAcBgNVBAoMFWRvd25sb2FkLnh4
-bHNwZWVkLmNvbTEeMBwGA1UECwwVZG93bmxvYWQueHhsc3BlZWQuY29tMR4wHAYD
-VQQDDBVkb3dubG9hZC54eGxzcGVlZC5jb20xJDAiBgkqhkiG9w0BCQEWFWRvd25s
-b2FkLnh4bHNwZWVkLmNvbTB2MBAGByqGSM49AgEGBSuBBAAiA2IABFObW+pRshVD
-gvMPvGdPGji2DAfdvkl3gvpyiQ0PUqxuTxwtBlwBo6cz2cMnkKdActuvE/VOTRG5
-/z7CcvG7b0+qgrHDffg7C2wWlAN0dSjuoV2Av7VoN1vEU96TCtheSqNQME4wHQYD
-VR0OBBYEFPbEZH9oidjadUfvsnsh23b1jZnVMB8GA1UdIwQYMBaAFPbEZH9oidja
-dUfvsnsh23b1jZnVMAwGA1UdEwQFMAMBAf8wCgYIKoZIzj0EAwQDaAAwZQIwT1py
-AV2hLFL/5ZgwmybdaCBBUsj3cGYroXb/Z2BHLDYmH8enK0DhhWyPdN1a7eCsAjEA
-oQRU7lhXrisckjA2911Q5mA8y2sFAN/PDPrUeU9PI5vDF/ezTi20zULMOqbU1uRz
------END CERTIFICATE-----

contrib/certificates/ssl/i2p.mooo.com.crt

@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDvTCCAqWgAwIBAgIJAOeW0ejPrHimMA0GCSqGSIb3DQEBCwUAMHUxCzAJBgNV
-BAYTAlVTMQ0wCwYDVQQIDARub25lMQ0wCwYDVQQHDARub25lMQ0wCwYDVQQKDARu
-b25lMQ0wCwYDVQQLDARub25lMRUwEwYDVQQDDAxpMnAubW9vby5jb20xEzARBgkq
-hkiG9w0BCQEWBG5vbmUwHhcNMTUwMjA4MTczMzA5WhcNMTkwMzE5MTczMzA5WjB1
-MQswCQYDVQQGEwJVUzENMAsGA1UECAwEbm9uZTENMAsGA1UEBwwEbm9uZTENMAsG
-A1UECgwEbm9uZTENMAsGA1UECwwEbm9uZTEVMBMGA1UEAwwMaTJwLm1vb28uY29t
-MRMwEQYJKoZIhvcNAQkBFgRub25lMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAqxej7oRl9GOb8benIBCENrJXoow1iWhI9M+2nU0SaonrCDql5M2YMlwd
-HzYUWtFbRjz2NinjB0fgFq9cfzHfr1Sc8k/OeGg1jvNfqt8wWo9tryQNjiHtDQUZ
-6lQ5T13I+lj0CBasowgbApKQfrYjvaeuTaVYTfP8IVA60hoUQ+sy9JN+Unsx3/0Y
-PLLd98+bT27qYuBNRB1g/ifUTd9Wosj2PevGBlCxYDaUjmCG4Q8kcQr87KvM6RTu
-3AV61s/Wyy1j2YemlGG/ZhJ44YnlVMSu1vTjt9HInVf3lRRx/+RzbQO3lqeVC8LC
-Bq3KbSlfJVx4vHslfHwBFw9A4rmD1QIDAQABo1AwTjAdBgNVHQ4EFgQUsSUvX0ED
-yivB67iksVwZ+b8vLtQwHwYDVR0jBBgwFoAUsSUvX0EDyivB67iksVwZ+b8vLtQw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAde4wts7Q8TylFEc38ftJ
-2f285fFIR7P1SSbBcHPK2eBwLEg0zJyFrCeiHuEpPrn+d5GqL2zOskjfcESGmDBT
-aFajj8jPBJj/AmpkdWJG6a1YKro5tu9wrlenGwHOHu2/Cl0IJvafxrOs2x4G+2Nl
-5Hcw/FIy8mK7eIch4pACfi0zNMZ6KMCKfX9bxPrQo78WdBfVjbrIBlgyOQJ5NJEF
-JlWvS7Butv7eERi4I2huN5VRJSCFzjbuO+tjP3I8IB6WgdBmTeqq8ObtXRgahBuD
-ZmkvqVSfIzK5JN4GjO8FOdCBomuwm9A92kgmAptwQwAHM9qCDJpH8L07/7poxlGb
-iA==
------END CERTIFICATE-----

contrib/certificates/ssl/i2pseed.zarrenspry.info.crt

@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEkzCCA3ugAwIBAgIJAKsW7idQxp0aMA0GCSqGSIb3DQEBCwUAMIHfMQswCQYD
-VQQGEwJVSzEgMB4GA1UECAwXaTJwc2VlZC56YXJyZW5zcHJ5LmluZm8xIDAeBgNV
-BAcMF2kycHNlZWQuemFycmVuc3ByeS5pbmZvMSAwHgYDVQQKDBdpMnBzZWVkLnph
-cnJlbnNwcnkuaW5mbzEgMB4GA1UECwwXaTJwc2VlZC56YXJyZW5zcHJ5LmluZm8x
-IDAeBgNVBAMMF2kycHNlZWQuemFycmVuc3ByeS5pbmZvMSYwJAYJKoZIhvcNAQkB
-FhdpMnBzZWVkLnphcnJlbnNwcnkuaW5mbzAeFw0xNDEyMjgxOTI3MDdaFw0xOTAy
-MDUxOTI3MDdaMIHfMQswCQYDVQQGEwJVSzEgMB4GA1UECAwXaTJwc2VlZC56YXJy
-ZW5zcHJ5LmluZm8xIDAeBgNVBAcMF2kycHNlZWQuemFycmVuc3ByeS5pbmZvMSAw
-HgYDVQQKDBdpMnBzZWVkLnphcnJlbnNwcnkuaW5mbzEgMB4GA1UECwwXaTJwc2Vl
-ZC56YXJyZW5zcHJ5LmluZm8xIDAeBgNVBAMMF2kycHNlZWQuemFycmVuc3ByeS5p
-bmZvMSYwJAYJKoZIhvcNAQkBFhdpMnBzZWVkLnphcnJlbnNwcnkuaW5mbzCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANrEncHwS+7R0Ti/jZa2Ex7ujglV
-huYO59nLxeAOpEQwn6V41X5+L0hmhM0zuYavuP1jzKfF/Cn0CG1PqkGbEnXrTOGf
-4gMj2wy/UVVFXaPQwldi+CEiNo6nI5S+T/upg5VK6M5/ahYbfIbX5xF27QNPV5qW
-RnM0VK4gIQkFFtpiI0dFcEU9VYe+cg7a4Jvxc5LzqaIBZHWMX6alPfBT70LkYiiQ
-76IRw5oBmqZjfIdiudRhFkezMkDomKSgLR2/0HJbekq2WeLXJLMPM1rdpCYldBEi
-t6Zng9uAJa1mA6Al4RhO1aQEPj9Vo5h+Vj6FHJAJJcb+YW6wLKBkJVGLF4UCAwEA
-AaNQME4wHQYDVR0OBBYEFL538Fr1l/9YQgG+iZvJUuOzAaVaMB8GA1UdIwQYMBaA
-FL538Fr1l/9YQgG+iZvJUuOzAaVaMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
-BQADggEBAKq7KEnR0V43PsA5D23Lhawy5W/BDs4RO3LkYSxi+zR4EAMC8RhafrmG
-6IZVp+ykplZtFK3Kkw1osakcvmHRLoPCXPWLibXtWMEpmH4GhWJKf5Ct1kY0VkEE
-ALP7vCtjDm5l6WBaNOZYv25wwg5wgjyhzfJtLxzyRRPOjUuv0M3FFwJEAauzoo+4
-nle91IHNcWPIq1kgWUwWBHpLgZ2RpSOZS9MBOCkjHwQhoebhpgwSPgUHvBJ7FoLb
-AeAdwpgPdIQ9gZEZEPfCPfG/Qp60yLAhkT2CF7F1h47VYe8LGBDbd1HGpSwjulq/
-lnvV4zDIoKhbQhUpxwgHo79nxcgddOA=
------END CERTIFICATE-----

contrib/certificates/ssl/netdb.i2p2.no.crt

@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID1TCCAr2gAwIBAgIJAOd9wIt+w/I5MA0GCSqGSIb3DQEBCwUAMIGAMQswCQYD
-VQQGEwJOTzENMAsGA1UECAwET3NsbzENMAsGA1UEBwwET3NsbzEMMAoGA1UECgwD
-STJQMQwwCgYDVQQLDANJMlAxFjAUBgNVBAMMDW5ldGRiLmkycDIubm8xHzAdBgkq
-hkiG9w0BCQEWEG1lZWhAaTJwbWFpbC5vcmcwHhcNMTQxMjA2MjM1OTM1WhcNMjAw
-NTI4MjM1OTM1WjCBgDELMAkGA1UEBhMCTk8xDTALBgNVBAgMBE9zbG8xDTALBgNV
-BAcMBE9zbG8xDDAKBgNVBAoMA0kyUDEMMAoGA1UECwwDSTJQMRYwFAYDVQQDDA1u
-ZXRkYi5pMnAyLm5vMR8wHQYJKoZIhvcNAQkBFhBtZWVoQGkycG1haWwub3JnMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmtRtAALMImh0G0X+AtMpJNBa
-HduNkg5t+0juitKRboXXAp5k7yN9qnimlBxlAicNb+QubcDuL+WV91NKz43dd6Xp
-SAewqMFRPUAki8uYzoh+hQEfzyd3NmadUKquYZsYwomhHnraOmLZLbxD6ED3FEwl
-hGBJwYnhyMZUCgB5+DEEHg8RdLz+H0bMrwz3e7/0lMtH6lM1lIHz0KBULWLp7Om0
-sk3rmmhPUIXqfoY8X3vClI74o0KcslMVaF4rt3lAHdoi3lwA6Qbdqq9nC9rPWHUS
-USQQ/MKsNfDTGsHkbW2l0VgNvJkw92DwHTXSJrsEqgkdV/B1hHxCKgL44c/CbwID
-AQABo1AwTjAdBgNVHQ4EFgQUCkebDZE05yKMbXORa6gO+aLdCscwHwYDVR0jBBgw
-FoAUCkebDZE05yKMbXORa6gO+aLdCscwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAQEAfHO0g5M//X5xDIuXGCeqQMUrF3r1N45a+0kqo2b/rd9USueNGrJl
-KE7MfDgShy2d4strZ1m0M4StW0RlUUZ4V4FYwzcknF6VXbOQK3BTrAeOwuxsrHoT
-abrMZ36ABYur5WakOYtPyQ5oXFUAIpGBe9LH7q3XLegSOfftvc2xdJ+VK0n4MEfY
-GfaRGMNW/pxGYLWvao3soOJMtp6cQ5KIYGuX92DMon/UgPBqEygeUj7aIqjhRss0
-b0dUZQyHccAG+e5NeTF2ifHCEh2rZY18VGxPL7KLrCQigu5lif1TTv5CDO5rKrHl
-TuTOsnooMxUH4ThIVI9cxXk6bzRMehLghA==
------END CERTIFICATE-----

contrib/certificates/ssl/reseed.i2p-projekt.de.crt

@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID7TCCAtWgAwIBAgIJAOHakoadaLRiMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-VQQGEwJBVDEQMA4GA1UECAwHQXVzdHJpYTENMAsGA1UEBwwER3JhejEMMAoGA1UE
-CgwDSTJQMQ8wDQYDVQQLDAZSZXNlZWQxHjAcBgNVBAMMFXJlc2VlZC5pMnAtcHJv
-amVrdC5kZTEdMBsGCSqGSIb3DQEJARYOcmVzZWVkQGkycDIuZGUwHhcNMTQwNTEw
-MTAxOTM3WhcNMjQwNTA3MTAxOTM3WjCBjDELMAkGA1UEBhMCQVQxEDAOBgNVBAgM
-B0F1c3RyaWExDTALBgNVBAcMBEdyYXoxDDAKBgNVBAoMA0kyUDEPMA0GA1UECwwG
-UmVzZWVkMR4wHAYDVQQDDBVyZXNlZWQuaTJwLXByb2pla3QuZGUxHTAbBgkqhkiG
-9w0BCQEWDnJlc2VlZEBpMnAyLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA8t5igIeAUZVX9k/A2gudRWVfToIV4yvlxmnH9UTJ8DTkWfHGbY9MmW2+
-b0ZdvIZDcgg1nvcLEKqCDQnIp3wLGdM8fdVSXqxA1dLyHdk6IrGVqb60qpGENeIc
-EHiUeB1g0KqP4kLcj2sNlo+Vupjnu7qS8v0/LfZ3fq2m4vtx8dYnvo+JIzGL9K0f
-/DOil8QIcdTZupzMbXd6P936Blm/1RdbW/uKROOuuYE38NwYOUCq2/Nd+T86S5DD
-9wQBjy0U+9nNayWf6BOSuP6m2mxx/pA1CvKRq7CzI0Gqjo2Msd+i0dTL2WIO2JDp
-5uykZ0GabRW3UrMEuyrzzK6U2RZ1dQIDAQABo1AwTjAdBgNVHQ4EFgQUIejD2MMl
-6PpcCernYd3ku3sEWfswHwYDVR0jBBgwFoAUIejD2MMl6PpcCernYd3ku3sEWfsw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAupUg3ZTBSE7iRebjcZ+y
-zgnRaClmgrv8Mpa1/weTuXKhJZ65k6+G5mplI5hN/crKi/3b6oyfRrYhgdTdb0rD
-2CbrhBkPGGlubhkjkxWjAhibzU6Kt3a7WOjykGnslpCZhwS/hiVB7ZE2JGdphFld
-aJTKt12CytyP3GyIQyyX7O2t92dk8cW4tlxRVpaPNr59lk0V50qpvNmNyhxv3yDz
-taop/etfjHStq1YrltHWH0d4Dxy8ubb7nV19uvPcE0+MrR2xm7jvOBfGjAf1bQ7Z
-rk7RMHio4xWFJZO7TSzL5/8EH2jX6ZqpH+hZ6sV8TmzuRWsPkm0doXWr+HBZ/gMt
-5w==
------END CERTIFICATE-----

contrib/certificates/ssl/reseed.i2p.vzaws.com.crt

@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-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
------END CERTIFICATE-----

contrib/certificates/ssl/uk.reseed.i2p2.no.crt

@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFsTCCA5mgAwIBAgIJANgzPow6thRuMA0GCSqGSIb3DQEBBQUAMG8xCzAJBgNV
-BAYTAk5PMQ0wCwYDVQQIDARPc2xvMQswCQYDVQQHDAJVSzETMBEGA1UECgwKSTJQ
-IFJlc2VlZDETMBEGA1UECwwKSTJQIFJlc2VlZDEaMBgGA1UEAwwRdWsucmVzZWVk
-LmkycDIubm8wHhcNMTQwNjI4MjA0OTA3WhcNMjQwNjI1MjA0OTA3WjBvMQswCQYD
-VQQGEwJOTzENMAsGA1UECAwET3NsbzELMAkGA1UEBwwCVUsxEzARBgNVBAoMCkky
-UCBSZXNlZWQxEzARBgNVBAsMCkkyUCBSZXNlZWQxGjAYBgNVBAMMEXVrLnJlc2Vl
-ZC5pMnAyLm5vMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxlVlXWn5
-Ham6ZqM6FkH6ZoXeXbncY/PnF669mCPcrPH56V2xZXwpeCXHWfu7YiHuhXXZSmzP
-zwRrawHZTJulHt4e6j27JnDuEj69gmFpyi4B1djQ0kav0aJeagwCPG2do/UD7Cbr
-4nITkU4CifLe47IUW/2K/EBI6bZGsRIDHJ3A+fAQmLnvehEkpvLN+cvtkpJOtZYx
-6WvbwLsirkISnaio4//UY8M4poIu9mSG5pvNLagn9uoRPUSuj8jDEysB1Nmh12Zu
-gFnt2XcxQB9/0krB5GnDTodrgfsz/UPbk44l4kFmQoLv5ACFndH69RKftogisauj
-VVUrqCL3l9TcNsx8GLqZkeWhCwdZycZFjBhK01zihTYPEiU2HXfCNWhzLqxrM2Hh
-r1ci+56fyNdn/ssO4o3hrGaWPDiayiHlEGEJxaG/ueKX2c3c0UJKkIGBPTEcdBjW
-q42n/7EhY/ISaieQXPRK+gVm18I1OlGUH5FEYELO20bL88J8pr/bYuJyJnC8fiMP
-YzKZuiVhey6dPr0zZgNDHyRbOlZqQllzKd1wbzbE4xqdUZfBWYwtRpdOJKDw4eoi
-M69TwPQFfudeiudnMcR1gN37OkxS7UTEdsYIB5urgLb6qQD+tYFsxpcVPkedJw62
-3TobhZjucaEZWzePd4u9faT9mQBXBAgY6VcCAwEAAaNQME4wHQYDVR0OBBYEFDTN
-QRqhzaLc6XX2gFg26K//e0+8MB8GA1UdIwQYMBaAFDTNQRqhzaLc6XX2gFg26K//
-e0+8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBACcJ99Z45ghglvL3
-/yMnx6IkOSneEm2/ADQoOabBQSC2grRAMBescKUiqpgbpBFalIPbPJUVrlH9tXYB
-izNhqWETBY2tNy7AEHcJcCsAFuC2gOhaFH7FLgPA8V5IJmZ+McjB8REyowcN+CP4
-GDY8s5/yr9S3HpKLD80UV18UX/j5m4b6I1w61QceMOSt6ahTtlnyvNBonFW94L1c
-RmkdbhxYWn2eeUas62Q/+9bjr24E0weDKqopa3bbO7MWJ3mKkS4rua42j8GG3Q3q
-UWPGh4zm+2+Ncjmz0Ho73RyYDDcp9IjwlAEv+NW86rz/5Pdkhoy+SzQwFYAwNgaQ
-FRKb6ltpslxmu3tUdZ7Ydrj6MBGQyH2gRVm9qByro7WGI4UsyzsjP009Iu6dbhdC
-2ddTGMisXF3dOmdRWh8dlggmW6gV4iaVgZkzLtrc9S0SK66utKMVXa4EUTm6XogX
-F5ImPnVzIMo2qF2pP31aGDzKqJF3GNjGj+xHRVau5whz0a4ESY6V14PLTEL4Vc/H
-J9uLCySifvqN+jzs5iY2QvNXjg2zPaTJbnjxxpYQJVSQHX6SyRcszhChqQzxnbyo
-+S19BRclqzufRq6pp6VcOiID0BB7qPcrUHM9h1ingMXcZZlGBgHew9cY7tb5TAox
-o+aTNc4k/7E543FVbs40dpOD2Fcr
------END CERTIFICATE-----

contrib/certificates/ssl/us.reseed.i2p2.no.crt

@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDUDCCAjgCCQCkTcCJMdZV7zANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJO
-TzENMAsGA1UECAwET3NsbzENMAsGA1UEBwwET3NsbzENMAsGA1UECgwET3NsbzES
-MBAGA1UECwwJTm9yZGNsb3VkMRowGAYDVQQDDBF1cy5yZXNlZWQuaTJwMi5ubzAe
-Fw0xNDA2MjcyMjQxMjFaFw0yNDA2MjQyMjQxMjFaMGoxCzAJBgNVBAYTAk5PMQ0w
-CwYDVQQIDARPc2xvMQ0wCwYDVQQHDARPc2xvMQ0wCwYDVQQKDARPc2xvMRIwEAYD
-VQQLDAlOb3JkY2xvdWQxGjAYBgNVBAMMEXVzLnJlc2VlZC5pMnAyLm5vMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAomVoBEc53jzy3xGMfgRaKyX6MaGG
-KAmwu0uMTX6bVzGjy56JMMq3luoxOrpvgrNZF52lu7i36Tejo0HM75AHoea1es55
-DNLmrlDeqzlBU2WibOnizbB8G+tlMEbx8eAGAWk/Wv/vH8CAKmxjImslmbajzZC2
-LEH7inp3J5T2sVV7zmXeL9OEPKNyohbu6Mrno2IAlEOr8cu+lWAaFWzpknnR1gBX
-NkB/8+7vK5Fq4MT7B0qnXPxmaWDbUOepPPni8u+2L9+qt19vZH4/6KNuH7xd7JLz
-FfIdol6jy2cBQyAK7cVKWDHNk7ceB4Dl0mjBDbBIRTtLK+rfdnVmfWn8aQIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQCQH4QJMp5xneh2ah7fiuVdtKbiv6QNunRz7nb/
-mWYyqmBX7EHL8jOG5qmPELDgDt58HmnaYMo05nEJb9JhAoviEDXSYw0s6eN4n4nc
-MKqgR/HLLSiXPwT+Wi1MI57OYim5AFTUCYTSaWFUT+dZKYb0QPE1XjGpQXi3ppsJ
-3TJG71tOzJmZT6vRPmdTHJO70v6ZEhr5w4SiGx07gNmcgO8WRyb5ajOwSHiGKrj6
-UsuRNhtCyZaAEmelR9mfKBR1J2Nb+9jTz6mJtpT82WY3bst6mFk+A+mMWBQy7Hjt
-gpdSDBCcFx9if+AKINGLgFvFKV2q8UzbfXms19NsVt9Hu7W3
------END CERTIFICATE-----

contrib/certificates/ssl/user.mx24.eu.crt

@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICwDCCAkagAwIBAgIJAKXCoCBjd/C0MAoGCCqGSM49BAMEMIGdMQswCQYDVQQG
-EwJERTEVMBMGA1UECAwMdXNlci5teDI0LmV1MRUwEwYDVQQHDAx1c2VyLm14MjQu
-ZXUxFTATBgNVBAoMDHVzZXIubXgyNC5ldTEVMBMGA1UECwwMdXNlci5teDI0LmV1
-MRUwEwYDVQQDDAx1c2VyLm14MjQuZXUxGzAZBgkqhkiG9w0BCQEWDHVzZXIubXgy
-NC5ldTAeFw0xNTA5MDMxNjMyNDVaFw0yMTAyMjMxNjMyNDVaMIGdMQswCQYDVQQG
-EwJERTEVMBMGA1UECAwMdXNlci5teDI0LmV1MRUwEwYDVQQHDAx1c2VyLm14MjQu
-ZXUxFTATBgNVBAoMDHVzZXIubXgyNC5ldTEVMBMGA1UECwwMdXNlci5teDI0LmV1
-MRUwEwYDVQQDDAx1c2VyLm14MjQuZXUxGzAZBgkqhkiG9w0BCQEWDHVzZXIubXgy
-NC5ldTB2MBAGByqGSM49AgEGBSuBBAAiA2IABPlKs5fYTqVhIOMiR6U9U4TimxS3
-P5NBDVzeeIAgbw5KBC8UImScZVt9g4V1wQe5kPs7TxA2BfanAPZ+ekQiRRvMVQxD
-bSlRYupEWhq5BrJI6Lq/HDc7VJe9UUWffWKUoKNQME4wHQYDVR0OBBYEFBGJ0Yr+
-PZXnrk5RafQEALUpAU6ZMB8GA1UdIwQYMBaAFBGJ0Yr+PZXnrk5RafQEALUpAU6Z
-MAwGA1UdEwQFMAMBAf8wCgYIKoZIzj0EAwQDaAAwZQIxAPcovePHMCosrAQNzS5i
-VDUiyPNLOxHyRBm79yKXGl13LxysB6OK+2M7t8j8E/udBwIwXVVjxN6aSgXYTJ7d
-p+Hg/2CuBMwf41/ENRcYQA+oGS9bU6A+7U9KJ1xTWWoqsUEs
------END CERTIFICATE-----

contrib/debian/README

@@ -1,2 +1,2 @@
 This forder contain systemd unit files.
-To use systemd daemon control, place files from this directory to debian folder.
+To use systemd daemon control, place files from this directory to debian folder before building package.

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/rpm/i2pd.spec

@@ -1,6 +1,8 @@
+%define build_timestamp %(date +"%Y%m%d")
+
 Name:           i2pd
-Version:        2.10.0
-Release:        3%{?dist}
+Version:        2.12.0
+Release:        %{build_timestamp}git%{?dist}
 Summary:        I2P router written in C++
 
 License:        BSD
@@ -101,6 +103,23 @@ getent passwd i2pd >/dev/null || \
 
 
 %changelog
+* Tue Feb 14 2017 orignal <i2porignal@yandex.ru> - 2.12.0
+- Additional HTTP and SOCKS proxy tunnels
+- Reseed from ZIP archive
+- 'X' bandwidth code
+- Reduced memory and file descriptors usage
+
+* Mon Dec 19 2016 orignal <i2porignal@yandex.ru> - 2.11.0
+- Full support of zero-hops tunnels
+- Tunnel configuration for HTTP and SOCKS proxy
+- Websockets support
+- Multiple acceptors for SAM destination
+- Routing path for UDP tunnels
+- Reseed through a floodfill
+- Use AVX instructions for DHT and HMAC if applicable
+- Fixed UPnP discovery bug, producing excessive CPU usage
+- Handle multiple lookups of the same LeaseSet correctly
+
 * Tue Oct 20 2016 Anatolii Vorona <vorona.tolik@gmail.com> - 2.10.0-3
 - add support C7
 - move rpm-related files to contrib folder

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);
 
@@ -140,7 +146,7 @@ namespace i2p
 			}
 			i2p::context.SetSupportsV6		 (ipv6);
 			i2p::context.SetSupportsV4		 (ipv4);
-			
+
 			bool transit; i2p::config::GetOption("notransit", transit);
 			i2p::context.SetAcceptsTunnels (!transit);
 			uint16_t transitTunnels; i2p::config::GetOption("limits.transittunnels", transitTunnels);
@@ -157,17 +163,17 @@ namespace i2p
 			/* this section also honors 'floodfill' flag, if set above */
 			std::string bandwidth; i2p::config::GetOption("bandwidth", bandwidth);
 			if (bandwidth.length () > 0)
-			{	
-				if (bandwidth[0] >= 'K' && bandwidth[0] <= 'X') 
+			{
+				if (bandwidth[0] >= 'K' && bandwidth[0] <= 'X')
 				{
 					i2p::context.SetBandwidth (bandwidth[0]);
 					LogPrint(eLogInfo, "Daemon: bandwidth set to ", i2p::context.GetBandwidthLimit (), "KBps");
-				} 
-				else 
+				}
+				else
 				{
 					auto value = std::atoi(bandwidth.c_str());
-					if (value > 0) 
-					{	
+					if (value > 0)
+					{
 						i2p::context.SetBandwidth (value);
 						LogPrint(eLogInfo, "Daemon: bandwidth set to ", i2p::context.GetBandwidthLimit (), " KBps");
 					}
@@ -175,24 +181,27 @@ namespace i2p
 					{
 						LogPrint(eLogInfo, "Daemon: unexpected bandwidth ", bandwidth, ". Set to 'low'");
 						i2p::context.SetBandwidth (i2p::data::CAPS_FLAG_LOW_BANDWIDTH2);
-					}	
-				}	
-			}	
-			else if (isFloodfill) 
+					}
+				}
+			}
+			else if (isFloodfill)
 			{
 				LogPrint(eLogInfo, "Daemon: floodfill bandwidth set to 'extra'");
 				i2p::context.SetBandwidth (i2p::data::CAPS_FLAG_EXTRA_BANDWIDTH1);
-			} 
+			}
 			else
 			{
 				LogPrint(eLogInfo, "Daemon: bandwidth set to 'low'");
 				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)
-				LogPrint(eLogInfo, "Daemon: family set to ", family);	
+				LogPrint(eLogInfo, "Daemon: family set to ", family);
 
       bool trust; i2p::config::GetOption("trust.enabled", trust);
       if (trust)
@@ -211,7 +220,7 @@ namespace i2p
 						fams.insert (fam.substr (pos, comma != std::string::npos ? comma - pos : std::string::npos));
 						pos = comma + 1;
 					}
-					while (comma != std::string::npos);				 
+					while (comma != std::string::npos);
 					i2p::transport::transports.RestrictRoutesToFamilies(fams);
 					restricted  = fams.size() > 0;
         }
@@ -222,11 +231,11 @@ namespace i2p
 					{
 						comma = routers.find (',', pos);
 						i2p::data::IdentHash ident;
-						ident.FromBase64 (routers.substr (pos, comma != std::string::npos ? comma - pos : std::string::npos));	
+						ident.FromBase64 (routers.substr (pos, comma != std::string::npos ? comma - pos : std::string::npos));
 						idents.insert (ident);
 						pos = comma + 1;
 					}
-					while (comma != std::string::npos);				 
+					while (comma != std::string::npos);
 					LogPrint(eLogInfo, "Daemon: setting restricted routes to use ", idents.size(), " trusted routesrs");
 					i2p::transport::transports.RestrictRoutesToRouters(idents);
 					restricted = idents.size() > 0;
@@ -242,7 +251,7 @@ namespace i2p
       }
       return true;
 		}
-			
+
 		bool Daemon_Singleton::start()
 		{
 			i2p::log::Logger().Start();
@@ -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");
@@ -270,7 +280,7 @@ namespace i2p
 				i2p::data::netdb.Stop();
 				return false;
 			}
-						
+
 			bool http; i2p::config::GetOption("http.enabled", http);
 			if (http) {
 				std::string httpAddr; i2p::config::GetOption("http.address", httpAddr);
@@ -280,7 +290,7 @@ namespace i2p
 				d.httpServer->Start();
 			}
 
-			
+
 			LogPrint(eLogInfo, "Daemon: starting Tunnels");
 			i2p::tunnel::tunnels.Start();
 
@@ -307,7 +317,6 @@ namespace i2p
 				d.m_WebsocketServer->Start();
 				i2p::event::core.SetListener(d.m_WebsocketServer->ToListener());
 			}
-			
 #endif
 			return true;
 		}

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);
-		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";
+		ShowTraffic (s, i2p::transport::transports.GetTotalReceivedBytes ());
 		s << " (" << (double) i2p::transport::transports.GetInBandwidth () / 1024 << " KiB/s)<br>\r\n";
 		s << "<b>Sent:</b> ";
-		auto numKBytesSent = (double) i2p::transport::transports.GetTotalSentBytes () / 1024;
-		if (numKBytesSent < 1024)
-			s << numKBytesSent << " KiB";
-		else if (numKBytesSent < 1024 * 1024)
-			s << numKBytesSent / 1024 << " MiB";
-		else
-			s << numKBytesSent / 1024 / 1024 << " GiB";
+		ShowTraffic (s, i2p::transport::transports.GetTotalSentBytes ());
 		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";
@@ -451,26 +452,26 @@ namespace http {
 		s << "<br>\r\n";
 	}
 
-	static void ShowCommands (std::stringstream& s)
+	static void ShowCommands (std::stringstream& s, uint32_t token)
 	{
 		/* commands */
 		s << "<b>Router Commands</b><br>\r\n";
-		s << "  <a href=\"/?cmd=" << HTTP_COMMAND_RUN_PEER_TEST << "\">Run peer test</a><br>\r\n";
+		s << "  <a href=\"/?cmd=" << HTTP_COMMAND_RUN_PEER_TEST << "&token=" << token << "\">Run peer test</a><br>\r\n";
 		//s << "  <a href=\"/?cmd=" << HTTP_COMMAND_RELOAD_CONFIG << "\">Reload config</a><br>\r\n";
 		if (i2p::context.AcceptsTunnels ())
-			s << "  <a href=\"/?cmd=" << HTTP_COMMAND_DISABLE_TRANSIT << "\">Decline transit tunnels</a><br>\r\n";
+			s << "  <a href=\"/?cmd=" << HTTP_COMMAND_DISABLE_TRANSIT << "&token=" << token << "\">Decline transit tunnels</a><br>\r\n";
 		else
-			s << "  <a href=\"/?cmd=" << HTTP_COMMAND_ENABLE_TRANSIT << "\">Accept transit tunnels</a><br>\r\n";
+			s << "  <a href=\"/?cmd=" << HTTP_COMMAND_ENABLE_TRANSIT << "&token=" << token << "\">Accept transit tunnels</a><br>\r\n";
 #if (!defined(WIN32) && !defined(QT_GUI_LIB) && !defined(ANDROID))
 		if (Daemon.gracefulShutdownInterval) 
-			s << "  <a href=\"/?cmd=" << HTTP_COMMAND_SHUTDOWN_CANCEL << "\">Cancel graceful shutdown</a><br>";
+			s << "  <a href=\"/?cmd=" << HTTP_COMMAND_SHUTDOWN_CANCEL << "&token=" << token << "\">Cancel graceful shutdown</a><br>";
 		else 
-			s << "  <a href=\"/?cmd=" << HTTP_COMMAND_SHUTDOWN_START << "\">Start graceful shutdown</a><br>\r\n";
+			s << "  <a href=\"/?cmd=" << HTTP_COMMAND_SHUTDOWN_START << "&token=" << token << "\">Start graceful shutdown</a><br>\r\n";
 #endif
 #ifdef WIN32_APP
-		s << "  <a href=\"/?cmd=" << HTTP_COMMAND_SHUTDOWN_START << "\">Graceful shutdown</a><br>\r\n";
+		s << "  <a href=\"/?cmd=" << HTTP_COMMAND_SHUTDOWN_START << "&token=" << token << "\">Graceful shutdown</a><br>\r\n";
 #endif
-		s << "  <a href=\"/?cmd=" << HTTP_COMMAND_SHUTDOWN_NOW << "\">Force shutdown</a><br>\r\n";
+		s << "  <a href=\"/?cmd=" << HTTP_COMMAND_SHUTDOWN_NOW << "&token=" << token << "\">Force shutdown</a><br>\r\n";
 	}
 
 	static void ShowTransitTunnels (std::stringstream& s)
@@ -494,8 +495,9 @@ namespace http {
 		auto ntcpServer = i2p::transport::transports.GetNTCPServer (); 
 		if (ntcpServer)
 		{
-			s << "<b>NTCP</b><br>\r\n";
-			for (const auto& it: ntcpServer->GetNTCPSessions ())
+			auto sessions = ntcpServer->GetNTCPSessions ();
+			s << "<b>NTCP</b> ( " << (int) sessions.size() << " )<br>\r\n";
+			for (const auto& it: sessions )
 			{
 				if (it.second && it.second->IsEstablished ())
 				{
@@ -512,8 +514,9 @@ namespace http {
 		auto ssuServer = i2p::transport::transports.GetSSUServer ();
 		if (ssuServer)
 		{
-			s << "<br>\r\n<b>SSU</b><br>\r\n";
-			for (const auto& it: ssuServer->GetSessions ())
+			auto sessions = ssuServer->GetSessions ();
+			s << "<br>\r\n<b>SSU</b> ( " << (int) sessions.size() << " )<br>\r\n";
+			for (const auto& it: sessions)
 			{
 				auto endpoint = it.second->GetRemoteEndpoint ();
 				if (it.second->IsOutgoing ()) s << " &#8658; ";
@@ -604,6 +607,15 @@ namespace http {
 			s << i2p::client::context.GetAddressBook ().ToAddress(ident);
 			s << "<br>\r\n"<< std::endl;
 		}	
+		auto socksProxy = i2p::client::context.GetSocksProxy ();
+		if (socksProxy)
+		{
+			auto& ident = socksProxy->GetLocalDestination ()->GetIdentHash();
+			s << "<a href=\"/?page=" << HTTP_PAGE_LOCAL_DESTINATION << "&b32=" << ident.ToBase32 () << "\">"; 
+			s << "SOCKS Proxy" << "</a> &#8656; ";
+			s << i2p::client::context.GetAddressBook ().ToAddress(ident);
+			s << "<br>\r\n"<< std::endl;
+		}	
 		s << "<br>\r\n<b>Server Tunnels:</b><br>\r\n<br>\r\n";
 		for (auto& it: i2p::client::context.GetServerTunnels ())
 		{
@@ -703,17 +715,25 @@ namespace http {
 				return true;
 		}
 		/* method #2: 'Authorization' header sent */
-		if (req.headers.count("Authorization") > 0) {
-			std::string provided = req.headers.find("Authorization")->second;
+		auto provided = req.GetHeader ("Authorization");
+		 if (provided.length () > 0) 
+		 {
+			bool result = false;
+			
 			std::string expected = user + ":" + pass;
-			char b64_creds[64];
+			size_t b64_sz = i2p::data::Base64EncodingBufferSize(expected.length()) + 1;
+			char * b64_creds = new char[b64_sz];
 			std::size_t len = 0;
-			len = i2p::data::ByteStreamToBase64((unsigned char *)expected.c_str(), expected.length(), b64_creds, sizeof(b64_creds));
-			b64_creds[len] = '\0';
-			expected = "Basic ";
-			expected += b64_creds;
-			if (provided == expected)
-				return true;
+			len = i2p::data::ByteStreamToBase64((unsigned char *)expected.c_str(), expected.length(), b64_creds, b64_sz);
+			/* if we decoded properly then check credentials */
+			if(len) {
+				b64_creds[len] = '\0';
+				expected = "Basic ";
+				expected += b64_creds;
+				result = expected == provided;
+			}
+			delete [] b64_creds;
+			return result;
 		}
 
 		LogPrint(eLogWarning, "HTTPServer: auth failure from ", m_Socket->remote_endpoint().address ());
@@ -752,6 +772,7 @@ namespace http {
 		SendReply (res, content);
 	}
 
+	std::map<uint32_t, uint32_t> HTTPConnection::m_Tokens;
 	void HTTPConnection::HandlePage (const HTTPReq& req, HTTPRes& res, std::stringstream& s)
   {
 		std::map<std::string, std::string> params;
@@ -767,7 +788,21 @@ namespace http {
 		else if (page == HTTP_PAGE_TUNNELS)
 			ShowTunnels (s);
 		else if (page == HTTP_PAGE_COMMANDS)
-			ShowCommands (s);
+		{
+			uint32_t token;
+			RAND_bytes ((uint8_t *)&token, 4);
+			token &= 0x7FFFFFFF; // clear first bit
+			auto ts = i2p::util::GetSecondsSinceEpoch ();
+			for (auto it = m_Tokens.begin (); it != m_Tokens.end (); )
+			{
+				if (ts > it->second + TOKEN_EXPIRATION_TIMEOUT)
+					it = m_Tokens.erase (it);
+				else
+					++it;
+			}
+			m_Tokens[token] = ts; 
+			ShowCommands (s, token);
+		}
 		else if (page == HTTP_PAGE_TRANSIT_TUNNELS)
 			ShowTransitTunnels (s);
 		else if (page == HTTP_PAGE_LOCAL_DESTINATIONS)
@@ -794,13 +829,19 @@ namespace http {
 	void HTTPConnection::HandleCommand (const HTTPReq& req, HTTPRes& res, std::stringstream& s)
 	{
 		std::map<std::string, std::string> params;
-		std::string cmd("");
 		URL url;
 
 		url.parse(req.uri);
 		url.parse_query(params);
-		cmd = params["cmd"];
 
+		std::string token = params["token"];
+		if (token.empty () || m_Tokens.find (std::stoi (token)) == m_Tokens.end ())
+		{
+			ShowError(s, "Invalid token");
+			return;
+		}
+
+		std::string cmd = params["cmd"];	
 		if (cmd == HTTP_COMMAND_RUN_PEER_TEST)
 			i2p::transport::transports.PeerTest ();
 		else if (cmd == HTTP_COMMAND_RELOAD_CONFIG)
@@ -837,6 +878,7 @@ namespace http {
 
 	void HTTPConnection::SendReply (HTTPRes& reply, std::string& content)
 	{
+		reply.add_header("X-Frame-Options", "SAMEORIGIN");
 		reply.add_header("Content-Type", "text/html");
 		reply.body = content;
 

daemon/HTTPServer.h

@@ -1,10 +1,20 @@
 #ifndef HTTP_SERVER_H__
 #define HTTP_SERVER_H__
 
-namespace i2p {
-namespace http {
-	extern const char *itoopieFavicon;
-	const size_t HTTP_CONNECTION_BUFFER_SIZE = 8192;	
+#include <inttypes.h>
+#include <string>
+#include <memory>
+#include <map>
+#include <thread>
+#include <boost/asio.hpp>
+#include "HTTP.h"
+
+namespace i2p 
+{
+namespace http 
+{
+	const size_t HTTP_CONNECTION_BUFFER_SIZE = 8192;		
+	const int TOKEN_EXPIRATION_TIMEOUT = 30; // in seconds	
 
 	class HTTPConnection: public std::enable_shared_from_this<HTTPConnection>
 	{
@@ -35,6 +45,8 @@ namespace http {
 			bool needAuth;
 			std::string user;
 			std::string pass;
+
+			static std::map<uint32_t, uint32_t> m_Tokens; // token->timestamp in seconds
 	};
 
 	class HTTPServer

daemon/I2PControl.cpp

@@ -2,6 +2,8 @@
 #include <sstream>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
+#include <boost/lexical_cast.hpp>
+#include <boost/date_time/local_time/local_time.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/property_tree/ini_parser.hpp>
 
@@ -14,9 +16,8 @@
 #include "Crypto.h"
 #include "FS.h"
 #include "Log.h"
-#include "HTTP.h"
 #include "Config.h"
-#include "NetDb.h"
+#include "NetDb.hpp"
 #include "RouterContext.h"
 #include "Daemon.h"
 #include "Tunnel.h"
@@ -24,6 +25,7 @@
 #include "Transports.h"
 #include "version.h"
 #include "util.h"
+#include "ClientContext.h"
 #include "I2PControl.h"
 
 namespace i2p
@@ -77,6 +79,8 @@ namespace client
 		m_RouterInfoHandlers["i2p.router.net.bw.outbound.1s"] = &I2PControlService::OutboundBandwidth1S;
 		m_RouterInfoHandlers["i2p.router.net.status"]         = &I2PControlService::NetStatusHandler;
 		m_RouterInfoHandlers["i2p.router.net.tunnels.participating"] = &I2PControlService::TunnelsParticipatingHandler;
+		m_RouterInfoHandlers["i2p.router.net.tunnels.successrate"] =
+&I2PControlService::TunnelsSuccessRateHandler;	
 		m_RouterInfoHandlers["i2p.router.net.total.received.bytes"]  = &I2PControlService::NetTotalReceivedBytes;
 		m_RouterInfoHandlers["i2p.router.net.total.sent.bytes"]      = &I2PControlService::NetTotalSentBytes;
 
@@ -186,67 +190,84 @@ namespace client
  		size_t bytes_transferred, std::shared_ptr<ssl_socket> socket,
 		std::shared_ptr<I2PControlBuffer> buf)
 	{
-		if (ecode) {
+		if (ecode) 
+		{
 			LogPrint (eLogError, "I2PControl: read error: ", ecode.message ());
 			return;
-		}
-		/* try to parse received data */
-		std::stringstream json;
-		std::string response;
-		bool isHTTP = false;
-		if (memcmp (buf->data (), "POST", 4) == 0) {
-			long int remains = 0;
-			isHTTP = true;
-			i2p::http::HTTPReq req;
-			std::size_t len = req.parse(buf->data(), bytes_transferred);
-			if (len <= 0) {
-				LogPrint(eLogError, "I2PControl: incomplete/malformed POST request");
-				return;
-			}
-			/* append to json chunk of data from 1st request */
-			json.write(buf->data() + len, bytes_transferred - len);
-			remains = req.content_length() - len;
-			/* if request has Content-Length header, fetch rest of data and store to json buffer */
-			while (remains > 0) {
-				len = ((long int) buf->size() < remains) ? buf->size() : remains;
-				bytes_transferred = boost::asio::read (*socket, boost::asio::buffer (buf->data (), len));
-				json.write(buf->data(), bytes_transferred);
-				remains -= bytes_transferred;
-			}
-		} else {
-			json.write(buf->data(), bytes_transferred);
-		}
-		LogPrint(eLogDebug, "I2PControl: json from request: ", json.str());
+		} 
+		else 
+		{
+			bool isHtml = !memcmp (buf->data (), "POST", 4);
+			try
+			{
+				std::stringstream ss;
+				ss.write (buf->data (), bytes_transferred);
+				if (isHtml)
+				{
+					std::string header;
+					size_t contentLength = 0;
+					while (!ss.eof () && header != "\r")
+					{
+						std::getline(ss, header);
+						auto colon = header.find (':');
+						if (colon != std::string::npos && header.substr (0, colon) == "Content-Length")
+							contentLength = std::stoi (header.substr (colon + 1));
+					}
+					if (ss.eof ())
+					{
+						LogPrint (eLogError, "I2PControl: malformed request, HTTP header expected");
+						return; // TODO:
+					}
+					std::streamoff rem = contentLength + ss.tellg () - bytes_transferred; // more bytes to read
+					if (rem > 0)
+					{
+						bytes_transferred = boost::asio::read (*socket, boost::asio::buffer (buf->data (), rem));
+						ss.write (buf->data (), bytes_transferred);
+					}
+				}
+				std::ostringstream response;
 #if GCC47_BOOST149
-		LogPrint (eLogError, "I2PControl: json_read is not supported due bug in boost 1.49 with gcc 4.7");
-		BuildErrorResponse(response, 32603, "JSON requests is not supported with this version of boost");
+				LogPrint (eLogError, "I2PControl: json_read is not supported due bug in boost 1.49 with gcc 4.7");
+				response << "{\"id\":null,\"error\":";
+				response << "{\"code\":-32603,\"message\":\"JSON requests is not supported with this version of boost\"},";
+				response << "\"jsonrpc\":\"2.0\"}";
 #else
-		/* now try to parse json itself */
-		try {
-			boost::property_tree::ptree pt;
-			boost::property_tree::read_json (json, pt);
+				boost::property_tree::ptree pt;
+				boost::property_tree::read_json (ss, pt);
 
-			std::string id     = pt.get<std::string>("id");
-			std::string method = pt.get<std::string>("method");
-			auto it = m_MethodHandlers.find (method);
-			if (it != m_MethodHandlers.end ()) {
-				std::ostringstream ss;
-				ss << "{\"id\":" << id << ",\"result\":{";
-				(this->*(it->second))(pt.get_child ("params"), ss);
-				ss << "},\"jsonrpc\":\"2.0\"}";
-				response = ss.str();
-			} else {
-				LogPrint (eLogWarning, "I2PControl: unknown method ", method);
-				BuildErrorResponse(response, 32601, "Method not found");
-			}
-		} catch (std::exception& ex) {
-			LogPrint (eLogError, "I2PControl: exception when handle request: ", ex.what ());
-			BuildErrorResponse(response, 32603, ex.what());
-		} catch (...) {
-			LogPrint (eLogError, "I2PControl: handle request unknown exception");
-		}
+				std::string id     = pt.get<std::string>("id");
+				std::string method = pt.get<std::string>("method");
+				auto it = m_MethodHandlers.find (method);
+				if (it != m_MethodHandlers.end ())
+				{
+					response << "{\"id\":" << id << ",\"result\":{";
+					(this->*(it->second))(pt.get_child ("params"), response);
+					response << "},\"jsonrpc\":\"2.0\"}";
+				} 
+				else 
+				{
+					LogPrint (eLogWarning, "I2PControl: unknown method ", method);
+					response << "{\"id\":null,\"error\":";
+					response << "{\"code\":-32601,\"message\":\"Method not found\"},";
+					response << "\"jsonrpc\":\"2.0\"}";
+				}
 #endif
-		SendResponse (socket, buf, response, isHTTP);
+				SendResponse (socket, buf, response, isHtml);
+			}
+			catch (std::exception& ex)
+			{
+				LogPrint (eLogError, "I2PControl: exception when handle request: ", ex.what ());
+				std::ostringstream response;
+				response << "{\"id\":null,\"error\":";
+				response << "{\"code\":-32700,\"message\":\"" << ex.what () << "\"},";
+				response << "\"jsonrpc\":\"2.0\"}";
+				SendResponse (socket, buf, response, isHtml);
+			}
+			catch (...)
+			{
+				LogPrint (eLogError, "I2PControl: handle request unknown exception");
+			}
+		}
 	}
 
 	void I2PControlService::InsertParam (std::ostringstream& ss, const std::string& name, int value) const
@@ -268,28 +289,27 @@ namespace client
 		ss << "\"" << name << "\":" << std::fixed << std::setprecision(2) << value;
 	}
 
-	void I2PControlService::BuildErrorResponse (std::string & content, int code, const char *message) {
-		std::stringstream ss;
-		ss << "{\"id\":null,\"error\":";
-		ss << "{\"code\":" << -code << ",\"message\":\"" << message << "\"},";
-		ss << "\"jsonrpc\":\"2.0\"}";
-		content = ss.str();
-	}
-
 	void I2PControlService::SendResponse (std::shared_ptr<ssl_socket> socket,
-		std::shared_ptr<I2PControlBuffer> buf, std::string& content, bool isHTTP)
+		std::shared_ptr<I2PControlBuffer> buf, std::ostringstream& response, bool isHtml)
 	{
-		if (isHTTP) {
-			i2p::http::HTTPRes res;
-			res.code = 200;
-			res.add_header("Content-Type", "application/json");
-			res.add_header("Connection", "close");
-			res.body = content;
-			std::string tmp = res.to_string();
-			content = tmp;
+		size_t len = response.str ().length (), offset = 0;
+		if (isHtml)
+		{
+			std::ostringstream header;
+			header << "HTTP/1.1 200 OK\r\n";
+			header << "Connection: close\r\n";
+			header << "Content-Length: " << boost::lexical_cast<std::string>(len) << "\r\n";
+			header << "Content-Type: application/json\r\n";
+			header << "Date: ";
+			auto facet = new boost::local_time::local_time_facet ("%a, %d %b %Y %H:%M:%S GMT");
+			header.imbue(std::locale (header.getloc(), facet));
+			header << boost::posix_time::second_clock::local_time() << "\r\n";
+			header << "\r\n";
+			offset = header.str ().size ();
+			memcpy (buf->data (), header.str ().c_str (), offset);
 		}
-		std::copy(content.begin(), content.end(), buf->begin());
-		boost::asio::async_write (*socket, boost::asio::buffer (buf->data (), content.length()),
+		memcpy (buf->data () + offset, response.str ().c_str (), len);
+		boost::asio::async_write (*socket, boost::asio::buffer (buf->data (), offset + len),
 			boost::asio::transfer_all (),
 			std::bind(&I2PControlService::HandleResponseSent, this,
 				std::placeholders::_1, std::placeholders::_2, socket, buf));
@@ -316,7 +336,7 @@ namespace client
 		}
 		InsertParam (results, "API", api);
 		results << ",";
-        std::string token = std::to_string(i2p::util::GetSecondsSinceEpoch ());
+		std::string token = boost::lexical_cast<std::string>(i2p::util::GetSecondsSinceEpoch ());
 		m_Tokens.insert (token);	
 		InsertParam (results, "Token", token);
 	}	
@@ -358,7 +378,7 @@ namespace client
 
 	void I2PControlService::RouterInfoHandler (const boost::property_tree::ptree& params, std::ostringstream& results)
 	{
-		for (auto it = params.begin (); it != params.end (); ++it)
+		for (auto it = params.begin (); it != params.end (); it++)
 		{
 			LogPrint (eLogDebug, "I2PControl: RouterInfo request: ", it->first);
 			auto it1 = m_RouterInfoHandlers.find (it->first);
@@ -384,7 +404,8 @@ namespace client
 
 	void I2PControlService::StatusHandler (std::ostringstream& results)
 	{
-		InsertParam (results, "i2p.router.status", "???"); // TODO:
+		auto dest = i2p::client::context.GetSharedLocalDestination ();
+		InsertParam (results, "i2p.router.status", (dest && dest->IsReady ()) ? "1" : "0"); 
 	}
 
 	void I2PControlService::NetDbKnownPeersHandler (std::ostringstream& results)
@@ -408,6 +429,12 @@ namespace client
 		InsertParam (results, "i2p.router.net.tunnels.participating", transit);
 	}
 
+	void I2PControlService::TunnelsSuccessRateHandler (std::ostringstream& results)
+	{
+		int rate = i2p::tunnel::tunnels.GetTunnelCreationSuccessRate ();
+		InsertParam (results, "i2p.router.net.tunnels.successrate", rate);
+	}
+
 	void I2PControlService::InboundBandwidth1S (std::ostringstream& results)
 	{
 		double bw = i2p::transport::transports.GetInBandwidth ();
@@ -434,7 +461,7 @@ namespace client
 
 	void I2PControlService::RouterManagerHandler (const boost::property_tree::ptree& params, std::ostringstream& results)
 	{
-		for (auto it = params.begin (); it != params.end (); ++it)
+		for (auto it = params.begin (); it != params.end (); it++)
 		{
 			if (it != params.begin ()) results << ",";	
 			LogPrint (eLogDebug, "I2PControl: RouterManager request: ", it->first);
@@ -483,7 +510,7 @@ namespace client
 // network setting
 	void I2PControlService::NetworkSettingHandler (const boost::property_tree::ptree& params, std::ostringstream& results)
 	{
-		for (auto it = params.begin (); it != params.end (); ++it)
+		for (auto it = params.begin (); it != params.end (); it++)
 		{
 			if (it != params.begin ()) results << ",";	
 			LogPrint (eLogDebug, "I2PControl: NetworkSetting request: ", it->first);
@@ -529,7 +556,7 @@ namespace client
 			X509_gmtime_adj (X509_get_notAfter (x509), I2P_CONTROL_CERTIFICATE_VALIDITY*24*60*60); // expiration
 			X509_set_pubkey (x509, pkey); // public key
 			X509_NAME * name = X509_get_subject_name (x509);
-			X509_NAME_add_entry_by_txt (name, "C",  MBSTRING_ASC, (unsigned char *)"RU", -1, -1, 0); // country (Russia by default)
+			X509_NAME_add_entry_by_txt (name, "C",  MBSTRING_ASC, (unsigned char *)"A1", -1, -1, 0); // country (Anonymous proxy)
 			X509_NAME_add_entry_by_txt (name, "O",  MBSTRING_ASC, (unsigned char *)I2P_CONTROL_CERTIFICATE_ORGANIZATION, -1, -1, 0); // organization
 			X509_NAME_add_entry_by_txt (name, "CN", MBSTRING_ASC, (unsigned char *)I2P_CONTROL_CERTIFICATE_COMMON_NAME, -1, -1, 0); // common name
 			X509_set_issuer_name (x509, name); // set issuer to ourselves

daemon/I2PControl.h

@@ -45,9 +45,8 @@ namespace client
 			void ReadRequest (std::shared_ptr<ssl_socket> socket);
 			void HandleRequestReceived (const boost::system::error_code& ecode, size_t bytes_transferred,
 				std::shared_ptr<ssl_socket> socket, std::shared_ptr<I2PControlBuffer> buf);
-			void BuildErrorResponse (std::string & content, int code, const char *message);
 			void SendResponse (std::shared_ptr<ssl_socket> socket,
-				std::shared_ptr<I2PControlBuffer> buf, std::string& response, bool isHtml);
+				std::shared_ptr<I2PControlBuffer> buf, std::ostringstream& response, bool isHtml);
 			void HandleResponseSent (const boost::system::error_code& ecode, std::size_t bytes_transferred,
 				std::shared_ptr<ssl_socket> socket, std::shared_ptr<I2PControlBuffer> buf);
 
@@ -82,6 +81,7 @@ namespace client
 			void NetDbActivePeersHandler (std::ostringstream& results);
 			void NetStatusHandler (std::ostringstream& results);
 			void TunnelsParticipatingHandler (std::ostringstream& results);
+			void TunnelsSuccessRateHandler (std::ostringstream& results);
 			void InboundBandwidth1S (std::ostringstream& results);
 			void OutboundBandwidth1S (std::ostringstream& results);
 			void NetTotalReceivedBytes (std::ostringstream& results);
@@ -120,4 +120,3 @@ namespace client
 }
 
 #endif
-

daemon/UPnP.cpp

@@ -0,0 +1,205 @@
+#ifdef USE_UPNP
+#include <string>
+#include <thread>
+
+#include <boost/thread/thread.hpp>
+#include <boost/asio.hpp>
+#include <boost/bind.hpp>
+
+#include "Log.h"
+
+#include "RouterContext.h"
+#include "UPnP.h"
+#include "NetDb.hpp"
+#include "util.h"
+#include "RouterInfo.h"
+#include "Config.h"
+
+#include <miniupnpc/miniupnpc.h>
+#include <miniupnpc/upnpcommands.h>
+
+namespace i2p
+{
+namespace transport
+{
+	UPnP::UPnP () : m_IsRunning(false), m_Thread (nullptr), m_Timer (m_Service)
+	{
+	}
+
+	void UPnP::Stop ()
+	{
+		if (m_IsRunning)
+		{
+			LogPrint(eLogInfo, "UPnP: stopping");
+			m_IsRunning = false;
+			m_Timer.cancel ();
+			m_Service.stop ();
+			if (m_Thread)
+			{
+				m_Thread->join ();
+				m_Thread.reset (nullptr);
+			}
+			CloseMapping ();
+			Close ();
+		}
+	}
+
+	void UPnP::Start()
+	{
+		m_IsRunning = true;
+		LogPrint(eLogInfo, "UPnP: starting");
+		m_Service.post (std::bind (&UPnP::Discover, this));
+		std::unique_lock<std::mutex> l(m_StartedMutex);
+		m_Thread.reset (new std::thread (std::bind (&UPnP::Run, this)));
+		m_Started.wait_for (l, std::chrono::seconds (5)); // 5 seconds maximum
+	}
+
+	UPnP::~UPnP ()
+	{
+		Stop ();
+	}
+
+	void UPnP::Run ()
+	{
+		while (m_IsRunning)
+		{
+			try
+			{
+				m_Service.run ();
+				// Discover failed
+				break; // terminate the thread
+			}
+			catch (std::exception& ex)
+			{
+				LogPrint (eLogError, "UPnP: runtime exception: ", ex.what ());
+				PortMapping ();
+			}
+		}
+	}
+
+	void UPnP::Discover ()
+	{
+		int nerror = 0;
+#if MINIUPNPC_API_VERSION >= 14
+		m_Devlist = upnpDiscover (2000, m_MulticastIf, m_Minissdpdpath, 0, 0, 2, &nerror);
+#else
+		m_Devlist = upnpDiscover (2000, m_MulticastIf, m_Minissdpdpath, 0, 0, &nerror);
+#endif
+		{
+			// notify satrting thread
+			std::unique_lock<std::mutex> l(m_StartedMutex);
+			m_Started.notify_all ();
+		}
+
+		int r;
+		r = UPNP_GetValidIGD (m_Devlist, &m_upnpUrls, &m_upnpData, m_NetworkAddr, sizeof (m_NetworkAddr));
+		if (r == 1)
+		{
+			r = UPNP_GetExternalIPAddress (m_upnpUrls.controlURL, m_upnpData.first.servicetype, m_externalIPAddress);
+			if(r != UPNPCOMMAND_SUCCESS)
+			{
+				LogPrint (eLogError, "UPnP: UPNP_GetExternalIPAddress() returned ", r);
+				return;
+			}
+			else
+			{
+				if (!m_externalIPAddress[0])
+				{
+					LogPrint (eLogError, "UPnP: GetExternalIPAddress() failed.");
+					return;
+				}
+			}
+		}
+		else
+		{
+			LogPrint (eLogError, "UPnP: GetValidIGD() failed.");
+			return;
+		}
+
+		// UPnP discovered
+		LogPrint (eLogDebug, "UPnP: ExternalIPAddress is ", m_externalIPAddress);
+		i2p::context.UpdateAddress (boost::asio::ip::address::from_string (m_externalIPAddress));
+		// port mapping
+		PortMapping ();
+	}
+
+	void UPnP::PortMapping ()
+	{
+		const auto& a = context.GetRouterInfo().GetAddresses();
+		for (const auto& address : a)
+		{
+			if (!address->host.is_v6 ())
+			TryPortMapping (address);
+		}
+		m_Timer.expires_from_now (boost::posix_time::minutes(20));	// every 20 minutes
+		m_Timer.async_wait ([this](const boost::system::error_code& ecode)
+		{
+			if (ecode != boost::asio::error::operation_aborted)
+			PortMapping ();
+		});
+
+	}
+
+	void UPnP::CloseMapping ()
+	{
+		const auto& a = context.GetRouterInfo().GetAddresses();
+		for (const auto& address : a)
+		{
+			if (!address->host.is_v6 ())
+			CloseMapping (address);
+		}
+	}
+
+	void UPnP::TryPortMapping (std::shared_ptr<i2p::data::RouterInfo::Address> address)
+	{
+		std::string strType (GetProto (address)), strPort (std::to_string (address->port));
+		int r;
+		std::string strDesc; i2p::config::GetOption("upnp.name", strDesc);
+		r = UPNP_AddPortMapping (m_upnpUrls.controlURL, m_upnpData.first.servicetype, strPort.c_str (), strPort.c_str (), m_NetworkAddr, strDesc.c_str (), strType.c_str (), 0, "0");
+		if (r!=UPNPCOMMAND_SUCCESS)
+		{
+			LogPrint (eLogError, "UPnP: AddPortMapping (", m_NetworkAddr, ":", strPort, ") failed with code ", r);
+			return;
+		}
+		else
+		{
+			LogPrint (eLogDebug, "UPnP: Port Mapping successful. (", m_NetworkAddr ,":", strPort, " type ", strType, " -> ", m_externalIPAddress ,":", strPort ,")");
+			return;
+		}
+	}
+
+	void UPnP::CloseMapping (std::shared_ptr<i2p::data::RouterInfo::Address> address)
+	{
+		std::string strType (GetProto (address)), strPort (std::to_string (address->port));
+		int r = 0;
+		r = UPNP_DeletePortMapping (m_upnpUrls.controlURL, m_upnpData.first.servicetype, strPort.c_str (), strType.c_str (), 0);
+		LogPrint (eLogError, "UPnP: DeletePortMapping() returned : ", r);
+	}
+
+	void UPnP::Close ()
+	{
+		freeUPNPDevlist (m_Devlist);
+		m_Devlist = 0;
+		FreeUPNPUrls (&m_upnpUrls);
+	}
+
+	std::string UPnP::GetProto (std::shared_ptr<i2p::data::RouterInfo::Address> address)
+	{
+		switch (address->transportStyle)
+		{
+			case i2p::data::RouterInfo::eTransportNTCP:
+			return "TCP";
+			break;
+			case i2p::data::RouterInfo::eTransportSSU:
+			default:
+			return "UDP";
+		}
+	}
+}
+}
+#else /* USE_UPNP */
+namespace i2p {
+namespace transport {
+}
+}
+#endif /* USE_UPNP */

daemon/UnixDaemon.cpp

@@ -21,24 +21,30 @@ void handle_signal(int sig)
 	switch (sig)
 	{
 		case SIGHUP:
-			LogPrint(eLogInfo, "Daemon: Got SIGHUP, reopening logs and tunnel configuration...");
-			i2p::log::Logger().Reopen ();
+			LogPrint(eLogInfo, "Daemon: Got SIGHUP, reopening tunnel configuration...");
 			i2p::client::context.ReloadConfig();
 		break;
+		case SIGUSR1:
+			LogPrint(eLogInfo, "Daemon: Got SIGUSR1, reopening logs...");
+			i2p::log::Logger().Reopen ();
+		break;
 		case SIGINT:
 			if (i2p::context.AcceptsTunnels () && !Daemon.gracefulShutdownInterval)
-			{	
+			{
 				i2p::context.SetAcceptsTunnels (false);
 				Daemon.gracefulShutdownInterval = 10*60; // 10 minutes
 				LogPrint(eLogInfo, "Graceful shutdown after ", Daemon.gracefulShutdownInterval, " seconds");
-			}	
+			}
 			else
-				Daemon.running = 0; 
-		break;	
+				Daemon.running = 0;
+		break;
 		case SIGABRT:
 		case SIGTERM:
 			Daemon.running = 0; // Exit loop
 		break;
+		case SIGPIPE:
+			LogPrint(eLogInfo, "SIGPIPE received");
+		break;
 	}
 }
 
@@ -76,12 +82,10 @@ namespace i2p
 					return false;
 				}
 
-#if !defined(__OpenBSD__)
 				// point std{in,out,err} descriptors to /dev/null
-                stdin  = freopen("/dev/null", "r", stdin);
-				stdout = freopen("/dev/null", "w", stdout);
-				stderr = freopen("/dev/null", "w", stderr);
-#endif
+				freopen("/dev/null", "r", stdin);
+				freopen("/dev/null", "w", stdout);
+				freopen("/dev/null", "w", stderr);
 			}
 
 			// set proc limits
@@ -103,8 +107,8 @@ namespace i2p
 			}
 			uint32_t cfsize; i2p::config::GetOption("limits.coresize", cfsize);
 			if (cfsize) // core file size set
-			{	
-	  			cfsize *= 1024;
+			{
+				cfsize *= 1024;
 				getrlimit(RLIMIT_CORE, &limit);
 				if (cfsize <= limit.rlim_max) {
 					limit.rlim_cur = cfsize;
@@ -118,7 +122,7 @@ namespace i2p
 				} else {
 					LogPrint(eLogError, "Daemon: limits.coresize exceeds system limit: ", limit.rlim_max);
 				}
-			}	
+			}
 
 			// Pidfile
 			// this code is c-styled and a bit ugly, but we need fd for locking pidfile
@@ -155,9 +159,11 @@ namespace i2p
 			sigemptyset(&sa.sa_mask);
 			sa.sa_flags = SA_RESTART;
 			sigaction(SIGHUP, &sa, 0);
+			sigaction(SIGUSR1, &sa, 0);
 			sigaction(SIGABRT, &sa, 0);
 			sigaction(SIGTERM, &sa, 0);
 			sigaction(SIGINT, &sa, 0);
+			sigaction(SIGPIPE, &sa, 0);			
 
 			return Daemon_Singleton::start();
 		}
@@ -166,7 +172,7 @@ namespace i2p
 		{
 			i2p::fs::Remove(pidfile);
 
-			return Daemon_Singleton::stop();			
+			return Daemon_Singleton::stop();
 		}
 
 		void DaemonLinux::run ()
@@ -177,12 +183,12 @@ namespace i2p
 				if (gracefulShutdownInterval)
 				{
 					gracefulShutdownInterval--; // - 1 second
-					if (gracefulShutdownInterval <= 0) 
-					{	
+					if (gracefulShutdownInterval <= 0)
+					{
 						LogPrint(eLogInfo, "Graceful shutdown");
 						return;
 					}
-				}	
+				}
 			}
 		}
 	}

debian/changelog

@@ -1,3 +1,39 @@
+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
+  * updated debian/control
+  * renamed logrotate to i2pd.logrotate
+  * fixed init.d script
+
+ -- orignal <orignal@i2pmail.org>  Thu, 6 Apr 2017 14:00:00 +0000
+
+i2pd (2.12.0-1) unstable; urgency=low
+
+  * updated to version 2.12.0/0.9.28
+
+ -- orignal <orignal@i2pmail.org>  Tue, 14 Feb 2017 17:59:30 +0000
+
+i2pd (2.11.0-1) unstable; urgency=low
+
+  * updated to version 2.11.0/0.9.28
+
+ -- orignal <orignal@i2pmail.org>  Sun, 18 Dec 2016 21:01:30 +0000
+
+i2pd (2.10.2-1) unstable; urgency=low
+
+  * updated to version 2.10.2
+
+ -- orignal <orignal@i2pmail.org>  Sun, 4 Dec 2016 19:38:30 +0000
+
 i2pd (2.10.1-1) unstable; urgency=low
 
   * updated to version 2.10.1

debian/control

@@ -1,17 +1,10 @@
 Source: i2pd
 Section: net
-Priority: extra
-Maintainer: hagen <hagen@i2pmail.org>
-Build-Depends: debhelper (>= 9.0.0), 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
-Standards-Version: 3.9.3
-Homepage: https://github.com/PurpleI2P/i2pd
+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, zlib1g-dev
+Standards-Version: 3.9.6
+Homepage: http://i2pd.website/
 Vcs-Git: git://github.com/PurpleI2P/i2pd.git
 Vcs-Browser: https://github.com/PurpleI2P/i2pd.git
 
@@ -19,26 +12,23 @@ Package: i2pd
 Architecture: any
 Pre-Depends: adduser
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: privoxy
-Suggests: tor
-Description: load-balanced unspoofable packet switching network - C++ port
- I2P is an anonymizing network, offering a simple layer that identity-sensitive
- applications can use to securely communicate. All data is wrapped with several
- layers of encryption, and the network is both distributed and dynamic, with no
- trusted parties.
+Suggests: tor, privoxy
+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.
  .
- This package contains the port of the I2P router to C++. Unless willing
- to test and report problems, you should install the 'i2p' package instead.
+ This package contains the full-featured C++ implementation of I2P router.
 
 Package: i2pd-dbg
 Architecture: any
 Priority: extra
 Section: debug
 Depends: i2pd (= ${binary:Version}), ${misc:Depends}
+Suggests: gdb
 Description: i2pd debugging symbols
- I2P is an anonymizing network, offering a simple layer that identity-sensitive
- applications can use to securely communicate. All data is wrapped with several
- layers of encryption, and the network is both distributed and dynamic, with no
- trusted parties.
+ 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.
  .
  This package contains symbols required for debugging.

debian/copyright

@@ -3,9 +3,9 @@ Upstream-Name: i2pd
 Source: https://github.com/PurpleI2P
 
 Files: *
-Copyright: 2013-2016 PurpleI2P
+Copyright: 2013-2017 PurpleI2P
 License: BSD-3-clause
- Copyright (c) 2013-2016, The PurpleI2P Project
+ Copyright (c) 2013-2017, The PurpleI2P Project
  .
  All rights reserved.
  .
@@ -34,7 +34,8 @@ License: BSD-3-clause
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: 2014-2016 hagen <hagen@i2pmail.org>
+Copyright: 2016-2017 R4SAS <r4sas@i2pmail.org>
+           2014-2016 hagen <hagen@i2pmail.org>
            2013-2015 Kill Your TV <killyourtv@i2pmail.org>
 License: GPL-2.0+
  This package is free software; you can redistribute it and/or modify

debian/docs

@@ -1,2 +1 @@
 README.md
-docs/configuration.md

debian/i2pd.1

@@ -72,7 +72,7 @@ Bandwidth limit: integer in KBps or letter aliases: \fIL (32KBps)\fR, O (256), P
 \fB\-\-family=\fR
 Name of a family, router belongs to.
 .PP
-See service-specific parameters in page \fIdocs/configuration.md\fR or in example config file \fIdocs/i2pd.conf\fR
+See service-specific parameters in example config file \fIcontrib/i2pd.conf\fR
 
 .SH FILES
 .PP

debian/i2pd.default

@@ -8,4 +8,4 @@ I2PD_ENABLED="yes"
 DAEMON_OPTS=""
 
 # If you have problems with hunging i2pd, you can try enable this 
-#ulimit -n 4096
+ulimit -n 4096

debian/i2pd.init

@@ -53,7 +53,7 @@ do_start()
     || return 1
   start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --chuid "$USER" -- \
     --service --daemon --log=file --logfile=$LOGFILE --conf=$I2PCONF --tunconf=$TUNCONF \
-    $DAEMON_OPTS > /dev/null 2>&1 \
+    --pidfile=$PIDFILE $DAEMON_OPTS > /dev/null 2>&1 \
     || return 2
   return $?
 }

debian/i2pd.install

@@ -1,5 +1,5 @@
 i2pd usr/sbin/
-docs/i2pd.conf      etc/i2pd/
-docs/tunnels.conf etc/i2pd/
-docs/subscriptions.txt etc/i2pd/
+contrib/i2pd.conf      etc/i2pd/
+contrib/tunnels.conf etc/i2pd/
+contrib/subscriptions.txt etc/i2pd/
 contrib/certificates/ usr/share/i2pd/

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

debian/patches/01-tune-build-opts.patch

@@ -1,16 +1,18 @@
 diff --git a/Makefile b/Makefile
-index b6fc795..abc3ace 100644
+index bdadfe0..2f71eec 100644
+
 --- a/Makefile
 +++ b/Makefile
 @@ -9,10 +9,10 @@ DEPS := obj/make.dep
  
  include filelist.mk
  
--USE_AESNI  := yes
-+USE_AESNI  := no
- USE_STATIC := no
- USE_MESHNET := no
- USE_UPNP   := no
+-USE_AESNI	:= yes
++USE_AESNI	:= no
+-USE_AVX		:= yes
++USE_AVX		:= no
+ USE_STATIC	:= no
+ USE_MESHNET	:= no
+ USE_UPNP	:= no
 
  ifeq ($(WEBSOCKETS),1)
- 	NEEDED_CXXFLAGS += -DWITH_EVENTS

docs/README.md

@@ -0,0 +1,3 @@
+Documentation is moved to [separate repository](https://github.com/PurpleI2P/i2pd_docs_en.git)
+
+[View docs online](https://i2pd.readthedocs.io/en/latest/)

docs/building/android.md

@@ -1,65 +0,0 @@
-Building on Android
-===================
-
-There are two versions: with QT and without QT.
-
-Pre-requesties
---------------
-
-You need to install Android SDK, NDK  and QT with android support.
-
-- [SDK](https://developer.android.com/studio/index.html) (choose command line tools only)
-- [NDK](https://developer.android.com/ndk/downloads/index.html)
-- [QT](https://www.qt.io/download-open-source/)(for QT only).
-  Choose one for your platform for android. For example QT 5.6 under Linux would be [this file](http://download.qt.io/official_releases/qt/5.6/5.6.1-1/qt-opensource-linux-x64-android-5.6.1-1.run)
-
-You also need Java JDK and Ant.
-
-QT-Creator (for QT only)
-------------------------
-
-Open QT-creator that should be installed with QT.
-Go to Settings/Anndroid and specify correct paths to SDK and NDK.
-If everything is correct you will see two set avaiable:
-Android for armeabi-v7a (gcc, qt) and Android for x86 (gcc, qt).
-
-Dependencies
---------------
-
-Take following pre-compiled binaries from PurpleI2P's repositories.
-
-	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
-
-Building the app with QT
-------------------------
-
-- Open `qt/i2pd_qt/i2pd_qt.pro` in the QT-creator
-- Change line `MAIN_PATH = /path/to/libraries` to an actual path where you put the dependancies to
-- Select appropriate project (usually armeabi-v7a) and build
-- You will find an .apk file in `android-build/bin` folder
-
-Building the app without QT
----------------------------
-
-- Change line `I2PD_LIBS_PATH` in `android/jni/Application.mk` to an actual path where you put the dependancies to
-- Run `ndk-build -j4` from andorid folder
-- Create or edit file 'local.properties'. Place 'sdk.dir=<path to SDK>' and 'ndk.dir=<path to NDK>'
-- Run `ant clean debug`
-
-Creating release .apk
-----------------------
-
-In order to create release .apk you must obtain a Java keystore file(.jks). Either you have in already, or you can generate it yourself using keytool, or from one of you existing well-know ceritificates.
-For example, i2pd release are signed with this [certificate](https://github.com/PurpleI2P/i2pd/blob/openssl/contrib/certificates/router/orignal_at_mail.i2p.crt).
-
-Create file 'ant.propeties':
-
-	key.store='path to keystore file'
-	key.alias='alias name'
-	key.store.password='keystore password'
-	key.alias.password='alias password'
-
-Run `ant clean release`

docs/building/cross.md

@@ -1,74 +0,0 @@
-Cross compilation notes
-=======================
-
-Static 64 bit windows binary on Ubuntu 15.10 (Wily Werewolf)
-------------------------------------------------------------
-
-Install cross compiler and friends
-
-	sudo apt-get install g++-mingw-w64-x86-64
-
-Default is to use Win32 threading model which lacks std::mutex and such. So we change defaults
-
-	sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
-
-From now on we assume we have everything in `~/dev/`. Get Boost sources unpacked into `~/dev/boost_1_60_0/` and change directory to it.
-Now add out cross compiler configuration. Warning: the following will wipe out whatever you had in there.
-
-	echo "using gcc : mingw : x86_64-w64-mingw32-g++ ;" > ~/user-config.jam
-
-Proceed with building Boost normal way, but let's define dedicated staging directory
-
-	./bootstrap.sh
-	./b2 toolset=gcc-mingw target-os=windows variant=release link=static runtime-link=static address-model=64 \
-	  --build-type=minimal --with-filesystem --with-program_options --with-date_time \
-	  --stagedir=stage-mingw-64
-	cd ..
-
-Now we get & build OpenSSL
-
-	git clone https://github.com/openssl/openssl
-	cd openssl
-	git checkout OpenSSL_1_0_2g
-	./Configure mingw64 no-rc2 no-rc4 no-rc5 no-idea no-bf no-cast no-whirlpool no-md2 no-md4 no-ripemd no-mdc2 \
-	  no-camellia no-seed no-comp no-krb5 no-gmp no-rfc3779 no-ec2m no-ssl2 no-jpake no-srp no-sctp no-srtp \
-	  --prefix=~/dev/stage --cross-compile-prefix=x86_64-w64-mingw32-
-	make depend
-	make
-	make install
-	cd ..
-
-...and zlib
-
-	git clone https://github.com/madler/zlib
-	cd zlib
-	git checkout v1.2.8
-	CC=x86_64-w64-mingw32-gcc CFLAGS=-O3 ./configure --static --64 --prefix=~/dev/stage
-	make
-	make install
-	cd ..
-
-Now we prepare cross toolchain hint file for CMake, let's name it `~/dev/toolchain-mingw.cmake`
-
-	set(CMAKE_SYSTEM_NAME Windows)
-	set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
-	set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
-	set(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
-	set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32)
-	set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-
-Download miniupnpc, unpack and symlink it into `~/dev/miniupnpc/`.
-Finally, we can build i2pd with all that goodness
-
-	git clone https://github.com/PurpleI2P/i2pd
-	mkdir i2pd-mingw-64-build
-	cd i2pd-mingw-64-build
-	BOOST_ROOT=~/dev/boost_1_60_0 cmake -G 'Unix Makefiles' ~/dev/i2pd/build -DBUILD_TYPE=Release \
-	  -DCMAKE_TOOLCHAIN_FILE=~/dev/toolchain-mingw.cmake -DWITH_AESNI=ON -DWITH_UPNP=ON -DWITH_STATIC=ON \
-	  -DWITH_HARDENING=ON -DCMAKE_INSTALL_PREFIX:PATH=~/dev/i2pd-mingw-64-static \
-	  -DZLIB_ROOT=~/dev/stage -DBOOST_LIBRARYDIR:PATH=~/dev/boost_1_60_0/stage-mingw-64/lib \
-	  -DOPENSSL_ROOT_DIR:PATH=~/dev/stage
-	make
-	x86_64-w64-mingw32-strip i2pd.exe
-
-By now, you should have a release build with stripped symbols.

docs/building/ios.md

@@ -1,85 +0,0 @@
-Building on iOS
-===================
-
-How to build i2pd for iOS 9 and iOS Simulator 386/x64
-
-Prerequisites
---------------
-
-XCode7+, cmake 3.2+
-
-Dependencies
-------------
-
-- precompiled openssl
-- precompiled boost with modules `filesystem`, `program_options`, `date_time` and `system`
-- ios-cmake toolchain from `https://github.com/vovasty/ios-cmake.git`
-
-Building
---------
-
-Assume you have folder structure
-
-	lib/
-		libboost_date_time.a
-		libboost_filesystem.a
-		libboost_program_options.a
-		libboost_system.a
-		libboost.a
-		libcrypto.a
-		libssl.a
-	include/
-		boost/
-		openssl/
-	ios-cmake/
-	i2pd/
-
-```bash
-mkdir -p build/simulator/lib build/ios/lib include/i2pd
-
-pushd build/simulator && \
-cmake   -DIOS_PLATFORM=SIMULATOR \
-        -DPATCH=/usr/bin/patch \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_TOOLCHAIN_FILE=../../ios-cmake/toolchain/iOS.cmake \
-        -DWITH_STATIC=yes \
-        -DWITH_BINARY=no \
-        -DBoost_INCLUDE_DIR=../../include \
-        -DOPENSSL_INCLUDE_DIR=../../include \
-        -DBoost_LIBRARY_DIR=../../lib \
-        -DOPENSSL_SSL_LIBRARY=../../lib/libssl.a \
-        -DOPENSSL_CRYPTO_LIBRARY=../../lib/libcrypto.a \
-        ../../i2pd/build && \
-make -j16 VERBOSE=1 && \
-popd
-
-pushd build/ios
-cmake   -DIOS_PLATFORM=OS \
-        -DPATCH=/usr/bin/patch \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_TOOLCHAIN_FILE=../../ios-cmake/toolchain/iOS.cmake \
-        -DWITH_STATIC=yes \
-        -DWITH_BINARY=no \
-        -DBoost_INCLUDE_DIR=../../include \
-        -DOPENSSL_INCLUDE_DIR=../../include \
-        -DBoost_LIBRARY_DIR=../../lib \
-        -DOPENSSL_SSL_LIBRARY=../../lib/libssl.a \
-        -DOPENSSL_CRYPTO_LIBRARY=../../lib/libcrypto.a \
-        ../../i2pd/build && \
-make -j16 VERBOSE=1 && \
-popd
-
-libtool -static -o lib/libi2pdclient.a build/*/libi2pdclient.a
-libtool -static -o lib/libi2pd.a build/*/libi2pd.a
-
-cp i2pd/*.h include/i2pd
-```
-
-Include into project
---------------------
-
-- add all libraries in `lib` folder to `Project linked frameworks`.
-- add `libc++` and `libz` libraries from system libraries to `Project linked frameworks`.
-- add path to i2p headers to your `Headers search paths`
-
-Alternatively you may use swift wrapper `https://github.com/vovasty/SwiftyI2P.git`

docs/building/requirements.md

@@ -1,15 +0,0 @@
-Build requirements
-==================
-
-In general, for building i2pd you need several things:
-
-* compiler with c++11 support (for example: gcc >= 4.7, clang)
-* boost >= 1.49
-* openssl library
-* zlib library (openssl already depends on it)
-
-Optional tools:
-
-* cmake >= 2.8 (or 3.3+ if you want to use precompiled headers on windows)
-* miniupnp library (for upnp support)
-* [websocketpp](https://github.com/zaphoyd/websocketpp/) (for websocket ui)

docs/building/unix.md

@@ -1,136 +0,0 @@
-Building on Unix systems
-=============================
-
-First of all we need to make sure that all dependencies are satisfied.
-
-This doc is trying to cover:
-
-* [Debian/Ubuntu](#debian-ubuntu) (contains packaging instructions)
-* [Fedora/Centos](#fedora-centos)
-* [Fedora/Centos](#mac-os-x)
-* [FreeBSD](#freebsd)
-
-Make sure you have all required dependencies for your system successfully installed.
-See [this](requirements.md) page for common requirements.
-
-If so then we are ready to go!
-Let's clone the repository and start building the i2pd:
-
-	git clone https://github.com/PurpleI2P/i2pd.git
-
-Generic build process looks like this (with cmake):
-
-	cd i2pd/build
-	cmake <cmake options> . # see "CMake Options" section below
-	make                    # you may add VERBOSE=1 to cmdline for debugging
-
-..or with quick-and-dirty way with just make:
-
-	cd i2pd/
-	make
-
-After successfull build i2pd could be installed with:
-
-	make install
-
-CMake Options
--------------
-
-Available CMake options(each option has a form of `<key>=<value>`, for more information see `man 1 cmake`):
-
-* `CMAKE_BUILD_TYPE` build profile (Debug/Release)
-* `WITH_BINARY`      build i2pd itself
-* `WITH_LIBRARY`     build libi2pd
-* `WITH_STATIC`      build static versions of library and i2pd binary
-* `WITH_UPNP`        build with UPnP support (requires libminiupnp)
-* `WITH_AESNI`       build with AES-NI support (ON/OFF)
-* `WITH_HARDENING`   enable hardening features (ON/OFF) (gcc only)
-* `WITH_PCH`         use pre-compiled header (experimental, speeds up build)
-* `WITH_I2LUA`       used when building i2lua
-* `WITH_WEBSOCKETS`  enable websocket server
-
-
-Also there is `-L` flag for CMake that could be used to list current cached options:
-
-	cmake -L
-
-Debian/Ubuntu
--------------
-
-You will need a compiler and other tools that could be installed with `build-essential` package:
-
-	sudo apt-get install build-essential
-
-Also you will need a bunch of development libraries:
-
-	sudo apt-get install \
-	    libboost-date-time-dev \
-	    libboost-filesystem-dev \
-	    libboost-program-options-dev \
-	    libboost-system-dev \
-	    libssl-dev
-
-If you need UPnP support miniupnpc development library should be installed (don't forget to rerun CMake with needed option):
-
-	sudo apt-get install libminiupnpc-dev
-
-You may also build deb-package with the following:
-
-	sudo apt-get install fakeroot devscripts
-	cd i2pd
-	debuild --no-tgz-check
-
-Fedora/Centos
--------------
-
-You will need a compiler and other tools to perform a build:
-
-	sudo yum install make cmake gcc gcc-c++
-
-Also you will need a bunch of development libraries
-
-	sudo yum install boost-devel openssl-devel
-
-If you need UPnP support miniupnpc development library should be installed (don't forget to rerun CMake with needed option):
-
-	sudo yum install miniupnpc-devel
-
-Latest Fedora systems using [DNF](https://en.wikipedia.org/wiki/DNF_(software)) instead of YUM by default, you may prefer to use DNF, but YUM should be ok
-
-Centos 7 has CMake 2.8.11 in the official repositories that too old to build i2pd, CMake >=2.8.12 is required.
-But you can use cmake3 from the epel repository:
-
-	yum install epel-release -y
-	yum install make cmake3 gcc gcc-c++ miniupnpc-devel boost-devel openssl-devel -y
-
-...and then use 'cmake3' instead 'cmake'.
-
-MAC OS X
---------
-
-Requires [homebrew](http://brew.sh)
-
-	brew install boost libressl
-
-Then build:
-
-	make HOMEBREW=1
-
-FreeBSD
--------
-
-For 10.X  use clang. You would also need devel/boost-libs, security/openssl and devel/gmake ports.
-Type gmake, it invokes Makefile.bsd, make necessary changes there is required.
-
-Branch 9.X has gcc v4.2, that is too old (not supports -std=c++11)
-
-Required ports:
-
-* `devel/cmake`
-* `devel/boost-libs`
-* `lang/gcc47`(or later version)
-
-To use newer compiler you should set these variables(replace "47" with your actual gcc version):
-
-	export CC=/usr/local/bin/gcc47
-	export CXX=/usr/local/bin/g++47

docs/building/windows.md

@@ -1,159 +0,0 @@
-Building on Windows
-=========================
-
-There are two approaches available to build i2pd on Windows. The best
-one depends on your needs and personal preferences. One is to use
-msys2 and [unix alike infrastructure](unix.md). Another
-one is to use Visual Studio. While there might be no difference for
-end users of i2pd daemon, developers, however, shall be wary of
-differences in C++ name mangling between the two compilers when making
-a choice to be able to link their software against libi2pd.
-
-If you are a stranger to C++ with no development tools installed on
-your system and your only goal is to have i2pd up and running from the
-most recent source, consider using msys2. Although it relies on
-command line operations, it should be straight forward.
-
-In this guide, we will use CMake for both approaches and we will
-assume that you typically have your projects in C:\dev\ as your
-development location for the sake of convenience. Adjust paths
-accordingly if it is not the case. Note that msys uses unix-alike
-paths like /c/dev/ for C:\dev\.
-
-msys2
------
-
-Get install file `msys2-$ARCH-*.exe` from `https://msys2.github.io`
-
-Where $ARCH is `i686` or `x86_64` (matching your system).
-
-- Open MSYS2 Shell (from Start menu).
-- Install all prerequisites and download i2pd source:
-
-        export ARCH='i686'     # or 'x86_64'
-        export MINGW='mingw32' # or 'mingw64'
-        pacman -S mingw-w64-$ARCH-boost mingw-w64-$ARCH-openssl mingw-w64-$ARCH-gcc git make
-        mkdir -p /c/dev/i2pd
-        cd /c/dev/i2pd
-        git clone https://github.com/PurpleI2P/i2pd.git
-        cd i2pd
-        # we need compiler on PATH which is usually heavily cluttered on Windows
-        export PATH=/$MINGW/bin:/usr/bin
-        make
-
-### Caveats
-
-It is important to restrict PATH as described above.
-If you have Strawberry Perl and/or Mercurial installed,
-it will pick up gcc & openssl from the wrong places.
-
-If you do use precompiled headers to speed up compilation (recommended),
-things can go wrong if compiler options have changed for whatever reason.
-Just delete `stdafx.h.gch` found in your build folder, note the file extension.
-
-If you are an Arch Linux user, refrain from updating system with `pacman -Syu`.
-Always update runtime separately as described on the home page,
-otherwise you might end up with DLLs incompatibility problems.
-
-### AES-NI
-
-If your processor has [AES instruction set](https://en.wikipedia.org/wiki/AES_instruction_set),
-use `make USE_AESNI=1` instead just `make`. No check is done however, it will compile,
-but it might crash with `Illegal instruction` if this feature is not supported by your processor.
-
-You should be able to run ./i2pd . If you need to start from the new shell,
-consider starting *MinGW-w64 Win32 Shell* instead of *MSYS2 Shell*
-as it adds `/minw32/bin` to the PATH.
-
-### UPnP
-
-You can install it through the MSYS2 and build with `USE_UPNP` key.
-
-	export ARCH='i686' # or 'x86_64'
-	pacman -S mingw-w64-$ARCH-miniupnpc
-	make USE_UPNP=yes
-
-Using Visual Studio
--------------------
-
-Requirements for building:
-
-* [CMake](https://cmake.org/) (tested with 3.1.3)
-* [Visual Studio Community Edition](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx) (tested with VS2013 Update 4)
-* [Boost](http://www.boost.org/) (tested with 1.59)
-* Optionally [MiniUPnP](http://miniupnp.free.fr) (tested with 1.9), we need only few client headers
-* OpenSSL (tested with 1.0.1p and 1.0.2e), if building from sources (recommended), you'll need as well
-	* [Netwide assembler](http://www.nasm.us/)
-	* Strawberry Perl or ActiveState Perl, do NOT try msys2 perl, it won't work
-
-### Building Boost
-
-Open a Command Prompt (there is no need to start Visual Studio command
-prompt to build Boost) and run the following:
-
-	cd C:\dev\boost
-	bootstrap
-	b2 toolset=msvc-12.0 --build-type=complete --with-filesystem --with-program_options --with-date_time
-
-If you are on 64-bit Windows and you want to build 64-bit version as well
-
-	b2 toolset=msvc-12.0 --build-type=complete --stagedir=stage64 address-model=64 --with-filesystem --with-program_options --with-date_time
-
-After Boost is compiled, set the environment variable `BOOST_ROOT` to
-the directory Boost was unpacked to, e.g., C:\dev\boost.
-
-If you are planning on building only particular variant, e.g. Debug only and static linking,
-and/or you are out of space/time, you might consider `--build-type=minimal`.
-Take a look at [appveyor.yml](../appveyor.yml) for details on how test builds are done.
-
-### Building OpenSSL
-
-Download OpenSSL, e.g. with git
-
-	git clone https://github.com/openssl/openssl.git
-	cd openssl
-	git checkout OpenSSL_1_0_1p
-
-Now open Visual Studio command prompt and change directory to that with OpenSSL
-
-	set "PATH=%PATH%;C:\Program Files (x86)\nasm"
-	perl Configure VC-WIN32 --prefix=c:\OpenSSL-Win32
-	ms\do_nasm
-	nmake -f ms\ntdll.mak
-	nmake -f ms\ntdll.mak install
-
-You should have it installed into C:\OpenSSL-Win32 by now.
-
-Note that you might consider providing `-DOPENSSL_ROOT_DIR` to CMake and/or
-create a symlink (with mklink /J) to C:\OpenSSL if you plan on maintain
-multiple versions, e.g. 64 bit and/or static/shared.
-See `C:\Program Files (x86)\CMake\share\cmake-3.3\Modules\FindOpenSSL.cmake` for details.
-
-### Get miniupnpc
-
-If you are behind a UPnP enabled router and don't feel like manually configuring port forwarding,
-you should consider using [MiniUPnP](http://miniupnp.free.fr) client.
-I2pd can be built capable of using miniupnpc shared library (DLL) to open up necessary port.
-You'd want to have include headers around to build i2pd with support for this.
-Unpack client source code to subdir, e.g. `C:\dev\miniupnpc`.
-You may want to remove version number from folder name included in downloaded archive.
- 
-### Creating Visual Studio project
-
-Start CMake GUI, navigate to i2pd directory, choose building directory,  e.g. ./out, and configure options.
-
-Alternatively, if you feel adventurous, try that from the command line
-
-	mkdir i2pd\out
-	cd i2pd\out
-	cmake ..\build -G "Visual Studio 12 2013" -DWITH_UPNP=ON -DWITH_PCH=ON -DCMAKE_INSTALL_PREFIX:PATH=C:\dev\Debug_Win32_stage
-
-If necessary files are not found `WITH_UPNP` will stay off.
-
-### Building i2pd
-
-You can open generated solution/project with Visual Studio and build from there,
-alternatively you can use `cmake --build . --config Release --target install` or
-[MSBuild tool](https://msdn.microsoft.com/en-us/library/dd293626.aspx)
-
-	msbuild i2pd.sln /p:Configuration=Release

docs/conf.py

@@ -1,300 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# i2pd documentation build configuration file, created by
-# sphinx-quickstart on Tue Jan 12 06:26:12 2016.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys
-import os
-import shlex
-from recommonmark.parser import CommonMarkParser
-
-source_parsers = {
-    '.md': CommonMarkParser,
-}
-
-# Check if on RTD
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-#templates_path = ['_templates']
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-# source_suffix = ['.rst', '.md']
-source_suffix = ['.rst', '.md']
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'i2pd'
-copyright = u'2016, PurpleI2P team'
-author = u'PurpleI2P team'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = u'2.2.0'
-# The full version, including alpha/beta/rc tags.
-release = u'2.2.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-# If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
-
-# If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = False
-
-
-# -- Options for HTML output ----------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'default'
-
-if not on_rtd:
-    try:
-        import sphinx_rtd_theme
-        html_theme = 'sphinx_rtd_theme'
-        html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-    except ImportError:
-        pass
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-#html_extra_path = []
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Language to be used for generating the HTML full-text search index.
-# Sphinx supports the following languages:
-#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
-#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
-#html_search_language = 'en'
-
-# A dictionary with options for the search language support, empty by default.
-# Now only 'ja' uses this config value
-#html_search_options = {'type': 'default'}
-
-# The name of a javascript file (relative to the configuration directory) that
-# implements a search results scorer. If empty, the default will be used.
-#html_search_scorer = 'scorer.js'
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'i2pddoc'
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-  (master_doc, 'i2pd.tex', u'i2pd Documentation',
-   u'PurpleI2P team', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'i2pd', u'i2pd Documentation',
-     [author], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  (master_doc, 'i2pd', u'i2pd Documentation',
-   author, 'i2pd', 'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False

docs/config_opts_after_2.3.0.md

@@ -1,43 +0,0 @@
-Изменения обработки параметров в релизах > 2.3.0
-------------------------------------------------
-
-Система параметров отличается от того, что было ранее и достаточно сильно:
-
-* изменения имён и стиля параметров
-
-Все параметры теперь в виде --help (gnu-style), у некоторых есть шорткаты в виде -h (unix-style). 
-Это касается всех систем, в том числе винды.
-
---daemon=1 и подобное -> просто --daemon, без параметра. Нет опции - false, есть - true
---notransit=1 -> --notransit, то же что и выше: есть опция - false, нет - true
---v6 -> --ipv6 (первое было похоже на версию какого-то своего протокола, типа socksproxy --v5)
---tunnelscfg -> --tunconf (имя параметра было слишком длинным, cfg переделан на conf - единообразно с --conf)
---sockskeys -> разделён на два, для socks и httpproxy по-отдельности
-
-* поддержка секций в основном конфиге
-
-Выглядит это так:
-
-    # основные опции
-    pidfile = /var/run/i2pd.pid
-    #
-    # настройки конкретного модуля
-    [httproxy]
-    address = 1.2.3.4
-    port    = 4446
-    keys    = httproxy-keys.dat
-    # и так далее
-    [sam]
-    enabled = no
-    addresss = 127.0.0.2
-    # ^^ переопределяется только адрес, остальное берётся из дефолта
-
-Точно так же сейчас работает конфиг туннелей: секция до точки - имя, после - параметр
-
-* поддержка выключения отдельных сервисов "на корню" см sam.enabled и подобное
-
-Это позволило задать дефолт для номера порта и не писать его руками для включения.
-
-* добавлен --help (см #110)
-
-* присутствует некая валидация параметров, --port=abcd - не прокатит, --port=100500 - тоже

docs/configuration.md

@@ -1,159 +0,0 @@
-i2pd configuration
-==================
-
-Command line options
---------------------
-
-Options specified on the command line take precedence over those in the config file.
-If you are upgrading your very old router (< 2.3.0) see also [this](config_opts_after_2.3.0.md) page.
-
-* --help                - Show builtin help message (default value of option will be shown in braces)
-* --conf=               - Config file (default: ~/.i2pd/i2pd.conf or /var/lib/i2pd/i2pd.conf)
-                          This parameter will be silently ignored if the specified config file does not exist.
-* --tunconf=            - Tunnels config file (default: ~/.i2pd/tunnels.conf or /var/lib/i2pd/tunnels.conf)
-* --pidfile=            - Where to write pidfile (dont write by default)
-* --log=                - Logs destination: stdout, file (stdout if not set, file - otherwise, for compatibility)
-* --logfile=            - Path to logfile (default - autodetect)
-* --loglevel=           - Log messages above this level (debug, info, warn, error)
-* --datadir=            - Path to storage of i2pd data (RI, keys, peer profiles, ...)
-* --host=               - Router external IP for incoming connections
-* --port=               - Port to listen for incoming connections (default: auto)
-* --daemon              - Router will go to background after start
-* --service             - Router will use system folders like '/var/lib/i2pd'
-* --ipv6                - Enable communication through ipv6. false by default
-* --notransit           - Router will not accept transit tunnels at startup. false by default
-* --floodfill           - Router will be floodfill. false by default
-* --bandwidth=          - Bandwidth limit: integer in KBps or letters: L (32), O (256), P (2048), X (>9000)
-* --family=             - Name of a family, router belongs to
-* --netid=				- Network ID, router belongs to. Main I2P is 2.
-
-Windows-specific options:
-
-* --svcctl=             - Windows service management (--svcctl="install" or --svcctl="remove")
-* --insomnia            - Prevent system from sleeping
-* --close=              - Action on close: minimize, exit, ask
-
-All options below still possible in cmdline, but better write it in config file:
-
-* --http.address=       - The address to listen on (HTTP server)
-* --http.port=          - The port to listen on (HTTP server)
-* --http.auth           - Enable basic HTTP auth for webconsole
-* --http.user=          - Username for basic auth (default: i2pd)
-* --http.pass=          - Password for basic auth (default: random, see logs)
-
-* --httpproxy.enabled=  - If HTTP proxy is enabled. true by default  
-* --httpproxy.address=  - The address to listen on (HTTP Proxy)  
-* --httpproxy.port=     - The port to listen on (HTTP Proxy) 4444 by default  
-* --httpproxy.keys=     - optional keys file for HTTP proxy local destination  
-* --httpproxy.inbound.length= 	- Inbound tunnels length if keys is set. 3 by default  
-* --httpproxy.inbound.quantity= - Inbound tunnels quantity if keys is set. 5 by default  
-* --httpproxy.outbound.length=	- Outbound tunnels length if keys is set. 3 by default  
-* --httpproxy.outbound.quantity= - Outbound tunnels quantity if keys is set. 5 by default    
-
-* --socksproxy.enabled=  - If SOCKS proxy is enabled. true by default  
-* --socksproxy.address= - The address to listen on (SOCKS Proxy)  
-* --socksproxy.port=    - The port to listen on (SOCKS Proxy). 4447 by default  
-* --socksproxy.keys=    - optional keys file for SOCKS proxy local destination  
-* --socksproxy.inbound.length= 	- Inbound tunnels length if keys is set. 3 by default  
-* --socksproxy.inbound.quantity= - Inbound tunnels quantity if keys is set. 5 by default  
-* --socksproxy.outbound.length=	- Outbound tunnels length if keys is set. 3 by default  
-* --socksproxy.outbound.quantity= - Outbound tunnels quantity if keys is set. 5 by default  
-* --socksproxy.outproxy= - Address of outproxy. requests outside i2p will go there  
-* --socksproxy.outproxyport=  - Outproxy remote port  
-
-* --sam.address=        - The address to listen on (SAM bridge)
-* --sam.port=           - Port of SAM bridge. Usually 7656. SAM is off if not specified
-* --sam.enabled=        - If SAM is enabled. false by default 
-
-* --bob.address=        - The address to listen on (BOB command channel)
-* --bob.port=           - Port of BOB command channel. Usually 2827. BOB is off if not specified
-* --bob.enabled=        - If BOB is enabled. false by default 
-
-* --i2cp.address=        - The address to listen on or an abstract address for Android LocalSocket
-* --i2cp.port=           - Port of I2CP server. Usually 7654. Ignored for Andorid
-* --i2cp.enabled=        - If I2CP is enabled. false by default. Other services don't require I2CP 
-
-* --i2pcontrol.address= - The address to listen on (I2P control service)
-* --i2pcontrol.port=    - Port of I2P control service. Usually 7650. I2PControl is off if not specified
-* --i2pcontrol.enabled= - If I2P control is enabled. false by default   
-
-* --upnp.enabled=       - Enable or disable UPnP, false by default for CLI and true for GUI (Windows, Android)  
-* --upnp.name=          - Name i2pd appears in UPnP forwardings list. I2Pd by default  
-
-* --precomputation.elgamal=  - Use ElGamal precomputated tables. false for x64 and true for other platforms by default  
-* --reseed.verify=      - Request SU3 signature verification  
-* --reseed.file=        - Full path to SU3 file to reseed from  
-* --reseed.urls=        - Reseed URLs, separated by comma
-* --addressbook.defaulturl=     - AddressBook subscription URL for initial setup
-* --addressbook.subscriptions=  - AddressBook subscriptions URLs, separated by comma
-
-* --limits.transittunnels=  - Override maximum number of transit tunnels. 2500 by default   
-* --limits.openfiles=	- Maximum size of corefile in Kb (0 - use system limit)  
-* --limits.coresize=	- Maximum size of corefile in Kb (0 - use system limit)  
-
-Config files
-------------
-
-INI-like, syntax is the following : <key> = <value>.
-Comments are "#", not ";" as you may expect. See [boost ticket](https://svn.boost.org/trac/boost/ticket/808)
-All command-line parameters are allowed as keys, but note for those which contains dot (.).
-
-For example:
-
-i2pd.conf:
-
-    # comment
-    log = true
-    ipv6 = true
-    # settings for specific module
-    [httpproxy]
-    port = 4444
-    # ^^ this will be --httproxy.port= in cmdline
-    # another comment
-    [sam]
-    enabled = true
-
-See also commented config with examples of all options in ``docs/i2pd.conf``.
-
-tunnels.conf:
-
-    # outgoing tunnel sample, to remote service
-    # mandatory parameters:
-    # * type -- always "client"
-    # * port -- local port to listen to
-    # * destination -- i2p hostname
-    # optional parameters (may be omitted)
-    # * keys -- our identity, if unset, will be generated on every startup,
-    #     if set and file missing, keys will be generated and placed to this file
-    # * address -- local interface to bind
-    # * signaturetype -- signature type for new destination. 0 (DSA/SHA1), 1 (EcDSA/SHA256) or 7 (EdDSA/SHA512)
-    [IRC]
-    type = client
-    address = 127.0.0.1
-    port = 6668
-    destination = irc.postman.i2p
-    keys = irc-keys.dat
-    #
-    # incoming tunnel sample, for local service
-    # mandatory parameters:
-    # * type -- "server" or "http"
-    # * host -- ip address of our service
-    # * port -- port of our service
-    # * keys -- file with LeaseSet of address in i2p
-    # optional parameters (may be omitted)
-    # * inport -- optional, i2p service port, if unset - the same as 'port'
-    # * accesslist -- comma-separated list of i2p addresses, allowed to connect
-    #    every address is b32 without '.b32.i2p' part
-    [LOCALSITE]
-    type = http
-    host = 127.0.0.1
-    port = 80
-    keys = site-keys.dat
-    #
-    [IRC-SERVER]
-    type = server
-    host = 127.0.0.1
-    port = 6667
-    keys = irc.dat
-
-Also see [this page](https://github.com/PurpleI2P/i2pd/wiki/tunnels.cfg) for more tunnel examples.

docs/family.md

@@ -1,36 +0,0 @@
-Family configuration
-====================
-
-Your might want to specify a family, your router belongs to.
-There are two possibilities: create new family or joing to existing.
-
-New family
------------
-
-You must create family self-signed certificate and key.  
-The only key type supposted is prime256v1.
-Use the following list of commands:  
-
-    openssl ecparam -name prime256v1 -genkey -out <your family name>.key  
-    openssl req -new -key <your family name>.key -out <your family name>.csr  
-    touch v3.ext
-    openssl x509 -req -days 3650 -in <your family name>.csr -signkey <your family name>.key -out <your family name>.crt -extfile v3.ext  
-
-Specify <your family name>.family.i2p.net for CN (Common Name) when requested.
-
-Once you are done with it place <your-family-name>.key and <your-family-name>.crt to <ip2d data>/family folder (for exmple ~/.i2pd/family).
-You should provide these two files to other members joining your family.
-If you want to register you family and let I2P network recorgnize it, create pull request for you .crt file into contrib/certificate/family.
-It will appear in i2pd and I2P next releases packages. Dont place .key file, it must be shared between you family members only.
-
-How to join existing family
----------------------------
-
-Once you and that family agree to do it, they must give you .key and .crt file and you must place in <i2pd datadir>/certificates/family/ folder.
-
-Publish your family
--------------------
-
-Run i2pd with parameter 'family=<your-family-name>', make sure you have <your-family-name>.key and <your-family-name>.crt in your 'family' folder.
-If everything is set properly, you router.info will contain two new fields: 'family' and 'family.sig'.
-Otherwise your router will complain on startup with log messages starting with "Family:" prefix and severity 'warn' or 'error'.

docs/hacking.md

@@ -1,114 +0,0 @@
-
-# Hacking on I2PD
-
-This document contains notes compiled from hacking on i2pd
-
-## prerequisites
-
-This guide assumes:
-
-* a decent understanding of c++ 
-* basic understanding of how i2p works at i2np level and up
-
-## general structure
-
-Notes on multithreading
-
-* every compontent runs in its own thread 
-
-* each component (usually) has a public function `GetService()` which can be used to obtain the `boost::asio::io_service` that it uses.
-
-* when talking between components/threads, **always** use `GetService().post()` and be mindfull of stack allocated memory.
-
-
-### NetDb
-
-#### NetDb.h
-
-The `i2p::data::netdb` is a `i2p::data::NetDb` instance processes and dispatches *inbound* i2np messages passed in from transports.
-
-global singleton at `i2p::data::netdb` as of 2.10.1
-
-#### NetDbRequests.h
-
-For Pending RouterInfo/LeaseSet lookup and store requests
-
-
-### ClientContext 
-
-#### ClientContext.h
-
-`i2p::client::ClientContext` spawns all destinations used by the i2p router including the shared local destination.
-
-global singleton at `i2p::client::context` as of 2.10.1
-
-
-
-### Daemon
-
-File: Daemon.cpp
-
-`i2p::util::Daemon_Singleton_Private` subclasses implement the daemon start-up and tear-down, creates Http Webui and i2p control server.
-
-
-
-
-### Destinations
-
-#### Destination.h
-
-each destination runs in its own thread
-
-##### i2p::client::LeaseSetDestination
-
-Base for `i2p::client::ClientDestination`
-
-##### i2p::client::ClientDestination
-
-Destination capable of creating (tcp/i2p) streams and datagram sessions.
-
-
-#### Streaming.h
-
-##### i2p::stream::StreamingDestination
-
-Does not implement any destination related members, the name is a bit misleading.
-
-Owns a `i2p::client::ClientDestination` and runs in the destination thread.
-
-Anyone creating or using streams outside of the destination thread **MUST** be aware of the consequences of multithreaded c++ :^)
-
-If you use streaming please consider running all code within the destination thread using `ClientDestination::GetService().post()`
-
-
-#### Garlic.h
-
-Provides Inter-Destination routing primatives.
-
-##### i2p::garlic::GarlicDestination
-
-sublcass of `i2p::client::LeaseSetDestination` for sending messages down shared routing paths.
-
-##### i2p::garlic::GarlicRoutingSession
-
-a point to point conversation between us and 1 other destination.
-
-##### i2p::garlic::GarlicRoutingPath
-
-A routing path currently used by a routing session. specifies which outbound tunnel to use and which remote lease set to use for `OBEP` to `IBGW` inter tunnel communication.
-
-members:
-
-* outboundTunnel (OBEP)
-* remoteLease (IBGW)
-* rtt (round trip time)
-* updatedTime (last time this path's IBGW/OBEP was updated)
-* numTimesUsesd (number of times this path was used)
-
-### Transports
-
-each transport runs in its own thread
-
-#### Transports.h
-
-`i2p::transport::Transports` contains NTCP and SSU transport instances

docs/index.rst

@@ -1,41 +0,0 @@
-i2pd
-====
-
-i2pd is a full-featured C++ implementation of 
-`I2P <https://geti2p.net/en/about/intro>`_ client.
-
-* `Website <http://i2pd.website>`_
-* `GitHub <https://github.com/PurpleI2P/i2pd>`_
-* `Wiki <https://github.com/PurpleI2P/i2pd/wiki>`_
-* `Tickets/Issues <https://github.com/PurpleI2P/i2pd/issues>`_
-* `Twitter <https://twitter.com/i2porignal>`_
-
-Installing
-----------
-
-The easiest way to install i2pd is by using 
-`precompiled binaries <https://github.com/PurpleI2P/i2pd/releases/latest>`_. 
-See documentation for how to build i2pd from source on your OS.
-
-Using i2pd
-----------
-
-See documentation and 
-`example config file <https://github.com/PurpleI2P/i2pd/blob/openssl/docs/i2pd.conf>`_.
-
-Contents:
----------
-
-.. toctree::
-   :maxdepth: 2
-
-   building/requirements
-   building/unix
-   building/windows
-   building/cross
-   building/android
-   building/ios
-   configuration
-   family
-   usage
-

docs/usage.md

@@ -1,171 +0,0 @@
-Usage and tutorials
-===================
-
-
-i2pd can be used for:
-
-* [anonymous websites](#browsing-and-hosting-websites)
-* [anonymous chats](#using-and-hosting-chat-servers)
-* [anonymous file sharing](#file-sharing)
-
-and many more.
-
-## Starting, stopping and reloading configuration
-
-After you have built i2pd from source, just run a binary:
-
-    ./i2pd
-
-To display all available options:
-
-    ./i2pd --help
-
-i2pd can be controlled with signals. Process ID by default is written to file `~/.i2pd/i2pd.pid` or `/var/run/i2pd/i2pd.pid`.
-You can use `kill` utility to send signals like this:
-
-    kill -INT $( cat /var/run/i2pd/i2pd.pid )
-
-i2pd supports the following signals:
-
-* INT - Graceful shutdown. i2pd will wait for 10 minutes and stop. Send second INT signal to shutdown i2pd immediately.
-* HUP - Reload configuration files.
-
-
-### systemd unit
-
-Some binary Linux packages have a systemd control unit, so it is possible to managage i2pd with it.
-
-Start/stop i2pd:
-
-    sudo systemctl start i2pd.service
-    sudo systemctl stop i2pd.service
-
-Enable/disable i2pd to be started on bootup:
-
-    sudo systemctl enable i2pd.service
-    sudo systemctl disable i2pd.service
-
-
-## Configuring i2pd
-
-See [configuration documentation](/page/configuration.html).
-
-
-## Browsing and hosting websites
-
-### Browse anonymous websites
-
-To browse anonymous websites inside Invisible Internet, configure your web browser to use HTTP proxy 127.0.0.1:4444 (available by default in i2pd).
-
-In Firefox: Preferences -> Advanced -> Network tab -> Connection Settings -> choose Manual proxy configuration, Enter HTTP proxy 127.0.0.1, Port 4444
-
-In Chromium: run chromium executable with key
-
-    chromium --proxy-server="http://127.0.0.1:4444"
-
-Note that if you wish to stay anonymous too you'll need to tune your browser for better privacy. Do your own research, [can start here](http://www.howtogeek.com/102032/how-to-optimize-mozilla-firefox-for-maximum-privacy/).
-
-Big list of Invisible Internet websites can be found at [identiguy.i2p](http://identiguy.i2p).
-
-### Host anonymous website
-
-
-If you wish to run your own website in Invisible Internet, follow those steps:
-
-1) Run your webserver and find out which host:port it uses (for example, 127.0.0.1:8080).
-
-2) Configure i2pd to create HTTP server tunnel. Put in your ~/.i2pd/tunnels.conf file:
-
-        [anon-website]
-        type = http
-        host = 127.0.0.1
-        port = 8080
-        keys = anon-website.dat
-
-3) Restart i2pd.
-
-4) Find b32 destination of your website.
-
-    Go to webconsole -> [I2P tunnels page](http://127.0.0.1:7070/?page=i2p_tunnels). Look for Sever tunnels and you will see address like \<long random string\>.b32.i2p next to anon-website.
-
-    Website is now available in Invisible Internet by visiting this address.
-
-5) (Optional) Register short and rememberable .i2p domain on [inr.i2p](http://inr.i2p).
-
-
-## Using and hosting chat servers
-
-### Running anonymous IRC server
-
-1) Run your IRC server software and find out which host:port it uses (for example, 127.0.0.1:5555).
-
-    For small private IRC servers you can use [miniircd](https://github.com/jrosdahl/miniircd), for large public networks [UnreadIRCd](https://www.unrealircd.org/).
-
-2) Configure i2pd to create IRC server tunnel.
-
-    Simplest case, if your server does not support WebIRC, add this to ~/.i2pd/tunnels.conf:
-
-        [anon-chatserver]
-        type = irc
-        host = 127.0.0.1     
-        port = 5555
-        keys = chatserver-key.dat
-
-    And that is it.
-
-    Alternatively, if your IRC server supports WebIRC, for example, UnreadIRCd, put this into UnrealIRCd config:
-
-        webirc {
-            mask 127.0.0.1;
-            password your_password;
-        };
-
-    Also change line:
-
-        modes-on-connect "+ixw";
-
-    to
-
-        modes-on-connect "+iw";
-
-    And this in ~/.i2pd/tunnels.conf:
-
-        [anon-chatserver]
-        type = irc
-        host = 127.0.0.1
-        port = 5555
-        keys = chatserver-key.dat
-        webircpassword = your_password
-
-3) Restart i2pd.
-
-4) Find b32 destination of your anonymous IRC server.
-
-    Go to webconsole -> [I2P tunnels page](http://127.0.0.1:7070/?page=i2p_tunnels). Look for Sever tunnels and you will see address like \<long random string\>.b32.i2p next to anon-chatserver.
-
-    Clients will use this address to connect to your server anonymously.
-
-### Connect to anonymous IRC server
-
-To connect to IRC server at *walker.i2p*, add this to ~/.i2pd/tunnels.conf:
-
-    [IRC2]
-    type = client
-    address = 127.0.0.1
-    port = 6669
-    destination = walker.i2p
-    #keys = walker-keys.dat
-
-Restart i2pd, then connect to irc://127.0.0.1:6669 with your IRC client.
-
-## File sharing
-
-You can share and download torrents with [Transmission-I2P](https://github.com/l-n-s/transmission-i2p).
-
-Alternative torrent-clients are [Robert](http://en.wikipedia.org/wiki/Robert_%28P2P_Software%29) and [Vuze](https://en.wikipedia.org/wiki/Vuze).
-
-Robert uses BOB protocol, i2pd must be run with parameter --bob.enabled=true.
-
-Vuze uses I2CP protocol, i2pd must be run with parameter --i2cp.enabled=true.
-
-Also, visit [postman tracker](http://tracker2.postman.i2p).

entrypoint.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+ARGS=""
+if [ "${ENABLE_IPV6}" != "" ]; then
+  ARGS="${ARGS} –ipv6"
+fi
+
+if [ "${LOGLEVEL}" != "" ]; then
+  ARGS="${ARGS} –loglevel=${LOGLEVEL}"
+fi
+
+if [ "${ENABLE_AUTH}" != "" ]; then
+  ARGS="${ARGS} –http.auth"
+fi
+
+
+# To make ports exposeable
+DEFAULT_ARGS=" –http.address=0.0.0.0 –httpproxy.address=0.0.0.0 -socksproxy.address=0.0.0.0 –sam.address=0.0.0.0 –bob.address=0.0.0.0 –i2cp.address=0.0.0.0 –i2pcontrol.port=0.0.0.0 –upnp.enabled=false -service "
+
+mkdir -p /var/lib/i2pd && chown -R i2pd:nobody /var/lib/i2pd && chmod u+rw /var/lib/i2pd
+
+gosu i2pd i2pd $DEFAULT_ARGS $ARGS
+
+

filelist.mk

@@ -1,17 +1,22 @@
-LIB_SRC = \
-  Gzip.cpp Crypto.cpp Datagram.cpp Garlic.cpp I2NPProtocol.cpp LeaseSet.cpp \
-  Log.cpp NTCPSession.cpp NetDb.cpp NetDbRequests.cpp Profiling.cpp \
-  Reseed.cpp RouterContext.cpp RouterInfo.cpp Signature.cpp SSU.cpp \
-  SSUSession.cpp SSUData.cpp Streaming.cpp Identity.cpp TransitTunnel.cpp \
-  Transports.cpp Tunnel.cpp TunnelEndpoint.cpp TunnelPool.cpp TunnelGateway.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
+#LIB_SRC = \
+#  BloomFilter.cpp Gzip.cpp Crypto.cpp Datagram.cpp Garlic.cpp I2NPProtocol.cpp LeaseSet.cpp \
+#  Log.cpp NTCPSession.cpp NetDb.cpp NetDbRequests.cpp Profiling.cpp \
+#  Reseed.cpp RouterContext.cpp RouterInfo.cpp Signature.cpp SSU.cpp \
+#  SSUSession.cpp SSUData.cpp Streaming.cpp Identity.cpp TransitTunnel.cpp \
+#  Transports.cpp Tunnel.cpp TunnelEndpoint.cpp TunnelPool.cpp TunnelGateway.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
 
-LIB_CLIENT_SRC = \
-	AddressBook.cpp BOB.cpp ClientContext.cpp I2PTunnel.cpp I2PService.cpp \
-	SAM.cpp SOCKS.cpp HTTPProxy.cpp I2CP.cpp
+LIB_SRC = $(wildcard $(LIB_SRC_DIR)/*.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 = \
-	HTTPServer.cpp I2PControl.cpp UPnP.cpp Daemon.cpp i2pd.cpp
+#DAEMON_SRC = \
+#	HTTPServer.cpp I2PControl.cpp UPnP.cpp Daemon.cpp i2pd.cpp
 
+DAEMON_SRC = $(wildcard $(DAEMON_SRC_DIR)/*.cpp)