/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2015 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2018 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
GLOBAL bool
IRC_ERROR(CLIENT *Client, REQUEST *Req)
{
+ char *msg;
+
assert( Client != NULL );
assert( Req != NULL );
return CONNECTED;
}
- if (Req->argc < 1)
+ if (Req->argc < 1) {
+ msg = "Got ERROR command";
Log(LOG_NOTICE, "Got ERROR from \"%s\"!",
Client_Mask(Client));
- else
+ } else {
+ msg = Req->argv[0];
Log(LOG_NOTICE, "Got ERROR from \"%s\": \"%s\"!",
- Client_Mask(Client), Req->argv[0]);
+ Client_Mask(Client), msg);
+ }
+
+ if (Client_Conn(Client) != NONE) {
+ Conn_Close(Client_Conn(Client), NULL, msg, false);
+ return DISCONNECTED;
+ }
return CONNECTED;
} /* IRC_ERROR */
* 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.
+ * Client_ThisServer() when generated internally.
* @param Req Request structure with prefix and all parameters.
* @return CONNECTED or DISCONNECTED.
*/
/* Do we know such a client in the network? */
c = Client_Search(Nick);
if (!c) {
- LogDebug("Client with nick \"%s\" is unknown, not forwaring.", Nick);
+ LogDebug("Client with nick \"%s\" is unknown, not forwarding.", Nick);
return CONNECTED;
}
- /* Inform other servers */
- IRC_WriteStrServersPrefix(From ? Client : NULL,
- From ? From : Client_ThisServer(),
- "KILL %s :%s", Nick, Reason);
-
- if (Client_Type(c) != CLIENT_USER && Client_Type(c) != CLIENT_GOTNICK) {
+ if (Client_Type(c) != CLIENT_USER && Client_Type(c) != CLIENT_GOTNICK
+ && Client_Type(c) != CLIENT_SERVICE) {
/* Target of this KILL is not a regular user, this is
* invalid! So we ignore this case if we received a
* regular KILL from the network and try to kill the
Client_Type(c), Nick);
}
+ /* Inform other servers */
+ IRC_WriteStrServersPrefix(From ? Client : NULL,
+ From ? From : Client_ThisServer(),
+ "KILL %s :%s", Nick, Reason);
+
+
/* Save ID of this connection */
if (Client)
my_conn = Client_Conn(Client);
* Send help for a given topic to the client.
*
* @param Client The client requesting help.
- * @param Topoc The help topic requested.
+ * @param Topic The help topic requested.
* @return CONNECTED or DISCONNECTED.
*/
static bool
* @return Pointer to static (global) string buffer.
*/
static char *
-#ifdef ZLIB
+#if defined(SSL_SUPPORT) || defined(ZLIB)
Option_String(CONN_ID Idx)
-#else
-Option_String(UNUSED CONN_ID Idx)
-#endif
{
static char option_txt[8];
UINT16 options;
if(options & CONN_ZIP) /* zlib compression enabled */
strlcat(option_txt, "z", sizeof(option_txt));
#endif
- LogDebug(" *** %d: %d = %s", Idx, options, option_txt);
return option_txt;
+#else
+Option_String(UNUSED CONN_ID Idx)
+{
+ return "";
+#endif
} /* Option_String */
/**
* Send a message to target(s).
*
- * This function is used by IRC_{PRIVMSG|NOTICE|SQUERY} to actualy
+ * This function is used by IRC_{PRIVMSG|NOTICE|SQUERY} to actually
* send the message(s).
*
* @param Client The client from which this command has been received.
#endif
message = Req->argv[1];
+ if (message[0] == '\0') {
+ if (!SendErrors)
+ return CONNECTED;
+ return IRC_WriteErrClient(Client, ERR_NOTEXTTOSEND_MSG,
+ Client_ID(Client));
+ }
+
/* handle msgtarget = msgto *("," msgto) */
currentTarget = strtok_r(currentTarget, ",", &strtok_last);
ngt_UpperStr(Req->command);
goto send_next_target;
}
- if (Client_HasMode(cl, 'C')) {
+ if (Client_HasMode(cl, 'C') &&
+ !Client_HasMode(from, 'o') &&
+ !(Client_Type(from) == CLIENT_SERVER) &&
+ !(Client_Type(from) == CLIENT_SERVICE)) {
cl2chan = Channel_FirstChannelOf(cl);
while (cl2chan) {
chan = Channel_GetChannel(cl2chan);