#include <stdio.h>\r
#include <string.h>\r
#include <net.h>\r
-\r
-#define BUFSIZ 1023\r
+#include <readline.h>\r
+#include <acess/devices/pty.h>\r
\r
// === TYPES ===\r
typedef struct sServer {\r
+ struct sServer *Next;\r
int FD;\r
char InBuf[BUFSIZ+1];\r
int ReadPos;\r
+ char Name[];\r
} tServer;\r
\r
+typedef struct sMessage\r
+{\r
+ struct sMessage *Next;\r
+ time_t Timestamp;\r
+ tServer *Server;\r
+ int Type;\r
+ char *Source; // Pointer into `Data`\r
+ char Data[];\r
+} tMessage;\r
+\r
+typedef struct sWindow\r
+{\r
+ struct sWindow *Next;\r
+ tMessage *Messages;\r
+ tServer *Server; //!< Canoical server (can be NULL)\r
+ int ActivityLevel;\r
+ char Name[]; // Channel name / remote user\r
+} tWindow;\r
+\r
+enum eMessageTypes\r
+{\r
+ MSG_TYPE_NULL,\r
+ MSG_TYPE_SERVER, // Server message\r
+ \r
+ MSG_TYPE_NOTICE, // NOTICE command\r
+ MSG_TYPE_JOIN, // JOIN command\r
+ MSG_TYPE_PART, // PART command\r
+ MSG_TYPE_QUIT, // QUIT command\r
+ \r
+ MSG_TYPE_STANDARD, // Standard line\r
+ MSG_TYPE_ACTION, // /me\r
+ \r
+ MSG_TYPE_UNK\r
+};\r
+\r
// === PROTOTYPES ===\r
int ParseArguments(int argc, const char *argv[]);\r
-void ProcessIncoming(tServer *Server);\r
+ int ParseUserCommand(char *String);\r
+// --- \r
+tServer *Server_Connect(const char *Name, const char *AddressString, short PortNumber);\r
+tMessage *Message_AppendF(tServer *Server, int Type, const char *Source, const char *Dest, const char *Message, ...);\r
+tMessage *Message_Append(tServer *Server, int Type, const char *Source, const char *Dest, const char *Message);\r
+tWindow *Window_Create(tServer *Server, const char *Name);\r
+void Redraw_Screen(void);\r
+\r
+ int ProcessIncoming(tServer *Server);\r
+// --- Helpers\r
+void SetCursorPos(int Row, int Col);\r
int writef(int FD, const char *Format, ...);\r
int OpenTCP(const char *AddressString, short PortNumber);\r
+char *GetValue(char *Str, int *Ofs);\r
+static inline int isdigit(int ch);\r
\r
// === GLOBALS ===\r
-char *gsUsername = "root";\r
+char *gsUsername = "user";\r
char *gsHostname = "acess";\r
-char *gsRemoteAddress = NULL;\r
char *gsRealName = "Acess2 IRC Client";\r
char *gsNickname = "acess";\r
-short giRemotePort = 6667;\r
+tServer *gpServers;\r
+tWindow gWindow_Status = {\r
+ NULL, NULL, NULL, // No next, empty list, no server\r
+ 0, {""} // No activity, empty name (rendered as status)\r
+};\r
+tWindow *gpWindows = &gWindow_Status;\r
+tWindow *gpCurrentWindow = &gWindow_Status;\r
+ int giTerminal_Width = 80;\r
+ int giTerminal_Height = 25;\r
\r
// ==== CODE ====\r
+void ExitHandler(void)\r
+{\r
+ printf("\x1B[?1047l");\r
+ printf("Quit\n");\r
+}\r
+\r
int main(int argc, const char *argv[], const char *envp[])\r
{\r
int tmp;\r
- tServer srv;\r
+ tReadline *readline_info;\r
+ \r
+ // Parse Command line\r
+ if( (tmp = ParseArguments(argc, argv)) ) return tmp;\r
\r
- memset(&srv, 0, sizeof(srv));\r
+ atexit(ExitHandler);\r
\r
- if( (tmp = ParseArguments(argc, argv)) ) {\r
- return tmp;\r
+<<<<<<< HEAD
+ if( _SysIOCtl(1, DRV_IOCTL_TYPE, NULL) != DRV_TYPE_TERMINAL ) {\r
+ printf(stderr, "note: assuming 80x25, can't get terminal dimensions\n");\r
+ giTerminal_Width = 80;\r
+ giTerminal_Height = 25;\r
}\r
+ else {\r
+ struct ptydims dims;\r
+ _SysIOCtl(1, PTY_IOCTL_GETDIMS, &dims);\r
+=======
+ {\r
+ struct ptydims dims;\r
+ if( _SysIOCtl(1, PTY_IOCTL_GETDIMS, &dims) ) {\r
+ perror("Can't get terminal dimensions");\r
+ return 1;\r
+ }\r
+ \r
+>>>>>>> e7a76b0d8a0cc6aa77966509780973a6f8216ef7
+ giTerminal_Width = dims.W;\r
+ giTerminal_Height = dims.H;\r
+ }\r
+ \r
+ printf("\x1B[?1047h");\r
+ printf("\x1B[%i;%ir", 0, giTerminal_Height-1);\r
\r
- srv.FD = OpenTCP( gsRemoteAddress, giRemotePort );\r
- if( srv.FD == -1 ) {\r
- fprintf(stderr, "Unable to create socket\n");\r
+ SetCursorPos(giTerminal_Height-1, 0);\r
+ printf("[(status)] ");\r
+ \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
+ // Freenode (#osdev)\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
+ // Local server\r
+// gWindow_Status.Server = Server_Connect( "BitlBee", "192.168.1.39", 6667 );\r
+ \r
+ if( !gWindow_Status.Server )\r
return -1;\r
- }\r
\r
- writef(srv.FD, "USER %s %s %s : %s\n", gsUsername, gsHostname, gsRemoteAddress, gsRealName);\r
- writef(srv.FD, "NICK %s", gsNickname);\r
+ SetCursorPos(giTerminal_Height-1, 0);\r
+ printf("[(status)] ");\r
+ fflush(stdout);\r
+ readline_info = Readline_Init(1);\r
\r
- ProcessIncoming(&srv);\r
+ for( ;; )\r
+ {\r
+ fd_set readfds, errorfds;\r
+ int rv, maxFD = 0;\r
+ tServer *srv;\r
+ \r
+ FD_ZERO(&readfds);\r
+ FD_ZERO(&errorfds);\r
+ FD_SET(0, &readfds); // stdin\r
+ \r
+ // Fill server FDs in fd_set\r
+ for( srv = gpServers; srv; srv = srv->Next )\r
+ {\r
+ FD_SET(srv->FD, &readfds);\r
+ FD_SET(srv->FD, &errorfds);\r
+ if( srv->FD > maxFD )\r
+ maxFD = srv->FD;\r
+ }\r
+ \r
+ rv = _SysSelect(maxFD+1, &readfds, 0, &errorfds, NULL, 0);\r
+ if( rv == -1 ) break;\r
+ \r
+ if(FD_ISSET(0, &readfds))\r
+ {\r
+ // User input\r
+ char *cmd = Readline_NonBlock(readline_info);\r
+ if( cmd )\r
+ {\r
+ if( cmd[0] )\r
+ {\r
+ ParseUserCommand(cmd);\r
+ }\r
+ free(cmd);\r
+ // Prompt\r
+ SetCursorPos(giTerminal_Height-1, 0);\r
+ printf("\x1B[K"); // Clear line\r
+ if( gpCurrentWindow->Name[0] )\r
+ printf("[%s:%s] ", gpCurrentWindow->Server->Name, gpCurrentWindow->Name);\r
+ else\r
+ printf("[(status)] ");\r
+ fflush(stdout);\r
+ }\r
+ }\r
+ \r
+ // Server response\r
+ for( srv = gpServers; srv; srv = srv->Next )\r
+ {\r
+ if(FD_ISSET(srv->FD, &readfds))\r
+ {\r
+ if( ProcessIncoming(srv) != 0 ) {\r
+ // Oops, error\r
+ break;\r
+ }\r
+ }\r
+ \r
+ if(FD_ISSET(srv->FD, &errorfds))\r
+ {\r
+ break;\r
+ }\r
+ }\r
+ \r
+ // Oops, an error\r
+ if( srv ) break;\r
+ }\r
\r
- close(srv.FD);\r
+ {\r
+ tServer *srv;\r
+ for( srv = gpServers; srv; srv = srv->Next )\r
+ _SysClose(srv->FD);\r
+ }\r
return 0;\r
}\r
\r
*/\r
int ParseArguments(int argc, const char *argv[])\r
{\r
- gsRemoteAddress = "130.95.13.18"; // irc.ucc.asn.au\r
- \r
return 0;\r
}\r
\r
-void Cmd_PRIVMSG(tServer *Server, const char *Dest, const char *Src, const char *Message)\r
+\r
+void Cmd_join(char *ArgString)\r
+{\r
+ int pos=0;\r
+ char *channel_name = GetValue(ArgString, &pos);\r
+ \r
+ if( gpCurrentWindow->Server )\r
+ {\r
+ writef(gpCurrentWindow->Server->FD, "JOIN :%s\n", channel_name);\r
+ }\r
+}\r
+\r
+void Cmd_quit(char *ArgString)\r
{\r
- printf("%p: %s => %s\t%s\n", Server, Src, Dest, Message);\r
+ const char *quit_message = ArgString;\r
+ if( quit_message == NULL || quit_message[0] == '\0' )\r
+ quit_message = "/quit - Acess2 IRC Client";\r
+ \r
+ for( tServer *srv = gpServers; srv; srv = srv->Next )\r
+ {\r
+ writef(srv->FD, "QUIT :%s\n", quit_message);\r
+ }\r
+ \r
+ exit(0);\r
}\r
\r
+void Cmd_window(char *ArgString)\r
+{\r
+ int pos = 0;\r
+ char *window_id = GetValue(ArgString, &pos);\r
+ int window_num = atoi(window_id);\r
+ \r
+ if( window_num > 0 )\r
+ {\r
+ tWindow *win;\r
+ window_num --; // Move to base 0\r
+ // Get `window_num`th window\r
+ for( win = gpWindows; win && window_num--; win = win->Next );\r
+ if( win ) {\r
+ gpCurrentWindow = win;\r
+ Redraw_Screen();\r
+ }\r
+ // Otherwise, silently ignore\r
+ }\r
+ else\r
+ {\r
+ window_num = 1;\r
+ for( tWindow *win = gpWindows; win; win = win->Next, window_num ++ )\r
+ {\r
+ if( win->Name[0] ) {\r
+ Message_AppendF(NULL, MSG_TYPE_SERVER, "client", "",\r
+ "%i: %s/%s", window_num, win->Server->Name, win->Name);\r
+ }\r
+ else {\r
+ Message_AppendF(NULL, MSG_TYPE_SERVER, "client", "",\r
+ "%i: (status)", window_num);\r
+ }\r
+ }\r
+ }\r
+}\r
+\r
+const struct {\r
+ const char *Name;\r
+ void (*Fcn)(char *ArgString);\r
+} caCommands[] = {\r
+ {"join", Cmd_join},\r
+ {"quit", Cmd_quit},\r
+ {"window", Cmd_window},\r
+ {"win", Cmd_window},\r
+ {"w", Cmd_window},\r
+};\r
+const int ciNumCommands = sizeof(caCommands)/sizeof(caCommands[0]);\r
+\r
/**\r
- * \brief Read a space-separated value from a string\r
+ * \brief Handle a line from the prompt\r
*/\r
-char *GetValue(char *Src, int *Ofs)\r
+int ParseUserCommand(char *String)\r
{\r
- int pos = *Ofs;\r
- char *ret = Src + pos;\r
- char *end;\r
+ if( String[0] == '/' )\r
+ {\r
+ char *command;\r
+ int pos = 0;\r
+ \r
+ command = GetValue(String, &pos)+1;\r
+\r
+ // TODO: Prefix matches\r
+ int cmdIdx = -1;\r
+ for( int i = 0; i < ciNumCommands; i ++ )\r
+ {\r
+ if( strcmp(command, caCommands[i].Name) == 0 ) {\r
+ cmdIdx = i;\r
+ break;\r
+ }\r
+ }\r
+ if( cmdIdx != -1 ) {\r
+ caCommands[cmdIdx].Fcn(String+pos);\r
+ }\r
+ else\r
+ {\r
+ Message_AppendF(NULL, MSG_TYPE_SERVER, "client", "", "Unknown command %s", command);\r
+ }\r
+ }\r
+ else\r
+ {\r
+ // Message\r
+ // - Only send if server is valid and window name is non-empty\r
+ if( gpCurrentWindow->Server && gpCurrentWindow->Name[0] )\r
+ {\r
+ Message_Append(gpCurrentWindow->Server, MSG_TYPE_STANDARD,\r
+ gsNickname, gpCurrentWindow->Name, String);\r
+ writef(gpCurrentWindow->Server->FD,\r
+ "PRIVMSG %s :%s\n", gpCurrentWindow->Name,\r
+ String\r
+ );\r
+ }\r
+ }\r
\r
- while( *ret == ' ' ) ret ++;\r
+ return 0;\r
+}\r
+\r
+/**\r
+ * \brief Connect to a server\r
+ */\r
+tServer *Server_Connect(const char *Name, const char *AddressString, short PortNumber)\r
+{\r
+ tServer *ret;\r
\r
- end = strchr(ret, ' ');\r
- if( end ) {\r
- *end = '\0';\r
+ ret = calloc(1, sizeof(tServer) + strlen(Name) + 1);\r
+ \r
+ strcpy(ret->Name, Name);\r
+ \r
+ // Connect to the remove server\r
+ ret->FD = OpenTCP( AddressString, PortNumber );\r
+ if( ret->FD == -1 ) {\r
+ fprintf(stderr, "%s: Unable to create socket\n", Name);\r
+ return NULL;\r
}\r
- else {\r
- end = ret + strlen(ret) - 1;\r
+ \r
+ // Append to open list\r
+ ret->Next = gpServers;\r
+ gpServers = ret;\r
+ \r
+ // Read some initial data\r
+ Message_Append(NULL, MSG_TYPE_SERVER, Name, "", "Connection opened");\r
+ ProcessIncoming(ret);\r
+ \r
+ // Identify\r
+ writef(ret->FD, "USER %s %s %s : %s\n", gsUsername, gsHostname, AddressString, gsRealName);\r
+ writef(ret->FD, "NICK %s\n", gsNickname);\r
+ Message_Append(NULL, MSG_TYPE_SERVER, Name, "", "Identified");\r
+ //printf("%s: Identified\n", Name);\r
+ \r
+ return ret;\r
+}\r
+\r
+tMessage *Message_AppendF(tServer *Server, int Type, const char *Source, const char *Dest, const char *Message, ...)\r
+{\r
+ va_list args;\r
+ int len;\r
+ va_start(args, Message);\r
+ len = vsnprintf(NULL, 0, Message, args);\r
+ {\r
+ char buf[len+1];\r
+ vsnprintf(buf, len+1, Message, args);\r
+ return Message_Append(Server, Type, Source, Dest, buf);\r
}\r
- *Ofs = end - Src + 1;\r
+}\r
+\r
+tMessage *Message_Append(tServer *Server, int Type, const char *Source, const char *Dest, const char *Message)\r
+{\r
+ tWindow *win = NULL;\r
+ int msgLen = strlen(Message);\r
+ \r
+ // Server==NULL indicates an internal message\r
+ if( Server == NULL || Source[0] == '\0' )\r
+ {\r
+ win = &gWindow_Status;\r
+ }\r
+ // Determine if it's a channel or PM\r
+ else if( Dest[0] == '#' || Dest[0] == '&' ) // TODO: Better determining here\r
+ {\r
+ for(win = gpWindows; win; win = win->Next)\r
+ {\r
+ if( win->Server == Server && strcmp(win->Name, Dest) == 0 )\r
+ {\r
+ break;\r
+ }\r
+ }\r
+ if( !win ) {\r
+ win = Window_Create(Server, Dest);\r
+ }\r
+ }\r
+ #if 0\r
+ else if( strcmp(Dest, Server->Nick) != 0 )\r
+ {\r
+ // Umm... message for someone who isn't us?\r
+ win = &gWindow_Status; // Stick it in the status window, just in case\r
+ }\r
+ #endif\r
+ // Server message?\r
+ else if( strchr(Source, '.') ) // TODO: And again, less hack please\r
+ {\r
+ #if 1\r
+ for(win = gpWindows; win; win = win->Next)\r
+ {\r
+ if( win->Server == Server && strcmp(win->Name, Source) == 0 )\r
+ {\r
+ break;\r
+ }\r
+ }\r
+ #endif\r
+ if( !win ) {\r
+ win = &gWindow_Status;\r
+ }\r
+ \r
+ }\r
+ // Private message\r
+ else\r
+ {\r
+ for(win = gpWindows; win; win = win->Next)\r
+ {\r
+ if( win->Server == Server && strcmp(win->Name, Source) == 0 )\r
+ {\r
+ break;\r
+ }\r
+ }\r
+ if( !win ) {\r
+ win = Window_Create(Server, Dest);\r
+ }\r
+ }\r
+\r
+ // Create message cache \r
+ _SysDebug("Win (%s) msg: <%s> %s", win->Name, Source, Message);\r
+ tMessage *ret;\r
+ ret = malloc( sizeof(tMessage) + msgLen + 1 + strlen(Source) + 1 );\r
+ ret->Source = ret->Data + msgLen + 1;\r
+ strcpy(ret->Source, Source);\r
+ strcpy(ret->Data, Message);\r
+ ret->Type = Type;\r
+ ret->Server = Server;\r
+ \r
+ // Append to window message list\r
+ ret->Next = win->Messages;\r
+ win->Messages = ret;\r
+ \r
+ // Print now if current window\r
+ if( win == gpCurrentWindow )\r
+ {\r
+ printf("\x1b[s");\r
+ SetCursorPos(giTerminal_Height-2, 0);\r
+ int prefixlen = strlen(Source) + 3;\r
+ int avail = giTerminal_Width - prefixlen;\r
+ int msglen = strlen(Message);\r
+ printf("\x1B[T"); // Scroll down 1 (free space below)\r
+ 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
+ printf("\x1b[u");\r
+ }\r
+ \r
+ return ret;\r
+}\r
+\r
+tWindow *Window_Create(tServer *Server, const char *Name)\r
+{\r
+ tWindow *ret, *prev = NULL;\r
+ int num = 1;\r
+ \r
+ // Get the end of the list\r
+ // TODO: Cache this instead\r
+ for( ret = gpCurrentWindow; ret; prev = ret, ret = ret->Next )\r
+ num ++;\r
+ \r
+ ret = malloc(sizeof(tWindow) + strlen(Name) + 1);\r
+ ret->Messages = NULL;\r
+ ret->Server = Server;\r
+ ret->ActivityLevel = 1;\r
+ strcpy(ret->Name, Name);\r
+ \r
+ if( prev ) {\r
+ ret->Next = prev->Next;\r
+ prev->Next = ret;\r
+ }\r
+ else { // Shouldn't happen really\r
+ ret->Next = gpWindows;\r
+ gpWindows = ret;\r
+ }\r
+ \r
+// printf("Win %i %s:%s created\n", num, Server->Name, Name);\r
\r
return ret;\r
}\r
\r
+void Redraw_Screen(void)\r
+{\r
+ int y = 0;\r
+ tMessage *msg;\r
+\r
+ printf("\x1B[2J"); // Clear screen\r
+ printf("\x1B[0;0H"); // Reset cursor\r
+\r
+ msg = gpCurrentWindow->Messages;\r
+ \r
+ // TODO: Title bar?\r
+\r
+ // Note: This renders from the bottom up\r
+ for( y = giTerminal_Height - 1; y -- && msg; msg = msg->Next)\r
+ {\r
+ int msglen = strlen(msg->Data);\r
+ int prefix_len = 3 + strlen(msg->Source);\r
+ int line_avail = giTerminal_Width - prefix_len;\r
+ int i = 0, done = 0;\r
+ \r
+ y -= msglen / line_avail; // Extra lines (y-- above handles the 1 line case)\r
+ SetCursorPos(y, 0);\r
+ printf("[%s] ", msg->Source);\r
+ \r
+ while(done < msglen) {\r
+ done += printf("%.*s", line_avail, msg->Data+done);\r
+ i ++;\r
+ SetCursorPos(y+i, prefix_len);\r
+ }\r
+ }\r
+\r
+ // Bottom line is rendered by the prompt\r
+}\r
+\r
+void Cmd_PRIVMSG(tServer *Server, const char *Dest, const char *Src, const char *Message)\r
+{\r
+ Message_Append(Server, MSG_TYPE_STANDARD, Dest, Src, Message);\r
+ //printf("<%s:%s:%s> %s\n", Server->Name, Dest, Src, Message);\r
+}\r
+\r
/**\r
*/\r
void ParseServerLine(tServer *Server, char *Line)\r
{\r
- int pos;\r
+ int pos = 0;\r
char *ident, *cmd;\r
- if( *Line == ':' ) {\r
- // Message\r
- ident = GetValue(Line, &pos);\r
- pos ++; // Space\r
+\r
+// _SysDebug("[%s] %s", Server->Name, Line); \r
+ \r
+ // Message?\r
+ if( *Line == ':' )\r
+ {\r
+ pos ++;\r
+ ident = GetValue(Line, &pos); // Ident (user or server)\r
cmd = GetValue(Line, &pos);\r
\r
- if( strcmp(cmd, "PRIVMSG") == 0 ) {\r
+ // Numeric command\r
+ if( isdigit(cmd[0]) && isdigit(cmd[1]) && isdigit(cmd[2]) )\r
+ {\r
+ char *user, *message;\r
+ int num;\r
+ num = (cmd[0] - '0') * 100;\r
+ num += (cmd[1] - '0') * 10;\r
+ num += (cmd[2] - '0') * 1;\r
+ \r
+ user = GetValue(Line, &pos);\r
+ \r
+ if( Line[pos] == ':' ) {\r
+ message = Line + pos + 1;\r
+ }\r
+ else {\r
+ message = GetValue(Line, &pos);\r
+ }\r
+ \r
+ switch(num)\r
+ {\r
+ case 332: // Topic\r
+ user = message; // Channel\r
+ message = Line + pos + 1; // Topic\r
+ Message_AppendF(Server, MSG_TYPE_SERVER, user, user, "Topic: %s", message);\r
+ break;\r
+ case 333: // Topic set by\r
+ user = message; // Channel\r
+ message = GetValue(Line, &pos); // User\r
+ GetValue(Line, &pos); // Timestamp\r
+ Message_AppendF(Server, MSG_TYPE_SERVER, user, user, "Set by %s", message);\r
+ break;\r
+ case 353: // /NAMES list\r
+ // <user> = <channel> :list\r
+ // '=' was eaten in and set to message\r
+ user = GetValue(Line, &pos); // Actually channel\r
+ message = Line + pos + 1; // List\r
+ Message_AppendF(Server, MSG_TYPE_SERVER, user, user, "Names: %s", message);\r
+ break;\r
+ case 366: // end of /NAMES list\r
+ // <user> <channel> :msg\r
+ user = message;\r
+ message = Line + pos + 1;\r
+ Message_Append(Server, MSG_TYPE_SERVER, user, user, message);\r
+ break;\r
+ case 372: // MOTD Data\r
+ case 375: // MOTD Start\r
+ case 376: // MOTD End\r
+ \r
+ default:\r
+ //printf("[%s] %i %s\n", Server->Name, num, message);\r
+ Message_Append(Server, MSG_TYPE_SERVER, ident, user, message);\r
+ break;\r
+ }\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
+ }\r
+ else {\r
+ message = GetValue(Line, &pos);\r
+ }\r
+ \r
+ //printf("[%s] NOTICE %s: %s\n", Server->Name, ident, message);\r
+ char *ident_bang = strchr(ident, '!');\r
+ if( ident_bang ) {\r
+ *ident_bang = '\0';\r
+ }\r
+ Message_Append(Server, MSG_TYPE_NOTICE, ident, "", message);\r
+ }\r
+ else if( strcmp(cmd, "PRIVMSG") == 0 )\r
+ {\r
char *dest, *message;\r
- pos ++;\r
dest = GetValue(Line, &pos);\r
- pos ++;\r
+ \r
if( Line[pos] == ':' ) {\r
message = Line + pos + 1;\r
}\r
else {\r
message = GetValue(Line, &pos);\r
}\r
- Cmd_PRIVMSG(Server, dest, ident, message);\r
+\r
+ // TODO: Catch when the privmsg is addressed to the user\r
+\r
+// Cmd_PRIVMSG(Server, dest, ident, message);\r
+ char *ident_bang = strchr(ident, '!');\r
+ if( ident_bang ) {\r
+ *ident_bang = '\0';\r
+ }\r
+ Message_Append(Server, MSG_TYPE_STANDARD, ident, dest, message);\r
+ }\r
+ else if( strcmp(cmd, "JOIN" ) == 0 )\r
+ {\r
+ char *channel;\r
+ channel = Line + pos + 1;\r
+ Window_Create(Server, channel);\r
+ }\r
+ else\r
+ {\r
+ Message_AppendF(Server, MSG_TYPE_SERVER, "", "", "Unknown message %s (%s)\n", cmd, Line+pos);\r
}\r
}\r
- else {\r
- // Command to client\r
+ else { \r
+ cmd = GetValue(Line, &pos);\r
+ \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
/**\r
* \brief Process incoming lines from the server\r
*/\r
-void ProcessIncoming(tServer *Server)\r
+int ProcessIncoming(tServer *Server)\r
{ \r
char *ptr, *newline;\r
int len;\r
// process it line by line\r
// ioctl#8 on a TCP client gets the number of bytes in the recieve buffer\r
// - Used to avoid blocking\r
- while( ioctl(Server->FD, 8, NULL) )\r
+ #if NON_BLOCK_READ\r
+ while( (len = _SysIOCtl(Server->FD, 8, NULL)) > 0 )\r
{\r
+ #endif\r
// Read data\r
- len = read(Server->FD, BUFSIZ - Server->ReadPos, Server->InBuf + Server->ReadPos);\r
+ len = _SysRead(Server->FD, &Server->InBuf[Server->ReadPos], BUFSIZ - Server->ReadPos);\r
+ if( len == -1 ) {\r
+ return -1;\r
+ }\r
Server->InBuf[Server->ReadPos + len] = '\0';\r
\r
// Break into lines\r
while( (newline = strchr(ptr, '\n')) )\r
{\r
*newline = '\0';\r
- printf("%s\n", ptr);\r
+ if( newline[-1] == '\r' ) newline[-1] = '\0';\r
ParseServerLine(Server, ptr);\r
ptr = newline + 1;\r
}\r
\r
// Handle incomplete lines\r
if( ptr - Server->InBuf < len + Server->ReadPos ) {\r
- Server->ReadPos = ptr - Server->InBuf;\r
+ // Update the read position\r
+ // InBuf ReadPos ptr ReadPos+len\r
+ // | old | new used | new unused |\r
+ Server->ReadPos = len + Server->ReadPos - (ptr - Server->InBuf);\r
+ // Copy stuff back (moving "new unused" to the start of the buffer)\r
memcpy(Server->InBuf, ptr, Server->ReadPos);\r
}\r
else {\r
Server->ReadPos = 0;\r
}\r
+ #if NON_BLOCK_READ\r
}\r
+ #endif\r
+ \r
+ return 0;\r
}\r
\r
/**\r
int len;\r
\r
va_start(args, Format);\r
- len = vsnprintf(NULL, 1000, Format, args);\r
+ len = vsnprintf(NULL, 0, Format, args);\r
va_end(args);\r
\r
{\r
vsnprintf(buf, len+1, Format, args);\r
va_end(args);\r
\r
- return write(FD, len, buf);\r
+ return _SysWrite(FD, buf, len);\r
}\r
}\r
\r
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
- // 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 to '%s'\n", AddressString);\r
+ _SysDebug("Unable to open TCP client to '%s'\n", AddressString);\r
return -1;\r
}\r
-\r
+ \r
// Set remote port and address\r
- ioctl(fd, 5, &PortNumber);\r
- ioctl(fd, 6, addrBuffer);\r
+// printf("Setting port and remote address\n");\r
+ _SysIOCtl(fd, 5, &PortNumber);\r
+ _SysIOCtl(fd, 6, addrBuffer);\r
\r
// Connect\r
- if( ioctl(fd, 7, NULL) == 0 ) {\r
+// printf("Initiating connection\n");\r
+ if( _SysIOCtl(fd, 7, NULL) == 0 ) {\r
// Shouldn't happen :(\r
+ fprintf(stderr, "Unable to start connection\n");\r
return -1;\r
}\r
\r
// Return descriptor\r
return fd;\r
}\r
+\r
+/**\r
+ * \brief Read a space-separated value from a string\r
+ */\r
+char *GetValue(char *Src, int *Ofs)\r
+{\r
+ int pos = *Ofs;\r
+ char *ret = Src + pos;\r
+ char *end;\r
+ \r
+ if( !Src ) return NULL;\r
+ \r
+ while( *ret == ' ' ) ret ++;\r
+ \r
+ end = strchr(ret, ' ');\r
+ if( end ) {\r
+ *end = '\0';\r
+ }\r
+ else {\r
+ end = ret + strlen(ret) - 1;\r
+ }\r
+ \r
+ end ++ ;\r
+ while( *ret == ' ' ) end ++;\r
+ *Ofs = end - Src;\r
+ \r
+ return ret;\r
+}\r
+\r
+void SetCursorPos(int Row, int Col)\r
+{\r
+ printf("\x1B[%i;%iH", Col, Row);\r
+}\r
+\r
+static inline int isdigit(int ch)\r
+{\r
+ return '0' <= ch && ch < '9';\r
+}\r
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au