#include "logger.h"
#include "s_conf.h"
-static int m_error(struct Client *, struct Client *, int, const char **);
-static int ms_error(struct Client *, struct Client *, int, const char **);
+static int m_error(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int ms_error(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
struct Message error_msgtab = {
- "ERROR", 0, 0, 0, MFLG_SLOW | MFLG_UNREG,
+ "ERROR", 0, 0, 0, 0,
{{m_error, 0}, mg_ignore, mg_ignore, {ms_error, 0}, mg_ignore, mg_ignore}
};
if (!strncmp(message, "Closing Link: 127.0.0.1 (", 25))
return 1;
- rb_snprintf(prefix2, sizeof prefix2,
+ snprintf(prefix2, sizeof prefix2,
"Closing Link: 127.0.0.1 %s (", me.name);
if (!strncmp(message, prefix2, strlen(prefix2)))
return 1;
* although this is called internally from other functions
* --msa
*
- * parv[0] = sender prefix
* parv[*] = parameters
*/
int
-m_error(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_error(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
const char *para;
int hideit = ConfigFileEntry.hide_error_messages;
para = (parc > 1 && *parv[1] != '\0') ? parv[1] : "<>";
- ilog(L_SERVER, "Received ERROR message from %s: %s",
- log_client_name(source_p, SHOW_IP), para);
+ if (IsAnyServer(client_p))
+ {
+ ilog(L_SERVER, "Received ERROR message from %s: %s",
+ log_client_name(source_p, SHOW_IP), para);
+ }
if(is_safe_error(para))
hideit = 0;
}
static int
-ms_error(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+ms_error(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
const char *para;
int hideit = ConfigFileEntry.hide_error_messages;