From 1a9c183bc6ec7e168ad58e9bc4798c4ca9d40d32 Mon Sep 17 00:00:00 2001 From: leak Date: Mon, 7 Jul 2014 22:09:17 +0200 Subject: Fixed the AsyncAcceptor overload (too much c#..) --- src/server/game/Server/WorldSocket.h | 4 ++-- src/server/shared/Networking/AsyncAcceptor.h | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h index ddce699f7f1..ae35a9367a0 100644 --- a/src/server/game/Server/WorldSocket.h +++ b/src/server/game/Server/WorldSocket.h @@ -16,8 +16,8 @@ * with this program. If not, see . */ -#ifndef __WORLDTCPSESSION_H__ -#define __WORLDTCPSESSION_H__ +#ifndef __WORLDSOCKET_H__ +#define __WORLDSOCKET_H__ #include #include diff --git a/src/server/shared/Networking/AsyncAcceptor.h b/src/server/shared/Networking/AsyncAcceptor.h index fbb0313381e..eade15fb5f5 100644 --- a/src/server/shared/Networking/AsyncAcceptor.h +++ b/src/server/shared/Networking/AsyncAcceptor.h @@ -33,14 +33,17 @@ public: AsyncAccept(); }; - AsyncAcceptor(boost::asio::io_service& ioService, std::string bindIp, int port, bool tcpNoDelay) : - AsyncAcceptor(ioService, bindIp, port) + AsyncAcceptor(boost::asio::io_service& ioService, std::string bindIp, int port, bool tcpNoDelay) : + _socket(ioService), + _acceptor(ioService, tcp::endpoint(boost::asio::ip::address::from_string(bindIp), port)) { _socket.set_option(boost::asio::ip::tcp::no_delay(tcpNoDelay)); + + AsyncAccept(); }; private: - void AsyncAcceptor::AsyncAccept() + void AsyncAccept() { _acceptor.async_accept(_socket, [this](boost::system::error_code error) { -- cgit v1.2.3