diff options
author | madmaxoft <github@xoft.cz> | 2014-04-04 13:29:48 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-04-04 13:29:48 +0200 |
commit | d77ca77086ddc158355d7d1c4b37ae19eedfe5f7 (patch) | |
tree | 5bf093d28fb0be55e4c1447161d3275cc55bb5ff /Tools/ProtoProxy/Connection.cpp | |
parent | Merge branch 'master' into HTTPSizeT (diff) | |
parent | Explicit change record size. (diff) | |
download | cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.gz cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.bz2 cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.lz cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.xz cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.tar.zst cuberite-d77ca77086ddc158355d7d1c4b37ae19eedfe5f7.zip |
Diffstat (limited to 'Tools/ProtoProxy/Connection.cpp')
-rw-r--r-- | Tools/ProtoProxy/Connection.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp index f02b503f1..d9b8e3dd1 100644 --- a/Tools/ProtoProxy/Connection.cpp +++ b/Tools/ProtoProxy/Connection.cpp @@ -387,6 +387,8 @@ bool cConnection::RelayFromServer(void) return CLIENTSEND(Buffer, res); } } + ASSERT(!"Unhandled server state while relaying from server"); + return false; } @@ -423,6 +425,8 @@ bool cConnection::RelayFromClient(void) return SERVERSEND(Buffer, res); } } + ASSERT(!"Unhandled server state while relaying from client"); + return false; } @@ -438,11 +442,11 @@ double cConnection::GetRelativeTime(void) -bool cConnection::SendData(SOCKET a_Socket, const char * a_Data, int a_Size, const char * a_Peer) +bool cConnection::SendData(SOCKET a_Socket, const char * a_Data, size_t a_Size, const char * a_Peer) { - DataLog(a_Data, a_Size, "Sending data to %s, %d bytes", a_Peer, a_Size); + DataLog(a_Data, a_Size, "Sending data to %s, %u bytes", a_Peer, (unsigned)a_Size); - int res = send(a_Socket, a_Data, a_Size, 0); + int res = send(a_Socket, a_Data, (int)a_Size, 0); if (res <= 0) { Log("%s closed the socket: %d, %d; aborting connection", a_Peer, res, SocketError); |