Permalink
Browse files

Fix error handling on inconsistent client ready message

Fix android makefile to provide a correct dummy githash if detection fails
  • Loading branch information...
sapier sapier
sapier authored and sapier committed Jul 16, 2014
1 parent 7d72ac6 commit d38f6ebb9bb9ff201b3a1e19a8e6ad311dbe4972
Showing with 13 additions and 3 deletions.
  1. +5 −1 build/android/Makefile
  2. +8 −2 src/server.cpp
@@ -691,7 +691,11 @@ $(ROOT)/jni/src/android_version.h :
echo "#define VERSION_PATCH_ORIG $$(cat ${ROOT}/../../CMakeLists.txt | \
grep ^set\(VERSION_PATCH\ | sed 's/)/ /' | awk '{print $$2;}')" \
>> ${ROOT}/jni/src/android_version.h; \
echo "#define CMAKE_VERSION_GITHASH \"$$(git rev-parse --short=8 HEAD)\"" \
export GITHASH=$$(git rev-parse --short=8 HEAD); \
if [ "x$$GITHASH" = "x" ] ; then \
export GITHASH=gUnknown; \
fi; \
echo "#define CMAKE_VERSION_GITHASH \"$$GITHASH\"" \
>> ${ROOT}/jni/src/android_version.h; \
echo "#define CMAKE_VERSION_STRING STR(VERSION_MAJOR)\".\"STR(VERSION_MINOR)\
\".\"STR(VERSION_PATCH)" \
@@ -1732,14 +1732,20 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
if (playersao == NULL) {
errorstream
<< "TOSERVER_CLIENT_READY stage 2 client init failed for peer "
<< "TOSERVER_CLIENT_READY stage 2 client init failed for peer_id: "
<< peer_id << std::endl;
m_con.DisconnectPeer(peer_id);
return;
}
if(datasize < 2+8)
if(datasize < 2+8) {
errorstream
<< "TOSERVER_CLIENT_READY client sent inconsistent data, disconnecting peer_id: "
<< peer_id << std::endl;
m_con.DisconnectPeer(peer_id);
return;
}
m_clients.setClientVersion(
peer_id,

0 comments on commit d38f6eb

Please sign in to comment.