diff options
author | Howaner <franzi.moos@googlemail.com> | 2014-04-06 21:43:23 +0200 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2014-04-06 21:43:23 +0200 |
commit | 7da308a7e158542fba0b28d3ad0e865b9e60bfc4 (patch) | |
tree | 84e11eab9c0608e71acedae999bbc3fba9c95d2a /Tools/ProtoProxy/Connection.cpp | |
parent | Add CanChangeDirtToGrass function to Block Handlers. (diff) | |
parent | Updated cWorld::CreateProjectile() documentation (diff) | |
download | cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.tar cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.tar.gz cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.tar.bz2 cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.tar.lz cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.tar.xz cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.tar.zst cuberite-7da308a7e158542fba0b28d3ad0e865b9e60bfc4.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); |