* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information.
- *
- * IRC commands
*/
-
#include "portab.h"
-static char UNUSED id[] = "$Id: irc.c,v 1.132 2008/01/15 22:28:14 fw Exp $";
+/**
+ * @file
+ * IRC commands
+ */
#include "imp.h"
#include <assert.h>
#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"
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 */
/**
- * Kill client on request.
+ * Handler for the IRC "KILL" command.
+ *
* This function implements the IRC command "KILL" wich is used to selectively
* disconnect clients. It can be used by IRC operators and servers, for example
- * to "solve" nick collisions after netsplits.
+ * to "solve" nick collisions after netsplits. See RFC 2812 section 3.7.1.
+ *
* Please note that this function is also called internally, without a real
- * KILL command beeing received over the network! Client is Client_ThisServer()
- * in this case. */
+ * KILL command being received over the network! Client is Client_ThisServer()
+ * in this case, and the prefix in Req is NULL.
+ *
+ * @param Client The client from which this command has been received
+ * or Client_ThisServer() when generated interanlly.
+ * @param Req Request structure with prefix and all parameters.
+ * @returns CONNECTED or DISCONNECTED.
+ */
GLOBAL bool
IRC_KILL( CLIENT *Client, REQUEST *Req )
{
char reason[COMMAND_LEN], *msg;
CONN_ID my_conn, conn;
- assert( Client != NULL );
- assert( Req != NULL );
+ assert (Client != NULL);
+ assert (Req != NULL);
- if(( Client_Type( Client ) != CLIENT_SERVER ) &&
- ( ! Client_OperByMe( Client )))
- {
- /* The originator of the KILL is neither an IRC operator of
- * this server nor a server. */
- return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG,
- Client_ID( Client ));
- }
+ if (Client_Type(Client) != CLIENT_SERVER && !Client_OperByMe(Client))
+ return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG,
+ Client_ID(Client));
- if( Req->argc != 2 )
- {
- /* This command requires exactly 2 parameters! */
- return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG,
- Client_ID( Client ), Req->command );
- }
+ if (Req->argc != 2)
+ return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+ Client_ID(Client), Req->command);
- if( Req->prefix ) prefix = Client_Search( Req->prefix );
- else prefix = Client;
- if( ! prefix )
- {
- Log( LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!",
- Req->prefix );
- prefix = Client_ThisServer( );
+ /* Get prefix (origin); use the client if no prefix is given. */
+ if (Req->prefix)
+ prefix = Client_Search(Req->prefix);
+ else
+ prefix = Client;
+
+ /* Log a warning message and use this server as origin when the
+ * prefix (origin) is invalid. */
+ if (!prefix) {
+ Log(LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!",
+ Req->prefix );
+ prefix = Client_ThisServer();
}
- if( Client != Client_ThisServer( ))
- {
- /* This is a "real" KILL received from the network. */
- Log( LOG_NOTICE|LOG_snotice, "Got KILL command from \"%s\" for \"%s\": %s",
- Client_Mask( prefix ), Req->argv[0], Req->argv[1] );
- }
+ if (Client != Client_ThisServer())
+ Log(LOG_NOTICE|LOG_snotice,
+ "Got KILL command from \"%s\" for \"%s\": %s",
+ Client_Mask(prefix), Req->argv[0], Req->argv[1]);
- /* Build reason string */
- if( Client_Type( Client ) == CLIENT_USER )
- {
- /* Prefix the "reason" if the originator is a regular user,
- * so users can't spoof KILLs of servers. */
- snprintf( reason, sizeof( reason ), "KILLed by %s: %s",
- Client_ID( Client ), Req->argv[1] );
- }
+ /* Build reason string: Prefix the "reason" if the originator is a
+ * regular user, so users can't spoof KILLs of servers. */
+ if (Client_Type(Client) == CLIENT_USER)
+ snprintf(reason, sizeof(reason), "KILLed by %s: %s",
+ Client_ID(Client), Req->argv[1]);
else
- strlcpy( reason, Req->argv[1], sizeof( reason ));
+ strlcpy(reason, Req->argv[1], sizeof(reason));
/* Inform other servers */
- IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s",
- Req->argv[0], reason );
+ IRC_WriteStrServersPrefix(Client, prefix, "KILL %s :%s",
+ Req->argv[0], reason);
/* Save ID of this connection */
my_conn = Client_Conn( Client );
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] );
}
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;
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)
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 */
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, Req->command, currentTarget,
Req->argv[1], SendErrors))
return DISCONNECTED;
- } else if ((chan = Channel_Search(currentTarget))) {
- /* channel */
- if (!Channel_Write(chan, from, Client, Req->command,
- SendErrors, Req->argv[1]))
- return DISCONNECTED;
} else {
if (!SendErrors)
return CONNECTED;
}
currentTarget = strtok_r(NULL, ",", &lastCurrentTarget);
+ if (currentTarget)
+ Conn_SetPenalty(Client_Conn(Client), 1);
}
return CONNECTED;
CLIENT *cl;
bool client_match;
char *mask = targetMask + 1;
+ const char *check_wildcards;
cl = NULL;
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)
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;