X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fngircd%2Firc-info.c;h=c2412651121a69220a407d60f850d9c4ef4048b0;hb=470d2e236258ce72c6d574b04f1400c0fedc4a3a;hp=ebb7be4afb5c7aed28a361d1fae6a34a79083176;hpb=f47904bf954696803c0df8e756a57a3dabaa8845;p=ngircd-alex.git

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index ebb7be4a..c2412651 100644
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors.
  *
  * 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
@@ -154,6 +154,15 @@ IRC_INFO(CLIENT * Client, REQUEST * Req)
 } /* 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.
+ */
 GLOBAL bool
 IRC_ISON( CLIENT *Client, REQUEST *Req )
 {
@@ -162,80 +171,103 @@ IRC_ISON( CLIENT *Client, REQUEST *Req )
 	char *ptr;
 	int i;
 
-	assert( Client != NULL );
-	assert( Req != NULL );
+	assert(Client != NULL);
+	assert(Req != NULL);
 
-	/* Falsche Anzahl Parameter? */
-	if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+	/* Bad number of arguments? */
+	if (Req->argc < 1)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
 
-	strlcpy( rpl, RPL_ISON_MSG, sizeof rpl );
-	for( i = 0; i < Req->argc; i++ )
-	{
-		ptr = strtok( Req->argv[i], " " );
-		while( ptr )
-		{
-			ngt_TrimStr( ptr );
-			c = Client_Search( ptr );
-			if( c && ( Client_Type( c ) == CLIENT_USER ))
-			{
-				/* Dieser Nick ist "online" */
-				strlcat( rpl, ptr, sizeof( rpl ));
-				strlcat( rpl, " ", sizeof( rpl ));
+	strlcpy(rpl, RPL_ISON_MSG, sizeof rpl);
+	for (i = 0; i < Req->argc; i++) {
+		/* "All" ircd even parse ":<x> <y> ..." arguments and split
+		 * them up; so we do the same ... */
+		ptr = strtok(Req->argv[i], " ");
+		while (ptr) {
+			ngt_TrimStr(ptr);
+			c = Client_Search(ptr);
+			if (c && Client_Type(c) == CLIENT_USER) {
+				strlcat(rpl, Client_ID(c), sizeof(rpl));
+				strlcat(rpl, " ", sizeof(rpl));
 			}
-			ptr = strtok( NULL, " " );
+			ptr = strtok(NULL, " ");
 		}
 	}
 	ngt_TrimLastChr(rpl, ' ');
 
-	return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
+	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.
+ */
 GLOBAL bool
-IRC_LINKS( CLIENT *Client, REQUEST *Req )
+IRC_LINKS(CLIENT *Client, REQUEST *Req)
 {
 	CLIENT *target, *from, *c;
 	char *mask;
 
-	assert( Client != NULL );
-	assert( Req != NULL );
+	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);
 
-	/* Server-Mask ermitteln */
-	if( Req->argc > 0 ) mask = Req->argv[Req->argc - 1];
-	else mask = "*";
+	if (Req->argc > 2)
+		return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+					  Client_ID(Client), Req->command);
 
-	/* 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 );
+	/* Get pointer to server mask or "*", if none given */
+	if (Req->argc > 0)
+		mask = Req->argv[Req->argc - 1];
+	else
+		mask = "*";
 
-	/* An anderen Server forwarden? */
-	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] );
-	}
+	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);
 
-	/* 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 );
+	/* 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]);
+	}
 
-	c = Client_First( );
-	while( c )
-	{
-		if( Client_Type( c ) == CLIENT_SERVER )
-		{
-			if( ! IRC_WriteStrClient( target, RPL_LINKS_MSG, Client_ID( target ), Client_ID( c ), Client_ID( Client_TopServer( c ) ? Client_TopServer( c ) : Client_ThisServer( )), Client_Hops( c ), Client_Info( c ))) return DISCONNECTED;
+	c = Client_First();
+	while (c) {
+		if (Client_Type(c) == CLIENT_SERVER
+		    && MatchCaseInsensitive(mask, Client_ID(c))) {
+			if (!IRC_WriteStrClient(from, RPL_LINKS_MSG,
+					Client_ID(from), Client_ID(c),
+					Client_ID(Client_TopServer(c)
+						  ? Client_TopServer(c)
+						  : Client_ThisServer()),
+					Client_Hops(c), Client_Info(c)))
+				return DISCONNECTED;
 		}
-		c = Client_Next( c );
+		c = Client_Next(c);
 	}
-	
-	IRC_SetPenalty( target, 1 );
-	return IRC_WriteStrClient( target, RPL_ENDOFLINKS_MSG, Client_ID( target ), mask );
+	return IRC_WriteStrClient(from, RPL_ENDOFLINKS_MSG,
+				  Client_ID(from), mask);
 } /* IRC_LINKS */
 
 
@@ -1077,8 +1109,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
 				    Client_Away(c)))
 			return DISCONNECTED;
 
-	return IRC_WriteStrClient(from, RPL_ENDOFWHOIS_MSG,
-				  Client_ID(from), Client_ID(c));
+	return CONNECTED;
 } /* IRC_WHOIS_SendReply */
 
 
@@ -1098,7 +1129,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 	unsigned int match_count = 0, found = 0;
 	bool has_wildcards, is_remote;
 	bool got_wildcard = false;
-	const char *query;
+	char mask[COMMAND_LEN], *query;
 
 	assert( Client != NULL );
 	assert( Req != NULL );
@@ -1139,7 +1170,8 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 						Req->argv[0], Req->argv[1]);
 
 	is_remote = Client_Conn(from) < 0;
-	for (query = strtok(Req->argv[Req->argc - 1], ",");
+	strlcpy(mask, Req->argv[Req->argc - 1], sizeof(mask));
+	for (query = strtok(ngt_LowerStr(mask), ",");
 			query && found < 3;
 			query = strtok(NULL, ","), found++)
 	{
@@ -1154,7 +1186,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 		 */
 		if (!has_wildcards || is_remote) {
 			c = Client_Search(query);
-			if (c) {
+			if (c && Client_Type(c) == CLIENT_USER) {
 				if (!IRC_WHOIS_SendReply(Client, from, c))
 					return DISCONNECTED;
 			} else {
@@ -1187,10 +1219,12 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 		}
 
 		if (match_count == 0)
-			return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
-				Client_ID(Client), Req->argv[Req->argc - 1]);
+			IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+					   Client_ID(Client),
+					   Req->argv[Req->argc - 1]);
 	}
-	return CONNECTED;
+	return IRC_WriteStrClient(from, RPL_ENDOFWHOIS_MSG,
+				  Client_ID(from), Req->argv[Req->argc - 1]);
 } /* IRC_WHOIS */
 
 
@@ -1534,7 +1568,7 @@ IRC_Send_ISUPPORT(CLIENT * Client)
 	return IRC_WriteStrClient(Client, RPL_ISUPPORT2_MSG, Client_ID(Client),
 				  CHANNEL_NAME_LEN - 1, Conf_MaxNickLength - 1,
 				  COMMAND_LEN - 23, CLIENT_AWAY_LEN - 1,
-				  COMMAND_LEN - 113);
+				  COMMAND_LEN - 113, MAX_CMODES_ARG);
 } /* IRC_Send_ISUPPORT */