Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

empty the model string if the client version's lower than what I'm

Browse source 
about to release and there's non-ascii stuff in it.
This commit is contained in:
Eric House 2014-04-17 08:13:01 -07:00
parent f05b1e0525
commit 6f0b5c1bea
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
xwords4/relay/xwrelay.cpp
View file

@ -327,6 +327,22 @@ vli2un( const uint8_t** bufpp, const uint8_t* end, uint32_t* out )
return success;
}
static void
checkAllAscii( string& str )
{
const char* strp = str.c_str();
bool bad = false;
while ( '\0' != *strp && !bad ) {
bad = 0 != (0x80 & *strp);
}
if ( bad ) {
logf( XW_LOGERROR, "emptying string %s", str.c_str() );
str.clear();
} else {
logf( XW_LOGINFO, "string %s is ok", str.c_str() );
}
}
static bool
getVLIString( const uint8_t** bufpp, const uint8_t* end,
string& out )
@ -1657,7 +1673,9 @@ handle_udp_packet( UdpThreadClosure* utc )
&& getVLIString( &ptr, end, devDesc )
&& getVLIString( &ptr, end, model )
&& getVLIString( &ptr, end, osVers ) ) {
logf( XW_LOGINFO, "%s: model=%s", __func__, model.c_str() );
if ( 3 >= clientVers ) {
checkAllAscii( model );
}
registerDevice( relayID, &devID, utc->addr(),
clientVers, devDesc, model, osVers );
}