2.32.1

Signed-off-by: R4SAS <r4sas@i2pmail.org>

ChangeLog

@@ -1,6 +1,14 @@
 # for this file format description,
 # see https://github.com/olivierlacan/keep-a-changelog
 
+## [2.32.1] - 2020-06-02
+### Added
+- Read explicit peers in tunnels config
+### Fixed
+- Generation of tags for detached sessions
+- Non-updating LeaseSet1
+- Start when deprecated websocket options present in i2pd.conf
+
 ## [2.32.0] - 2020-05-25
 ### Added
 - Multiple encryption types for local destinations

Win32/installer.iss

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

android/build.gradle

@@ -30,8 +30,8 @@ android {
         applicationId "org.purplei2p.i2pd"
         targetSdkVersion 29
         minSdkVersion 14
-        versionCode 2320
+        versionCode 2321
-        versionName "2.32.0"
+        versionName "2.32.1"
         setProperty("archivesBaseName", archivesBaseName + "-" + versionName)
         ndk {
             abiFilters 'armeabi-v7a'

appveyor.yml

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

contrib/rpm/i2pd-git.spec

@@ -1,32 +1,32 @@
 %define git_hash %(git rev-parse HEAD | cut -c -7)
 
-Name:           i2pd-git
+Name:          i2pd-git
-Version:        2.31.0
+Version:       2.32.1
-Release:        git%{git_hash}%{?dist}
+Release:       git%{git_hash}%{?dist}
-Summary:        I2P router written in C++
+Summary:       I2P router written in C++
-Conflicts:      i2pd
+Conflicts:     i2pd
 
-License:        BSD
+License:       BSD
-URL:            https://github.com/PurpleI2P/i2pd
+URL:           https://github.com/PurpleI2P/i2pd
-Source0:        https://github.com/PurpleI2P/i2pd/archive/openssl/i2pd-openssl.tar.gz
+Source0:       https://github.com/PurpleI2P/i2pd/archive/openssl/i2pd-openssl.tar.gz
 
-%if 0%{?rhel}  == 7
+%if 0%{?rhel} == 7
-BuildRequires:  cmake3
+BuildRequires: cmake3
 %else
-BuildRequires:  cmake
+BuildRequires: cmake
 %endif
 
-BuildRequires:  chrpath
+BuildRequires: chrpath
-BuildRequires:  gcc-c++
+BuildRequires: gcc-c++
-BuildRequires:  zlib-devel
+BuildRequires: zlib-devel
-BuildRequires:  boost-devel
+BuildRequires: boost-devel
-BuildRequires:  openssl-devel
+BuildRequires: openssl-devel
-BuildRequires:  miniupnpc-devel
+BuildRequires: miniupnpc-devel
-BuildRequires:  systemd-units
+BuildRequires: systemd-units
 
-Requires:	logrotate
+Requires:      logrotate
-Requires:	systemd
+Requires:      systemd
-Requires(pre):  %{_sbindir}/useradd %{_sbindir}/groupadd
+Requires(pre): %{_sbindir}/useradd %{_sbindir}/groupadd
 
 %description
 C++ implementation of I2P.
@@ -74,17 +74,17 @@ pushd build
 
 chrpath -d i2pd
 %{__install} -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd
+%{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd
+%{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
+%{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
 %{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}%{_sysconfdir}/i2pd/i2pd.conf
 %{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/subscriptions.txt %{buildroot}%{_sysconfdir}/i2pd/subscriptions.txt
 %{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf
-%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/tunnels.d/README %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d/README
 %{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/i2pd
 %{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.service %{buildroot}%{_unitdir}/i2pd.service
 %{__install} -D -m 644 %{_builddir}/%{name}-%{version}/debian/i2pd.1 %{buildroot}%{_mandir}/man1/i2pd.1
-%{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
+%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates
-%{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
+%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/tunnels.d/ %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d
-%{__install} -d -m 755 %{buildroot}%{_datadir}/%{name}
-%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/%{name}/certificates
 ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates
 
 
@@ -111,16 +111,22 @@ getent passwd i2pd >/dev/null || \
 %doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d
 %{_sbindir}/i2pd
 %config(noreplace) %{_sysconfdir}/i2pd/*.conf
+%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*.conf
+%config %{_sysconfdir}/i2pd/subscriptions.txt
+%doc %{_sysconfdir}/i2pd/tunnels.conf.d/README
+%{_sysconfdir}/logrotate.d/i2pd
 %{_unitdir}/i2pd.service
 %{_mandir}/man1/i2pd.1*
 %dir %attr(0700,i2pd,i2pd) %{_sharedstatedir}/i2pd
 %dir %attr(0700,i2pd,i2pd) %{_localstatedir}/log/i2pd
-%{_datadir}/%{name}/certificates
+%{_datadir}/i2pd/certificates
 %{_sharedstatedir}/i2pd/certificates
-%{_sysconfdir}/logrotate.d/i2pd
 
 
 %changelog
+* Tue Jun 02 2020 r4sas <r4sas@i2pmail.org> - 2.32.1
+- update to 2.32.1
+
 * Mon May 25 2020 r4sas <r4sas@i2pmail.org> - 2.32.0
 - update to 2.32.0
 - updated systemd service file (#1394)

contrib/rpm/i2pd.spec

@@ -1,30 +1,30 @@
-Name:           i2pd
+Name:          i2pd
-Version:        2.31.0
+Version:       2.32.1
-Release:        3%{?dist}
+Release:       1%{?dist}
-Summary:        I2P router written in C++
+Summary:       I2P router written in C++
-Conflicts:      i2pd-git
+Conflicts:     i2pd-git
 
-License:        BSD
+License:       BSD
-URL:            https://github.com/PurpleI2P/i2pd
+URL:           https://github.com/PurpleI2P/i2pd
-Source0:        https://github.com/PurpleI2P/i2pd/archive/%{version}/%name-%version.tar.gz
+Source0:       https://github.com/PurpleI2P/i2pd/archive/%{version}/%name-%version.tar.gz
 
-%if 0%{?rhel}  == 7
+%if 0%{?rhel} == 7
-BuildRequires:  cmake3
+BuildRequires: cmake3
 %else
-BuildRequires:  cmake
+BuildRequires: cmake
 %endif
 
-BuildRequires:  chrpath
+BuildRequires: chrpath
-BuildRequires:  gcc-c++
+BuildRequires: gcc-c++
-BuildRequires:  zlib-devel
+BuildRequires: zlib-devel
-BuildRequires:  boost-devel
+BuildRequires: boost-devel
-BuildRequires:  openssl-devel
+BuildRequires: openssl-devel
-BuildRequires:  miniupnpc-devel
+BuildRequires: miniupnpc-devel
-BuildRequires:  systemd-units
+BuildRequires: systemd-units
 
-Requires:	logrotate
+Requires:      logrotate
-Requires:	systemd
+Requires:      systemd
-Requires(pre):  %{_sbindir}/useradd %{_sbindir}/groupadd
+Requires(pre): %{_sbindir}/useradd %{_sbindir}/groupadd
 
 %description
 C++ implementation of I2P.
@@ -71,19 +71,19 @@ pushd build
 %endif
 
 chrpath -d i2pd
-install -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd
+%{__install} -D -m 755 i2pd %{buildroot}%{_sbindir}/i2pd
-install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}%{_sysconfdir}/i2pd/i2pd.conf
+%{__install} -d -m 755 %{buildroot}%{_datadir}/i2pd
-install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf
+%{__install} -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
-install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/i2pd
+%{__install} -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
-install -d -m 755 %{buildroot}%{_datadir}/i2pd
+%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.conf %{buildroot}%{_sysconfdir}/i2pd/i2pd.conf
-install -d -m 755 %{buildroot}%{_datadir}/i2pd/tunnels.conf.d
+%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/subscriptions.txt %{buildroot}%{_sysconfdir}/i2pd/subscriptions.txt
+%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf
+%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/i2pd
+%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.service %{buildroot}%{_unitdir}/i2pd.service
+%{__install} -D -m 644 %{_builddir}/%{name}-%{version}/debian/i2pd.1 %{buildroot}%{_mandir}/man1/i2pd.1
 %{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates
 %{__cp} -r %{_builddir}/%{name}-%{version}/contrib/tunnels.d/ %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d
-install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/i2pd.service %{buildroot}%{_unitdir}/i2pd.service
-install -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
-install -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
 ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates
-ln -s %{_datadir}/i2pd/tunnels.conf.d %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d
 
 
 %pre
@@ -106,19 +106,25 @@ getent passwd i2pd >/dev/null || \
 
 
 %files
-%doc LICENSE README.md
+%doc LICENSE README.md contrib/i2pd.conf contrib/subscriptions.txt contrib/tunnels.conf contrib/tunnels.d
 %{_sbindir}/i2pd
-%{_datadir}/i2pd/certificates
 %config(noreplace) %{_sysconfdir}/i2pd/*.conf
-%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*
+%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*.conf
-/%{_unitdir}/i2pd.service
+%config %{_sysconfdir}/i2pd/subscriptions.txt
-%dir %attr(0700,i2pd,i2pd) %{_localstatedir}/log/i2pd
+%doc %{_sysconfdir}/i2pd/tunnels.conf.d/README
-%dir %attr(0700,i2pd,i2pd) %{_sharedstatedir}/i2pd
-%{_sharedstatedir}/i2pd/certificates
 %{_sysconfdir}/logrotate.d/i2pd
+%{_unitdir}/i2pd.service
+%{_mandir}/man1/i2pd.1*
+%dir %attr(0700,i2pd,i2pd) %{_sharedstatedir}/i2pd
+%dir %attr(0700,i2pd,i2pd) %{_localstatedir}/log/i2pd
+%{_datadir}/i2pd/certificates
+%{_sharedstatedir}/i2pd/certificates
 
 
 %changelog
+* Tue Jun 02 2020 r4sas <r4sas@i2pmail.org> - 2.32.1
+- update to 2.32.1
+
 * Mon May 25 2020 r4sas <r4sas@i2pmail.org> - 2.32.0
 - update to 2.32.0
 - updated systemd service file (#1394)

debian/changelog

@@ -1,3 +1,9 @@
+i2pd (2.32.1-1) unstable; urgency=high
+
+  * updated to version 2.32.1
+
+ -- r4sas <r4sas@i2pmail.org>  Tue, 02 Jun 2020 16:30:00 +0000
+
 i2pd (2.32.0-1) unstable; urgency=high
 
   * updated to version 2.32.0/0.9.46

libi2pd/Config.cpp

@@ -221,6 +221,14 @@ namespace config {
 			("trust.hidden", value<bool>()->default_value(false),      "Should we hide our router from other routers?")
 		;
 
+		// Save deprecated websocket options for compatibility
+		options_description websocket("Websocket Options");
+		websocket.add_options()
+			("websockets.enabled", value<bool>()->default_value(false),     "Deprecated option")
+			("websockets.address", value<std::string>()->default_value(""), "Deprecated option")
+			("websockets.port", value<uint16_t>()->default_value(0),        "Deprecated option")
+		;
+
 		options_description exploratory("Exploratory Options");
 		exploratory.add_options()
 			("exploratory.inbound.length", value<int>()->default_value(2),    "Exploratory inbound tunnel length")
@@ -271,6 +279,7 @@ namespace config {
 			.add(reseed)
 			.add(addressbook)
 			.add(trust)
+			.add(websocket) // deprecated
 			.add(exploratory)
 			.add(ntcp2)
 			.add(nettime)

libi2pd/ECIESX25519AEADRatchetSession.cpp

@@ -612,7 +612,7 @@ namespace garlic
 		int moreTags = ECIESX25519_MIN_NUM_GENERATED_TAGS + (index >> 2); // N/4
 		if (moreTags > ECIESX25519_MAX_NUM_GENERATED_TAGS) moreTags = ECIESX25519_MAX_NUM_GENERATED_TAGS;
 		moreTags -= (receiveTagset->GetNextIndex () - index);
-		if (moreTags > 0)
+		if (moreTags > 0 && GetOwner ())
 			GenerateMoreReceiveTags (receiveTagset, moreTags);
 		return true;
 	}

libi2pd/LeaseSet.cpp

@@ -187,7 +187,7 @@ namespace data
 
 	bool LeaseSet::IsNewer (const uint8_t * buf, size_t len) const
 	{
-		return ExtractExpirationTimestamp (buf, len) > (m_ExpirationTime ? m_ExpirationTime : ExtractExpirationTimestamp (m_Buffer, m_BufferLen));
+		return ExtractExpirationTimestamp (buf, len) > ExtractExpirationTimestamp (m_Buffer, m_BufferLen);
 	}
 
 	bool LeaseSet::ExpiresSoon(const uint64_t dlt, const uint64_t fudge) const

libi2pd/version.h

@@ -17,7 +17,7 @@
 
 #define I2PD_VERSION_MAJOR 2
 #define I2PD_VERSION_MINOR 32
-#define I2PD_VERSION_MICRO 0
+#define I2PD_VERSION_MICRO 1
 #define I2PD_VERSION_PATCH 0
 #define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO)
 #define VERSION I2PD_VERSION

libi2pd_client/ClientContext.cpp

@@ -459,6 +459,8 @@ namespace client
 			else if (authType == "2") // PSK
 				ReadI2CPOptionsGroup (section, I2CP_PARAM_LEASESET_CLIENT_PSK, options);
 		}
+		std::string explicitPeers = GetI2CPStringOption(section, I2CP_PARAM_EXPLICIT_PEERS, "");
+		if (explicitPeers.length () > 0) options[I2CP_PARAM_EXPLICIT_PEERS] = explicitPeers;
 	}
 
 	void ClientContext::ReadI2CPOptionsFromConfig (const std::string& prefix, std::map<std::string, std::string>& options) const

qt/i2pd_qt/data/website.i2pd.i2pd.appdata.xml

@@ -35,6 +35,7 @@
   <translation type="qt" />
 
   <releases>
+    <release version="2.32.1" date="2020-06-02" />
     <release version="2.32.0" date="2020-05-25" />
     <release version="2.31.0" date="2020-04-10" />
     <release version="2.30.0" date="2020-02-25" />