Merge pull request #8 from kkzi/main

适配新版本boost
Zhou-zhi-peng · Jan 26, 2022 · 752a32d · 752a32d
2 parents 5bbdbca + 76e75b1
commit 752a32d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/NetDebugger/SerialPort.cpp b/NetDebugger/SerialPort.cpp
@@ -1279,7 +1279,7 @@ class TcpForwardClientChannel :
 		{
 			auto channel = shared_from_this();
 			boost::system::error_code ec;
-			auto rslv = std::make_shared<boost::asio::ip::tcp::resolver>(m_Socket.get_io_context());
+			auto rslv = std::make_shared<boost::asio::ip::tcp::resolver>(theApp.GetIOContext());
 			boost::asio::ip::tcp::resolver::query qry(WStringToString(m_ServerURL), std::to_string(m_RemotePort));
 			auto keepAlive = m_Keepalive;
 			rslv->async_resolve(qry, [rslv, channel, keepAlive, handler](const boost::system::error_code& ec, boost::asio::ip::tcp::resolver::iterator iter)

diff --git a/NetDebugger/TCPClient.cpp b/NetDebugger/TCPClient.cpp
@@ -34,7 +34,7 @@ void TCPClientChannel::Connect(const std::wstring& host, int port, bool keepAliv
 	{
 		auto channel = shared_from_this();
 		boost::system::error_code ec;
-		auto rslv = std::make_shared<boost::asio::ip::tcp::resolver>(m_Socket.get_io_context());
+		auto rslv = std::make_shared<boost::asio::ip::tcp::resolver>(theApp.GetIOContext());
 		boost::asio::ip::tcp::resolver::query qry(WStringToString(host), std::to_string(port));
 		rslv->async_resolve(qry, [rslv, channel, keepAlive, handler](const boost::system::error_code &ec, boost::asio::ip::tcp::resolver::iterator iter)
 		{

diff --git a/NetDebugger/TCPServer.cpp b/NetDebugger/TCPServer.cpp
@@ -210,7 +210,7 @@ void TCPServer::Stop(void)
 
 TcpChannel::TcpChannel(std::shared_ptr<TCPServer> owner) :
 	m_Owner(owner),
-	m_Socket(owner->m_Acceptor.get_io_context())
+	m_Socket(theApp.GetIOContext())
 {
 
 }

diff --git a/NetDebugger/TCPSwitch.cpp b/NetDebugger/TCPSwitch.cpp
@@ -241,7 +241,7 @@ void TCPForwardServer::StartAcceptClient(void)
 void TCPForwardServer::ConnectServer(std::shared_ptr<TCPForwardServer> self, std::shared_ptr<TcpForwardChannel> channelClient, std::shared_ptr<TcpForwardChannel> channelServer)
 {
 	boost::system::error_code ec;
-	auto rslv = std::make_shared<boost::asio::ip::tcp::resolver>(self->m_Acceptor.get_io_context());
+	auto rslv = std::make_shared<boost::asio::ip::tcp::resolver>(theApp.GetIOContext());
 	boost::asio::ip::tcp::resolver::query qry(WStringToString(self->m_RemoteHost), std::to_string(self->m_RemotePort));
 	rslv->async_resolve(qry, [rslv, self, channelClient, channelServer](const boost::system::error_code &ec, boost::asio::ip::tcp::resolver::iterator iter)
 	{

diff --git a/NetDebugger/UDPStream.cpp b/NetDebugger/UDPStream.cpp
@@ -172,7 +172,7 @@ void UDPBasic::Start(void)
 	std::thread connectThread([client]()
 	{
 		boost::system::error_code ec;
-		boost::asio::ip::udp::resolver rslv(client->m_Socket.get_io_context());
+		boost::asio::ip::udp::resolver rslv(theApp.GetIOContext());
 		boost::asio::ip::udp::resolver::query qry(WStringToString(client->m_RemoteAddress), std::to_string(client->m_RemotePort));
 		boost::asio::ip::udp::resolver::iterator iter = rslv.resolve(qry, ec);
 		boost::asio::ip::udp::resolver::iterator end;
@@ -652,7 +652,7 @@ void UDPClient::Start(void)
 	std::thread connectThread([client]()
 	{
 		boost::system::error_code ec;
-		boost::asio::ip::udp::resolver rslv(client->m_Socket.get_io_context());
+		boost::asio::ip::udp::resolver rslv(theApp.GetIOContext());
 		boost::asio::ip::udp::resolver::query qry(WStringToString(client->m_RemoteAddress), std::to_string(client->m_RemotePort));
 		boost::asio::ip::udp::resolver::iterator iter = rslv.resolve(qry, ec);
 		boost::asio::ip::udp::resolver::iterator end;

diff --git a/NetDebugger/Websocket.cpp b/NetDebugger/Websocket.cpp
@@ -800,7 +800,7 @@ void WebSocketClientChannel::Connect(
 			m_ConnectQueryString = query;
 			auto channel = shared_from_this();
 			boost::system::error_code ec;
-			auto rslv = std::make_shared<boost::asio::ip::tcp::resolver>(GetSocket().get_io_context());
+			auto rslv = std::make_shared<boost::asio::ip::tcp::resolver>(theApp.GetIOContext());
 			boost::asio::ip::tcp::resolver::query qry(host, std::to_string(port));
 			rslv->async_resolve(qry, [rslv, channel, query, host, port, handler](const boost::system::error_code &ec, boost::asio::ip::tcp::resolver::iterator iter)
 			{