X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-info.c;h=ad0404083a638ec92b8f0923152212c9a3ce0768;hb=1254d315b9d33010035aaf7eba61ac4e8e1cc98f;hp=de4cba279ecb85e960bc3592af340ccd023b9ec3;hpb=5facf5c15ecc49bad1c12e8f624877fb8637e63b;p=ngircd-alex.git

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index de4cba27..ad040408 100644
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -38,6 +38,7 @@
 #include "tool.h"
 #include "parse.h"
 #include "irc.h"
+#include "irc-macros.h"
 #include "irc-write.h"
 #include "client-cap.h"
 
@@ -297,7 +298,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps)
 static bool
 IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
 {
-	char str[LINE_LEN + 1];
+	char str[COMMAND_LEN];
 	CL2CHAN *cl2chan;
 	CHANNEL *chan;
 
@@ -346,7 +347,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
 				    str, sizeof(str));
 		strlcat(str, Channel_Name(chan), sizeof(str));
 
-		if (strlen(str) > (LINE_LEN - CHANNEL_NAME_LEN - 4)) {
+		if (strlen(str) > (COMMAND_LEN - CHANNEL_NAME_LEN - 4)) {
 			/* Line becomes too long: send it! */
 			if (!IRC_WriteStrClient(Client, "%s", str))
 				return DISCONNECTED;
@@ -360,8 +361,15 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
 			return DISCONNECTED;
 	}
 
+	/* IRC-Services? */
+	if (Client_Type(c) == CLIENT_SERVICE &&
+	    !IRC_WriteStrClient(from, RPL_WHOISSERVICE_MSG,
+				Client_ID(from), Client_ID(c)))
+		return DISCONNECTED;
+
 	/* IRC-Operator? */
-	if (Client_HasMode(c, 'o') &&
+	if (Client_Type(c) != CLIENT_SERVICE &&
+	    Client_HasMode(c, 'o') &&
 	    !IRC_WriteStrClient(from, RPL_WHOISOPERATOR_MSG,
 				Client_ID(from), Client_ID(c)))
 		return DISCONNECTED;
@@ -373,10 +381,19 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
 		return DISCONNECTED;
 
 	/* Connected using SSL? */
-	if (Conn_UsesSSL(Client_Conn(c)) &&
-	    !IRC_WriteStrClient(from, RPL_WHOISSSL_MSG, Client_ID(from),
-				Client_ID(c)))
-		return DISCONNECTED;
+	if (Conn_UsesSSL(Client_Conn(c))) {
+		if (!IRC_WriteStrClient(from, RPL_WHOISSSL_MSG, Client_ID(from),
+					Client_ID(c)))
+			return DISCONNECTED;
+
+		/* Certificate fingerprint? */
+		if (Conn_GetFingerprint(Client_Conn(c)) &&
+		    from == c &&
+		    !IRC_WriteStrClient(from, RPL_WHOISCERTFP_MSG,
+					Client_ID(from), Client_ID(c),
+					Conn_GetFingerprint(Client_Conn(c))))
+			return DISCONNECTED;
+	}
 
 	/* Registered nickname? */
 	if (Client_HasMode(c, 'R') &&
@@ -461,16 +478,26 @@ Show_MOTD_End(CLIENT *Client)
 #ifdef SSL_SUPPORT
 static bool Show_MOTD_SSLInfo(CLIENT *Client)
 {
-	bool ret = true;
-	char buf[COMMAND_LEN] = "Connected using Cipher ";
-
-	if (!Conn_GetCipherInfo(Client_Conn(Client), buf + 23, sizeof buf - 23))
-		return true;
+	char buf[COMMAND_LEN];
+	char c_str[128];
+
+	if (Conn_GetCipherInfo(Client_Conn(Client), c_str, sizeof(c_str))) {
+		snprintf(buf, sizeof(buf), "Connected using Cipher %s", c_str);
+		if (!IRC_WriteStrClient(Client, RPL_MOTD_MSG,
+					Client_ID(Client), buf))
+			return false;
+	}
 
-	if (!Show_MOTD_Sendline(Client, buf))
-		ret = false;
+	if (Conn_GetFingerprint(Client_Conn(Client))) {
+		snprintf(buf, sizeof(buf),
+			 "Your client certificate fingerprint is: %s",
+			 Conn_GetFingerprint(Client_Conn(Client)));
+		if (!IRC_WriteStrClient(Client, RPL_MOTD_MSG,
+					Client_ID(Client), buf))
+			return false;
+	}
 
-	return ret;
+	return true;
 }
 #else
 static inline bool
@@ -480,6 +507,13 @@ Show_MOTD_SSLInfo(UNUSED CLIENT *c)
 
 /* Global functions */
 
+/**
+ * Handler for the IRC command "ADMIN".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_ADMIN(CLIENT *Client, REQUEST *Req )
 {
@@ -488,41 +522,41 @@ IRC_ADMIN(CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-	/* find target ... */
-	if( Req->argc == 1 ) target = Client_Search( Req->argv[0] );
-	else target = Client_ThisServer( );
-
-	/* find 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 );
+	IRC_SetPenalty(Client, 1);
 
-	/* forwad message to another server? */
-	if( target != Client_ThisServer( ))
-	{
-		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG, Client_ID( prefix ), Req->argv[0] );
+	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
+	_IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
+	_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix)
 
-		/* forward */
-		IRC_WriteStrClientPrefix( target, prefix, "ADMIN %s", Req->argv[0] );
+	/* Forward? */
+	if(target != Client_ThisServer()) {
+		IRC_WriteStrClientPrefix(target, prefix,
+					 "ADMIN %s", Client_ID(target));
 		return CONNECTED;
 	}
 
-	/* mit Versionsinfo antworten */
-	if( ! IRC_WriteStrClient( Client, RPL_ADMINME_MSG, Client_ID( prefix ), Conf_ServerName )) return DISCONNECTED;
-	if( ! IRC_WriteStrClient( Client, RPL_ADMINLOC1_MSG, Client_ID( prefix ), Conf_ServerAdmin1 )) return DISCONNECTED;
-	if( ! IRC_WriteStrClient( Client, RPL_ADMINLOC2_MSG, Client_ID( prefix ), Conf_ServerAdmin2 )) return DISCONNECTED;
-	if( ! IRC_WriteStrClient( Client, RPL_ADMINEMAIL_MSG, Client_ID( prefix ), Conf_ServerAdminMail )) return DISCONNECTED;
+	if (!IRC_WriteStrClient(Client, RPL_ADMINME_MSG, Client_ID(prefix),
+				Conf_ServerName))
+		return DISCONNECTED;
+	if (!IRC_WriteStrClient(Client, RPL_ADMINLOC1_MSG, Client_ID(prefix),
+				Conf_ServerAdmin1))
+		return DISCONNECTED;
+	if (!IRC_WriteStrClient(Client, RPL_ADMINLOC2_MSG, Client_ID(prefix),
+				Conf_ServerAdmin2))
+		return DISCONNECTED;
+	if (!IRC_WriteStrClient(Client, RPL_ADMINEMAIL_MSG, Client_ID(prefix),
+				Conf_ServerAdminMail))
+		return DISCONNECTED;
 
-	IRC_SetPenalty( Client, 1 );
 	return CONNECTED;
 } /* IRC_ADMIN */
 
-
 /**
  * Handler for the IRC command "INFO".
- * See RFC 2812 section 3.4.10.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
  */
 GLOBAL bool
 IRC_INFO(CLIENT * Client, REQUEST * Req)
@@ -533,38 +567,16 @@ IRC_INFO(CLIENT * Client, REQUEST * Req)
 	assert(Client != NULL);
 	assert(Req != NULL);
 
-	/* Wrong number of parameters? */
-	if (Req->argc > 1)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
-
-	/* Determine 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);
-
-	/* Look for a target */
-	if (Req->argc > 0)
-		target = Client_Search(Req->argv[0]);
-	else
-		target = Client_ThisServer();
-
-	/* Make sure that the target is a server */
-	if (target && Client_Type(target) != CLIENT_SERVER)
-		target = Client_Introducer(target);
+	IRC_SetPenalty(Client, 2);
 
-	if (!target)
-		return IRC_WriteStrClient(prefix, ERR_NOSUCHSERVER_MSG,
-					  Client_ID(prefix), Req->argv[0]);
+	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
+	_IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
+	_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix)
 
-	/* Pass on to another server? */
+	/* Forward? */
 	if (target != Client_ThisServer()) {
 		IRC_WriteStrClientPrefix(target, prefix, "INFO %s",
-					 Req->argv[0]);
+					 Client_ID(target));
 		return CONNECTED;
 	}
 
@@ -586,16 +598,12 @@ IRC_INFO(CLIENT * Client, REQUEST * Req)
 	if (!IRC_WriteStrClient(Client, RPL_ENDOFINFO_MSG, Client_ID(prefix)))
 		return DISCONNECTED;
 
-	IRC_SetPenalty(Client, 2);
 	return CONNECTED;
 } /* IRC_INFO */
 
-
 /**
  * Handler for the IRC "ISON" command.
  *
- * See RFC 2812, 4.9 "Ison message".
- *
  * @param Client The client from which this command has been received.
  * @param Req Request structure with prefix and all parameters.
  * @return CONNECTED or DISCONNECTED.
@@ -611,10 +619,7 @@ IRC_ISON( CLIENT *Client, REQUEST *Req )
 	assert(Client != NULL);
 	assert(Req != NULL);
 
-	/* Bad number of arguments? */
-	if (Req->argc < 1)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
+	_IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
 
 	strlcpy(rpl, RPL_ISON_MSG, sizeof rpl);
 	for (i = 0; i < Req->argc; i++) {
@@ -636,12 +641,9 @@ IRC_ISON( CLIENT *Client, REQUEST *Req )
 	return IRC_WriteStrClient(Client, rpl, Client_ID(Client));
 } /* IRC_ISON */
 
-
 /**
  * Handler for the IRC "LINKS" command.
  *
- * See RFC 2812, 3.4.5 "Links message".
- *
  * @param Client The client from which this command has been received.
  * @param Req Request structure with prefix and all parameters.
  * @return CONNECTED or DISCONNECTED.
@@ -657,9 +659,8 @@ IRC_LINKS(CLIENT *Client, REQUEST *Req)
 
 	IRC_SetPenalty(Client, 1);
 
-	if (Req->argc > 2)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
+	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
+	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
 	/* Get pointer to server mask or "*", if none given */
 	if (Req->argc > 0)
@@ -667,26 +668,15 @@ IRC_LINKS(CLIENT *Client, REQUEST *Req)
 	else
 		mask = "*";
 
-	if (Client_Type(Client) == CLIENT_SERVER)
-		from = Client_Search(Req->prefix);
-	else
-		from = Client;
-	if (!from)
-		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
-					  Client_ID(Client), Req->prefix);
-
 	/* Forward? */
 	if (Req->argc == 2) {
-		target = Client_Search(Req->argv[0]);
-		if (! target || Client_Type(target) != CLIENT_SERVER)
-			return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
-						  Client_ID(from),
-						  Req->argv[0] );
-		else
-			if (target != Client_ThisServer())
-				return IRC_WriteStrClientPrefix(target, from,
-						"LINKS %s %s", Req->argv[0],
-						Req->argv[1]);
+		_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, from)
+		if (target != Client_ThisServer()) {
+			IRC_WriteStrClientPrefix(target, from,
+					"LINKS %s %s", Client_ID(target),
+					Req->argv[1]);
+			return CONNECTED;
+		}
 	}
 
 	c = Client_First();
@@ -707,7 +697,13 @@ IRC_LINKS(CLIENT *Client, REQUEST *Req)
 				  Client_ID(from), mask);
 } /* IRC_LINKS */
 
-
+/**
+ * Handler for the IRC "LUSERS" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_LUSERS( CLIENT *Client, REQUEST *Req )
 {
@@ -716,49 +712,41 @@ IRC_LUSERS( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+	IRC_SetPenalty(Client, 1);
 
-	/* Absender ermitteln */
-	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
-	else from = Client;
-	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
+	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
+	_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from)
 
-	/* An anderen Server forwarden? */
-	if( Req->argc == 2 )
-	{
-		target = Client_Search( Req->argv[1] );
-		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
-		else if( target != Client_ThisServer( )) return IRC_WriteStrClientPrefix( target, from, "LUSERS %s %s", Req->argv[0], Req->argv[1] );
+	/* Forward? */
+	if (target != Client_ThisServer()) {
+		IRC_WriteStrClientPrefix(target, from,
+					 "LUSERS %s %s", Req->argv[0],
+					 Client_ID(target));
+		return CONNECTED;
 	}
 
-	/* Wer ist der Absender? */
-	if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix );
-	else target = Client;
-	if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
-
-	IRC_Send_LUSERS( target );
-
-	IRC_SetPenalty( target, 1 );
-	return CONNECTED;
+	return IRC_Send_LUSERS(from);
 } /* IRC_LUSERS */
 
-
 /**
  * Handler for the IRC command "SERVLIST".
- * List registered services, see RFC 2811, section 3.5.1: the syntax is
- * "SERVLIST [<mask> [<type>]]".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
  */
 GLOBAL bool
 IRC_SERVLIST(CLIENT *Client, REQUEST *Req)
 {
 	CLIENT *c;
 
+	IRC_SetPenalty(Client, 1);
+
 	assert(Client != NULL);
 	assert(Req != NULL);
 
-	if (Req->argc > 2)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
+	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
 
 	if (Req->argc < 2 || strcmp(Req->argv[1], "0") == 0) {
 		for (c = Client_First(); c!= NULL; c = Client_Next(c)) {
@@ -780,7 +768,13 @@ IRC_SERVLIST(CLIENT *Client, REQUEST *Req)
 				  Req->argc > 1 ? Req->argv[1] : "0");
 } /* IRC_SERVLIST */
 
-
+/**
+ * Handler for the IRC command "MOTD".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_MOTD( CLIENT *Client, REQUEST *Req )
 {
@@ -789,31 +783,29 @@ IRC_MOTD( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-	/* From aus Prefix ermitteln */
-	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
-	else from = Client;
-	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+	IRC_SetPenalty(Client, 3);
 
-	if( Req->argc == 1 )
-	{
-		/* forward? */
-		target = Client_Search( Req->argv[0] );
-		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] );
+	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
+	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
+	_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, from)
 
-		if( target != Client_ThisServer( ))
-		{
-			/* Ok, anderer Server ist das Ziel: forwarden */
-			return IRC_WriteStrClientPrefix( target, from, "MOTD %s", Req->argv[0] );
-		}
+	/* Forward? */
+	if (target != Client_ThisServer()) {
+		IRC_WriteStrClientPrefix(target, from, "MOTD %s",
+					 Client_ID(target));
+		return CONNECTED;
 	}
 
-	IRC_SetPenalty( from, 3 );
-	return IRC_Show_MOTD( from );
+	return IRC_Show_MOTD(from);
 } /* IRC_MOTD */
 
-
+/**
+ * Handler for the IRC command "NAMES".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_NAMES( CLIENT *Client, REQUEST *Req )
 {
@@ -824,87 +816,76 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-	/* use prefix to determine "From" */
-	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
-	else from = Client;
-	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+	IRC_SetPenalty(Client, 1);
 
-	if( Req->argc == 2 )
-	{
-		/* forward to another server? */
-		target = Client_Search( Req->argv[1] );
-		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
+	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
+	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
+	_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from)
 
-		if( target != Client_ThisServer( )) {
-			/* target is another server, forward */
-			return IRC_WriteStrClientPrefix( target, from, "NAMES %s :%s", Req->argv[0], Req->argv[1] );
-		}
+	/* Forward? */
+	if (target != Client_ThisServer()) {
+		IRC_WriteStrClientPrefix(target, from, "NAMES %s :%s",
+					 Req->argv[0], Client_ID(target));
+		return CONNECTED;
 	}
 
-	if( Req->argc > 0 )
-	{
-		/* bestimmte Channels durchgehen */
-		ptr = strtok( Req->argv[0], "," );
-		while( ptr )
-		{
-			chan = Channel_Search( ptr );
-			if( chan )
-			{
-				/* print name */
-				if( ! IRC_Send_NAMES( from, chan )) return DISCONNECTED;
-			}
-			if( ! IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), ptr )) return DISCONNECTED;
-
-			/* get next channel name */
+	if (Req->argc > 0) {
+		/* Return NAMES list for specific channels */
+		ptr = strtok(Req->argv[0], ",");
+		while(ptr) {
+			chan = Channel_Search(ptr);
+			if (chan && !IRC_Send_NAMES(from, chan))
+				return DISCONNECTED;
+			if (!IRC_WriteStrClient(from, RPL_ENDOFNAMES_MSG,
+						Client_ID(from), ptr))
+				return DISCONNECTED;
 			ptr = strtok( NULL, "," );
 		}
 		return CONNECTED;
 	}
 
-	chan = Channel_First( );
-	while( chan )
-	{
-		if( ! IRC_Send_NAMES( from, chan )) return DISCONNECTED;
-
-		chan = Channel_Next( chan );
+	chan = Channel_First();
+	while (chan) {
+		if (!IRC_Send_NAMES(from, chan))
+			return DISCONNECTED;
+		chan = Channel_Next(chan);
 	}
 
 	/* Now print all clients which are not in any channel */
-	c = Client_First( );
-	snprintf( rpl, sizeof( rpl ), RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
-	while( c )
-	{
-		if(( Client_Type( c ) == CLIENT_USER ) && ( Channel_FirstChannelOf( c ) == NULL ) && ( ! strchr( Client_Modes( c ), 'i' )))
+	c = Client_First();
+	snprintf(rpl, sizeof(rpl), RPL_NAMREPLY_MSG, Client_ID(from), "*", "*");
+	while (c) {
+		if (Client_Type(c) == CLIENT_USER
+		    && Channel_FirstChannelOf(c) == NULL
+		    && !strchr(Client_Modes(c), 'i'))
 		{
 			/* its a user, concatenate ... */
-			if( rpl[strlen( rpl ) - 1] != ':' ) strlcat( rpl, " ", sizeof( rpl ));
-			strlcat( rpl, Client_ID( c ), sizeof( rpl ));
+			if (rpl[strlen(rpl) - 1] != ':')
+				strlcat(rpl, " ", sizeof(rpl));
+			strlcat(rpl, Client_ID(c), sizeof(rpl));
 
-			if( strlen( rpl ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
-			{
+			if (strlen(rpl) > COMMAND_LEN - CLIENT_NICK_LEN - 4) {
 				/* Line is gwoing too long, send now */
-				if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
-				snprintf( rpl, sizeof( rpl ), RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
+				if (!IRC_WriteStrClient(from, "%s", rpl))
+					return DISCONNECTED;
+				snprintf(rpl, sizeof(rpl), RPL_NAMREPLY_MSG,
+					 Client_ID(from), "*", "*");
 			}
 		}
-
-		c = Client_Next( c );
-	}
-	if( rpl[strlen( rpl ) - 1] != ':')
-	{
-		if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
+		c = Client_Next(c);
 	}
+	if (rpl[strlen(rpl) - 1] != ':' && !IRC_WriteStrClient(from, "%s", rpl))
+		return DISCONNECTED;
 
-	IRC_SetPenalty( from, 1 );
-	return IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), "*" );
+	return IRC_WriteStrClient(from, RPL_ENDOFNAMES_MSG, Client_ID(from), "*");
 } /* IRC_NAMES */
 
-
 /**
  * Handler for the IRC command "STATS".
- * See RFC 2812 section 3.4.4.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
  */
 GLOBAL bool
 IRC_STATS( CLIENT *Client, REQUEST *Req )
@@ -921,32 +902,17 @@ IRC_STATS( CLIENT *Client, REQUEST *Req )
 	assert(Client != NULL);
 	assert(Req != NULL);
 
-	if (Req->argc > 2)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
-
-	/* use prefix to determine "From" */
-	if (Client_Type(Client) == CLIENT_SERVER)
-		from = Client_Search(Req->prefix);
-	else
-		from = Client;
-
-	if (!from)
-		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
-					  Client_ID(Client), Req->prefix);
+	IRC_SetPenalty(Client, 2);
 
-	if (Req->argc == 2) {
-		/* forward to another server? */
-		target = Client_Search(Req->argv[1]);
-		if ((!target) || (Client_Type(target) != CLIENT_SERVER))
-			return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
-						 Client_ID(from), Req->argv[1]);
+	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
+	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
+	_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from)
 
-		if (target != Client_ThisServer()) {
-			/* forward to another server */
-			return IRC_WriteStrClientPrefix(target, from,
-				     "STATS %s %s", Req->argv[0], Req->argv[1]);
-		}
+	/* Forward? */
+	if (target != Client_ThisServer()) {
+		IRC_WriteStrClientPrefix(target, from, "STATS %s %s",
+					 Req->argv[0], Client_ID(target));
+		return CONNECTED;
 	}
 
 	if (Req->argc > 0)
@@ -1038,25 +1004,35 @@ IRC_STATS( CLIENT *Client, REQUEST *Req )
 		break;
 	}
 
-	IRC_SetPenalty(from, 2);
 	return IRC_WriteStrClient(from, RPL_ENDOFSTATS_MSG,
 				  Client_ID(from), query);
 } /* IRC_STATS */
 
-
 /**
  * Handler for the IRC command "SUMMON".
- * See RFC 2812 section 4.5. ngIRCd doesn't implement this functionality and
- * therefore answers with ERR_SUMMONDISABLED.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
  */
 GLOBAL bool
 IRC_SUMMON(CLIENT * Client, UNUSED REQUEST * Req)
 {
+	assert(Client != NULL);
+
+	IRC_SetPenalty(Client, 1);
+
 	return IRC_WriteStrClient(Client, ERR_SUMMONDISABLED_MSG,
 				  Client_ID(Client));
 } /* IRC_SUMMON */
 
-
+/**
+ * Handler for the IRC command "TIME".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_TIME( CLIENT *Client, REQUEST *Req )
 {
@@ -1064,35 +1040,34 @@ IRC_TIME( CLIENT *Client, REQUEST *Req )
 	char t_str[64];
 	time_t t;
 
-	assert( Client != NULL );
-	assert( Req != NULL );
-
-	if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+	assert(Client != NULL);
+	assert(Req != NULL);
 
-	if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
-	else from = Client;
-	if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+	IRC_SetPenalty(Client, 1);
 
-	if( Req->argc == 1 )
-	{
-		target = Client_Search( Req->argv[0] );
-		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
+	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
+	_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, from)
 
-		if( target != Client_ThisServer( ))
-		{
-			return IRC_WriteStrClientPrefix( target, from, "TIME %s", Req->argv[0] );
-		}
+	/* Forward? */
+	if (target != Client_ThisServer()) {
+		IRC_WriteStrClientPrefix(target, from, "TIME %s",
+					 Client_ID(target));
+		return CONNECTED;
 	}
 
 	t = time( NULL );
-	(void)strftime( t_str, 60, "%A %B %d %Y -- %H:%M %Z", localtime( &t ));
-	return IRC_WriteStrClient( from, RPL_TIME_MSG, Client_ID( from ), Client_ID( Client_ThisServer( )), t_str );
+	(void)strftime(t_str, 60, "%A %B %d %Y -- %H:%M %Z", localtime(&t));
+	return IRC_WriteStrClient(from, RPL_TIME_MSG, Client_ID(from),
+				  Client_ID(Client_ThisServer()), t_str);
 } /* IRC_TIME */
 
-
 /**
  * Handler for the IRC command "USERHOST".
- * See RFC 2812 section 4.8.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
  */
 GLOBAL bool
 IRC_USERHOST(CLIENT *Client, REQUEST *Req)
@@ -1104,9 +1079,9 @@ IRC_USERHOST(CLIENT *Client, REQUEST *Req)
 	assert(Client != NULL);
 	assert(Req != NULL);
 
-	if ((Req->argc < 1))
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
+	IRC_SetPenalty(Client, 1);
+
+	_IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
 
 	if (Req->argc > 5)
 		max = 5;
@@ -1137,19 +1112,31 @@ IRC_USERHOST(CLIENT *Client, REQUEST *Req)
 	return IRC_WriteStrClient(Client, rpl, Client_ID(Client));
 } /* IRC_USERHOST */
 
-
 /**
  * Handler for the IRC command "USERS".
- * See RFC 2812 section 4.6. As suggested there the command is disabled.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
  */
 GLOBAL bool
 IRC_USERS(CLIENT * Client, UNUSED REQUEST * Req)
 {
+	assert(Client != NULL);
+
+	IRC_SetPenalty(Client, 1);
+
 	return IRC_WriteStrClient(Client, ERR_USERSDISABLED_MSG,
 				  Client_ID(Client));
 } /* IRC_USERS */
 
-
+/**
+ * Handler for the IRC command "VERSION".
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
+ */
 GLOBAL bool
 IRC_VERSION( CLIENT *Client, REQUEST *Req )
 {
@@ -1158,41 +1145,29 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
-
-	/* Ziel suchen */
-	if( Req->argc == 1 ) target = Client_Search( Req->argv[0] );
-	else target = Client_ThisServer( );
-
-	/* Prefix ermitteln */
-	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 );
+	IRC_SetPenalty(Client, 1);
 
-	/* An anderen Server weiterleiten? */
-	if( target != Client_ThisServer( ))
-	{
-		if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG, Client_ID( prefix ), Req->argv[0] );
+	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
+	_IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
+	_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix)
 
-		/* forwarden */
-		IRC_WriteStrClientPrefix( target, prefix, "VERSION %s", Req->argv[0] );
+	/* Forward? */
+	if (target != Client_ThisServer()) {
+		IRC_WriteStrClientPrefix(target, prefix, "VERSION %s",
+					 Client_ID(target));
 		return CONNECTED;
 	}
 
 	/* send version information */
-	IRC_SetPenalty(Client, 1);
 	return IRC_WriteStrClient(Client, RPL_VERSION_MSG, Client_ID(prefix),
 				  PACKAGE_NAME, PACKAGE_VERSION,
 				  NGIRCd_DebugLevel, Conf_ServerName,
 				  NGIRCd_VersionAddition);
 } /* IRC_VERSION */
 
-
 /**
  * Handler for the IRC "WHO" command.
  *
- * See RFC 2812, 3.6.1 "Who query".
- *
  * @param Client The client from which this command has been received.
  * @param Req Request structure with prefix and all parameters.
  * @return CONNECTED or DISCONNECTED.
@@ -1206,12 +1181,11 @@ IRC_WHO(CLIENT *Client, REQUEST *Req)
 	assert (Client != NULL);
 	assert (Req != NULL);
 
-	if (Req->argc > 2)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					  Client_ID(Client), Req->command);
+	IRC_SetPenalty(Client, 1);
 
-	only_ops = false;
+	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
 
+	only_ops = false;
 	if (Req->argc == 2) {
 		if (strcmp(Req->argv[1], "o") == 0)
 			only_ops = true;
@@ -1224,7 +1198,6 @@ IRC_WHO(CLIENT *Client, REQUEST *Req)
 #endif
 	}
 
-	IRC_SetPenalty(Client, 1);
 	if (Req->argc >= 1) {
 		/* Channel or mask given */
 		chan = Channel_Search(Req->argv[0]);
@@ -1244,15 +1217,12 @@ IRC_WHO(CLIENT *Client, REQUEST *Req)
 	return IRC_WHO_Mask(Client, NULL, only_ops);
 } /* IRC_WHO */
 
-
 /**
  * Handler for the IRC "WHOIS" command.
  *
- * See RFC 2812, 3.6.2 "Whois query".
- *
- * @param Client	The client from which this command has been received.
- * @param Req		Request structure with prefix and all parameters.
- * @return		CONNECTED or DISCONNECTED.
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
  */
 GLOBAL bool
 IRC_WHOIS( CLIENT *Client, REQUEST *Req )
@@ -1266,40 +1236,29 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
+	IRC_SetPenalty(Client, 1);
+
 	/* Bad number of parameters? */
 	if (Req->argc < 1 || Req->argc > 2)
 		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
 					  Client_ID(Client), Req->command);
 
-	/* Search sender of the WHOIS */
-	if (Client_Type(Client) == CLIENT_SERVER) {
-		from = Client_Search(Req->prefix);
-	} else {
-		IRC_SetPenalty(Client, 1);
-		from = Client;
-	}
-	if (!from)
-		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
-					  Client_ID(Client), Req->prefix);
+	_IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
 	/* Get target server for this command */
 	if (Req->argc > 1) {
-		/* Search the target server, which can be specified as a
-		 * nickname on that server as well: */
-		target = Client_Search(Req->argv[0]);
-		if (!target)
-			return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
-						Client_ID(from), Req->argv[0]);
+		_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, Client)
 	} else
 		target = Client_ThisServer();
+
 	assert(target != NULL);
 
-	/* Forward to other server? */
-	if (Client_NextHop(target) != Client_ThisServer() &&
-	    Client_Type(Client_NextHop(target)) == CLIENT_SERVER)
-		return IRC_WriteStrClientPrefix(target, from,
-						"WHOIS %s :%s",
-						Req->argv[0], Req->argv[1]);
+	/* Forward? */
+	if (target != Client_ThisServer()) {
+		IRC_WriteStrClientPrefix(target, from, "WHOIS %s :%s",
+					 Req->argv[0], Req->argv[1]);
+		return CONNECTED;
+	}
 
 	is_remote = Client_Conn(from) < 0;
 	strlcpy(mask, Req->argv[Req->argc - 1], sizeof(mask));
@@ -1318,7 +1277,8 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 		 */
 		if (!has_wildcards || is_remote) {
 			c = Client_Search(query);
-			if (c && Client_Type(c) == CLIENT_USER) {
+			if (c && (Client_Type(c) == CLIENT_USER
+				  || Client_Type(c) == CLIENT_SERVICE)) {
 				if (!IRC_WHOIS_SendReply(Client, from, c))
 					return DISCONNECTED;
 			} else {
@@ -1364,11 +1324,12 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 				  Client_ID(from), Req->argv[Req->argc - 1]);
 } /* 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.
+ * Handler for the IRC "WHOWAS" command.
+ *
+ * @param Client The client from which this command has been received.
+ * @param Req Request structure with prefix and all parameters.
+ * @return CONNECTED or DISCONNECTED.
  */
 GLOBAL bool
 IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
@@ -1387,38 +1348,19 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
 		return CONNECTED;
 
 	/* Wrong number of parameters? */
-	if (Req->argc > 3)
-		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
-					Client_ID(Client), Req->command);
 	if (Req->argc < 1)
-		return IRC_WriteStrClient(Client, ERR_NONICKNAMEGIVEN_MSG, Client_ID(Client));
+		return IRC_WriteStrClient(Client, ERR_NONICKNAMEGIVEN_MSG,
+					  Client_ID(Client));
 
-	/* Search target */
-	if (Req->argc == 3)
-		target = Client_Search(Req->argv[2]);
-	else
-		target = Client_ThisServer();
-
-	/* Get prefix */
-	if (Client_Type(Client) == CLIENT_SERVER)
-		prefix = Client_Search(Req->prefix);
-	else
-		prefix = Client;
+	_IRC_ARGC_LE_OR_RETURN_(Client, Req, 3)
+	_IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
+	_IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 2, prefix)
 
-	if (!prefix)
-		return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
-						Client_ID(Client), Req->prefix);
-
-	/* Forward to other server? */
+	/* Forward? */
 	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] );
+		IRC_WriteStrClientPrefix(target, prefix, "WHOWAS %s %s %s",
+					 Req->argv[0], Req->argv[1],
+					 Client_ID(target));
 		return CONNECTED;
 	}
 
@@ -1466,10 +1408,10 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
 						Client_ID(prefix), nick))
 			return DISCONNECTED;
 	}
-	return IRC_WriteStrClient(prefix, RPL_ENDOFWHOWAS_MSG, Client_ID(prefix), Req->argv[0]);
+	return IRC_WriteStrClient(prefix, RPL_ENDOFWHOWAS_MSG,
+				  Client_ID(prefix), Req->argv[0]);
 } /* IRC_WHOWAS */
 
-
 /**
  * Send LUSERS reply to a client.
  *
@@ -1542,7 +1484,6 @@ IRC_Send_LUSERS(CLIENT *Client)
 	return CONNECTED;
 } /* IRC_Send_LUSERS */
 
-
 GLOBAL bool
 IRC_Show_MOTD( CLIENT *Client )
 {
@@ -1575,7 +1516,6 @@ IRC_Show_MOTD( CLIENT *Client )
 	return Show_MOTD_End(Client);
 } /* IRC_Show_MOTD */
 
-
 /**
  * Send NAMES reply for a specific client and channel.
  *
@@ -1587,7 +1527,7 @@ GLOBAL bool
 IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
 {
 	bool is_visible, is_member;
-	char str[LINE_LEN + 1];
+	char str[COMMAND_LEN];
 	CL2CHAN *cl2chan;
 	CLIENT *cl;
 
@@ -1626,7 +1566,7 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
 					    str, sizeof(str));
 			strlcat(str, Client_ID(cl), sizeof(str));
 
-			if (strlen(str) > (LINE_LEN - CLIENT_NICK_LEN - 4)) {
+			if (strlen(str) > (COMMAND_LEN - CLIENT_NICK_LEN - 4)) {
 				if (!IRC_WriteStrClient(Client, "%s", str))
 					return DISCONNECTED;
 				snprintf(str, sizeof(str), RPL_NAMREPLY_MSG,
@@ -1645,7 +1585,6 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
 	return CONNECTED;
 } /* IRC_Send_NAMES */
 
-
 /**
  * Send the ISUPPORT numeric (005).
  * This numeric indicates the features that are supported by this server.
@@ -1664,5 +1603,4 @@ IRC_Send_ISUPPORT(CLIENT * Client)
 				  MAX_HNDL_CHANNEL_LISTS);
 } /* IRC_Send_ISUPPORT */
 
-
 /* -eof- */