X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Firc_src%2Fmain.c;h=3f46d1587feac7b026e6e444c736a45c6a4d0722;hb=2da16f7b05b8c3f17ac136128a849db332b067ad;hp=952da4e8428da778c19172c5823ec8b80d1b0f4a;hpb=f36dc289101a45c839595bb88cf1bf942f2cf12b;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/irc_src/main.c b/Usermode/Applications/irc_src/main.c
index 952da4e8..3f46d158 100644
--- a/Usermode/Applications/irc_src/main.c
+++ b/Usermode/Applications/irc_src/main.c
@@ -8,8 +8,6 @@
 #include <net.h>
 #include <readline.h>
 
-#define BUFSIZ	1023
-
 // === TYPES ===
 typedef struct sServer {
 	struct sServer	*Next;
@@ -115,8 +113,8 @@ 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 );
+	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 );
 	
@@ -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
 	else if( Dest[0] == '#' || Dest[0] == '&' )	// TODO: Better determining here
 	{
-		tWindow	*prev = NULL;
-		for(win = gpWindows; win; prev = win, win = win->Next)
+		for(win = gpWindows; win; win = win->Next)
 		{
 			if( win->Server == Server && strcmp(win->Name, Dest) == 0 )
 			{
@@ -425,7 +422,6 @@ tMessage *Message_Append(tServer *Server, int Type, const char *Source, const ch
 	
 	{
 		int pos = SetCursorPos(giTerminal_Height-2, 0);
-		#if 1
 		if( win == gpCurrentWindow ) {
 			 int	prefixlen = strlen(Source) + 3;
 			 int	avail = giTerminal_Width - prefixlen;
@@ -434,17 +430,12 @@ tMessage *Message_Append(tServer *Server, int Type, const char *Source, const ch
 			printf("[%s] %.*s\n", Source, avail, Message);
 			while( msglen > avail ) {
 				msglen -= avail;
+				Message += avail;
 				printf("\x1B[T");
 				SetCursorPos(giTerminal_Height-2, prefixlen);
 				printf("%.*s\n", avail, Message);
 			}
 		}
-		#else
-		if(win->Name[0])
-			printf("%s/%s [%s] %s\n", win->Server->Name, win->Name, Source, Message);
-		else
-			printf("(status) [%s] %s\n", Source, Message);
-		#endif
 		SetCursorPos(-1, pos);
 	}
 	
@@ -583,6 +574,7 @@ void ParseServerLine(tServer *Server, char *Line)
 			char	*class, *message;
 			
 			class = GetValue(Line, &pos);
+			_SysDebug("NOTICE class='%s'", class);
 			
 			if( Line[pos] == ':' ) {
 				message = Line + pos + 1;
@@ -619,10 +611,17 @@ void ParseServerLine(tServer *Server, char *Line)
 			Message_AppendF(Server, MSG_TYPE_SERVER, "", "", "Unknown message %s (%s)\n", cmd, Line+pos);
 		}
 	}
-	else {
+	else {		
+		cmd = GetValue(Line, &pos);
 		
-		// Command to client
-		Message_AppendF(NULL, MSG_TYPE_UNK, "", "", "Client Command: %s", Line);
+		if( strcmp(cmd, "PING") == 0 ) {
+			writef(Server->FD, "PONG %s\n", gsHostname);
+			
+		}
+		else {
+			// Command to client
+			Message_AppendF(NULL, MSG_TYPE_UNK, "", "", "Client Command: %s", Line);
+		}
 	}
 }
 
@@ -643,7 +642,7 @@ int ProcessIncoming(tServer *Server)
 	{
 	#endif
 		// Read data
-		len = read(Server->FD, BUFSIZ - Server->ReadPos, &Server->InBuf[Server->ReadPos]);
+		len = read(Server->FD, &Server->InBuf[Server->ReadPos], BUFSIZ - Server->ReadPos);
 		if( len == -1 ) {
 			return -1;
 		}
@@ -697,7 +696,7 @@ int writef(int FD, const char *Format, ...)
 		vsnprintf(buf, len+1, Format, args);
 		va_end(args);
 		
-		return write(FD, len, buf);
+		return write(FD, buf, len);
 	}
 }
 
@@ -707,38 +706,21 @@ 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;
 	}