Fix crash when closing telnet server

daniele77 · daniele77 · commit 429ecc84a5f9 · 2023-06-27T18:43:42.000+02:00
diff --git a/include/cli/detail/server.h b/include/cli/detail/server.h
@@ -125,14 +125,12 @@ class Server
     Server& operator = ( const Server& ) = delete;
 
     Server(typename ASIOLIB::ContextType& ios, unsigned short port) :
-        acceptor(ios, asiolib::ip::tcp::endpoint(asiolib::ip::tcp::v4(), port)),
-        socket(ios)
+        acceptor(ios, asiolib::ip::tcp::endpoint(asiolib::ip::tcp::v4(), port))
     {
         Accept();
     }
     Server(typename ASIOLIB::ContextType& ios, std::string address, unsigned short port) :
-        acceptor(ios, asiolib::ip::tcp::endpoint(ASIOLIB::IpAddressFromString(address), port)),
-        socket(ios)
+        acceptor(ios, asiolib::ip::tcp::endpoint(ASIOLIB::IpAddressFromString(address), port))
     {
         Accept();
     }
@@ -142,16 +140,16 @@ class Server
 private:
     void Accept()
     {
-        acceptor.async_accept(socket, [this](asiolibec::error_code ec)
+        acceptor.async_accept([this](asiolibec::error_code ec, asiolib::ip::tcp::socket socket)
             {
                 if (!ec) CreateSession(std::move(socket))->Start();
                 Accept();
             });
     }
     asiolib::ip::tcp::acceptor acceptor;
-    asiolib::ip::tcp::socket socket;
 };
 
+
 } // namespace detail
 } // namespace cli
 

Original file line number	Diff line number	Diff line change
`@@ -125,14 +125,12 @@ class Server`
`125`	`125`	`Server& operator = ( const Server& ) = delete;`
`126`	`126`
`127`	`127`	`Server(typename ASIOLIB::ContextType& ios, unsigned short port) :`
`128`		`- acceptor(ios, asiolib::ip::tcp::endpoint(asiolib::ip::tcp::v4(), port)),`
`129`		`- socket(ios)`
	`128`	`+ acceptor(ios, asiolib::ip::tcp::endpoint(asiolib::ip::tcp::v4(), port))`
`130`	`129`	`{`
`131`	`130`	`Accept();`
`132`	`131`	`}`
`133`	`132`	`Server(typename ASIOLIB::ContextType& ios, std::string address, unsigned short port) :`
`134`		`- acceptor(ios, asiolib::ip::tcp::endpoint(ASIOLIB::IpAddressFromString(address), port)),`
`135`		`- socket(ios)`
	`133`	`+ acceptor(ios, asiolib::ip::tcp::endpoint(ASIOLIB::IpAddressFromString(address), port))`
`136`	`134`	`{`
`137`	`135`	`Accept();`
`138`	`136`	`}`
`@@ -142,16 +140,16 @@ class Server`
`142`	`140`	`private:`
`143`	`141`	`void Accept()`
`144`	`142`	`{`
`145`		`- acceptor.async_accept(socket, [this](asiolibec::error_code ec)`
	`143`	`+ acceptor.async_accept([this](asiolibec::error_code ec, asiolib::ip::tcp::socket socket)`
`146`	`144`	`{`
`147`	`145`	`if (!ec) CreateSession(std::move(socket))->Start();`
`148`	`146`	`Accept();`
`149`	`147`	`});`
`150`	`148`	`}`
`151`	`149`	`asiolib::ip::tcp::acceptor acceptor;`
`152`		`- asiolib::ip::tcp::socket socket;`
`153`	`150`	`};`
`154`	`151`
	`152`	`+`
`155`	`153`	`} // namespace detail`
`156`	`154`	`} // namespace cli`
`157`	`155`