#include "conn-func.h"
#include "conf.h"
#include "channel.h"
+#include "conn-encoding.h"
#include "defines.h"
#include "irc-write.h"
#include "log.h"
assert( Client != NULL );
assert( Req != NULL );
+ if (Client_Type(Client) != CLIENT_GOTPASS
+ && Client_Type(Client) != CLIENT_GOTPASS_2813
+ && Client_Type(Client) != CLIENT_UNKNOWNSERVER
+ && Client_Type(Client) != CLIENT_SERVER
+ && Client_Type(Client) != CLIENT_SERVICE) {
+ LogDebug("Ignored ERROR command from \"%s\" ...",
+ Client_Mask(Client));
+ IRC_SetPenalty(Client, 2);
+ return CONNECTED;
+ }
+
if (Req->argc < 1)
Log(LOG_NOTICE, "Got ERROR from \"%s\"!",
Client_Mask(Client));
CHANNEL *chan;
char *currentTarget = Req->argv[0];
char *lastCurrentTarget = NULL;
+ char *message = NULL;
assert(Client != NULL);
assert(Req != NULL);
return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
Client_ID(Client), Req->prefix);
+#ifdef ICONV
+ if (Client_Conn(Client) > NONE)
+ message = Conn_EncodingFrom(Client_Conn(Client), Req->argv[1]);
+ else
+#endif
+ message = Req->argv[1];
+
/* handle msgtarget = msgto *("," msgto) */
currentTarget = strtok_r(currentTarget, ",", &lastCurrentTarget);
ngt_UpperStr(Req->command);
if (nick != NULL && host != NULL) {
if (strcasecmp(nick, Client_ID(cl)) == 0 &&
strcasecmp(user, Client_User(cl)) == 0 &&
- strcasecmp(host, Client_HostnameCloaked(cl)) == 0)
+ strcasecmp(host, Client_HostnameDisplayed(cl)) == 0)
break;
else
continue;
if (strcasecmp(user, Client_User(cl)) != 0)
continue;
if (host != NULL && strcasecmp(host,
- Client_HostnameCloaked(cl)) != 0)
+ Client_HostnameDisplayed(cl)) != 0)
continue;
if (server != NULL && strcasecmp(server,
Client_ID(Client_Introducer(cl))) != 0)
Req->command = "PRIVMSG";
}
#endif
+ if (Client_HasMode(cl, 'b') &&
+ !Client_HasMode(from, 'R') &&
+ !Client_HasMode(from, 'o') &&
+ !(Client_Type(from) == CLIENT_SERVER) &&
+ !(Client_Type(from) == CLIENT_SERVICE)) {
+ if (SendErrors && !IRC_WriteStrClient(from,
+ ERR_NONONREG_MSG,
+ Client_ID(from), Client_ID(cl)))
+ return DISCONNECTED;
+ goto send_next_target;
+ }
if (Client_HasMode(cl, 'C')) {
cl2chan = Channel_FirstChannelOf(cl);
}
if (!IRC_WriteStrClientPrefix(cl, from, "%s %s :%s",
Req->command, Client_ID(cl),
- Req->argv[1]))
+ message))
return DISCONNECTED;
} else if (ForceType != CLIENT_SERVICE
&& (chan = Channel_Search(currentTarget))) {
if (!Channel_Write(chan, from, Client, Req->command,
- SendErrors, Req->argv[1]))
+ SendErrors, message))
return DISCONNECTED;
} else if (ForceType != CLIENT_SERVICE
/* $#: server/target mask, RFC 2812, sec. 3.3.1 */
&& strchr(currentTarget, '.')) {
/* targetmask */
if (!Send_Message_Mask(from, Req->command, currentTarget,
- Req->argv[1], SendErrors))
+ message, SendErrors))
return DISCONNECTED;
} else {
if (!SendErrors)