X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=b4db3b77473955f6c04c5952df444f9f2692c190;hb=6dc80bd195ad0760bb560177d6f91c86b7698758;hp=ad9d32c9ff0845a90a7a7a2299956b1459bbe986;hpb=74aac88dbf674979795a90f855f96883b43d18e6;p=ngircd-alex.git

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index ad9d32c9..b4db3b77 100644
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -33,14 +33,18 @@ static char UNUSED id[] = "$Id: irc.c,v 1.132 2008/01/15 22:28:14 fw Exp $";
 #include "match.h"
 #include "messages.h"
 #include "parse.h"
+#include "tool.h"
 
 #include "exp.h"
 #include "irc.h"
 
 
 static char *Option_String PARAMS((CONN_ID Idx));
-static bool Send_Message PARAMS((CLIENT *Client, REQUEST *Req, int ForceType, bool SendErrors));
-static bool Send_Message_Mask PARAMS((CLIENT *from, char *targetMask, char *message, bool SendErrors));
+static bool Send_Message PARAMS((CLIENT *Client, REQUEST *Req, int ForceType,
+				 bool SendErrors));
+static bool Send_Message_Mask PARAMS((CLIENT *from, char *command,
+				      char *targetMask, char *message,
+				      bool SendErrors));
 
 
 GLOBAL bool
@@ -49,8 +53,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 */
@@ -62,7 +70,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 )
@@ -346,6 +354,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
 
 	/* handle msgtarget = msgto *("," msgto) */
 	currentTarget = strtok_r(currentTarget, ",", &lastCurrentTarget);
+	ngt_UpperStr(Req->command);
 
 	while (currentTarget) {
 		/* Check for and handle valid <msgto> of form:
@@ -395,7 +404,8 @@ 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 &&
@@ -419,13 +429,31 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
 
 		if (cl) {
 			/* Target is a user, enforce type */
+#ifndef STRICT_RFC
+			if (Client_Type(cl) != ForceType &&
+			    !(ForceType == CLIENT_USER &&
+			      (Client_Type(cl) == CLIENT_USER ||
+			       Client_Type(cl) == CLIENT_SERVICE))) {
+#else
 			if (Client_Type(cl) != ForceType) {
+#endif
 				if (!SendErrors)
 					return CONNECTED;
 				return IRC_WriteStrClient(from, ERR_NOSUCHNICK_MSG,
 							  Client_ID(from),
 							  currentTarget);
 			}
+
+#ifndef STRICT_RFC
+			if (ForceType == CLIENT_SERVICE &&
+			    (Conn_Options(Client_Conn(Client_NextHop(cl)))
+			     & CONN_RFC1459)) {
+				/* SQUERY command but RFC 1459 link: convert
+				 * request to PRIVMSG command */
+				Req->command = "PRIVMSG";
+			}
+#endif
+
 			if (SendErrors && (Client_Type(Client) != CLIENT_SERVER)
 			    && strchr(Client_Modes(cl), 'a')) {
 				/* Target is away */
@@ -438,19 +466,23 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
 			if (Client_Conn(from) > NONE) {
 				Conn_UpdateIdle(Client_Conn(from));
 			}
-			if (!IRC_WriteStrClientPrefix(cl, from, "PRIVMSG %s :%s",
-						Client_ID(cl), Req->argv[1]))
+			if (!IRC_WriteStrClientPrefix(cl, from, "%s %s :%s",
+						      Req->command, Client_ID(cl),
+						      Req->argv[1]))
 				return DISCONNECTED;
-		} else if (strchr("$#", currentTarget[0])
+		} 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, currentTarget,
+			if (!Send_Message_Mask(from, Req->command, currentTarget,
 					       Req->argv[1], SendErrors))
 				return DISCONNECTED;
-		} else if ((chan = Channel_Search(currentTarget))) {
-			/* channel */
-			if (!Channel_Write(chan, from, Client, Req->argv[1]))
-				return DISCONNECTED;
 		} else {
 			if (!SendErrors)
 				return CONNECTED;
@@ -467,11 +499,13 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
 
 
 static bool
-Send_Message_Mask(CLIENT * from, char * targetMask, char * message, bool SendErrors)
+Send_Message_Mask(CLIENT * from, char * command, char * targetMask,
+		  char * message, bool SendErrors)
 {
 	CLIENT *cl;
 	bool client_match;
 	char *mask = targetMask + 1;
+	const char *check_wildcards;
 
 	cl = NULL;
 
@@ -482,25 +516,41 @@ Send_Message_Mask(CLIENT * from, char * targetMask, char * message, bool SendErr
 					  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)
 				continue;
 			client_match = MatchCaseInsensitive(mask, Client_Hostname(cl));
 			if (client_match)
-				if (!IRC_WriteStrClientPrefix(cl, from, "PRIVMSG %s :%s",
-							Client_ID(cl), message))
+				if (!IRC_WriteStrClientPrefix(cl, from, "%s %s :%s",
+						command, Client_ID(cl), message))
 					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;
 			client_match = MatchCaseInsensitive(mask,
 					Client_ID(Client_Introducer(cl)));
 			if (client_match)
-				if (!IRC_WriteStrClientPrefix(cl, from, "PRIVMSG %s :%s",
-							Client_ID(cl), message))
+				if (!IRC_WriteStrClientPrefix(cl, from, "%s %s :%s",
+						command, Client_ID(cl), message))
 					return false;
 		}
 	}