msg: remove last vestiges of the fakelag system. charybdis has never supported fakelag.

[solanum.git] / modules / core / m_error.c

diff --git a/modules/core/m_error.c b/modules/core/m_error.c
index 0c194b140a5898807be858de21bc791141ac8b14..23e6f08282a5203f1050394615f6a1c307287772 100644 (file)
--- a/modules/core/m_error.c
+++ b/modules/core/m_error.c
@@ -35,11 +35,11 @@
 #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}
 };
 
@@ -85,19 +85,21 @@ is_safe_error(const char *message)
  * 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;
@@ -106,11 +108,11 @@ m_error(struct Client *client_p, struct Client *source_p, int parc, const char *
                if (hideit < 2)
                        sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : (is_remote_connect(client_p) ? L_NETWIDE : L_ALL),
                                        "ERROR :from %s -- %s",
-                                       get_server_name(client_p, HIDE_IP), para);
+                                       client_p->name, para);
                if (hideit > 0)
                        sendto_realops_snomask(SNO_GENERAL, (hideit == 1 ? L_OPER : L_ALL) | (is_remote_connect(client_p) ? L_NETWIDE : L_ALL),
                                        "ERROR :from %s -- <hidden>",
-                                       get_server_name(client_p, HIDE_IP));
+                                       client_p->name);
        }
 
        exit_client(client_p, source_p, source_p, "ERROR");
@@ -119,7 +121,7 @@ m_error(struct Client *client_p, struct Client *source_p, int parc, const char *
 }
 
 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;
@@ -137,12 +139,12 @@ ms_error(struct Client *client_p, struct Client *source_p, int parc, const char
        if(client_p == source_p)
        {
                sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : L_ALL, "ERROR :from %s -- %s",
-                                    get_server_name(client_p, HIDE_IP), para);
+                                    client_p->name, para);
        }
        else
        {
                sendto_realops_snomask(SNO_GENERAL, hideit ? L_ADMIN : L_ALL, "ERROR :from %s via %s -- %s",
-                                    source_p->name, get_server_name(client_p, HIDE_IP), para);
+                                    source_p->name, client_p->name, para);
        }
 
        return 0;