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

fix conflict with type from Palm headers; fix for non-BEYOND_IR case.

Browse source
This commit is contained in:
ehouse 2005-03-08 05:33:38 +00:00
parent 9b9f71322f
commit 0f9eb528d8
1 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
xwords4/common/comms.c
View file

@ -43,7 +43,7 @@ typedef struct MsgQueueElem {
MsgID msgID; MsgID msgID;
} MsgQueueElem; } MsgQueueElem;
typedef XP_U16 HostID; typedef XP_U16 XWHostID;
typedef struct AddressRecord { typedef struct AddressRecord {
struct AddressRecord* next; struct AddressRecord* next;
@ -55,7 +55,7 @@ typedef struct AddressRecord {
MsgID nextMsgID; /* on a per-channel basis */ MsgID nextMsgID; /* on a per-channel basis */
MsgID lastMsgReceived; /* on a per-channel basis */ MsgID lastMsgReceived; /* on a per-channel basis */
XP_PlayerAddr channelNo; XP_PlayerAddr channelNo;
HostID remotesID; XWHostID remotesID;
} AddressRecord; } AddressRecord;
#define ADDRESSRECORD_SIZE_68K 20 #define ADDRESSRECORD_SIZE_68K 20
@ -66,7 +66,7 @@ struct CommsCtxt {
XP_U32 connID; /* 0 means ignore; otherwise must match */ XP_U32 connID; /* 0 means ignore; otherwise must match */
XP_U16 nextChannelNo; XP_U16 nextChannelNo;
AddressRecord* recs; /* return addresses */ AddressRecord* recs; /* return addresses */
HostID localID; /* allows relay to match host with socket */ XWHostID localID; /* allows relay to match host with socket */
TransportSend sendproc; TransportSend sendproc;
void* sendClosure; void* sendClosure;
@ -92,7 +92,7 @@ struct CommsCtxt {
****************************************************************************/ ****************************************************************************/
static AddressRecord* rememberChannelAddress( CommsCtxt* comms, static AddressRecord* rememberChannelAddress( CommsCtxt* comms,
XP_PlayerAddr channelNo, XP_PlayerAddr channelNo,
HostID hostID, XWHostID hostID,
CommsAddrRec* addr ); CommsAddrRec* addr );
static XP_Bool channelToAddress( CommsCtxt* comms, XP_PlayerAddr channelNo, static XP_Bool channelToAddress( CommsCtxt* comms, XP_PlayerAddr channelNo,
CommsAddrRec** addr ); CommsAddrRec** addr );
@ -109,7 +109,7 @@ CommsCtxt*
comms_make( MPFORMAL XW_UtilCtxt* util, XP_Bool isServer, comms_make( MPFORMAL XW_UtilCtxt* util, XP_Bool isServer,
TransportSend sendproc, void* closure ) TransportSend sendproc, void* closure )
{ {
HostID localID; XWHostID localID;
CommsCtxt* result = (CommsCtxt*)XP_MALLOC( mpool, sizeof(*result) ); CommsCtxt* result = (CommsCtxt*)XP_MALLOC( mpool, sizeof(*result) );
XP_MEMSET( result, 0, sizeof(*result) ); XP_MEMSET( result, 0, sizeof(*result) );
@ -205,7 +205,7 @@ comms_makeFromStream( MPFORMAL XWStreamCtxt* stream, XW_UtilCtxt* util,
XP_U16 nAddrRecs; XP_U16 nAddrRecs;
AddressRecord** prevsAddrNext; AddressRecord** prevsAddrNext;
MsgQueueElem** prevsQueueNext; MsgQueueElem** prevsQueueNext;
short i, len; short i;
isServer = stream_getU8( stream ); isServer = stream_getU8( stream );
comms = comms_make( MPPARM(mpool) util, isServer, sendproc, closure ); comms = comms_make( MPPARM(mpool) util, isServer, sendproc, closure );
@ -274,16 +274,19 @@ comms_makeFromStream( MPFORMAL XWStreamCtxt* stream, XW_UtilCtxt* util,
} }
#ifdef BEYOND_IR #ifdef BEYOND_IR
comms->addr.conType = stream_getBits( stream, 3 ); {
comms->addr.u.ip.ipAddr = stream_getU32( stream ); XP_U16 len;
comms->addr.u.ip.port = stream_getU16( stream ); comms->addr.conType = stream_getBits( stream, 3 );
comms->listenPort = stream_getU16( stream ); comms->addr.u.ip.ipAddr = stream_getU32( stream );
len = stream_getU8( stream ); comms->addr.u.ip.port = stream_getU16( stream );
stream_getBytes( stream, comms->addr.u.ip.hostName, len ); comms->listenPort = stream_getU16( stream );
comms->addr.u.ip.hostName[len] = '\0'; len = stream_getU8( stream );
stream_getBytes( stream, comms->addr.u.ip.hostName, len );
comms->addr.u.ip.hostName[len] = '\0';
/* tell client about the port */ /* tell client about the port */
util_listenPortChange( util, comms->listenPort ); util_listenPortChange( util, comms->listenPort );
}
#endif #endif
#ifdef DEBUG #ifdef DEBUG
@ -295,7 +298,7 @@ comms_makeFromStream( MPFORMAL XWStreamCtxt* stream, XW_UtilCtxt* util,
void void
comms_writeToStream( CommsCtxt* comms, XWStreamCtxt* stream ) comms_writeToStream( CommsCtxt* comms, XWStreamCtxt* stream )
{ {
XP_U16 nAddrRecs, len; XP_U16 nAddrRecs;
AddressRecord* rec; AddressRecord* rec;
MsgQueueElem* msg; MsgQueueElem* msg;
@ -338,13 +341,16 @@ comms_writeToStream( CommsCtxt* comms, XWStreamCtxt* stream )
} }
#ifdef BEYOND_IR #ifdef BEYOND_IR
stream_putBits( stream, 3, comms->addr.conType ); {
stream_putU32( stream, comms->addr.u.ip.ipAddr ); XP_U16 len;
stream_putU16( stream, comms->addr.u.ip.port ); stream_putBits( stream, 3, comms->addr.conType );
stream_putU16( stream, comms->listenPort ); stream_putU32( stream, comms->addr.u.ip.ipAddr );
len = XP_STRLEN( comms->addr.u.ip.hostName ); stream_putU16( stream, comms->addr.u.ip.port );
stream_putU8( stream, len ); stream_putU16( stream, comms->listenPort );
stream_putBytes( stream, comms->addr.u.ip.hostName, len ); len = XP_STRLEN( comms->addr.u.ip.hostName );
stream_putU8( stream, len );
stream_putBytes( stream, comms->addr.u.ip.hostName, len );
}
#endif #endif
#ifdef DEBUG #ifdef DEBUG
@ -386,7 +392,9 @@ comms_send( CommsCtxt* comms, CommsConnType conType, XWStreamCtxt* stream )
AddressRecord* rec = getRecordFor( comms, channelNo ); AddressRecord* rec = getRecordFor( comms, channelNo );
MsgID msgID = (!!rec)? ++rec->nextMsgID : 0; MsgID msgID = (!!rec)? ++rec->nextMsgID : 0;
MsgID lastMsgRcd = (!!rec)? rec->lastMsgReceived : 0; MsgID lastMsgRcd = (!!rec)? rec->lastMsgReceived : 0;
HostID remotesID = (!!rec)? rec->remotesID : 0; #ifdef BEYOND_IR
XWHostID remotesID = (!!rec)? rec->remotesID : 0;
#endif
MsgQueueElem* newMsgElem; MsgQueueElem* newMsgElem;
XWStreamCtxt* msgStream; XWStreamCtxt* msgStream;
@ -605,8 +613,11 @@ comms_checkIncommingStream( CommsCtxt* comms, XWStreamCtxt* stream,
MsgID lastMsgRcd; MsgID lastMsgRcd;
XP_Bool validMessage = XP_TRUE; XP_Bool validMessage = XP_TRUE;
AddressRecord* recs = (AddressRecord*)NULL; AddressRecord* recs = (AddressRecord*)NULL;
XWHostID senderID = 0;
#ifdef BEYOND_IR
XP_UCHAR* cookie; XP_UCHAR* cookie;
HostID senderID, hostID; XWHostID hostID;
#endif
#ifdef BEYOND_IR #ifdef BEYOND_IR
cookie = stringFromStream( MPPARM(comms->mpool) stream ); cookie = stringFromStream( MPPARM(comms->mpool) stream );
@ -722,7 +733,7 @@ comms_getStats( CommsCtxt* comms, XWStreamCtxt* stream )
static AddressRecord* static AddressRecord*
rememberChannelAddress( CommsCtxt* comms, XP_PlayerAddr channelNo, rememberChannelAddress( CommsCtxt* comms, XP_PlayerAddr channelNo,
HostID hostID, CommsAddrRec* addr ) XWHostID hostID, CommsAddrRec* addr )
{ {
AddressRecord* recs = NULL; AddressRecord* recs = NULL;
recs = getRecordFor( comms, channelNo ); recs = getRecordFor( comms, channelNo );