X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Firc_src%2Fmain.c;h=4ca24155e0afb994899b927c777b0afd0f91cb04;hb=94d9540cae85d2f9e145fe4d2986e84b46bbd052;hp=2bc0ee2389fd2191ea476aba143e191cc4afd339;hpb=cca8ffc1a18df8f209670b7322d64c7298c0aee1;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/irc_src/main.c b/Usermode/Applications/irc_src/main.c
index 2bc0ee23..4ca24155 100644
--- a/Usermode/Applications/irc_src/main.c
+++ b/Usermode/Applications/irc_src/main.c
@@ -78,7 +78,7 @@ char	*gsNickname = "acess";
 tServer	*gpServers;
 tWindow	gWindow_Status = {
 	NULL, NULL, NULL,	// No next, empty list, no server
-	0, ""	// No activity, empty name (rendered as status)
+	0, {""}	// No activity, empty name (rendered as status)
 };
 tWindow	*gpWindows = &gWindow_Status;
 tWindow	*gpCurrentWindow = &gWindow_Status;
@@ -102,8 +102,8 @@ int main(int argc, const char *argv[], const char *envp[])
 	
 	atexit(ExitHandler);
 	
-	giTerminal_Width = ioctl(1, 5, NULL);	// getset_width
-	giTerminal_Height = ioctl(1, 6, NULL);	// getset_height
+	giTerminal_Width = _SysIOCtl(1, 5, NULL);	// getset_width
+	giTerminal_Height = _SysIOCtl(1, 6, NULL);	// getset_height
 	
 	printf("\x1B[?1047h");
 	printf("\x1B[%i;%ir", 0, giTerminal_Height-1);
@@ -113,10 +113,12 @@ int main(int argc, const char *argv[], const char *envp[])
 	
 	// HACK: Static server entry
 	// UCC (University [of Western Australia] Computer Club) IRC Server
-//	gWindow_Status.Server = Server_Connect( "UCC", "130.95.13.18", 6667 );
-	gWindow_Status.Server = Server_Connect( "Freenode", "89.16.176.16", 6667 );
+	gWindow_Status.Server = Server_Connect( "UCC", "130.95.13.18", 6667 );
+	// Freenode (#osdev)
+//	gWindow_Status.Server = Server_Connect( "Freenode", "89.16.176.16", 6667 );
 //	gWindow_Status.Server = Server_Connect( "Host", "10.0.2.2", 6667 );
-//	gWindow_Status.Server = Server_Connect( "BitlBee", "192.168.1.34", 6667 );
+	// Local server
+//	gWindow_Status.Server = Server_Connect( "BitlBee", "192.168.1.39", 6667 );
 	
 	if( !gWindow_Status.Server )
 		return -1;
@@ -192,7 +194,7 @@ int main(int argc, const char *argv[], const char *envp[])
 	{
 		tServer *srv;
 		for( srv = gpServers; srv; srv = srv->Next )
-			close(srv->FD);
+			_SysClose(srv->FD);
 	}
 	return 0;
 }
@@ -205,6 +207,9 @@ int ParseArguments(int argc, const char *argv[])
 	return 0;
 }
 
+/**
+ * \brief Handle a line from the prompt
+ */
 int ParseUserCommand(char *String)
 {
 	if( String[0] == '/' )
@@ -335,7 +340,7 @@ tMessage *Message_AppendF(tServer *Server, int Type, const char *Source, const c
 	va_list	args;
 	 int	len;
 	va_start(args, Message);
-	len = vsnprintf(NULL, 1000, Message, args);
+	len = vsnprintf(NULL, 0, Message, args);
 	{
 		char	buf[len+1];
 		vsnprintf(buf, len+1, Message, args);
@@ -519,11 +524,12 @@ void ParseServerLine(tServer *Server, char *Line)
 	 int	pos = 0;
 	char	*ident, *cmd;
 
-	_SysDebug("Server %s: Line = %s", Server->Name, Line);	
+	_SysDebug("[%s] %s", Server->Name, Line);	
 	
 	// Message?
 	if( *Line == ':' )
 	{
+		pos ++;
 		ident = GetValue(Line, &pos);	// Ident (user or server)
 		cmd = GetValue(Line, &pos);
 		
@@ -547,20 +553,32 @@ void ParseServerLine(tServer *Server, char *Line)
 			
 			switch(num)
 			{
+			case 332:	// Topic
+				user = message;	// Channel
+				message = Line + pos + 1;	// Topic
+				Message_AppendF(Server, MSG_TYPE_SERVER, user, user, "Topic: %s", message);
+				break;
+			case 333:	// Topic set by
+				user = message;	// Channel
+				message = GetValue(Line, &pos);	// User
+				GetValue(Line, &pos);	// Timestamp
+				Message_AppendF(Server, MSG_TYPE_SERVER, user, user, "Set by %s", message);
+				break;
 			case 353:	// /NAMES list
 				// <user> = <channel> :list
-//				GetValue(Line, &pos);	// '='
+				// '=' was eaten in and set to message
 				user = GetValue(Line, &pos);	// Actually channel
 				message = Line + pos + 1;	// List
-				Message_AppendF(Server, MSG_TYPE_SERVER, user, "", "Names: %s", message);
+				Message_AppendF(Server, MSG_TYPE_SERVER, user, user, "Names: %s", message);
 				break;
 			case 366:	// end of /NAMES list
 				// <user> <channel> :msg
 				user = message;
 				message = Line + pos + 1;
-				Message_Append(Server, MSG_TYPE_SERVER, user, "", message);
+				Message_Append(Server, MSG_TYPE_SERVER, user, user, message);
 				break;
 			case 372:	// MOTD Data
+			case 375:	// MOTD Start
 			case 376:	// MOTD End
 				
 			default:
@@ -584,6 +602,10 @@ void ParseServerLine(tServer *Server, char *Line)
 			}
 			
 			//printf("[%s] NOTICE %s: %s\n", Server->Name, ident, message);
+			char *ident_bang = strchr(ident, '!');
+			if( ident_bang ) {
+				*ident_bang = '\0';
+			}
 			Message_Append(Server, MSG_TYPE_NOTICE, ident, "", message);
 		}
 		else if( strcmp(cmd, "PRIVMSG") == 0 )
@@ -597,13 +619,20 @@ void ParseServerLine(tServer *Server, char *Line)
 			else {
 				message = GetValue(Line, &pos);
 			}
+
+			// TODO: Catch when the privmsg is addressed to the user
+
 //			Cmd_PRIVMSG(Server, dest, ident, message);
+			char *ident_bang = strchr(ident, '!');
+			if( ident_bang ) {
+				*ident_bang = '\0';
+			}
 			Message_Append(Server, MSG_TYPE_STANDARD, ident, dest, message);
 		}
 		else if( strcmp(cmd, "JOIN" ) == 0 )
 		{
 			char	*channel;
-			channel = GetValue(Line, &pos) + 1;
+			channel = Line + pos + 1;
 			Window_Create(Server, channel);
 		}
 		else
@@ -638,11 +667,11 @@ int ProcessIncoming(tServer *Server)
 	// ioctl#8 on a TCP client gets the number of bytes in the recieve buffer
 	// - Used to avoid blocking
 	#if NON_BLOCK_READ
-	while( (len = ioctl(Server->FD, 8, NULL)) > 0 )
+	while( (len = _SysIOCtl(Server->FD, 8, NULL)) > 0 )
 	{
 	#endif
 		// Read data
-		len = read(Server->FD, &Server->InBuf[Server->ReadPos], BUFSIZ - Server->ReadPos);
+		len = _SysRead(Server->FD, &Server->InBuf[Server->ReadPos], BUFSIZ - Server->ReadPos);
 		if( len == -1 ) {
 			return -1;
 		}
@@ -687,7 +716,7 @@ int writef(int FD, const char *Format, ...)
 	 int	len;
 	
 	va_start(args, Format);
-	len = vsnprintf(NULL, 1000, Format, args);
+	len = vsnprintf(NULL, 0, Format, args);
 	va_end(args);
 	
 	{
@@ -696,7 +725,7 @@ int writef(int FD, const char *Format, ...)
 		vsnprintf(buf, len+1, Format, args);
 		va_end(args);
 		
-		return write(FD, buf, len);
+		return _SysWrite(FD, buf, len);
 	}
 }
 
@@ -706,49 +735,32 @@ int writef(int FD, const char *Format, ...)
 int OpenTCP(const char *AddressString, short PortNumber)
 {
 	 int	fd, addrType;
-	char	*iface;
 	char	addrBuffer[8];
 	
 	// Parse IP Address
 	addrType = Net_ParseAddress(AddressString, addrBuffer);
 	if( addrType == 0 ) {
 		fprintf(stderr, "Unable to parse '%s' as an IP address\n", AddressString);
+		_SysDebug("Unable to parse '%s' as an IP address\n", AddressString);
 		return -1;
 	}
 	
 	// Finds the interface for the destination address
-	iface = Net_GetInterface(addrType, addrBuffer);
-	if( iface == NULL ) {
-		fprintf(stderr, "Unable to find a route to '%s'\n", AddressString);
-		return -1;
-	}
-	
-//	printf("iface = '%s'\n", iface);
-	
-	// Open client socket
-	// TODO: Move this out to libnet?
-	{
-		 int	len = snprintf(NULL, 100, "/Devices/ip/%s/tcpc", iface);
-		char	path[len+1];
-		snprintf(path, 100, "/Devices/ip/%s/tcpc", iface);
-		fd = open(path, OPENFLAG_READ|OPENFLAG_WRITE);
-	}
-	
-	free(iface);
-	
+	fd = Net_OpenSocket(addrType, addrBuffer, "tcpc");
 	if( fd == -1 ) {
-		fprintf(stderr, "Unable to open TCP Client for reading\n");
+		fprintf(stderr, "Unable to open TCP Client to '%s'\n", AddressString);
+		_SysDebug("Unable to open TCP client to '%s'\n", AddressString);
 		return -1;
 	}
 	
 	// Set remote port and address
 //	printf("Setting port and remote address\n");
-	ioctl(fd, 5, &PortNumber);
-	ioctl(fd, 6, addrBuffer);
+	_SysIOCtl(fd, 5, &PortNumber);
+	_SysIOCtl(fd, 6, addrBuffer);
 	
 	// Connect
 //	printf("Initiating connection\n");
-	if( ioctl(fd, 7, NULL) == 0 ) {
+	if( _SysIOCtl(fd, 7, NULL) == 0 ) {
 		// Shouldn't happen :(
 		fprintf(stderr, "Unable to start connection\n");
 		return -1;
@@ -793,7 +805,7 @@ int SetCursorPos(int Row, int Col)
 		Row = Col / giTerminal_Width;
 		Col = Col % giTerminal_Width;
 	}
-	rv = ioctl(1, 9, NULL);	// Ugh, constants
+	rv = _SysIOCtl(1, 9, NULL);	// Ugh, constants
 	printf("\x1B[%i;%iH", Col, Row);
 	return rv;
 }