Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-28 07:58:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix proxy msg handling to process more than one relayID per message.

Browse source 
Formerly all but the first were dropped.
This commit is contained in:
Andy2 2011-08-15 18:27:00 -07:00
parent e2ef25ae90
commit dc273c7162
1 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
xwords4/relay/xwrelay.cpp
View file

@ -176,15 +176,28 @@ cmdToStr( XWRELAY_Cmd cmd )
} }
static bool static bool
parseRelayID( const char* const in, char* buf, HostID* hid ) parseRelayID( unsigned char** const inp, const unsigned char* const end,
char* buf, int buflen, HostID* hid )
{ {
const char* hidp = strrchr( (char*)in, '/' ); const char* hidp = strchr( (char*)*inp, '/' );
bool ok = NULL != hidp; bool ok = NULL != hidp;
int connNameLen;
if ( ok ) { if ( ok ) {
int connNameLen = hidp - in; connNameLen = hidp - (char*)*inp;
strncpy( buf, in, connNameLen ); ok = connNameLen < buflen;
}
if ( ok ) {
strncpy( buf, (char*)*inp, connNameLen );
buf[connNameLen] = '\0'; buf[connNameLen] = '\0';
*hid = atoi( hidp+1 ); *hid = atoi( hidp+1 );
char* endptr;
*hid = strtol( hidp + 1, &endptr, 10 );
if ( '\n' == *endptr ) {
++endptr;
}
*inp = (unsigned char*)endptr;
} }
return ok; return ok;
} }
@ -728,43 +741,42 @@ handleMsgsMsg( int sock, bool sendFull,
unsigned char* bufp, const unsigned char* end ) unsigned char* bufp, const unsigned char* end )
{ {
unsigned short nameCount; unsigned short nameCount;
int ii;
if ( getNetShort( &bufp, end, &nameCount ) ) { if ( getNetShort( &bufp, end, &nameCount ) ) {
char* in = (char*)bufp;
DBMgr* dbmgr = DBMgr::Get(); DBMgr* dbmgr = DBMgr::Get();
unsigned short count;
/* This is wrong now */
/* reply format: PRX_GET_MSGS case: <message len><n_msgs>[<len><msg>]*
* PRX_HAS_MSGS case: <message len><n_msgs><count>*
*/
vector<unsigned char> out(4); /* space for len and n_msgs */ vector<unsigned char> out(4); /* space for len and n_msgs */
assert( out.size() == 4 ); assert( out.size() == 4 );
for ( ii = 0; ii < nameCount && bufp < end; ++ii ) {
char* saveptr; // See NetUtils.java for reply format
for ( count = 0; ; ++count ) { // message-length: 2
char* name = strtok_r( in, "\n", &saveptr ); // nameCount: 2
if ( NULL == name ) { // name count reps of:
break; // counts-this-name: 2
} // counts-this-name reps of
// len: 2
// msg: <len>
// pack msgs for one game
HostID hid; HostID hid;
char connName[MAX_CONNNAME_LEN+1]; char connName[MAX_CONNNAME_LEN+1];
if ( !parseRelayID( name, connName, &hid ) ) { if ( !parseRelayID( &bufp, end, connName, sizeof(connName),
&hid ) ) {
break; break;
} }
/* For each relayID, write the number of messages and then each /* For each relayID, write the number of messages and then
message (in the getmsg case) */ each message (in the getmsg case) */
int msgCount = dbmgr->PendingMsgCount( connName, hid ); int msgCount = dbmgr->PendingMsgCount( connName, hid );
pushShort( out, msgCount ); pushShort( out, msgCount );
if ( sendFull ) { if ( sendFull ) {
pushMsgs( out, dbmgr, connName, hid, msgCount ); pushMsgs( out, dbmgr, connName, hid, msgCount );
} }
in = NULL;
} }
unsigned short tmp = htons( out.size() - sizeof(tmp) ); unsigned short tmp = htons( out.size() - sizeof(tmp) );
memcpy( &out[0], &tmp, sizeof(tmp) ); memcpy( &out[0], &tmp, sizeof(tmp) );
tmp = htons( count ); tmp = htons( nameCount );
memcpy( &out[2], &tmp, sizeof(tmp) ); memcpy( &out[2], &tmp, sizeof(tmp) );
write( sock, &out[0], out.size() ); write( sock, &out[0], out.size() );
} }
@ -817,24 +829,15 @@ handle_proxy_packet( unsigned char* buf, int len, int sock )
if ( !getNetShort( &bufp, end, &seed ) ) { if ( !getNetShort( &bufp, end, &seed ) ) {
break; break;
} }
unsigned char* crptr =
(unsigned char*)strchr( (char*)bufp, '\n' );
if ( NULL == crptr || crptr >= end ) {
break;
}
*crptr = '\0';
HostID hid; HostID hid;
char connName[MAX_CONNNAME_LEN+1]; char connName[MAX_CONNNAME_LEN+1];
if ( !parseRelayID( (const char*)bufp, connName, if ( !parseRelayID( &bufp, end, connName,
&hid ) ) { sizeof( connName ), &hid ) ) {
break; break;
} }
SafeCref scr( connName ); SafeCref scr( connName );
scr.DeviceGone( hid, seed ); scr.DeviceGone( hid, seed );
/* skip "\n" */
bufp = crptr + 1;
} }
} }
} }