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

listen port goes away; add separate union member for relay addressing

Browse source
This commit is contained in:
ehouse 2005-03-19 21:46:51 +00:00
parent 022fd1cb9d
commit fc6095255d
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
xwords4/common/comms.h
View file

@ -22,6 +22,7 @@
#include "comtypes.h" #include "comtypes.h"
#include "mempool.h" #include "mempool.h"
#include "xwrelay.h"
EXTERN_C_START EXTERN_C_START
@ -29,10 +30,12 @@ EXTERN_C_START
#define CONN_ID_NONE 0L #define CONN_ID_NONE 0L
typedef XP_U32 MsgID; typedef XP_U32 MsgID;
typedef XP_U16 XWHostID;
typedef enum { typedef enum {
COMMS_CONN_UNUSED, /* I want errors on uninited case */ COMMS_CONN_UNUSED, /* I want errors on uninited case */
COMMS_CONN_IP, COMMS_CONN_IP_NOUSE,
COMMS_CONN_RELAY,
COMMS_CONN_BT, COMMS_CONN_BT,
COMMS_CONN_IR, COMMS_CONN_IR,
@ -45,14 +48,24 @@ typedef struct CommsAddrRec {
union { union {
struct { struct {
XP_UCHAR hostName_ip[MAX_HOSTNAME_LEN + 1];
XP_U32 ipAddr_ip; /* looked up from above */
XP_U16 port_ip;
} ip;
struct {
XP_UCHAR cookie[MAX_COOKIE_LEN + 1];
XP_UCHAR hostName[MAX_HOSTNAME_LEN + 1]; XP_UCHAR hostName[MAX_HOSTNAME_LEN + 1];
XP_U32 ipAddr; /* looked up from above */ XP_U32 ipAddr; /* looked up from above */
XP_U16 port; XP_U16 port;
} ip; } ip_relay;
struct { struct {
/* nothing? */ /* nothing? */
XP_UCHAR foo; /* wince doesn't like nothing here */ XP_UCHAR foo; /* wince doesn't like nothing here */
} ir; } ir;
struct {
/* nothing? */
XP_UCHAR foo; /* wince doesn't like nothing here */
} bt;
} u; } u;
} CommsAddrRec; } CommsAddrRec;
@ -69,8 +82,9 @@ void comms_destroy( CommsCtxt* comms );
void comms_setConnID( CommsCtxt* comms, XP_U32 connID ); void comms_setConnID( CommsCtxt* comms, XP_U32 connID );
void comms_getAddr( CommsCtxt* comms, CommsAddrRec* addr, XP_U16* listenPort ); void comms_getAddr( CommsCtxt* comms, CommsAddrRec* addr );
void comms_setAddr( CommsCtxt* comms, CommsAddrRec* addr, XP_U16 listenPort ); void comms_setAddr( CommsCtxt* comms, CommsAddrRec* addr );
CommsConnType comms_getConType( CommsCtxt* comms ); CommsConnType comms_getConType( CommsCtxt* comms );
CommsCtxt* comms_makeFromStream( MPFORMAL XWStreamCtxt* stream, CommsCtxt* comms_makeFromStream( MPFORMAL XWStreamCtxt* stream,
@ -78,11 +92,7 @@ CommsCtxt* comms_makeFromStream( MPFORMAL XWStreamCtxt* stream,
void* closure ); void* closure );
void comms_writeToStream( CommsCtxt* comms, XWStreamCtxt* stream ); void comms_writeToStream( CommsCtxt* comms, XWStreamCtxt* stream );
/* void comms_setDefaultTarget( CommsCtxt* comms, char* hostName, */ XP_S16 comms_send( CommsCtxt* comms, XWStreamCtxt* stream );
/* short hostPort ); */
XP_S16 comms_send( CommsCtxt* comms, CommsConnType conType,
XWStreamCtxt* stream );
XP_S16 comms_resendAll( CommsCtxt* comms ); XP_S16 comms_resendAll( CommsCtxt* comms );