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

Merge branch 'android_branch' into gtk_multigame

Browse source 
Conflicts:
	xwords4/relay/xwrelay.cpp
This commit is contained in:
Eric House 2013-01-26 20:20:54 -08:00
commit cba04e4b95
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/relay/tpool.cpp
View file

@ -203,6 +203,7 @@ XWThreadPool::get_process_packet( SockType stype, QueueCallback proc, const Addr
short packetSize;
assert( sizeof(packetSize) == 2 );
// Fix this to return an allocated buffer
unsigned char buf[MAX_MSG_LEN+1];
int nRead = read_packet( addr->socket(), buf, sizeof(buf) );
if ( nRead < 0 ) {

2
xwords4/relay/xwrelay.h
View file

@ -188,7 +188,7 @@ typedef unsigned char XWRELAY_Cmd;
#define HOST_ID_SERVER 1
#define MAX_INVITE_LEN 31
#define MAX_MSG_LEN 1024 /* Used for proxy too! */
#define MAX_MSG_LEN 2048 /* Used for proxy too! */
#define MAX_CONNNAME_LEN 48 /* host ID, boot time, and seeds as hex? */
#define MAX_DEVID_LEN 8 /* 32-bit number as hex */