From 70829ee79e971f325ea4f3b753d0f8b02bce9fce Mon Sep 17 00:00:00 2001
From: r4sas <r4sas@i2pmail.org>
Date: Sun, 10 Sep 2023 13:02:52 +0300
Subject: [PATCH 01/15] [rpm] add Fedora ELN support

Signed-off-by: r4sas <r4sas@i2pmail.org>
---
 contrib/rpm/i2pd-git.spec | 68 +++++++++++++++-----------------------
 contrib/rpm/i2pd.spec     | 69 ++++++++++++++++-----------------------
 2 files changed, 55 insertions(+), 82 deletions(-)

diff --git a/contrib/rpm/i2pd-git.spec b/contrib/rpm/i2pd-git.spec
index 62a28631..ff46bc0f 100644
--- a/contrib/rpm/i2pd-git.spec
+++ b/contrib/rpm/i2pd-git.spec
@@ -11,9 +11,9 @@ URL:           https://github.com/PurpleI2P/i2pd
 Source0:       https://github.com/PurpleI2P/i2pd/archive/openssl/i2pd-openssl.tar.gz
 
 %if 0%{?rhel} == 7
-BuildRequires: cmake3
+  BuildRequires: cmake3
 %else
-BuildRequires: cmake
+  BuildRequires: cmake
 %endif
 
 BuildRequires: chrpath
@@ -28,9 +28,11 @@ Requires:      logrotate
 Requires:      systemd
 Requires(pre): %{_sbindir}/useradd %{_sbindir}/groupadd
 
+
 %description
 C++ implementation of I2P.
 
+
 %prep
 %setup -q -n i2pd-openssl
 
@@ -38,72 +40,56 @@ C++ implementation of I2P.
 %build
 cd build
 %if 0%{?rhel} == 7
-%cmake3 \
+  %cmake3 \
     -DWITH_LIBRARY=OFF \
     -DWITH_UPNP=ON \
     -DWITH_HARDENING=ON \
     -DBUILD_SHARED_LIBS:BOOL=OFF
 %else
-%cmake \
+  %cmake \
     -DWITH_LIBRARY=OFF \
     -DWITH_UPNP=ON \
     -DWITH_HARDENING=ON \
-%if 0%{?fedora} > 29
+  %if 0%{?fedora} > 29
     -DBUILD_SHARED_LIBS:BOOL=OFF \
     .
-%else
+  %else
     -DBUILD_SHARED_LIBS:BOOL=OFF
+  %endif
 %endif
-%endif
-
 
-%if 0%{?rhel} == 9
-pushd redhat-linux-build
-%endif
-
-%if 0%{?fedora} >= 35
-pushd redhat-linux-build
+%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
+  pushd redhat-linux-build
 %else
-%if 0%{?fedora} >= 33
-pushd %{_target_platform}
-%endif
-%endif
+  %if 0%{?fedora} >= 33
+    pushd %{_target_platform}
+  %endif
 
-%if 0%{?mageia} > 7
-pushd build
+  %if 0%{?mageia} > 7
+    pushd build
+  %endif
 %endif
 
 make %{?_smp_mflags}
 
-%if 0%{?rhel} == 9
-popd
+%if 0%{?rhel} == 9 || 0%{?fedora} >= 33 || 0%{?mageia} > 7
+  popd
 %endif
 
-%if 0%{?fedora} >= 33
-popd
-%endif
-
-%if 0%{?mageia} > 7
-popd
-%endif
 
 %install
 pushd build
 
-%if 0%{?rhel} == 9
-pushd redhat-linux-build
-%endif
-
-%if 0%{?fedora} >= 35
-pushd redhat-linux-build
+%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
+  pushd redhat-linux-build
 %else
-%if 0%{?fedora} >= 33
-pushd %{_target_platform}
-%endif
-%endif
+  %if 0%{?fedora} >= 33
+    pushd %{_target_platform}
+  %endif
 
-%if 0%{?mageia}
-pushd build
+  %if 0%{?mageia}
+    pushd build
+  %endif
 %endif
 
 chrpath -d i2pd
diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec
index 19825237..5d1adfb7 100644
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@@ -1,6 +1,6 @@
 Name:          i2pd
 Version:       2.48.0
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       I2P router written in C++
 Conflicts:     i2pd-git
 
@@ -9,9 +9,9 @@ URL:           https://github.com/PurpleI2P/i2pd
 Source0:       https://github.com/PurpleI2P/i2pd/archive/%{version}/%name-%version.tar.gz
 
 %if 0%{?rhel} == 7
-BuildRequires: cmake3
+  BuildRequires: cmake3
 %else
-BuildRequires: cmake
+  BuildRequires: cmake
 %endif
 
 BuildRequires: chrpath
@@ -26,9 +26,11 @@ Requires:      logrotate
 Requires:      systemd
 Requires(pre): %{_sbindir}/useradd %{_sbindir}/groupadd
 
+
 %description
 C++ implementation of I2P.
 
+
 %prep
 %setup -q
 
@@ -36,71 +38,56 @@ C++ implementation of I2P.
 %build
 cd build
 %if 0%{?rhel} == 7
-%cmake3 \
+  %cmake3 \
     -DWITH_LIBRARY=OFF \
     -DWITH_UPNP=ON \
     -DWITH_HARDENING=ON \
     -DBUILD_SHARED_LIBS:BOOL=OFF
 %else
-%cmake \
+  %cmake \
     -DWITH_LIBRARY=OFF \
     -DWITH_UPNP=ON \
     -DWITH_HARDENING=ON \
-%if 0%{?fedora} > 29
+  %if 0%{?fedora} > 29
     -DBUILD_SHARED_LIBS:BOOL=OFF \
     .
-%else
+  %else
     -DBUILD_SHARED_LIBS:BOOL=OFF
-%endif
+  %endif
 %endif
 
-%if 0%{?rhel} == 9
-pushd redhat-linux-build
-%endif
-
-%if 0%{?fedora} >= 35
-pushd redhat-linux-build
+%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
+  pushd redhat-linux-build
 %else
-%if 0%{?fedora} >= 33
-pushd %{_target_platform}
-%endif
-%endif
+  %if 0%{?fedora} >= 33
+    pushd %{_target_platform}
+  %endif
 
-%if 0%{?mageia} > 7
-pushd build
+  %if 0%{?mageia} > 7
+    pushd build
+  %endif
 %endif
 
 make %{?_smp_mflags}
 
-%if 0%{?rhel} == 9
-popd
+%if 0%{?rhel} == 9 || 0%{?fedora} >= 33 || 0%{?mageia} > 7
+  popd
 %endif
 
-%if 0%{?fedora} >= 33
-popd
-%endif
-
-%if 0%{?mageia} > 7
-popd
-%endif
 
 %install
 pushd build
 
-%if 0%{?rhel} == 9
-pushd redhat-linux-build
-%endif
-
-%if 0%{?fedora} >= 35
-pushd redhat-linux-build
+%if 0%{?rhel} == 9 || 0%{?fedora} >= 35 || 0%{?eln}
+  pushd redhat-linux-build
 %else
-%if 0%{?fedora} >= 33
-pushd %{_target_platform}
-%endif
-%endif
+  %if 0%{?fedora} >= 33
+    pushd %{_target_platform}
+  %endif
 
-%if 0%{?mageia}
-pushd build
+  %if 0%{?mageia}
+    pushd build
+  %endif
 %endif
 
 chrpath -d i2pd

From 1e7feae0df17eb26cd4d843fcbf1afb26bae95f7 Mon Sep 17 00:00:00 2001
From: r4sas <r4sas@i2pmail.org>
Date: Sun, 10 Sep 2023 13:08:00 +0300
Subject: [PATCH 02/15] [rpm] remove BuildRequires tabulation

Signed-off-by: r4sas <r4sas@i2pmail.org>
---
 contrib/rpm/i2pd-git.spec | 4 ++--
 contrib/rpm/i2pd.spec     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/rpm/i2pd-git.spec b/contrib/rpm/i2pd-git.spec
index ff46bc0f..cebc15a4 100644
--- a/contrib/rpm/i2pd-git.spec
+++ b/contrib/rpm/i2pd-git.spec
@@ -11,9 +11,9 @@ URL:           https://github.com/PurpleI2P/i2pd
 Source0:       https://github.com/PurpleI2P/i2pd/archive/openssl/i2pd-openssl.tar.gz
 
 %if 0%{?rhel} == 7
-  BuildRequires: cmake3
+BuildRequires: cmake3
 %else
-  BuildRequires: cmake
+BuildRequires: cmake
 %endif
 
 BuildRequires: chrpath
diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec
index 5d1adfb7..cc826928 100644
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@@ -9,9 +9,9 @@ URL:           https://github.com/PurpleI2P/i2pd
 Source0:       https://github.com/PurpleI2P/i2pd/archive/%{version}/%name-%version.tar.gz
 
 %if 0%{?rhel} == 7
-  BuildRequires: cmake3
+BuildRequires: cmake3
 %else
-  BuildRequires: cmake
+BuildRequires: cmake
 %endif
 
 BuildRequires: chrpath

From 918aa556ef93272464ca396ae485b30b24b42b36 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Fri, 15 Sep 2023 11:37:45 -0400
Subject: [PATCH 03/15] fixed non-x86 build

---
 libi2pd/CPU.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libi2pd/CPU.cpp b/libi2pd/CPU.cpp
index 106882eb..5d5fc6b3 100644
--- a/libi2pd/CPU.cpp
+++ b/libi2pd/CPU.cpp
@@ -13,7 +13,7 @@
 	#define bit_AES (1 << 25)
 #endif
 
-#if (defined(__GNUC__) && __GNUC__ < 5)
+#if (defined(__GNUC__) && __GNUC__ < 5 && (defined(__x86_64__) || defined(__i386__)))
 	#include <cpuid.h>
 #endif
 

From df6bb6d9b8b33d9a7db81386fd8771c5b7b8bc57 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Sun, 17 Sep 2023 10:19:57 -0400
Subject: [PATCH 04/15] 2.49.0

---
 ChangeLog                 | 27 +++++++++++++++++++++++++++
 contrib/rpm/i2pd-git.spec |  5 ++++-
 contrib/rpm/i2pd.spec     |  5 ++++-
 debian/changelog          |  6 ++++++
 libi2pd/version.h         |  4 ++--
 5 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 881e05d7..17ec98d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,33 @@
 # for this file format description,
 # see https://github.com/olivierlacan/keep-a-changelog
 
+## [2.49.0] - 2023-09-18
+### Added
+- Handle SOCK5 authrozation with empty user/password
+- Drop incoming transport sessions from too old or from future routers 
+- Memory pool for router profiles 
+- Allow 0 hops in explicitPeers
+### Changed
+- Separate network and testing status
+- Remove AVX code
+- Improve NTCP2 transport session logging 
+- Select router with ipv4 for tunnel endpoint 
+- Consider all addresses non-published for U and H routers even if they have host/port
+- Don't pick completely unreachable routers for tunnels
+- Exclude SSU1 introducers from SSU2 addresses 
+- Don't create paired inbound tunnel if length is different
+- Remove introducer from RouterInfo after 60 minutes 
+- Reduce SSU2 keep alive interval and add peer test interval variance 
+- Don't pick too old sessions for introducer
+### Fixed
+- Version of the subnegotiation in user/password SOCKS5 response
+- Send keepalive for existing session with introducer
+- Buffer offset for EVP_EncryptFinal_ex() to include outlen
+- Termination block size processing for transport sessions
+- Crash if deleted BOB destination was shared between few BOB sessions
+- Introducers with zero tag
+- Padding for SSU2 path response 
+
 ## [2.48.0] - 2023-06-12
 ### Added
 - Allow user/password authentication method for SOCK5 proxy
diff --git a/contrib/rpm/i2pd-git.spec b/contrib/rpm/i2pd-git.spec
index cebc15a4..c745e05f 100644
--- a/contrib/rpm/i2pd-git.spec
+++ b/contrib/rpm/i2pd-git.spec
@@ -1,7 +1,7 @@
 %define git_hash %(git rev-parse HEAD | cut -c -7)
 
 Name:          i2pd-git
-Version:       2.48.0
+Version:       2.49.0
 Release:       git%{git_hash}%{?dist}
 Summary:       I2P router written in C++
 Conflicts:     i2pd
@@ -144,6 +144,9 @@ getent passwd i2pd >/dev/null || \
 
 
 %changelog
+* Mon Sep 18 2023 orignal <orignal@i2pmail.org> - 2.49.0
+- update to 2.49.0
+
 * Mon Jun 12 2023 orignal <orignal@i2pmail.org> - 2.48.0
 - update to 2.48.0
 
diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec
index cc826928..b88f21b2 100644
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@@ -1,5 +1,5 @@
 Name:          i2pd
-Version:       2.48.0
+Version:       2.49.0
 Release:       2%{?dist}
 Summary:       I2P router written in C++
 Conflicts:     i2pd-git
@@ -142,6 +142,9 @@ getent passwd i2pd >/dev/null || \
 
 
 %changelog
+* Mon Sep 18 2023 orignal <orignal@i2pmail.org> - 2.49.0
+- update to 2.49.0
+
 * Mon Jun 12 2023 orignal <orignal@i2pmail.org> - 2.48.0
 - update to 2.48.0
 
diff --git a/debian/changelog b/debian/changelog
index 91b0abdf..613bc7c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+i2pd (2.49.0-1) unstable; urgency=high
+
+  * updated to version 2.49.0/0.9.60
+
+ -- orignal <orignal@i2pmail.org>  Mon, 18 Sep 2023 16:00:00 +0000
+
 i2pd (2.48.0-1) unstable; urgency=high
 
   * updated to version 2.48.0/0.9.59
diff --git a/libi2pd/version.h b/libi2pd/version.h
index 903ceebc..9854995e 100644
--- a/libi2pd/version.h
+++ b/libi2pd/version.h
@@ -18,7 +18,7 @@
 #define MAKE_VERSION_NUMBER(a,b,c) ((a*100+b)*100+c)
 
 #define I2PD_VERSION_MAJOR 2
-#define I2PD_VERSION_MINOR 48
+#define I2PD_VERSION_MINOR 49
 #define I2PD_VERSION_MICRO 0
 #define I2PD_VERSION_PATCH 0
 #ifdef GITVER
@@ -33,7 +33,7 @@
 
 #define I2P_VERSION_MAJOR 0
 #define I2P_VERSION_MINOR 9
-#define I2P_VERSION_MICRO 59
+#define I2P_VERSION_MICRO 60
 #define I2P_VERSION_PATCH 0
 #define I2P_VERSION MAKE_VERSION(I2P_VERSION_MAJOR, I2P_VERSION_MINOR, I2P_VERSION_MICRO)
 #define I2P_VERSION_NUMBER MAKE_VERSION_NUMBER(I2P_VERSION_MAJOR, I2P_VERSION_MINOR, I2P_VERSION_MICRO)

From 3a4238729a103baef76ab677d555ae55a4833a9b Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Sun, 17 Sep 2023 10:41:31 -0400
Subject: [PATCH 05/15] 2.49.0

---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 17ec98d7..69d5c4c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
 
 ## [2.49.0] - 2023-09-18
 ### Added
-- Handle SOCK5 authrozation with empty user/password
+- Handle SOCK5 authorization with empty user/password
 - Drop incoming transport sessions from too old or from future routers 
 - Memory pool for router profiles 
 - Allow 0 hops in explicitPeers
@@ -17,7 +17,7 @@
 - Exclude SSU1 introducers from SSU2 addresses 
 - Don't create paired inbound tunnel if length is different
 - Remove introducer from RouterInfo after 60 minutes 
-- Reduce SSU2 keep alive interval and add peer test interval variance 
+- Reduce SSU2 keep alive interval and add keep alive interval variance 
 - Don't pick too old sessions for introducer
 ### Fixed
 - Version of the subnegotiation in user/password SOCKS5 response

From 4d573f6655c37cc13022157c1e2d043debca7512 Mon Sep 17 00:00:00 2001
From: r4sas <r4sas@i2pmail.org>
Date: Sun, 17 Sep 2023 15:36:15 +0000
Subject: [PATCH 06/15] 2.49.0

Signed-off-by: r4sas <r4sas@i2pmail.org>
---
 ChangeLog             |  16 ++++++++--------
 Win32/mask.bmp        | Bin 25818 -> 0 bytes
 contrib/rpm/i2pd.spec |   2 +-
 debian/changelog      |   2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 Win32/mask.bmp

diff --git a/ChangeLog b/ChangeLog
index 69d5c4c9..4dd49a24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,20 +4,20 @@
 ## [2.49.0] - 2023-09-18
 ### Added
 - Handle SOCK5 authorization with empty user/password
-- Drop incoming transport sessions from too old or from future routers 
-- Memory pool for router profiles 
+- Drop incoming transport sessions from too old or from future routers
+- Memory pool for router profiles
 - Allow 0 hops in explicitPeers
 ### Changed
 - Separate network and testing status
 - Remove AVX code
-- Improve NTCP2 transport session logging 
-- Select router with ipv4 for tunnel endpoint 
+- Improve NTCP2 transport session logging
+- Select router with ipv4 for tunnel endpoint
 - Consider all addresses non-published for U and H routers even if they have host/port
 - Don't pick completely unreachable routers for tunnels
-- Exclude SSU1 introducers from SSU2 addresses 
+- Exclude SSU1 introducers from SSU2 addresses
 - Don't create paired inbound tunnel if length is different
-- Remove introducer from RouterInfo after 60 minutes 
-- Reduce SSU2 keep alive interval and add keep alive interval variance 
+- Remove introducer from RouterInfo after 60 minutes
+- Reduce SSU2 keep alive interval and add keep alive interval variance
 - Don't pick too old sessions for introducer
 ### Fixed
 - Version of the subnegotiation in user/password SOCKS5 response
@@ -26,7 +26,7 @@
 - Termination block size processing for transport sessions
 - Crash if deleted BOB destination was shared between few BOB sessions
 - Introducers with zero tag
-- Padding for SSU2 path response 
+- Padding for SSU2 path response
 
 ## [2.48.0] - 2023-06-12
 ### Added
diff --git a/Win32/mask.bmp b/Win32/mask.bmp
deleted file mode 100644
index cc2aeda75c6139ef81b479bb01f726996e756050..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25818
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

diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec
index b88f21b2..56a7f6e1 100644
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@@ -1,6 +1,6 @@
 Name:          i2pd
 Version:       2.49.0
-Release:       2%{?dist}
+Release:       1%{?dist}
 Summary:       I2P router written in C++
 Conflicts:     i2pd-git
 
diff --git a/debian/changelog b/debian/changelog
index 613bc7c9..4c8ed6bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-i2pd (2.49.0-1) unstable; urgency=high
+i2pd (2.49.0-1) unstable; urgency=medium
 
   * updated to version 2.49.0/0.9.60
 

From c599d6530750eefdc1c4c1796e0b2cbf0e719170 Mon Sep 17 00:00:00 2001
From: r4sas <r4sas@i2pmail.org>
Date: Sun, 17 Sep 2023 15:59:11 +0000
Subject: [PATCH 07/15] [i18n] update translations

Signed-off-by: r4sas <r4sas@i2pmail.org>
---
 i18n/French.cpp     | 6 +++---
 i18n/Italian.cpp    | 6 +++++-
 i18n/Portuguese.cpp | 6 +++++-
 i18n/Ukrainian.cpp  | 6 +++++-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/i18n/French.cpp b/i18n/French.cpp
index 8bec887c..0a5b147e 100644
--- a/i18n/French.cpp
+++ b/i18n/French.cpp
@@ -96,7 +96,7 @@ namespace french // language namespace
 		{"Address", "Adresse"},
 		{"Type", "Type"},
 		{"EncType", "EncType"},
-		{"Expire LeaseSet", "Expiration du LeaseSet"},
+		{"Expire LeaseSet", "Expirer le jeu de baux"},
 		{"Inbound tunnels", "Tunnels entrants"},
 		{"%dms", "%dms"},
 		{"Outbound tunnels", "Tunnels sortants"},
@@ -153,8 +153,8 @@ namespace french // language namespace
 		{"StreamID can't be null", "StreamID ne peut pas être vide"},
 		{"Return to destination page", "Retourner à la page de destination"},
 		{"You will be redirected in %d seconds", "Vous serez redirigé dans %d secondes"},
-		{"LeaseSet expiration time updated", "Temps d'expiration du LeaseSet mis à jour"},
-		{"LeaseSet is not found or already expired", "Le LeaseSet est introuvable ou a déjà expirée"},
+		{"LeaseSet expiration time updated", "Temps d'expiration du jeu de baux mis à jour"},
+		{"LeaseSet is not found or already expired", "Le jeu de baux est introuvable ou a déjà expiré"},
 		{"Transit tunnels count must not exceed %d", "Le nombre de tunnels de transit ne doit pas excéder %d"},
 		{"Back to commands list", "Retour à la liste des commandes"},
 		{"Register at reg.i2p", "Inscription à reg.i2p"},
diff --git a/i18n/Italian.cpp b/i18n/Italian.cpp
index 386372d5..2dcaab5e 100644
--- a/i18n/Italian.cpp
+++ b/i18n/Italian.cpp
@@ -69,6 +69,7 @@ namespace italian // language namespace
 		{"Stopping in", "Arresto in"},
 		{"Family", "Famiglia"},
 		{"Tunnel creation success rate", "Percentuale di tunnel creati con successo"},
+		{"Total tunnel creation success rate", "Percentuale di successo totale nella creazione del tunnel"},
 		{"Received", "Ricevuti"},
 		{"%.2f KiB/s", "%.2f KiB/s"},
 		{"Sent", "Inviati"},
@@ -95,6 +96,7 @@ namespace italian // language namespace
 		{"Address", "Indirizzo"},
 		{"Type", "Tipologia"},
 		{"EncType", "Tipo di crittografia"},
+		{"Expire LeaseSet", "Scadenza LeaseSet"},
 		{"Inbound tunnels", "Tunnel in entrata"},
 		{"%dms", "%dms"},
 		{"Outbound tunnels", "Tunnel in uscita"},
@@ -109,6 +111,7 @@ namespace italian // language namespace
 		{"Local Destination", "Destinazione locale"},
 		{"Streams", "Flussi"},
 		{"Close stream", "Interrompi il flusso"},
+		{"Such destination is not found", "Questa destinazione non è stata trovata"},
 		{"I2CP session not found", "Sessione I2CP non trovata"},
 		{"I2CP is not enabled", "I2CP non è abilitato"},
 		{"Invalid", "Invalido"},
@@ -150,6 +153,8 @@ namespace italian // language namespace
 		{"StreamID can't be null", "Lo StreamID non può essere null"},
 		{"Return to destination page", "Ritorna alla pagina di destinazione"},
 		{"You will be redirected in %d seconds", "Sarai reindirizzato tra %d secondi"},
+		{"LeaseSet expiration time updated", "Tempo di scadenza LeaseSet aggiornato"},
+		{"LeaseSet is not found or already expired", "LeaseSet non trovato o già scaduto"},
 		{"Transit tunnels count must not exceed %d", "Il conteggio dei tunnel di transito non deve superare %d"},
 		{"Back to commands list", "Ritorna alla lista dei comandi"},
 		{"Register at reg.i2p", "Registra a reg.i2p"},
@@ -158,7 +163,6 @@ namespace italian // language namespace
 		{"Submit", "Invia"},
 		{"Domain can't end with .b32.i2p", "I domini non possono terminare con .b32.i2p"},
 		{"Domain must end with .i2p", "I domini devono terminare con .i2p"},
-		{"Such destination is not found", "Questa destinazione non è stata trovata"},
 		{"Unknown command", "Comando sconosciuto"},
 		{"Command accepted", "Comando accettato"},
 		{"Proxy error", "Errore del proxy"},
diff --git a/i18n/Portuguese.cpp b/i18n/Portuguese.cpp
index 8ba7f0cd..4c6d749f 100644
--- a/i18n/Portuguese.cpp
+++ b/i18n/Portuguese.cpp
@@ -69,6 +69,7 @@ namespace portuguese // language namespace
 		{"Stopping in", "Parando em"},
 		{"Family", "Família"},
 		{"Tunnel creation success rate", "Taxa de sucesso na criação de túneis"},
+		{"Total tunnel creation success rate", "Taxa total de sucesso na criação de túneis"},
 		{"Received", "Recebido"},
 		{"%.2f KiB/s", "%.2f KiB/s"},
 		{"Sent", "Enviado"},
@@ -95,6 +96,7 @@ namespace portuguese // language namespace
 		{"Address", "Endereço"},
 		{"Type", "Tipo"},
 		{"EncType", "Tipo de Criptografia"},
+		{"Expire LeaseSet", "Expirar LeaseSet"},
 		{"Inbound tunnels", "Túneis de Entrada"},
 		{"%dms", "%dms"},
 		{"Outbound tunnels", "Túneis de Saída"},
@@ -109,6 +111,7 @@ namespace portuguese // language namespace
 		{"Local Destination", "Destinos Locais"},
 		{"Streams", "Fluxos"},
 		{"Close stream", "Fechar fluxo"},
+		{"Such destination is not found", "Tal destino não foi encontrado"},
 		{"I2CP session not found", "Sessão do I2CP não encontrada"},
 		{"I2CP is not enabled", "I2CP não está ativado"},
 		{"Invalid", "Inválido"},
@@ -150,6 +153,8 @@ namespace portuguese // language namespace
 		{"StreamID can't be null", "StreamID não pode ser nulo"},
 		{"Return to destination page", "Retornar para à página de destino"},
 		{"You will be redirected in %d seconds", "Você será redirecionado em %d segundos"},
+		{"LeaseSet expiration time updated", "Tempo de validade do LeaseSet atualizado"},
+		{"LeaseSet is not found or already expired", "LeaseSet não foi encontrado ou já expirou"},
 		{"Transit tunnels count must not exceed %d", "A contagem de túneis de trânsito não deve exceder %d"},
 		{"Back to commands list", "Voltar para a lista de comandos"},
 		{"Register at reg.i2p", "Registrar na reg.i2p"},
@@ -158,7 +163,6 @@ namespace portuguese // language namespace
 		{"Submit", "Enviar"},
 		{"Domain can't end with .b32.i2p", "O domínio não pode terminar com .b32.i2p"},
 		{"Domain must end with .i2p", "O domínio não pode terminar com .i2p"},
-		{"Such destination is not found", "Tal destino não foi encontrado"},
 		{"Unknown command", "Comando desconhecido"},
 		{"Command accepted", "Comando aceito"},
 		{"Proxy error", "Erro no proxy"},
diff --git a/i18n/Ukrainian.cpp b/i18n/Ukrainian.cpp
index c1e222ea..d089c142 100644
--- a/i18n/Ukrainian.cpp
+++ b/i18n/Ukrainian.cpp
@@ -69,6 +69,7 @@ namespace ukrainian // language namespace
 		{"Stopping in", "Зупинка через"},
 		{"Family", "Сімейство"},
 		{"Tunnel creation success rate", "Успішно побудованих тунелів"},
+		{"Total tunnel creation success rate", "Загальна кількість створених тунелів"},
 		{"Received", "Отримано"},
 		{"%.2f KiB/s", "%.2f КіБ/с"},
 		{"Sent", "Відправлено"},
@@ -95,6 +96,7 @@ namespace ukrainian // language namespace
 		{"Address", "Адреса"},
 		{"Type", "Тип"},
 		{"EncType", "ТипШифр"},
+		{"Expire LeaseSet", "Завершити LeaseSet"},
 		{"Inbound tunnels", "Вхідні тунелі"},
 		{"%dms", "%dмс"},
 		{"Outbound tunnels", "Вихідні тунелі"},
@@ -109,6 +111,7 @@ namespace ukrainian // language namespace
 		{"Local Destination", "Локальні Призначення"},
 		{"Streams", "Потоки"},
 		{"Close stream", "Закрити потік"},
+		{"Such destination is not found", "Така точка призначення не знайдена"},
 		{"I2CP session not found", "I2CP сесія не знайдена"},
 		{"I2CP is not enabled", "I2CP не увікнуто"},
 		{"Invalid", "Некоректний"},
@@ -150,6 +153,8 @@ namespace ukrainian // language namespace
 		{"StreamID can't be null", "Ідентифікатор потоку не може бути порожнім"},
 		{"Return to destination page", "Повернутися на сторінку точки призначення"},
 		{"You will be redirected in %d seconds", "Ви будете переадресовані через %d секунд"},
+		{"LeaseSet expiration time updated", "Час закінчення LeaseSet оновлено"},
+		{"LeaseSet is not found or already expired", "LeaseSet не знайдено або вже закінчився"},
 		{"Transit tunnels count must not exceed %d", "Кількість транзитних тунелів не повинна перевищувати %d"},
 		{"Back to commands list", "Повернутися до списку команд"},
 		{"Register at reg.i2p", "Зареєструвати на reg.i2p"},
@@ -158,7 +163,6 @@ namespace ukrainian // language namespace
 		{"Submit", "Надіслати"},
 		{"Domain can't end with .b32.i2p", "Домен не може закінчуватися на .b32.i2p"},
 		{"Domain must end with .i2p", "Домен повинен закінчуватися на .i2p"},
-		{"Such destination is not found", "Така точка призначення не знайдена"},
 		{"Unknown command", "Невідома команда"},
 		{"Command accepted", "Команда прийнята"},
 		{"Proxy error", "Помилка проксі"},

From 9c25a88707294f93843c2fead9cd4768776d6078 Mon Sep 17 00:00:00 2001
From: r4sas <r4sas@i2pmail.org>
Date: Sun, 17 Sep 2023 16:21:36 +0000
Subject: [PATCH 08/15] [i18n] update translations

Signed-off-by: r4sas <r4sas@i2pmail.org>
---
 i18n/Uzbek.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/i18n/Uzbek.cpp b/i18n/Uzbek.cpp
index 9d798be4..cf94a489 100644
--- a/i18n/Uzbek.cpp
+++ b/i18n/Uzbek.cpp
@@ -69,6 +69,7 @@ namespace uzbek // language namespace
 		{"Stopping in", "Ichida to'xtatish"},
 		{"Family", "Oila"},
 		{"Tunnel creation success rate", "Tunnel yaratish muvaffaqiyat darajasi"},
+		{"Total tunnel creation success rate", "Tunnel yaratishning umumiy muvaffaqiyat darajasi"},
 		{"Received", "Qabul qilindi"},
 		{"%.2f KiB/s", "%.2f KiB/s"},
 		{"Sent", "Yuborilgan"},
@@ -95,6 +96,7 @@ namespace uzbek // language namespace
 		{"Address", "Manzil"},
 		{"Type", "Turi"},
 		{"EncType", "ShifrlashTuri"},
+		{"Expire LeaseSet", "LeaseSet muddati tugaydi"},
 		{"Inbound tunnels", "Kirish tunnellari"},
 		{"%dms", "%dms"},
 		{"Outbound tunnels", "Chiquvchi tunnellar"},
@@ -109,6 +111,7 @@ namespace uzbek // language namespace
 		{"Local Destination", "Mahalliy joylanish"},
 		{"Streams", "Strim"},
 		{"Close stream", "Strimni o'chirish"},
+		{"Such destination is not found", "Bunday yo'nalish topilmadi"},
 		{"I2CP session not found", "I2CP sessiyasi topilmadi"},
 		{"I2CP is not enabled", "I2CP yoqilmagan"},
 		{"Invalid", "Noto'g'ri"},
@@ -150,6 +153,8 @@ namespace uzbek // language namespace
 		{"StreamID can't be null", "StreamID bo'sh bo'lishi mumkin emas"},
 		{"Return to destination page", "Manzilgoh sahifasiga qaytish"},
 		{"You will be redirected in %d seconds", "Siz %d soniyadan so‘ng boshqa yo‘nalishga yo‘naltirilasiz"},
+		{"LeaseSet expiration time updated", "LeaseSet amal qilish muddati yangilandi"},
+		{"LeaseSet is not found or already expired", "LeaseSet topilmadi yoki muddati tugagan"},
 		{"Transit tunnels count must not exceed %d", "Tranzit tunnellar soni %d dan oshmasligi kerak"},
 		{"Back to commands list", "Buyruqlar ro'yxatiga qaytish"},
 		{"Register at reg.i2p", "Reg.i2p-da ro'yxatdan o'ting"},
@@ -158,7 +163,6 @@ namespace uzbek // language namespace
 		{"Submit", "Yuborish"},
 		{"Domain can't end with .b32.i2p", "Domen .b32.i2p bilan tugashi mumkin emas"},
 		{"Domain must end with .i2p", "Domen .i2p bilan tugashi kerak"},
-		{"Such destination is not found", "Bunday yo'nalish topilmadi"},
 		{"Unknown command", "Noma'lum buyruq"},
 		{"Command accepted", "Buyruq qabul qilindi"},
 		{"Proxy error", "Proksi xatosi"},

From 1857f14be86aa360c90f7baab0d7013f10f22632 Mon Sep 17 00:00:00 2001
From: r4sas <r4sas@i2pmail.org>
Date: Sun, 17 Sep 2023 18:33:42 +0000
Subject: [PATCH 09/15] [cpu] use short defines instead of long checks

Signed-off-by: r4sas <r4sas@i2pmail.org>
---
 libi2pd/CPU.cpp    |  4 ++--
 libi2pd/CPU.h      | 18 ++++++++++++++++++
 libi2pd/Crypto.cpp | 15 +++++----------
 libi2pd/Crypto.h   |  8 ++++----
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/libi2pd/CPU.cpp b/libi2pd/CPU.cpp
index 5d5fc6b3..4c522987 100644
--- a/libi2pd/CPU.cpp
+++ b/libi2pd/CPU.cpp
@@ -13,7 +13,7 @@
 	#define bit_AES (1 << 25)
 #endif
 
-#if (defined(__GNUC__) && __GNUC__ < 5 && (defined(__x86_64__) || defined(__i386__)))
+#if defined(__GNUC__) && __GNUC__ < 5 && IS_X86
 	#include <cpuid.h>
 #endif
 
@@ -29,7 +29,7 @@ namespace cpu
 
 	inline bool cpu_support_aes()
 	{
-#if (defined(_M_AMD64) || defined(__x86_64__)) || (defined(_M_IX86) || defined(__i386__))
+#if IS_X86
 #if defined(__clang__)
 #	if (__clang_major__ >= 6)
 		__builtin_cpu_init();
diff --git a/libi2pd/CPU.h b/libi2pd/CPU.h
index a0695884..1c30db48 100644
--- a/libi2pd/CPU.h
+++ b/libi2pd/CPU.h
@@ -9,6 +9,24 @@
 #ifndef LIBI2PD_CPU_H
 #define LIBI2PD_CPU_H
 
+#if defined(_M_AMD64) || defined(__x86_64__) || defined(_M_IX86) || defined(__i386__)
+#	define IS_X86 1
+#	if defined(_M_AMD64) || defined(__x86_64__)
+#		define IS_X86_64 1
+#	else
+#		define IS_X86_64 0
+#	endif
+#else
+#	define IS_X86 0
+#	define IS_X86_64 0
+#endif
+
+#if defined(__AES__) && !defined(_MSC_VER) && IS_X86
+#	define SUPPORTS_AES 1
+#else
+#	define SUPPORTS_AES 0
+#endif
+
 namespace i2p
 {
 namespace cpu
diff --git a/libi2pd/Crypto.cpp b/libi2pd/Crypto.cpp
index b5bc33d1..3e5bdd35 100644
--- a/libi2pd/Crypto.cpp
+++ b/libi2pd/Crypto.cpp
@@ -28,11 +28,6 @@
 #include "I2PEndian.h"
 #include "Log.h"
 
-#if defined(__AES__) && !defined(_MSC_VER) && ((defined(_M_AMD64) || defined(__x86_64__)) || (defined(_M_IX86) || defined(__i386__)))
-	#define SUPPORTS_AES 1
-#else
-	#define SUPPORTS_AES 0
-#endif
 
 namespace i2p
 {
@@ -165,7 +160,7 @@ namespace crypto
 
 // DH/ElGamal
 
-#if !defined(__x86_64__)
+#if !IS_X86_64
 	const int ELGAMAL_SHORT_EXPONENT_NUM_BITS = 226;
 	const int ELGAMAL_SHORT_EXPONENT_NUM_BYTES = ELGAMAL_SHORT_EXPONENT_NUM_BITS/8+1;
 #endif
@@ -367,7 +362,7 @@ namespace crypto
 		BIGNUM * b1 = BN_CTX_get (ctx);
 		BIGNUM * b = BN_CTX_get (ctx);
 		// select random k
-#if (defined(_M_AMD64) || defined(__x86_64__))
+#if IS_X86_64
 		BN_rand (k, ELGAMAL_FULL_EXPONENT_NUM_BITS, -1, 1); // full exponent for x64
 #else
 		BN_rand (k, ELGAMAL_SHORT_EXPONENT_NUM_BITS, -1, 1); // short exponent of 226 bits
@@ -434,7 +429,7 @@ namespace crypto
 
 	void GenerateElGamalKeyPair (uint8_t * priv, uint8_t * pub)
 	{
-#if (defined(_M_AMD64) || defined(__x86_64__)) || (defined(_M_IX86) || defined(__i386__)) || defined(_MSC_VER)
+#if IS_X86 || defined(_MSC_VER)
 		RAND_bytes (priv, 256);
 #else
 		// lower 226 bits (28 bytes and 2 bits) only. short exponent
@@ -1309,7 +1304,7 @@ namespace crypto
 		CRYPTO_set_locking_callback (OpensslLockingCallback);*/
 		if (precomputation)
 		{
-#if (defined(_M_AMD64) || defined(__x86_64__))
+#if IS_X86_64
 			g_ElggTable = new BIGNUM * [ELGAMAL_FULL_EXPONENT_NUM_BYTES][255];
 			PrecalculateElggTable (g_ElggTable, ELGAMAL_FULL_EXPONENT_NUM_BYTES);
 #else
@@ -1324,7 +1319,7 @@ namespace crypto
 		if (g_ElggTable)
 		{
 			DestroyElggTable (g_ElggTable,
-#if (defined(_M_AMD64) || defined(__x86_64__))
+#if IS_X86_64
 				ELGAMAL_FULL_EXPONENT_NUM_BYTES
 #else
 				ELGAMAL_SHORT_EXPONENT_NUM_BYTES
diff --git a/libi2pd/Crypto.h b/libi2pd/Crypto.h
index 1419293b..816d79fd 100644
--- a/libi2pd/Crypto.h
+++ b/libi2pd/Crypto.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2022, The PurpleI2P Project
+* Copyright (c) 2013-2023, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -150,7 +150,7 @@ namespace crypto
 	};
 
 
-#ifdef __AES__
+#if SUPPORTS_AES
 	class ECBCryptoAESNI
 	{
 		public:
@@ -167,7 +167,7 @@ namespace crypto
 	};
 #endif
 
-#ifdef __AES__
+#if SUPPORTS_AES
 	class ECBEncryption: public ECBCryptoAESNI
 #else
 	class ECBEncryption
@@ -183,7 +183,7 @@ namespace crypto
 		AES_KEY m_Key;
 	};
 
-#ifdef __AES__
+#if SUPPORTS_AES
 	class ECBDecryption: public ECBCryptoAESNI
 #else
 	class ECBDecryption

From 3da50614264f2bb93bc7bad9425772d92b01a973 Mon Sep 17 00:00:00 2001
From: r4sas <r4sas@i2pmail.org>
Date: Mon, 18 Sep 2023 17:11:45 +0000
Subject: [PATCH 10/15] [cpu] Increase GCC version for use of builtin CPU
 extensions checker

Signed-off-by: r4sas <r4sas@i2pmail.org>
---
 libi2pd/CPU.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libi2pd/CPU.cpp b/libi2pd/CPU.cpp
index 4c522987..e434dd57 100644
--- a/libi2pd/CPU.cpp
+++ b/libi2pd/CPU.cpp
@@ -13,7 +13,7 @@
 	#define bit_AES (1 << 25)
 #endif
 
-#if defined(__GNUC__) && __GNUC__ < 5 && IS_X86
+#if defined(__GNUC__) && __GNUC__ < 6 && IS_X86
 	#include <cpuid.h>
 #endif
 

From fb420bb563a3ebf8803faaa390ba6b2bb840d872 Mon Sep 17 00:00:00 2001
From: r4sas <r4sas@i2pmail.org>
Date: Mon, 18 Sep 2023 18:12:26 +0000
Subject: [PATCH 11/15] [cpu] more builtin version check changes

Signed-off-by: r4sas <r4sas@i2pmail.org>
---
 libi2pd/CPU.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libi2pd/CPU.cpp b/libi2pd/CPU.cpp
index e434dd57..77820c88 100644
--- a/libi2pd/CPU.cpp
+++ b/libi2pd/CPU.cpp
@@ -35,10 +35,10 @@ namespace cpu
 		__builtin_cpu_init();
 #	endif
 		return __builtin_cpu_supports("aes");
-#elif (defined(__GNUC__) && __GNUC__ >= 5)
+#elif (defined(__GNUC__) && __GNUC__ >= 6)
 		__builtin_cpu_init();
 		return __builtin_cpu_supports("aes");
-#elif (defined(__GNUC__) && __GNUC__ < 5)
+#elif (defined(__GNUC__) && __GNUC__ < 6)
 		int cpu_info[4];
 		bool flag = false;
 		__cpuid(0, cpu_info[0], cpu_info[1], cpu_info[2], cpu_info[3]);

From 0cf656cd7687fce461f644820066afc36be312b3 Mon Sep 17 00:00:00 2001
From: hfsfox <darkkitsunezx128k2309@gmail.com>
Date: Thu, 28 Sep 2023 22:30:38 +0300
Subject: [PATCH 12/15] Add Haiku OS support (#1970)

---
 Makefile             |  3 +++
 Makefile.haiku       | 10 ++++++++++
 build/CMakeLists.txt |  4 ++++
 libi2pd/FS.cpp       |  8 ++++++++
 libi2pd/I2PEndian.h  |  2 +-
 libi2pd/util.cpp     | 11 +++++++++++
 6 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 Makefile.haiku

diff --git a/Makefile b/Makefile
index 0861ec0b..86ea0aa8 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,9 @@ else ifneq (, $(findstring linux, $(SYS))$(findstring gnu, $(SYS)))
 else ifneq (, $(findstring freebsd, $(SYS))$(findstring openbsd, $(SYS)))
 	DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
 	include Makefile.bsd
+else ifneq (, $(findstring haiku, $(SYS)))
+	DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp
+	include Makefile.haiku
 else # not supported
 	$(error Not supported platform)
 endif
diff --git a/Makefile.haiku b/Makefile.haiku
new file mode 100644
index 00000000..85c2835d
--- /dev/null
+++ b/Makefile.haiku
@@ -0,0 +1,10 @@
+CXX = g++
+CXXFLAGS := -Wall -std=c++11
+INCFLAGS = -I/system/develop/headers
+DEFINES = -D_DEFAULT_SOURCE -D_GNU_SOURCE
+LDLIBS = -lbe -lbsd -lnetwork -lz -lcrypto -lssl -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread
+
+ifeq ($(USE_UPNP),yes)
+	DEFINES += -DUSE_UPNP
+	LDLIBS += -lminiupnpc
+endif
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
index 3185ffab..abfadfca 100644
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@@ -139,6 +139,10 @@ if(APPLE)
   add_definitions(-DMAC_OSX)
 endif()
 
+if(HAIKU)
+  add_definitions(-D_DEFAULT_SOURCE -D_GNU_SOURCE)
+endif()
+
 if(MSVC)
   add_definitions(-DWINVER=0x0600)
   add_definitions(-D_WIN32_WINNT=0x0600)
diff --git a/libi2pd/FS.cpp b/libi2pd/FS.cpp
index 7334550f..d38bcc2f 100644
--- a/libi2pd/FS.cpp
+++ b/libi2pd/FS.cpp
@@ -136,6 +136,14 @@ namespace fs {
 		dataDir = (home != NULL && strlen(home) > 0) ? home : "";
 		dataDir += "/Library/Application Support/" + appName;
 		return;
+#elif defined(__HAIKU__)
+		char *home = getenv("HOME");
+		if (home != NULL && strlen(home) > 0) {
+			dataDir = std::string(home) + "/config/settings/" + appName;
+		} else {
+			dataDir = "/tmp/" + appName;
+		}
+		return;
 #else /* other unix */
 #if defined(ANDROID)
 		const char * ext = getenv("EXTERNAL_STORAGE");
diff --git a/libi2pd/I2PEndian.h b/libi2pd/I2PEndian.h
index 06abf29a..681a4999 100644
--- a/libi2pd/I2PEndian.h
+++ b/libi2pd/I2PEndian.h
@@ -14,7 +14,7 @@
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include <sys/endian.h>
 
-#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__GLIBC__)
+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__GLIBC__) || defined(__HAIKU__)
 #include <endian.h>
 
 #elif defined(__APPLE__) && defined(__MACH__)
diff --git a/libi2pd/util.cpp b/libi2pd/util.cpp
index 088a7af5..a7afdce8 100644
--- a/libi2pd/util.cpp
+++ b/libi2pd/util.cpp
@@ -27,6 +27,17 @@
 # include <AvailabilityMacros.h>
 #endif
 
+#if defined(__HAIKU__)
+#include <gnu/pthread.h>
+#include <posix/pthread.h>
+#include <posix/sys/sockio.h>
+#include <posix/sys/ioctl.h>
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE
+#include <bsd/ifaddrs.h>
+#endif
+#endif
+
 #ifdef _WIN32
 #include <stdlib.h>
 #include <string.h>

From 1e6edf06a29a0af8ac09f12c227f6b9ed76d75df Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Thu, 28 Sep 2023 16:05:13 -0400
Subject: [PATCH 13/15] send already accepting error response

---
 libi2pd_client/SAM.cpp | 49 ++++++++++++++++++++++++++++--------------
 libi2pd_client/SAM.h   |  5 +++--
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/libi2pd_client/SAM.cpp b/libi2pd_client/SAM.cpp
index bb9d6a6b..1a281c57 100644
--- a/libi2pd_client/SAM.cpp
+++ b/libi2pd_client/SAM.cpp
@@ -360,7 +360,7 @@ namespace client
 		if (type == eSAMSessionTypeUnknown)
 		{
 			// unknown style
-			SendI2PError("Unknown STYLE");
+			SendSessionI2PError("Unknown STYLE");
 			return;
 		}
 
@@ -375,14 +375,14 @@ namespace client
 			if (e)
 			{
 				// not an ip address
-				SendI2PError("Invalid IP Address in HOST");
+				SendSessionI2PError("Invalid IP Address in HOST");
 				return;
 			}
 
 			auto port = std::stoi(params[SAM_PARAM_PORT]);
 			if (port == -1)
 			{
-				SendI2PError("Invalid port");
+				SendSessionI2PError("Invalid port");
 				return;
 			}
 			forward = std::make_shared<boost::asio::ip::udp::endpoint>(addr, port);
@@ -484,7 +484,7 @@ namespace client
 		LogPrint (eLogDebug, "SAM: Stream connect: ", buf);
 		if ( m_SocketType != eSAMSocketTypeUnknown)
 		{
-			SendI2PError ("Socket already in use");
+			SendSessionI2PError ("Socket already in use");
 			return;
 		}
 		std::map<std::string, std::string> params;
@@ -582,7 +582,7 @@ namespace client
 		LogPrint (eLogDebug, "SAM: Stream accept: ", buf);
 		if ( m_SocketType != eSAMSocketTypeUnknown)
 		{
-			SendI2PError ("Socket already in use");
+			SendSessionI2PError ("Socket already in use");
 			return;
 		}
 		std::map<std::string, std::string> params;
@@ -598,9 +598,15 @@ namespace client
 			if (!session->GetLocalDestination ()->IsAcceptingStreams ())
 			{
 				m_IsAccepting = true;
+				SendMessageReply (SAM_STREAM_STATUS_OK, strlen(SAM_STREAM_STATUS_OK), false);
 				session->GetLocalDestination ()->AcceptOnce (std::bind (&SAMSocket::HandleI2PAccept, shared_from_this (), std::placeholders::_1));
 			}
-			SendMessageReply (SAM_STREAM_STATUS_OK, strlen(SAM_STREAM_STATUS_OK), false);
+			else // already accepting
+			{	
+				// TODO: implement queue
+				LogPrint (eLogInfo, "SAM: Session ", m_ID, " is already accepting");
+				SendStreamI2PError ("Already accepting");
+			}	
 		}
 		else
 			SendMessageReply (SAM_STREAM_STATUS_INVALID_ID, strlen(SAM_STREAM_STATUS_INVALID_ID), true);
@@ -620,26 +626,26 @@ namespace client
 		}
 		if (session->GetLocalDestination ()->IsAcceptingStreams ())
 		{
-			SendI2PError ("Already accepting");
+			SendSessionI2PError ("Already accepting");
 			return;
 		}
 		auto it = params.find (SAM_PARAM_PORT);
 		if (it == params.end ())
 		{
-			SendI2PError ("PORT is missing");
+			SendSessionI2PError ("PORT is missing");
 			return;
 		}
 		auto port = std::stoi (it->second);
 		if (port <= 0 || port >= 0xFFFF)
 		{
-			SendI2PError ("Invalid PORT");
+			SendSessionI2PError ("Invalid PORT");
 			return;
 		}
 		boost::system::error_code ec;
 		auto ep = m_Socket.remote_endpoint (ec);
 		if (ec)
 		{
-			SendI2PError ("Socket error");
+			SendSessionI2PError ("Socket error");
 			return;
 		}
 		ep.port (port);
@@ -791,13 +797,13 @@ namespace client
 			if (type == eSAMSessionTypeUnknown)
 			{
 				// unknown style
-				SendI2PError("Unsupported STYLE");
+				SendSessionI2PError("Unsupported STYLE");
 				return;
 			}
 			auto fromPort = std::stoi(params[SAM_PARAM_FROM_PORT]);
 			if (fromPort == -1)
 			{
-				SendI2PError("Invalid from port");
+				SendSessionI2PError("Invalid from port");
 				return;
 			}
 			auto subsession = std::make_shared<SAMSubSession>(masterSession, id, type, fromPort);
@@ -810,7 +816,7 @@ namespace client
 				SendMessageReply (SAM_SESSION_CREATE_DUPLICATED_ID, strlen(SAM_SESSION_CREATE_DUPLICATED_ID), false);
 		}
 		else
-			SendI2PError ("Wrong session type");
+			SendSessionI2PError ("Wrong session type");
 	}
 
 	void SAMSocket::ProcessSessionRemove (char * buf, size_t len)
@@ -832,12 +838,12 @@ namespace client
 			SendSessionCreateReplyOk ();
 		}
 		else
-			SendI2PError ("Wrong session type");
+			SendSessionI2PError ("Wrong session type");
 	}
 
-	void SAMSocket::SendI2PError(const std::string & msg)
+	void SAMSocket::SendSessionI2PError(const std::string & msg)
 	{
-		LogPrint (eLogError, "SAM: I2P error: ", msg);
+		LogPrint (eLogError, "SAM: Session I2P error: ", msg);
 #ifdef _MSC_VER
 		size_t len = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_SESSION_STATUS_I2P_ERROR, msg.c_str());
 #else
@@ -846,6 +852,17 @@ namespace client
 		SendMessageReply (m_Buffer, len, true);
 	}
 
+	void SAMSocket::SendStreamI2PError(const std::string & msg)
+	{
+		LogPrint (eLogError, "SAM: Stream I2P error: ", msg);
+#ifdef _MSC_VER
+		size_t len = sprintf_s (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_STREAM_STATUS_I2P_ERROR, msg.c_str());
+#else
+		size_t len = snprintf (m_Buffer, SAM_SOCKET_BUFFER_SIZE, SAM_STREAM_STATUS_I2P_ERROR, msg.c_str());
+#endif
+		SendMessageReply (m_Buffer, len, true);
+	}
+		
 	void SAMSocket::HandleNamingLookupLeaseSetRequestComplete (std::shared_ptr<i2p::data::LeaseSet> leaseSet, std::string name)
 	{
 		if (leaseSet)
diff --git a/libi2pd_client/SAM.h b/libi2pd_client/SAM.h
index b4c72754..736c0945 100644
--- a/libi2pd_client/SAM.h
+++ b/libi2pd_client/SAM.h
@@ -49,7 +49,7 @@ namespace client
 	const char SAM_STREAM_STATUS_INVALID_ID[] = "STREAM STATUS RESULT=INVALID_ID\n";
 	const char SAM_STREAM_STATUS_INVALID_KEY[] = "STREAM STATUS RESULT=INVALID_KEY\n";
 	const char SAM_STREAM_STATUS_CANT_REACH_PEER[] = "STREAM STATUS RESULT=CANT_REACH_PEER\n";
-	const char SAM_STREAM_STATUS_I2P_ERROR[] = "STREAM STATUS RESULT=I2P_ERROR\n";
+	const char SAM_STREAM_STATUS_I2P_ERROR[] = "STREAM STATUS RESULT=I2P_ERROR MESSAGE=\"%s\"\n";
 	const char SAM_STREAM_ACCEPT[] = "STREAM ACCEPT";
 	const char SAM_STREAM_FORWARD[] = "STREAM FORWARD";
 	const char SAM_DATAGRAM_SEND[] = "DATAGRAM SEND";
@@ -141,7 +141,8 @@ namespace client
 			void ProcessNamingLookup (char * buf, size_t len);
 			void ProcessSessionAdd (char * buf, size_t len);
 			void ProcessSessionRemove (char * buf, size_t len);
-			void SendI2PError(const std::string & msg);
+			void SendSessionI2PError(const std::string & msg);
+			void SendStreamI2PError(const std::string & msg);	
 			size_t ProcessDatagramSend (char * buf, size_t len, const char * data); // from SAM 1.0
 			void ExtractParams (char * buf, std::map<std::string, std::string>& params);
 

From efdbe267554bfa03bcb51097f8e19e9d335e3a9f Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Thu, 28 Sep 2023 18:40:51 -0400
Subject: [PATCH 14/15] try peer test again if Unknown

---
 libi2pd/Transports.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libi2pd/Transports.cpp b/libi2pd/Transports.cpp
index b452c05e..45284e24 100644
--- a/libi2pd/Transports.cpp
+++ b/libi2pd/Transports.cpp
@@ -833,8 +833,12 @@ namespace transport
 				}
 			}
 			bool ipv4Testing = i2p::context.GetTesting ();
+			if (!ipv4Testing)
+				ipv4Testing = i2p::context.GetRouterInfo ().IsSSU2V4 () && (i2p::context.GetStatus() == eRouterStatusUnknown);
 			bool ipv6Testing = i2p::context.GetTestingV6 ();
-			// if still testing, repeat peer test
+			if (!ipv6Testing)
+				ipv6Testing = i2p::context.GetRouterInfo ().IsSSU2V6 () && (i2p::context.GetStatusV6() == eRouterStatusUnknown);
+			// if still testing or unknown, repeat peer test
 			if (ipv4Testing || ipv6Testing)
 				PeerTest (ipv4Testing, ipv6Testing);
 			m_PeerCleanupTimer->expires_from_now (boost::posix_time::seconds(3 * SESSION_CREATION_TIMEOUT));

From 9980bfa0e7f03a3849eca4e2e771593cc64419a5 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Sat, 30 Sep 2023 14:10:45 -0400
Subject: [PATCH 15/15] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e7fb7318..ce25c8f2 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ Current status: [![Crowdin](https://badges.crowdin.net/i2pd/localized.svg)](http
 Donations
 ---------
 
-**E-Mail**: ```i2porignal at yandex.ru```
+**E-Mail**: ```i2porignal at yandex.com```
 
 **BTC**: ```3MDoGJW9TLMTCDGrR9bLgWXfm6sjmgy86f```