X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=75af32111d835a9a812e495cb8bff63ad1e75658;hp=0bfb3eed6a32e366a8d16d00a5a78348dc3ae647;hb=a988bbc86aed404b7bcfdbceafc030ea4bc5ecab;hpb=28e98887643bf881c11ba3b8df5e9cbcc7e967ba

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 0bfb3eed..75af3211 100644
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -22,10 +22,8 @@ static char UNUSED id[] = "$Id: irc.c,v 1.132 2008/01/15 22:28:14 fw Exp $";
 #include <string.h>
 
 #include "ngircd.h"
-#include "resolve.h"
 #include "conn-func.h"
 #include "conf.h"
-#include "client.h"
 #include "channel.h"
 #include "defines.h"
 #include "irc-write.h"
@@ -53,8 +51,12 @@ IRC_ERROR( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if( Req->argc < 1 ) Log( LOG_NOTICE, "Got ERROR from \"%s\"!", Client_Mask( Client ));
-	else Log( LOG_NOTICE, "Got ERROR from \"%s\": %s!", Client_Mask( Client ), Req->argv[0] );
+	if (Req->argc < 1)
+		Log(LOG_NOTICE, "Got ERROR from \"%s\"!",
+		    Client_Mask(Client));
+	else
+		Log(LOG_NOTICE, "Got ERROR from \"%s\": \"%s\"!",
+		    Client_Mask(Client), Req->argv[0]);
 
 	return CONNECTED;
 } /* IRC_ERROR */
@@ -66,7 +68,7 @@ IRC_ERROR( CLIENT *Client, REQUEST *Req )
  * disconnect clients. It can be used by IRC operators and servers, for example
  * to "solve" nick collisions after netsplits.
  * Please note that this function is also called internally, without a real
- * KILL command beeing received over the network! Client is Client_ThisServer()
+ * KILL command being received over the network! Client is Client_ThisServer()
  * in this case. */
 GLOBAL bool
 IRC_KILL( CLIENT *Client, REQUEST *Req )
@@ -156,11 +158,15 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 			     Client_Type( c ), Req->argv[0] );
 		}
 
-		/* Kill client NOW! */
+		/* Kill the client NOW:
+		 *  - Close the local connection (if there is one),
+		 *  - Destroy the CLIENT structure for remote clients.
+		 * Note: Conn_Close() removes the CLIENT structure as well. */
 		conn = Client_Conn( c );
-		Client_Destroy( c, NULL, reason, false );
-		if( conn > NONE )
-			Conn_Close( conn, NULL, reason, true );
+		if(conn > NONE)
+			Conn_Close(conn, NULL, reason, true);
+		else
+			Client_Destroy(c, NULL, reason, false);
 	}
 	else
 		Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] );
@@ -400,12 +406,13 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
 			}
 
 			for (cl = Client_First(); cl != NULL; cl = Client_Next(cl)) {
-				if (Client_Type(cl) != CLIENT_USER)
+				if (Client_Type(cl) != CLIENT_USER &&
+				    Client_Type(cl) != CLIENT_SERVICE)
 					continue;
 				if (nick != NULL && host != NULL) {
 					if (strcmp(nick, Client_ID(cl)) == 0 &&
 					    strcmp(user, Client_User(cl)) == 0 &&
-					    strcasecmp(host, Client_Hostname(cl)) == 0)
+					    strcasecmp(host, Client_HostnameCloaked(cl)) == 0)
 						break;
 					else
 						continue;
@@ -413,7 +420,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
 				if (strcasecmp(user, Client_User(cl)) != 0)
 					continue;
 				if (host != NULL && strcasecmp(host,
-						Client_Hostname(cl)) != 0)
+						Client_HostnameCloaked(cl)) != 0)
 					continue;
 				if (server != NULL && strcasecmp(server,
 						Client_ID(Client_Introducer(cl))) != 0)
@@ -466,18 +473,18 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
 						      Req->argv[1]))
 				return DISCONNECTED;
 		} else if (ForceType != CLIENT_SERVICE
+			   && (chan = Channel_Search(currentTarget))) {
+			if (!Channel_Write(chan, from, Client, Req->command,
+					   SendErrors, Req->argv[1]))
+					return DISCONNECTED;
+		} else if (ForceType != CLIENT_SERVICE
+			/* $#: server/target mask, RFC 2812, sec. 3.3.1 */
 			   && strchr("$#", currentTarget[0])
 			   && strchr(currentTarget, '.')) {
 			/* targetmask */
 			if (!Send_Message_Mask(from, Req->command, currentTarget,
 					       Req->argv[1], SendErrors))
 				return DISCONNECTED;
-		} else if (ForceType != CLIENT_SERVICE
-			   && (chan = Channel_Search(currentTarget))) {
-			/* channel */
-			if (!Channel_Write(chan, from, Client, Req->command,
-					   SendErrors, Req->argv[1]))
-					return DISCONNECTED;
 		} else {
 			if (!SendErrors)
 				return CONNECTED;
@@ -500,6 +507,7 @@ Send_Message_Mask(CLIENT * from, char * command, char * targetMask,
 	CLIENT *cl;
 	bool client_match;
 	char *mask = targetMask + 1;
+	const char *check_wildcards;
 
 	cl = NULL;
 
@@ -510,6 +518,21 @@ Send_Message_Mask(CLIENT * from, char * command, char * targetMask,
 					  Client_ID(from));
 	}
 
+	/*
+	 * RFC 2812, sec. 3.3.1 requires that targetMask have at least one
+	 * dot (".") and no wildcards ("*", "?") following the last one.
+	 */
+	check_wildcards = strrchr(targetMask, '.');
+	assert(check_wildcards != NULL);
+	if (check_wildcards &&
+		check_wildcards[strcspn(check_wildcards, "*?")])
+	{
+		if (!SendErrors)
+			return true;
+		return IRC_WriteStrClient(from, ERR_WILDTOPLEVEL, targetMask);
+	}
+
+	/* #: hostmask, see RFC 2812, sec. 3.3.1 */
 	if (targetMask[0] == '#') {
 		for (cl = Client_First(); cl != NULL; cl = Client_Next(cl)) {
 			if (Client_Type(cl) != CLIENT_USER)
@@ -521,6 +544,7 @@ Send_Message_Mask(CLIENT * from, char * command, char * targetMask,
 					return false;
 		}
 	} else {
+		assert(targetMask[0] == '$'); /* $: server mask, see RFC 2812, sec. 3.3.1 */
 		for (cl = Client_First(); cl != NULL; cl = Client_Next(cl)) {
 			if (Client_Type(cl) != CLIENT_USER)
 				continue;