Combine stats A output parameters (#35)

[solanum.git] / modules / m_links.c

diff --git a/modules/m_links.c b/modules/m_links.c
index 295baa6bc9b27f307e3dd505dbcb2f9ddff20972..499dd674ec62d4ba32a5c4d4f78779ca7cf39e3b 100644 (file)
--- a/modules/m_links.c
+++ b/modules/m_links.c
@@ -20,13 +20,11 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_links.c 254 2005-09-21 23:35:12Z nenolod $
  */
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
@@ -37,12 +35,17 @@
 #include "modules.h"
 #include "hook.h"
 #include "scache.h"
+#include "s_assert.h"
+
+static const char links_desc[] =
+       "Provides the LINKS command to view servers linked to the host server";
 
-static int m_links(struct Client *, struct Client *, int, const char **);
-static int mo_links(struct Client *, struct Client *, int, const char **);
+static void m_links(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_links(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static char * clean_string(char *dest, const unsigned char *src, size_t len);
 
 struct Message links_msgtab = {
-       "LINKS", 0, 0, 0, MFLG_SLOW,
+       "LINKS", 0, 0, 0, 0,
        {mg_unreg, {m_links, 0}, {mo_links, 0}, mg_ignore, mg_ignore, {mo_links, 0}}
 };
 
@@ -54,43 +57,41 @@ mapi_hlist_av1 links_hlist[] = {
        { NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(links, NULL, NULL, links_clist, links_hlist, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(links, NULL, NULL, links_clist, links_hlist, NULL, NULL, NULL, links_desc);
 
 /*
  * m_links - LINKS message handler
- *      parv[0] = sender prefix
  *      parv[1] = servername mask
  * or
- *      parv[0] = sender prefix
- *      parv[1] = server to query 
+ *      parv[1] = server to query
  *      parv[2] = servername mask
  */
-static int
-m_links(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_links(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        if(ConfigServerHide.flatten_links && !IsExemptShide(source_p))
                scache_send_flattened_links(source_p);
        else
-               mo_links(client_p, source_p, parc, parv);
-
-       return 0;
+               mo_links(msgbuf_p, client_p, source_p, parc, parv);
 }
 
-static int
-mo_links(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mo_links(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        const char *mask = "";
        struct Client *target_p;
        char clean_mask[2 * HOSTLEN + 4];
-       hook_data hd;
+       hook_cdata hd;
 
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
 
        if(parc > 2)
        {
+               if(strlen(parv[2]) > HOSTLEN)
+                       return;
                if(hunt_server(client_p, source_p, ":%s LINKS %s :%s", 1, parc, parv)
                   != HUNTED_ISME)
-                       return 0;
+                       return;
 
                mask = parv[2];
        }
@@ -107,7 +108,7 @@ mo_links(struct Client *client_p, struct Client *source_p, int parc, const char
 
        call_hook(doing_links_hook, &hd);
 
-       DLINK_FOREACH(ptr, global_serv_list.head)
+       RB_DLINK_FOREACH(ptr, global_serv_list.head)
        {
                target_p = ptr->data;
 
@@ -115,7 +116,7 @@ mo_links(struct Client *client_p, struct Client *source_p, int parc, const char
                        continue;
 
                /* We just send the reply, as if theyre here theres either no SHIDE,
-                * or theyre an oper..  
+                * or theyre an oper..
                 */
                sendto_one_numeric(source_p, RPL_LINKS, form_str(RPL_LINKS),
                                   target_p->name, target_p->servptr->name,
@@ -125,7 +126,40 @@ mo_links(struct Client *client_p, struct Client *source_p, int parc, const char
 
        sendto_one_numeric(source_p, RPL_ENDOFLINKS, form_str(RPL_ENDOFLINKS),
                           EmptyString(mask) ? "*" : mask);
-
-       return 0;
 }
 
+static char *
+clean_string(char *dest, const unsigned char *src, size_t len)
+{
+       char *d = dest;
+       s_assert(0 != dest);
+       s_assert(0 != src);
+
+       if(dest == NULL || src == NULL)
+               return NULL;
+
+       while (*src && (len > 1))
+       {
+               if(*src & 0x80) /* if high bit is set */
+               {
+                       *d++ = '.';
+                       --len;
+                       if(len <= 1)
+                               break;
+               }
+               else if(!IsPrint(*src)) /* if NOT printable */
+               {
+                       *d++ = '^';
+                       --len;
+                       if(len <= 1)
+                               break;
+                       *d++ = 0x40 + *src;     /* turn it into a printable */
+               }
+               else
+                       *d++ = *src;
+               ++src;
+               --len;
+       }
+       *d = '\0';
+       return dest;
+}