From 3f99e8a178167292858b5345a9a5d48ad31dd2d8 Mon Sep 17 00:00:00 2001 From: xX-TheDoctor-Xx Date: Wed, 20 Jul 2016 22:20:50 +0100 Subject: [PATCH] Removed VoidCode enum, added missing tcp client windos code and missing if macro in TcpClient.hpp --- .../Release/VoidNetVS.tlog/CL.command.1.tlog | Bin 5346 -> 5346 bytes .../Release/VoidNetVS.tlog/CL.read.1.tlog | Bin 189284 -> 189710 bytes .../Release/VoidNetVS.tlog/CL.write.1.tlog | Bin 3320 -> 4848 bytes .../Release/VoidNetVS.tlog/Lib.read.1.tlog | Bin 2622 -> 2470 bytes include/Defs.hpp | 10 ----- include/Init.hpp | 2 +- include/TcpClient.hpp | 9 +++-- src/InitWindows.cpp | 6 +-- src/TcpClientWindows.cpp | 37 +++++++++++------- src/VoidNetClient.cpp | 2 +- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/VoidNetVS/VoidNetVS/Release/VoidNetVS.tlog/CL.command.1.tlog b/VoidNetVS/VoidNetVS/Release/VoidNetVS.tlog/CL.command.1.tlog index 485734d1893b1a69d0dc39686ca904d61e89d9be..aee5b9382bb5c6406e9cc4e6e2fa05cd56145248 100644 GIT binary patch delta 43 wcmaE)`ABoaESAmh*h)Az?-NpCntYB;Ve%R_rOkU-jF=`@2&n-X9~eOl0E|))u>b%7 delta 47 wcmaE)`ABoaESAYBLQ0$E*gr4=8BUWou&Hf6z~aX_d5?%1L=?n$$Lqob0J{wlumAu6 diff --git a/VoidNetVS/VoidNetVS/Release/VoidNetVS.tlog/CL.read.1.tlog b/VoidNetVS/VoidNetVS/Release/VoidNetVS.tlog/CL.read.1.tlog index 273036a8655ca6d6b763c2e981e0bed614b9a658..a9af9a2cb4fc9a1c308a7388e9a01803aa203648 100644 GIT binary patch delta 128 zcmaEIjJxj?_k=T(z0UGYzjKU{Z*xkzhRODdv z+VlofMuq7G_Dpr#9ZVQ!T$`Ry%_KGPo!WEwjHj>5V62-g;LHX$N@3%f YnzZRRxR}(oS5-4DVA`(2%_LI*04&2W^8f$< delta 465 zcmeA>#r@!2OAd}H)`-eA-e(c-#q%&?{-2S14@ebqkzI;Z% z%?W{jn5HY_GO|tokjFT0`??>Dek{|0W<^ZzQ)E1~eM2jw5dZcCNsPM~r$;PhRM;Go zK4k!%ptgcZZL-1zh3R%Hnd&w_I5*?kbe$q5wTV`0+dq{s$rMc9bzWh5#ZpG8>D!8! l#I|P?F?BIb*ZafBH$7lFqtSM|Ql=M1(;wVmY#Fdn1ORs$!>|AV diff --git a/VoidNetVS/VoidNetVS/Release/VoidNetVS.tlog/CL.write.1.tlog b/VoidNetVS/VoidNetVS/Release/VoidNetVS.tlog/CL.write.1.tlog index a48a2b7b27216f1e801e4179730e011f4e057de3..7bfdec627a60bbcf30532f304edcf45cc1a39356 100644 GIT binary patch delta 180 zcmew%`9XEVKlaJ%7!@WvaPm!_!yz(R3(Qv8ti`yCaq>MLsmX7c{Wc$9Zeg5U!v<58 zHd&5U4azSAviTV$+)J#V9jbfGcRS6^jB`egRk2pivB?TNL105c pW<6k+1KS+IJ!$d;9>2+xSe3x)9VR~N@Q U39SAcqu690evtm0$#z^)08h*w!2kdN diff --git a/VoidNetVS/VoidNetVS/Release/VoidNetVS.tlog/Lib.read.1.tlog b/VoidNetVS/VoidNetVS/Release/VoidNetVS.tlog/Lib.read.1.tlog index abc774e0b517219e4fe70b9467168bf1da5c1159..3ab96a92d7daf616f812cbb6afe74b788adeeabb 100644 GIT binary patch delta 7 OcmdldvP^ixGEM*tpaSav delta 161 zcmW-Y!4APd6h+UL#EOlbB^%KY5j$Fy##F^BDgq~>` -VoidCode Initialization::initialize() +bool Initialization::initialize() { uint16 code = WSAStartup(MAKEWORD(2, 2), &wsa_data); if (code != 0) { if (Config::GetUsingConsole()) std::cerr << code << std::endl; // display some more information too - return VOID_WSA_INIT_FAILED; + return false; } - return VOID_SUCCESS; + return true; } \ No newline at end of file diff --git a/src/TcpClientWindows.cpp b/src/TcpClientWindows.cpp index 201a620..b84cc1d 100644 --- a/src/TcpClientWindows.cpp +++ b/src/TcpClientWindows.cpp @@ -10,12 +10,12 @@ #undef SendMessage -VoidCode TcpClient::Initialize(const std::string &ip, uint16 port) +bool TcpClient::Initialize(const std::string &ip, uint16 port) { if (ip.size() == 0 || std::count(ip.begin(), ip.end(), '.') != 4) - return VOID_INVALID_IP_ADDRESS; + return false; if (port == 0) - return VOID_INVALID_PORT; + return false; ZeroMemory(&hints, sizeof(hints)); hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; @@ -27,7 +27,7 @@ VoidCode TcpClient::Initialize(const std::string &ip, uint16 port) if (Config::GetUsingConsole()) std::cerr << code << std::endl; // display more info WSACleanup(); - return VOID_TCP_INIT_FAILED; + return false; } ptr = result; @@ -39,11 +39,21 @@ VoidCode TcpClient::Initialize(const std::string &ip, uint16 port) std::cerr << WSAGetLastError() << std::endl; // display more info freeaddrinfo(result); WSACleanup(); - return VOID_TCP_INIT_FAILED; + return false; + } + + code = bind(tcp_socket, result->ai_addr, (int)result->ai_addrlen); + if (code == SOCKET_ERROR) + { + if (Config::GetUsingConsole()) + std::cerr << WSAGetLastError() << std::endl; // display more info + freeaddrinfo(result); + WSACleanup(); + return false; } initialized = true; - return VOID_SUCCESS; + return true; } TcpClient::TcpClient() : port(default_port) @@ -83,23 +93,22 @@ void TcpClient::SetPort(uint16 port) this->port = port; } -VoidCode TcpClient::Connect() +bool TcpClient::Connect() { if (!initialized) { if (ip.size() == 0 || std::count(ip.begin(), ip.end(), '.') != 4) - return VOID_INVALID_IP_ADDRESS; + return false; if (port == 0) - return VOID_INVALID_PORT; - VoidCode code = Initialize(ip, port); - if (code != VOID_SUCCESS) - return code; + return false; + if (Initialize(ip, port) != true) + return false; } uint16 connect_code = ::connect(tcp_socket, ptr->ai_addr, ptr->ai_addrlen); if (connect_code == SOCKET_ERROR) - return VOID_COULDNT_CONNECT; + return false; receive = true; - return VOID_SUCCESS; + return true; } const NetworkBuffer &TcpClient::ReceiveDataArray() diff --git a/src/VoidNetClient.cpp b/src/VoidNetClient.cpp index 46d2b0d..a443b0b 100644 --- a/src/VoidNetClient.cpp +++ b/src/VoidNetClient.cpp @@ -8,7 +8,7 @@ bool VoidNetClientAPI::Connect(const std::string &ip, uint16 port) { client->SetIP(ip); client->SetPort(port); - return client->Connect() == VOID_SUCCESS; + return client->Connect(); } void VoidNetClientAPI::SendMessageToServer(byte tag, byte subject, void *data)