Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

do a better job of rejecting messages that have strayed in from a

Browse source 
different game; strutils syntax changes.
This commit is contained in:
ehouse 2006-09-15 07:34:39 +00:00
parent e627d7f670
commit 4029120fc6
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
xwords4/common/server.c
View file

@ -898,7 +898,7 @@ registerRemotePlayer( ServerCtxt* server, XWStreamCtxt* stream )
stream_getBytes( stream, name, nameLen ); stream_getBytes( stream, name, nameLen );
name[nameLen] = '\0'; name[nameLen] = '\0';
replaceStringIfDifferent( MPPARM(server->mpool) &lp->name, name ); replaceStringIfDifferent( server->mpool, &lp->name, name );
XP_FREE( server->mpool, name ); XP_FREE( server->mpool, name );
channelNo = stream_getAddress( stream ); channelNo = stream_getAddress( stream );
@ -974,7 +974,7 @@ client_readInitialMessage( ServerCtxt* server, XWStreamCtxt* stream )
/* so it's not lost (HACK!). Without this, a client won't have a default /* so it's not lost (HACK!). Without this, a client won't have a default
dict name when a new game is started. */ dict name when a new game is started. */
localGI.dictName = copyString( MPPARM(server->mpool) gi->dictName ); localGI.dictName = copyString( server->mpool, gi->dictName );
gi_copy( MPPARM(server->mpool) gi, &localGI ); gi_copy( MPPARM(server->mpool) gi, &localGI );
nCols = localGI.boardSize; nCols = localGI.boardSize;
@ -1606,7 +1606,7 @@ storeBadWords( XP_UCHAR* word, void* closure )
XP_STATUSF( "storeBadWords called with \"%s\"", word ); XP_STATUSF( "storeBadWords called with \"%s\"", word );
server->illegalWordInfo.words[server->illegalWordInfo.nWords++] server->illegalWordInfo.words[server->illegalWordInfo.nWords++]
= copyString( MPPARM(server->mpool) word ); = copyString( server->mpool, word );
return XP_TRUE; return XP_TRUE;
} /* storeBadWords */ } /* storeBadWords */
@ -2288,7 +2288,8 @@ server_receiveMessage( ServerCtxt* server, XWStreamCtxt* incoming )
/* break; */ /* break; */
case XWPROTO_MOVEMADE_INFO_CLIENT: /* client is reporting a move */ case XWPROTO_MOVEMADE_INFO_CLIENT: /* client is reporting a move */
accepted = reflectMoveAndInform( server, incoming ); accepted = (XWSTATE_INTURN == server->nv.gameState)
&& reflectMoveAndInform( server, incoming );
break; break;
case XWPROTO_MOVEMADE_INFO_SERVER: /* server telling me about a move */ case XWPROTO_MOVEMADE_INFO_SERVER: /* server telling me about a move */