diff options
author | leak <leak@bitmx.net> | 2014-07-07 22:09:17 +0200 |
---|---|---|
committer | leak <leak@bitmx.net> | 2014-07-07 22:09:17 +0200 |
commit | 1a9c183bc6ec7e168ad58e9bc4798c4ca9d40d32 (patch) | |
tree | 408c2abc03898573bb450e4700427e019eb063b8 /src | |
parent | a738cd96dcf506530e79ecb1f53e09fd59511a70 (diff) |
Fixed the AsyncAcceptor overload (too much c#..)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Server/WorldSocket.h | 4 | ||||
-rw-r--r-- | src/server/shared/Networking/AsyncAcceptor.h | 9 |
2 files changed, 8 insertions, 5 deletions
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 <http://www.gnu.org/licenses/>. */ -#ifndef __WORLDTCPSESSION_H__ -#define __WORLDTCPSESSION_H__ +#ifndef __WORLDSOCKET_H__ +#define __WORLDSOCKET_H__ #include <memory> #include <chrono> 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) { |