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

Merge remote-tracking branch 'origin/android_branch' into android_branch

Browse source
This commit is contained in:
Eric House 2013-01-29 18:57:38 -08:00
commit cdd40b0782
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/relay/scripts/gcm_loop.py
View file

@ -65,7 +65,7 @@ def getPendingMsgs( con, typ ):
def unregister( gcmid ):
global g_con
print "unregister(", gcmid, ")"
query = "UPDATE devices SET unreg=TRUE WHERE id = '%s'" % gcmid
query = "UPDATE devices SET unreg=TRUE WHERE devid = '%s'" % gcmid
g_con.cursor().execute( query )
def asGCMIds(con, devids, typ):

1
xwords4/relay/tpool.cpp
View file

@ -203,6 +203,7 @@ XWThreadPool::get_process_packet( SockType stype, const AddrInfo* 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 ) {

6
xwords4/relay/xwrelay.cpp
View file

@ -1240,11 +1240,11 @@ main( int argc, char** argv )
if ( nWorkerThreads == 0 ) {
(void)cfg->GetValueFor( "NTHREADS", &nWorkerThreads );
}
if ( g_maxsocks == -1 ) {
(void)cfg->GetValueFor( "MAXSOCKS", &g_maxsocks );
} else {
if ( g_maxsocks == -1 && !cfg->GetValueFor( "MAXSOCKS", &g_maxsocks ) ) {
g_maxsocks = 100;
}
char serverNameBuf[128];
if ( serverName == NULL ) {
if ( cfg->GetValueFor( "SERVERNAME", serverNameBuf,

2
xwords4/relay/xwrelay.h
View file

@ -122,7 +122,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 */