From f07bc03c69f704027ecd0fd3ff0d3a0016585061 Mon Sep 17 00:00:00 2001 From: lethosor Date: Tue, 14 Jun 2016 13:21:51 -0400 Subject: [PATCH] Update clsocket and Open()/Listen() usage --- depends/clsocket | 2 +- library/RemoteClient.cpp | 2 +- library/RemoteServer.cpp | 2 +- plugins/luasocket.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/depends/clsocket b/depends/clsocket index 55b6bfb81..b08d765a7 160000 --- a/depends/clsocket +++ b/depends/clsocket @@ -1 +1 @@ -Subproject commit 55b6bfb8121991876282f1ba7db10ab091391e14 +Subproject commit b08d765a7ddacf66693cb2721833b3b56b092aa3 diff --git a/library/RemoteClient.cpp b/library/RemoteClient.cpp index 09861ad5f..07f9c6961 100644 --- a/library/RemoteClient.cpp +++ b/library/RemoteClient.cpp @@ -155,7 +155,7 @@ bool RemoteClient::connect(int port) return false; } - if (!socket->Open((const uint8 *)"localhost", port)) + if (!socket->Open("localhost", port)) { default_output().printerr("Could not connect to localhost: %d\n", port); return false; diff --git a/library/RemoteServer.cpp b/library/RemoteServer.cpp index 0a05833ee..df65e8e5a 100644 --- a/library/RemoteServer.cpp +++ b/library/RemoteServer.cpp @@ -375,7 +375,7 @@ bool ServerMain::listen(int port) socket->Initialize(); - if (!socket->Listen((const uint8 *)"127.0.0.1", port)) + if (!socket->Listen("127.0.0.1", port)) return false; thread = new tthread::thread(threadFn, this); diff --git a/plugins/luasocket.cpp b/plugins/luasocket.cpp index fba059fdc..0259c562f 100644 --- a/plugins/luasocket.cpp +++ b/plugins/luasocket.cpp @@ -83,7 +83,7 @@ static int lua_socket_bind(std::string ip,int port) handle_error(err,false); } sock->SetBlocking(); - if(!sock->Listen((uint8_t*)ip.c_str(),port)) + if(!sock->Listen(ip.c_str(),port)) { handle_error(sock->GetSocketError(),false); } @@ -238,7 +238,7 @@ static int lua_socket_connect(std::string ip,int port) delete sock; throw std::runtime_error(CSimpleSocket::DescribeError(err)); } - if(!sock->Open((const uint8_t*)ip.c_str(),port)) + if(!sock->Open(ip.c_str(),port)) { CSimpleSocket::CSocketError err=sock->GetSocketError(); delete sock;