fix(WebTunnel): fix RemotePortForwarder channel close bug (shutting d…

…own WebSocket instead of StreamSocket)
my-devices · Nov 22, 2024 · 6c7fd8d · 6c7fd8d
1 parent 6a550bd
commit 6c7fd8d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/WebTunnel/include/Poco/WebTunnel/RemotePortForwarder.h b/WebTunnel/include/Poco/WebTunnel/RemotePortForwarder.h
@@ -129,6 +129,7 @@ class WebTunnel_API RemotePortForwarder
 	void connectTimeout(SocketDispatcher& dispatcher, Poco::Net::StreamSocket& socket, Poco::UInt16 channel);
 	void forwardData(const char* buffer, int size, Poco::UInt16 channel);
 	void openChannel(Poco::UInt16 channel, Poco::UInt16 port);
+	void shutdownSendChannel(Poco::UInt16 channel);
 	void removeChannel(Poco::UInt16 channel);
 	void sendResponse(Poco::UInt16 channel, Poco::UInt8 opcode, Poco::UInt16 errorCode);
 	void closeWebSocket(CloseReason reason, bool active);

diff --git a/WebTunnel/src/RemotePortForwarder.cpp b/WebTunnel/src/RemotePortForwarder.cpp
@@ -294,7 +294,7 @@ void RemotePortForwarder::demultiplex(SocketDispatcher& dispatcher, Poco::Net::S
 			}
 			else
 			{
-				_dispatcher.shutdownSend(socket);
+				shutdownSendChannel(channel);
 			}
 			break;
 
@@ -490,6 +490,17 @@ void RemotePortForwarder::openChannel(Poco::UInt16 channel, Poco::UInt16 port)
 }
 
 
+void RemotePortForwarder::shutdownSendChannel(Poco::UInt16 channel)
+{
+	Poco::FastMutex::ScopedLock lock(_mutex);
+	ChannelMap::iterator it = _channelMap.find(channel);
+	if (it != _channelMap.end())
+	{
+		_dispatcher.shutdownSend(it->second.socket);
+	}
+}
+
+
 void RemotePortForwarder::removeChannel(Poco::UInt16 channel)
 {
 	Poco::FastMutex::ScopedLock lock(_mutex);