From d496b15249e782cb4e10b082022de47478be9dc5 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Wed, 13 Aug 2025 17:16:56 -0400
Subject: [PATCH] handle SESSION ADD without FROM_PORT

---
 libi2pd_client/SAM.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/libi2pd_client/SAM.cpp b/libi2pd_client/SAM.cpp
index 09c2dfe9..1f5e313d 100644
--- a/libi2pd_client/SAM.cpp
+++ b/libi2pd_client/SAM.cpp
@@ -893,11 +893,17 @@ namespace client
 				SendSessionI2PError("Unsupported STYLE");
 				return;
 			}
-			auto fromPort = std::stoi(std::string (params[SAM_PARAM_FROM_PORT]));
-			if (fromPort == -1)
+			uint16_t fromPort = 0;
+			auto it = params.find (SAM_PARAM_FROM_PORT);
+			if (it != params.end ())
 			{
-				SendSessionI2PError("Invalid from port");
-				return;
+				auto p = it->second;
+				auto res = std::from_chars(p.data(), p.data() + p.size(), fromPort);
+				if (res.ec != std::errc())
+				{
+					SendSessionI2PError("Invalid from port");
+					return;
+				}
 			}
 			auto subsession = std::make_shared<SAMSubSession>(masterSession, id, type, fromPort);
 			if (m_Owner.AddSession (subsession))
@@ -1364,9 +1370,10 @@ namespace client
 
 	SAMSubSession::SAMSubSession (std::shared_ptr<SAMMasterSession> master, std::string_view name, SAMSessionType type, uint16_t port):
 		SAMSession (master->m_Bridge, name, type), masterSession (master), inPort (port)
-	{
-		if (Type == SAMSessionType::eSAMSessionTypeStream)
+	{	
+		if (Type == SAMSessionType::eSAMSessionTypeStream && port)
 		{
+			// additional streaming destination, use default if port is 0
 			auto d = masterSession->GetLocalDestination ()->CreateStreamingDestination (inPort);
 			if (d) d->Start ();
 		}