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

[solanum.git] / modules / m_monitor.c

diff --git a/modules/m_monitor.c b/modules/m_monitor.c
index 7018b27d3f0f2b0ea02228563d7a011f5ec1fdbb..ae26035be9ace6465baf2d11e92a45e6aa075a96 100644 (file)
--- a/modules/m_monitor.c
+++ b/modules/m_monitor.c
@@ -39,16 +39,30 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "send.h"
+#include "supported.h"
 
-static int m_monitor(struct Client *, struct Client *, int, const char **);
+static int monitor_init(void);
+static void monitor_deinit(void);
+static int m_monitor(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message monitor_msgtab = {
-       "MONITOR", 0, 0, 0, MFLG_SLOW,
+       "MONITOR", 0, 0, 0, 0,
        {mg_unreg, {m_monitor, 2}, mg_ignore, mg_ignore, mg_ignore, {m_monitor, 2}}
 };
 
 mapi_clist_av1 monitor_clist[] = { &monitor_msgtab, NULL };
-DECLARE_MODULE_AV1(monitor, NULL, NULL, monitor_clist, NULL, NULL, "$Revision: 312 $");
+DECLARE_MODULE_AV1(monitor, monitor_init, monitor_deinit, monitor_clist, NULL, NULL, "$Revision: 312 $");
+
+static int monitor_init(void)
+{
+       add_isupport("MONITOR", isupport_intptr, &ConfigFileEntry.max_monitor);
+       return 0;
+}
+
+static void monitor_deinit(void)
+{
+       delete_isupport("MONITOR");
+}
 
 static void
 add_monitor(struct Client *client_p, const char *nicks)
@@ -90,9 +104,9 @@ add_monitor(struct Client *client_p, const char *nicks)
                                sendto_one(client_p, "%s", offbuf);
 
                        if(p)
-                               rb_snprintf(buf, sizeof(buf), "%s,%s", name, p);
+                               snprintf(buf, sizeof(buf), "%s,%s", name, p);
                        else
-                               rb_snprintf(buf, sizeof(buf), "%s", name);
+                               snprintf(buf, sizeof(buf), "%s", name);
 
                        sendto_one(client_p, form_str(ERR_MONLISTFULL),
                                        me.name, client_p->name,
@@ -100,6 +114,9 @@ add_monitor(struct Client *client_p, const char *nicks)
                        return;
                }
 
+               if (!clean_nick(name, 0))
+                       continue;
+
                monptr = find_monitor(name, 1);
 
                /* already monitoring this nick */
@@ -182,6 +199,8 @@ del_monitor(struct Client *client_p, const char *nicks)
 
                rb_dlinkFindDestroy(client_p, &monptr->users);
                rb_dlinkFindDestroy(monptr, &client_p->localClient->monitor_list);
+
+               free_monitor(monptr);
        }
 }
 
@@ -305,7 +324,7 @@ show_monitor_status(struct Client *client_p)
 }
 
 static int
-m_monitor(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+m_monitor(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        switch(parv[1][0])
        {
@@ -351,4 +370,3 @@ m_monitor(struct Client *client_p, struct Client *source_p, int parc, const char
 
        return 0;
 }
-