X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2Flibaxwin3.so_src%2Fmsg.c;h=a9e416470f7b18c0ffc6b43e378bd01b22c55770;hb=8c20de5e4ec260d9a7ee6d737b7601fba1c871c0;hp=6c134a315d978c8e4f5c5903d952367f179ee53e;hpb=f194730e75d6d3681e5f99a4efed1616fd1ea738;p=tpg%2Facess2.git diff --git a/Usermode/Applications/axwin3_src/libaxwin3.so_src/msg.c b/Usermode/Applications/axwin3_src/libaxwin3.so_src/msg.c index 6c134a31..a9e41647 100644 --- a/Usermode/Applications/axwin3_src/libaxwin3.so_src/msg.c +++ b/Usermode/Applications/axwin3_src/libaxwin3.so_src/msg.c @@ -13,11 +13,16 @@ #include "include/internal.h" #include "include/ipc.h" +#define assert(cnd) do{if(!(cnd)){_SysDebug("Assertion failed: %s", #cnd);}}while(0) + +#define STATICBUF_SIZE 0x1000 + // === CONSTANTS === enum eConnectionType { CONNTYPE_NONE, CONNTYPE_SENDMESSAGE, + CONNTYPE_IPCPIPE, CONNTYPE_UDP, CONNTYPE_TCP }; @@ -33,7 +38,6 @@ tAxWin3_MessageCallback gAxWin3_MessageCallback; // === CODE === void AxWin3_Connect(const char *ServerDesc) { - _SysDebug("ServerDesc (argument) = %s", ServerDesc); if( !ServerDesc ) { ServerDesc = gsAxWin3_int_ServerDesc; } @@ -55,15 +59,31 @@ void AxWin3_Connect(const char *ServerDesc) } break; case 'u': - while(*ServerDesc && *ServerDesc != ':') ServerDesc ++; - ServerDesc ++; + assert( strncmp(ServerDesc, "udp:", 4) == 0 ); + ServerDesc += 4; + _SysDebug("TODO: UDP connection to '%s'", ServerDesc); // TODO: Open socket and create UDP header break; case 't': - while(*ServerDesc && *ServerDesc != ':') ServerDesc ++; - ServerDesc ++; + assert( strncmp(ServerDesc, "tcp:", 4) == 0 ); + ServerDesc += 4; + _SysDebug("TODO: TCP connection to '%s'", ServerDesc); // TODO: Open socket break; + case 'p': + assert( strncmp(ServerDesc, "pipe:", 5) == 0 ); + ServerDesc += 5; + giConnectionType = CONNTYPE_IPCPIPE; + giConnectionNum = _SysOpen(ServerDesc, OPENFLAG_READ|OPENFLAG_WRITE); + if( giConnectionNum == -1 ) { + _SysDebug("Cannot open IPC Pipe '%s'", ServerDesc); + exit(-1); + } + break; + default: + _SysDebug("Unknown server desc format '%s'", ServerDesc); + exit(-1); + break; } } @@ -100,18 +120,19 @@ void AxWin3_int_SendIPCMessage(tAxWin_IPCMessage *Msg) switch(giConnectionType) { case CONNTYPE_SENDMESSAGE: - SysSendMessage(giConnectionNum, size, Msg); + _SysSendMessage(giConnectionNum, size, Msg); break; case CONNTYPE_UDP: { // Create UDP header char tmpbuf[giAxWin3_int_UDPHeaderLen + size]; memcpy(tmpbuf, gaAxWin3_int_UDPHeader, giAxWin3_int_UDPHeaderLen); memcpy(tmpbuf + giAxWin3_int_UDPHeaderLen, Msg, size); - write(giConnectionNum, tmpbuf, sizeof(tmpbuf)); + _SysWrite(giConnectionNum, tmpbuf, sizeof(tmpbuf)); } break; + case CONNTYPE_IPCPIPE: case CONNTYPE_TCP: - write(giConnectionNum, Msg, size); + _SysWrite(giConnectionNum, Msg, size); break; default: break; @@ -122,12 +143,23 @@ tAxWin_IPCMessage *AxWin3_int_GetIPCMessage(int nFD, fd_set *fds) { int len; tAxWin_IPCMessage *ret = NULL; - pid_t tid; + int tid; + fd_set local_set; + + if(!fds) + fds = &local_set; + + if( giConnectionType != CONNTYPE_SENDMESSAGE ) + { + if(nFD <= giConnectionNum) + nFD = giConnectionNum+1; + FD_SET(giConnectionNum, fds); + } _SysSelect(nFD, fds, NULL, NULL, NULL, THREAD_EVENT_IPCMSG); // Clear out IPC messages - while( (len = SysGetMessage(&tid, 0, NULL)) ) + while( (len = _SysGetMessage(&tid, 0, NULL)) ) { if( giConnectionType != CONNTYPE_SENDMESSAGE || tid != giConnectionNum ) { @@ -136,7 +168,7 @@ tAxWin_IPCMessage *AxWin3_int_GetIPCMessage(int nFD, fd_set *fds) if( gAxWin3_MessageCallback ) gAxWin3_MessageCallback(tid, len); else - SysGetMessage(NULL, 0, GETMSG_IGNORE); + _SysGetMessage(NULL, 0, GETMSG_IGNORE); continue ; } @@ -144,16 +176,31 @@ tAxWin_IPCMessage *AxWin3_int_GetIPCMessage(int nFD, fd_set *fds) ret = malloc(len); if(ret == NULL) { _SysDebug("malloc() failed, ignoring message"); - SysGetMessage(NULL, 0, GETMSG_IGNORE); + _SysGetMessage(NULL, 0, GETMSG_IGNORE); return NULL; } - SysGetMessage(NULL, len, ret); + _SysGetMessage(NULL, len, ret); break; } - if( giConnectionType == CONNTYPE_TCP || giConnectionType == CONNTYPE_UDP ) + if( giConnectionType != CONNTYPE_SENDMESSAGE ) { - // Check fds + if( FD_ISSET(giConnectionNum, fds) ) + { + char tmpbuf[STATICBUF_SIZE]; + char *data = tmpbuf; + size_t len = _SysRead(giConnectionNum, tmpbuf, sizeof(tmpbuf)); + + if( giConnectionType == CONNTYPE_UDP ) + { + assert(len > giAxWin3_int_UDPHeaderLen); + len -= giAxWin3_int_UDPHeaderLen; + data += giAxWin3_int_UDPHeaderLen; + } + assert(len >= sizeof(tAxWin_IPCMessage)); + ret = malloc(len); + memcpy(ret, data, len); + } } return ret;