Misc warning killing

[tpg/acess2.git] / Usermode / Applications / irc_src / main.c

diff --git a/Usermode/Applications/irc_src/main.c b/Usermode/Applications/irc_src/main.c
index a08553a..3f46d15 100644 (file)
--- a/Usermode/Applications/irc_src/main.c
+++ b/Usermode/Applications/irc_src/main.c
@@ -8,8 +8,6 @@
 #include <net.h>\r
 #include <readline.h>\r
 \r
-#define BUFSIZ 1023\r
-\r
 // === TYPES ===\r
 typedef struct sServer {\r
        struct sServer  *Next;\r
@@ -115,8 +113,8 @@ int main(int argc, const char *argv[], const char *envp[])
        \r
        // HACK: Static server entry\r
        // UCC (University [of Western Australia] Computer Club) IRC Server\r
-       gWindow_Status.Server = Server_Connect( "UCC", "130.95.13.18", 6667 );\r
-//     gWindow_Status.Server = Server_Connect( "Freenode", "89.16.176.16", 6667 );\r
+//     gWindow_Status.Server = Server_Connect( "UCC", "130.95.13.18", 6667 );\r
+       gWindow_Status.Server = Server_Connect( "Freenode", "89.16.176.16", 6667 );\r
 //     gWindow_Status.Server = Server_Connect( "Host", "10.0.2.2", 6667 );\r
 //     gWindow_Status.Server = Server_Connect( "BitlBee", "192.168.1.34", 6667 );\r
        \r
@@ -359,8 +357,7 @@ tMessage *Message_Append(tServer *Server, int Type, const char *Source, const ch
        // Determine if it's a channel or PM message\r
        else if( Dest[0] == '#' || Dest[0] == '&' )     // TODO: Better determining here\r
        {\r
-               tWindow *prev = NULL;\r
-               for(win = gpWindows; win; prev = win, win = win->Next)\r
+               for(win = gpWindows; win; win = win->Next)\r
                {\r
                        if( win->Server == Server && strcmp(win->Name, Dest) == 0 )\r
                        {\r
@@ -425,7 +422,6 @@ tMessage *Message_Append(tServer *Server, int Type, const char *Source, const ch
        \r
        {\r
                int pos = SetCursorPos(giTerminal_Height-2, 0);\r
-               #if 1\r
                if( win == gpCurrentWindow ) {\r
                         int    prefixlen = strlen(Source) + 3;\r
                         int    avail = giTerminal_Width - prefixlen;\r
@@ -434,17 +430,12 @@ tMessage *Message_Append(tServer *Server, int Type, const char *Source, const ch
                        printf("[%s] %.*s\n", Source, avail, Message);\r
                        while( msglen > avail ) {\r
                                msglen -= avail;\r
+                               Message += avail;\r
                                printf("\x1B[T");\r
                                SetCursorPos(giTerminal_Height-2, prefixlen);\r
                                printf("%.*s\n", avail, Message);\r
                        }\r
                }\r
-               #else\r
-               if(win->Name[0])\r
-                       printf("%s/%s [%s] %s\n", win->Server->Name, win->Name, Source, Message);\r
-               else\r
-                       printf("(status) [%s] %s\n", Source, Message);\r
-               #endif\r
                SetCursorPos(-1, pos);\r
        }\r
        \r
@@ -578,15 +569,12 @@ void ParseServerLine(tServer *Server, char *Line)
                                break;\r
                        }\r
                }\r
-               else if( strcmp(cmd, "PING") == 0 )\r
-               {\r
-                       writef(Server->FD, "PONG %s\n", gsHostname);\r
-               }\r
                else if( strcmp(cmd, "NOTICE") == 0 )\r
                {\r
                        char    *class, *message;\r
                        \r
                        class = GetValue(Line, &pos);\r
+                       _SysDebug("NOTICE class='%s'", class);\r
                        \r
                        if( Line[pos] == ':' ) {\r
                                message = Line + pos + 1;\r
@@ -623,10 +611,17 @@ void ParseServerLine(tServer *Server, char *Line)
                        Message_AppendF(Server, MSG_TYPE_SERVER, "", "", "Unknown message %s (%s)\n", cmd, Line+pos);\r
                }\r
        }\r
-       else {\r
+       else {          \r
+               cmd = GetValue(Line, &pos);\r
                \r
-               // Command to client\r
-               Message_AppendF(NULL, MSG_TYPE_UNK, "", "", "Client Command: %s", Line);\r
+               if( strcmp(cmd, "PING") == 0 ) {\r
+                       writef(Server->FD, "PONG %s\n", gsHostname);\r
+                       \r
+               }\r
+               else {\r
+                       // Command to client\r
+                       Message_AppendF(NULL, MSG_TYPE_UNK, "", "", "Client Command: %s", Line);\r
+               }\r
        }\r
 }\r
 \r
@@ -711,38 +706,21 @@ int writef(int FD, const char *Format, ...)
 int OpenTCP(const char *AddressString, short PortNumber)\r
 {\r
         int    fd, addrType;\r
-       char    *iface;\r
        char    addrBuffer[8];\r
        \r
        // Parse IP Address\r
        addrType = Net_ParseAddress(AddressString, addrBuffer);\r
        if( addrType == 0 ) {\r
                fprintf(stderr, "Unable to parse '%s' as an IP address\n", AddressString);\r
+               _SysDebug("Unable to parse '%s' as an IP address\n", AddressString);\r
                return -1;\r
        }\r
        \r
        // Finds the interface for the destination address\r
-       iface = Net_GetInterface(addrType, addrBuffer);\r
-       if( iface == NULL ) {\r
-               fprintf(stderr, "Unable to find a route to '%s'\n", AddressString);\r
-               return -1;\r
-       }\r
-       \r
-//     printf("iface = '%s'\n", iface);\r
-       \r
-       // Open client socket\r
-       // TODO: Move this out to libnet?\r
-       {\r
-                int    len = snprintf(NULL, 100, "/Devices/ip/%s/tcpc", iface);\r
-               char    path[len+1];\r
-               snprintf(path, 100, "/Devices/ip/%s/tcpc", iface);\r
-               fd = open(path, OPENFLAG_READ|OPENFLAG_WRITE);\r
-       }\r
-       \r
-       free(iface);\r
-       \r
+       fd = Net_OpenSocket(addrType, addrBuffer, "tcpc");\r
        if( fd == -1 ) {\r
-               fprintf(stderr, "Unable to open TCP Client for reading\n");\r
+               fprintf(stderr, "Unable to open TCP Client to '%s'\n", AddressString);\r
+               _SysDebug("Unable to open TCP client to '%s'\n", AddressString);\r
                return -1;\r
        }\r
        \r