AxWin2 - Fiddling, almost ready for testing :)

[tpg/acess2.git] / Usermode / Applications / axwin2_src / WM / messages.c

diff --git a/Usermode/Applications/axwin2_src/WM/messages.c b/Usermode/Applications/axwin2_src/WM/messages.c
index af7c819..61ffc53 100644 (file)
--- a/Usermode/Applications/axwin2_src/WM/messages.c
+++ b/Usermode/Applications/axwin2_src/WM/messages.c
@@ -6,19 +6,21 @@
 #include <acess/sys.h>
 #include <net.h>
 #include <axwin2/messages.h>
-//#include <sys/select.h>
+#include <string.h>
 
 #define AXWIN_PORT     4101
 
 #define STATICBUF_SIZE 64
 
 // === TYPES ===
-typedef void tMessages_Handle_Callback(void*, size_t, void*);
 
 // === PROTOTYPES ===
-void   Messages_PollIPC();
+void   IPC_Init(void);
+void   IPC_FillSelect(int *nfds, fd_set *set);
+void   IPC_HandleSelect(fd_set *set);
+void   Messages_RespondDatagram(void *Ident, size_t Length, void *Data);
 void   Messages_RespondIPC(void *Ident, size_t Length, void *Data);
-void   Messages_Handle(void *Ident, int MsgLen, tAxWin_Message *Msg, tMessages_Handle_Callback *Respond);
+void   Messages_Handle(size_t IdentLen, void *Ident, size_t MsgLen, tAxWin_Message *Msg, tMessages_Handle_Callback *Respond);
 
 // === GLOBALS ===
  int   giNetworkFileHandle = -1;
@@ -30,10 +32,7 @@ void IPC_Init(void)
         int    tmp;
        // TODO: Check this
        giNetworkFileHandle = open("/Devices/ip/loop/udp", OPENFLAG_READ);
-       tmp = AXWIN_PORT;       ioctl(giIPCFileHandle, 4, &tmp);        // TODO: Don't hard-code IOCtl number
-
-       // TODO: Open a handle to something like /Devices/proc/cur/messages to watch for messages
-//     giMessagesFileHandle = open("/Devices/"
+       tmp = AXWIN_PORT;       ioctl(giNetworkFileHandle, 4, &tmp);    // TODO: Don't hard-code IOCtl number
 }
 
 void IPC_FillSelect(int *nfds, fd_set *set)
@@ -44,75 +43,76 @@ void IPC_FillSelect(int *nfds, fd_set *set)
 
 void IPC_HandleSelect(fd_set *set)
 {
-       if( FD_ISSET(giIPCFileHandle, set) )
+       if( FD_ISSET(giNetworkFileHandle, set) )
        {
                char    staticBuf[STATICBUF_SIZE];
                 int    readlen, identlen;
                char    *msg;
 
-               readlen = read(giIPCFileHandle, sizeof(staticBuf), staticBuf);
+               readlen = read(giNetworkFileHandle, sizeof(staticBuf), staticBuf);
                
                // Assume that all connections are from localhost
                identlen = 4 + Net_GetAddressSize( ((uint16_t*)staticBuf)[1] );
                msg = staticBuf + identlen;
 
-               Messages_Handle(staticBuf, readlen - identlen, (void*)msg, Messages_RespondIPC);
+               Messages_Handle(identlen, staticBuf, readlen - identlen, (void*)msg, Messages_RespondDatagram);
+       }
+
+       while(SysGetMessage(NULL, NULL))
+       {
+               pid_t   tid;
+                int    len = SysGetMessage(&tid, NULL);
+               char    data[len];
+               SysGetMessage(NULL, data);
+
+               Messages_Handle(sizeof(tid), &tid, len, (void*)data, Messages_RespondIPC);
        }
 }
 
-#if 0
-void Messages_PollIPC()
+void Messages_RespondDatagram(void *Ident, size_t Length, void *Data)
 {
-        int    len;
-       pid_t   tid = 0;
-       char    staticBuf[STATICBUF_SIZE];
-       tAxWin_Message  *msg;
-       
-       // Wait for a message
-       while( (len = SysGetMessage(&tid, NULL)) == 0 )
-               sleep();
-       
-       // Allocate the space for it
-       if( len <= STATICBUF_SIZE )
-               msg = (void*)staticBuf;
-       else {
-               msg = malloc( len );
-               if(!msg) {
-                       fprintf(
-                               stderr,
-                               "ERROR - Unable to allocate message buffer, ignoring message from %i\n",
-                               tid);
-                       SysGetMessage(NULL, GETMSG_IGNORE);
-                       return ;
-               }
-       }
-       
-       // Get message data
-       SysGetMessage(NULL, msg);
-       
-       Messages_Handle(msg, Messages_RespondIPC, tid);
+        int    addrSize = Net_GetAddressSize( ((uint16_t*)Ident)[1] );
+       char    tmpbuf[ 4 + addrSize + Length ];
+       memcpy(tmpbuf, Ident, 4 + addrSize);
+       memcpy(tmpbuf + 4 + addrSize, Data, Length);
+       // TODO: Handle fragmented packets
+       write(giNetworkFileHandle, sizeof(tmpbuf), tmpbuf);
 }
-#endif
 
 void Messages_RespondIPC(void *Ident, size_t Length, void *Data)
 {
        SysSendMessage( *(tid_t*)Ident, Length, Data );
 }
 
-void Messages_Handle(void *Ident, int MsgLen, tAxWin_Message *Msg, tMessages_Handle_Callback *Respond)
+void Messages_Handle(size_t IdentLen, void *Ident, size_t MsgLen, tAxWin_Message *Msg, tMessages_Handle_Callback *Respond)
 {
+       if( MsgLen < sizeof(tAxWin_Message) )
+               return ;
+       if( MsgLen < sizeof(tAxWin_Message) + Msg->Size )
+               return ;
+
        switch(Msg->ID)
        {
-       #if 0
        case MSG_SREQ_PING:
+               if( MsgLen < sizeof(tAxWin_Message) + 4 )       return;
                Msg->ID = MSG_SRSP_VERSION;
-               Msg->Size = 2;
+               Msg->Size = 4;
                Msg->Data[0] = 0;
                Msg->Data[1] = 1;
                *(uint16_t*)&Msg->Data[2] = -1;
                Respond(Ident, sizeof(Msg->ID), Msg);
                break;
-       #endif
+
+       case MSG_SREQ_REGISTER:
+               if( Msg->Data[Msg->Size-1] != '\0' ) {
+                       // Invalid message
+                       return ;
+               }
+               
+               AxWin_RegisterClient(IdentLen, Ident, Respond, Msg->Data);
+
+               break;
+
        default:
                fprintf(stderr, "WARNING: Unknown message %i (%p)\n", Msg->ID, Respond);
                _SysDebug("WARNING: Unknown message %i (%p)\n", Msg->ID, Respond);