From bdc1107c9608da51fe69492b054c7291842af136 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Tue, 20 Jul 2021 14:35:02 -0400
Subject: [PATCH] correct message type for ShortTunnelBuild

---
 libi2pd/Tunnel.cpp     |  4 ++--
 libi2pd/TunnelConfig.h | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libi2pd/Tunnel.cpp b/libi2pd/Tunnel.cpp
index f9f5ac38..9f096282 100644
--- a/libi2pd/Tunnel.cpp
+++ b/libi2pd/Tunnel.cpp
@@ -88,7 +88,7 @@ namespace tunnel
 			}
 			hop = hop->prev;
 		}
-		msg->FillI2NPMessageHeader (eI2NPVariableTunnelBuild);
+		msg->FillI2NPMessageHeader (m_Config->IsShort () ? eI2NPShortTunnelBuild : eI2NPVariableTunnelBuild);
 
 		// send message
 		if (outboundTunnel)
@@ -99,7 +99,7 @@ namespace tunnel
 				if (ident)
 				{	
 					auto msg1 = i2p::garlic::WrapECIESX25519MessageForRouter (msg, ident->GetEncryptionPublicKey ());
-					if (msg1) msg = msg;
+					if (msg1) msg = msg1;
 				}	
 			}	
 			outboundTunnel->SendTunnelDataMsg (GetNextIdentHash (), 0, msg);
diff --git a/libi2pd/TunnelConfig.h b/libi2pd/TunnelConfig.h
index d6441b03..76aa0b34 100644
--- a/libi2pd/TunnelConfig.h
+++ b/libi2pd/TunnelConfig.h
@@ -91,14 +91,17 @@ namespace tunnel
 	{
 		public:
 
-			TunnelConfig (const std::vector<std::shared_ptr<const i2p::data::IdentityEx> >& peers) // inbound
+			TunnelConfig (const std::vector<std::shared_ptr<const i2p::data::IdentityEx> >& peers, 
+				bool isShort = false): // inbound
+				m_IsShort (isShort)
 			{
 				CreatePeers (peers);
 				m_LastHop->SetNextIdent (i2p::context.GetIdentHash ());
 			}
 
 			TunnelConfig (const std::vector<std::shared_ptr<const i2p::data::IdentityEx> >& peers,
-				uint32_t replyTunnelID, const i2p::data::IdentHash& replyIdent) // outbound
+				uint32_t replyTunnelID, const i2p::data::IdentHash& replyIdent, bool isShort = false): // outbound
+				m_IsShort (isShort)
 			{
 				CreatePeers (peers);
 				m_FirstHop->isGateway = false;
@@ -185,7 +188,7 @@ namespace tunnel
 		protected:
 
 			// this constructor can't be called from outside
-			TunnelConfig (): m_FirstHop (nullptr), m_LastHop (nullptr)
+			TunnelConfig (): m_FirstHop (nullptr), m_LastHop (nullptr), m_IsShort (false)
 			{
 			}
 
@@ -218,7 +221,7 @@ namespace tunnel
 		private:
 
 			TunnelHopConfig * m_FirstHop, * m_LastHop;
-			bool m_IsShort = false;
+			bool m_IsShort;
 	};
 
 	class ZeroHopsTunnelConfig: public TunnelConfig