Commit Diff


commit - b1c14598e18243887b42f63f1e0a38095867ff4c
commit + 06caecb0c4ed9d4d8f237eab4469531e8c96bbf4
blob - 9a5f6969c7a93ab17b48744bca274e80f93d3790
blob + a6e4562f7c3dcdab8f3ec9067dd9ef94d37a1dfd
--- ChangeLog
+++ ChangeLog
@@ -11,6 +11,7 @@
 
 
 ngIRCd CVSHEAD
+  - Implemented the IRC function "WHOWAS".
   - Don't enable assert() calls when not ./configure'd with --enable-debug.
   - Fixed ./configure test for TCP Wrappers: now it runs on Mac OS X as well.
   - Enhanced configure script: now you can pass an (optional) search path
@@ -598,4 +599,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.269 2005/04/13 21:40:49 alex Exp $
+$Id: ChangeLog,v 1.270 2005/05/16 12:25:15 alex Exp $
blob - 1ec5b47c127aad8b1d91b6080a9a5f621ba2d373
blob + 6d052b091bdb4354c246cc310860175441750cd9
--- NEWS
+++ NEWS
@@ -12,6 +12,7 @@
 
 ngIRCd CVSHEAD
 
+  - Implemented the IRC function "WHOWAS".
   - New configuration option "OperServerMode" to enable a workaround needed
     when running an network with ircd2 servers and "OperCanUseMode" enabled
     to prevent the ircd2 daemon to drop mode changes of IRC operators.
@@ -205,4 +206,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: NEWS,v 1.72 2005/04/13 21:40:49 alex Exp $
+$Id: NEWS,v 1.73 2005/05/16 12:25:15 alex Exp $
blob - cf283b51d90e8a50280dc547099b6873d37884c9
blob + 5a55e3fdeb92b12ef95a92833918acfb7497d112
--- src/ngircd/irc-info.c
+++ src/ngircd/irc-info.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2005 Alexander Barton (alex@barton.de)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,12 +14,13 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-info.c,v 1.28 2005/03/19 18:43:48 fw Exp $";
+static char UNUSED id[] = "$Id: irc-info.c,v 1.29 2005/05/16 12:25:15 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 
@@ -722,18 +723,109 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 } /* IRC_WHOIS */
 
 
+/**
+ * IRC "WHOWAS" function.
+ * This function implements the IRC command "WHOWHAS". It handles local
+ * requests and request that should be forwarded to other servers.
+ */
 GLOBAL bool
 IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
 {
+	CLIENT *target, *prefix;
+	WHOWAS *whowas;
+	int max, last, count, i;
+	char t_str[60];
+	
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	/* Falsche Anzahl Parameter? */
-	if(( Req->argc < 1 ) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+	/* Wrong number of parameters? */
+	if(( Req->argc < 1 ) || ( Req->argc > 3 ))
+		return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG,
+					   Client_ID( Client ), Req->command );
 
-	/* ... */
+	/* Search taget */
+	if( Req->argc == 3 )
+		target = Client_Search( Req->argv[2] );
+	else
+		target = Client_ThisServer( );
 
-	return CONNECTED;
+	/* Get prefix */
+	if( Client_Type( Client ) == CLIENT_SERVER )
+		prefix = Client_Search( Req->prefix );
+	else
+		prefix = Client;
+
+	if( ! prefix )
+		return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG,
+					   Client_ID( Client ), Req->prefix );
+
+	/* Forward to other server? */
+	if( target != Client_ThisServer( ))
+	{
+		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER ))
+			return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG,
+						   Client_ID( prefix ),
+						   Req->argv[2] );
+
+		/* Forward */
+		IRC_WriteStrClientPrefix( target, prefix, "WHOWAS %s %s %s",
+					  Req->argv[0], Req->argv[1],
+					  Req->argv[2] );
+		return CONNECTED;
+	}
+	
+	whowas = Client_GetWhowas( );
+	last = Client_GetLastWhowasIndex( );
+	if( last < 0 ) last = 0;
+	
+	if( Req->argc > 1 )
+	{
+		max = atoi( Req->argv[1] );
+		if( max < 1 ) max = MAX_WHOWAS;
+	}
+	else
+		max = DEFAULT_WHOWAS;
+	
+	i = last;
+	count = 0;
+	do
+	{
+		/* Used entry? */
+		if( whowas[i].time > 0 &&
+		    strcasecmp( Req->argv[0], whowas[i].id ) == 0 )
+		{
+			(void)strftime( t_str, sizeof(t_str),
+					"%a %b %d %H:%M:%S %Y",
+					localtime( &whowas[i].time ));
+		
+			if( ! IRC_WriteStrClient( prefix, RPL_WHOWASUSER_MSG,
+						  Client_ID( prefix ),
+						  whowas[i].id,
+						  whowas[i].user,
+						  whowas[i].host, 
+						  whowas[i].info ))
+				return DISCONNECTED;
+		
+			if( ! IRC_WriteStrClient( prefix, RPL_WHOISSERVER_MSG,
+						  Client_ID( prefix ),
+						  whowas[i].id,
+						  whowas[i].server, t_str ))
+				return DISCONNECTED;
+		
+			count++;
+			if( count >= max ) break;
+		}
+		
+		/* previos entry */
+		i--;
+
+		/* "underflow", wrap around */
+		if( i < 0 ) i = MAX_WHOWAS - 1;
+	} while( i != last );
+	
+	return IRC_WriteStrClient( prefix, RPL_ENDOFWHOWAS_MSG,
+				   Client_ID( prefix ), Req->argv[0] );
 } /* IRC_WHOWAS */