asio: Fix resource leak (socket not closed) in server code
This commit is contained in:
parent
f6f908a541
commit
7d753d779e
|
@ -82,7 +82,9 @@ server::server(const std::string &address, uint16_t port,
|
|||
acceptors_.push_back(std::move(acceptor));
|
||||
}
|
||||
|
||||
start_accept();
|
||||
for (auto &acceptor : acceptors_) {
|
||||
start_accept(acceptor);
|
||||
}
|
||||
|
||||
start_timer();
|
||||
}
|
||||
|
@ -109,15 +111,14 @@ void server::start_timer() {
|
|||
|
||||
typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> ssl_socket;
|
||||
|
||||
void server::start_accept() {
|
||||
void server::start_accept(boost::asio::ip::tcp::acceptor &acceptor) {
|
||||
if (ssl_ctx_) {
|
||||
auto new_connection = std::make_shared<connection<ssl_socket>>(
|
||||
request_cb_, io_service_pool_.get_io_service(), *ssl_ctx_);
|
||||
|
||||
for (auto &acceptor : acceptors_) {
|
||||
acceptor.async_accept(
|
||||
new_connection->socket().lowest_layer(),
|
||||
[this, new_connection](const boost::system::error_code &e) {
|
||||
[this, &acceptor, new_connection](const boost::system::error_code &e) {
|
||||
if (!e) {
|
||||
new_connection->socket().lowest_layer().set_option(
|
||||
boost::asio::ip::tcp::no_delay(true));
|
||||
|
@ -130,29 +131,26 @@ void server::start_accept() {
|
|||
});
|
||||
}
|
||||
|
||||
start_accept();
|
||||
start_accept(acceptor);
|
||||
});
|
||||
}
|
||||
} else {
|
||||
auto new_connection =
|
||||
std::make_shared<connection<boost::asio::ip::tcp::socket>>(
|
||||
request_cb_, io_service_pool_.get_io_service());
|
||||
|
||||
for (auto &acceptor : acceptors_) {
|
||||
acceptor.async_accept(
|
||||
new_connection->socket(),
|
||||
[this, new_connection](const boost::system::error_code &e) {
|
||||
[this, &acceptor, new_connection](const boost::system::error_code &e) {
|
||||
if (!e) {
|
||||
new_connection->socket().set_option(
|
||||
boost::asio::ip::tcp::no_delay(true));
|
||||
new_connection->start();
|
||||
}
|
||||
|
||||
start_accept();
|
||||
start_accept(acceptor);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace server
|
||||
} // namespace asio_http2
|
||||
|
|
|
@ -72,7 +72,7 @@ public:
|
|||
|
||||
private:
|
||||
/// Initiate an asynchronous accept operation.
|
||||
void start_accept();
|
||||
void start_accept(boost::asio::ip::tcp::acceptor &acceptor);
|
||||
|
||||
void start_timer();
|
||||
|
||||
|
|
Loading…
Reference in New Issue