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)" \
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,