jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes #280 : added start_stop_mutex that is used in Server::bind() and Server::stop()

Browse source
This commit is contained in:
eidheim 2019-08-26 14:13:43 +02:00
commit 253b18f02b
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server_http.hpp
View file

@ -386,6 +386,8 @@ namespace SimpleWeb {
/// Returns assigned port. If io_service is not set, an internal io_service is created instead. /// Returns assigned port. If io_service is not set, an internal io_service is created instead.
/// Call before accept_and_run(). /// Call before accept_and_run().
unsigned short bind() { unsigned short bind() {
std::lock_guard<std::mutex> lock(start_stop_mutex);
asio::ip::tcp::endpoint endpoint; asio::ip::tcp::endpoint endpoint;
if(config.address.size() > 0) if(config.address.size() > 0)
endpoint = asio::ip::tcp::endpoint(make_address(config.address), config.port); endpoint = asio::ip::tcp::endpoint(make_address(config.address), config.port);
@ -452,6 +454,8 @@ namespace SimpleWeb {
/// Stop accepting new requests, and close current connections. /// Stop accepting new requests, and close current connections.
void stop() noexcept { void stop() noexcept {
std::lock_guard<std::mutex> lock(start_stop_mutex);
if(acceptor) { if(acceptor) {
error_code ec; error_code ec;
acceptor->close(ec); acceptor->close(ec);
@ -474,6 +478,8 @@ namespace SimpleWeb {
} }
protected: protected:
std::mutex start_stop_mutex;
bool internal_io_service = false; bool internal_io_service = false;
std::unique_ptr<asio::ip::tcp::acceptor> acceptor; std::unique_ptr<asio::ip::tcp::acceptor> acceptor;