Reverting some changed related not to moving on libratbox3 but using ratbox3 source!

[irc/rqf/shadowircd.git] / modules / m_xline.c

diff --git a/modules/m_xline.c b/modules/m_xline.c
index 5264fb92af7a075b8040cfcbcc150fb100900073..98b46da6548c82be1eb7f502d53fd8c41b81e96e 100644 (file)
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -31,7 +31,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "send.h"
 #include "channel.h"
 #include "client.h"
@@ -40,7 +39,6 @@
 #include "class.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "memory.h"
 #include "s_log.h"
 #include "s_serv.h"
 #include "whowas.h"
@@ -52,6 +50,7 @@
 #include "modules.h"
 #include "s_conf.h"
 #include "s_newconf.h"
+#include "reject.h"
 
 static int mo_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 static int ms_xline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
@@ -86,7 +85,7 @@ static void handle_remote_xline(struct Client *source_p, int temp_time,
                                const char *name, const char *reason);
 static void handle_remote_unxline(struct Client *source_p, const char *name);
 
-static int remove_xline(struct Client *source_p, const char *name);
+static void remove_xline(struct Client *source_p, const char *name);
 static int remove_xline_from_file(struct Client *source_p, const char *gecos);
 
 
@@ -153,7 +152,7 @@ mo_xline(struct Client *client_p, struct Client *source_p, int parc, const char
                if(!match(target_server, me.name))
                        return 0;
        }
-       else if(dlink_list_length(&cluster_conf_list) > 0)
+       else if(rb_dlink_list_length(&cluster_conf_list) > 0)
                cluster_xline(source_p, temp_time, name, reason);
 
        if((aconf = find_xline_mask(name)) != NULL)
@@ -312,17 +311,17 @@ apply_xline(struct Client *source_p, const char *name, const char *reason,
                }
 
                *new = '\0';
-               DupString(aconf->name, tmp);
+               aconf->name = rb_strdup(tmp);
        }
        else
-               DupString(aconf->name, name);
+               aconf->name = rb_strdup(name);
 
-       DupString(aconf->passwd, reason);
+       aconf->passwd = rb_strdup(reason);
        collapse(aconf->name);
 
        if(temp_time > 0)
        {
-               aconf->hold = CurrentTime + temp_time;
+               aconf->hold = rb_current_time() + temp_time;
 
                sendto_realops_snomask(SNO_GENERAL, L_ALL,
                             "%s added temporary %d min. X-Line for [%s] [%s]",
@@ -346,7 +345,7 @@ apply_xline(struct Client *source_p, const char *name, const char *reason,
                        get_oper_name(source_p), name, reason);
        }
 
-       dlinkAddAlloc(aconf, &xline_conf_list);
+       rb_dlinkAddAlloc(aconf, &xline_conf_list);
        check_xlines();
 }
 
@@ -372,9 +371,9 @@ write_xline(struct Client *source_p, struct ConfItem *aconf)
                return;
        }
 
-       ircsprintf(buffer, "\"%s\",\"0\",\"%s\",\"%s\",%ld\n",
+       rb_sprintf(buffer, "\"%s\",\"0\",\"%s\",\"%s\",%ld\n",
                   aconf->name, aconf->passwd,
-                  get_oper_name(source_p), CurrentTime);
+                  get_oper_name(source_p), rb_current_time());
 
        if(fputs(buffer, out) == -1)
        {
@@ -417,9 +416,9 @@ cluster_xline(struct Client *source_p, int temp_time, const char *name,
                const char *reason)
 {
        struct remote_conf *shared_p;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
 
-       DLINK_FOREACH(ptr, cluster_conf_list.head)
+       RB_DLINK_FOREACH(ptr, cluster_conf_list.head)
        {
                shared_p = ptr->data;
 
@@ -474,7 +473,7 @@ mo_unxline(struct Client *client_p, struct Client *source_p, int parc, const cha
                if(match(parv[3], me.name) == 0)
                        return 0;
        }
-       else if(dlink_list_length(&cluster_conf_list))
+       else if(rb_dlink_list_length(&cluster_conf_list))
                cluster_generic(source_p, "UNXLINE", SHARED_UNXLINE, CAP_CLUSTER,
                                "%s", parv[1]);
 
@@ -529,13 +528,13 @@ handle_remote_unxline(struct Client *source_p, const char *name)
        return;
 }
 
-static int
+static void
 remove_xline(struct Client *source_p, const char *name)
 {
        struct ConfItem *aconf;
-       dlink_node *ptr;
+       rb_dlink_node *ptr;
 
-       DLINK_FOREACH(ptr, xline_conf_list.head)
+       RB_DLINK_FOREACH(ptr, xline_conf_list.head)
        {
                aconf = ptr->data;
 
@@ -544,7 +543,7 @@ remove_xline(struct Client *source_p, const char *name)
                        if (!aconf->hold)
                        {
                                if (!remove_xline_from_file(source_p, name))
-                                       return 0;
+                                       return;
                        }
                        else
                        {
@@ -558,18 +557,19 @@ remove_xline(struct Client *source_p, const char *name)
                                                get_oper_name(source_p), name);
                        }
                        
+                       remove_reject_mask(aconf->name, NULL);
                        free_conf(aconf);
-                       dlinkDestroy(ptr, &xline_conf_list);
-                       return 1;
+                       rb_dlinkDestroy(ptr, &xline_conf_list);
+                       return;
                }
        }
 
        sendto_one_notice(source_p, ":No X-Line for %s", name);
 
-       return 0;
+       return;
 }
 
-/* remove_xline()
+/* remove_xline_from_file()
  *
  * inputs      - gecos to remove
  * outputs     - 
@@ -591,7 +591,7 @@ remove_xline_from_file(struct Client *source_p, const char *huntgecos)
        int found_xline = 0;
 
        filename = ConfigFileEntry.xlinefile;
-       ircsnprintf(temppath, sizeof(temppath),
+       rb_snprintf(temppath, sizeof(temppath),
                 "%s.tmp", ConfigFileEntry.xlinefile);
 
        if((in = fopen(filename, "r")) == NULL)