send: implement partial support for outbound tags (enough for account-tag as a testcase)

[solanum.git] / modules / m_kline.c

diff --git a/modules/m_kline.c b/modules/m_kline.c
index e133b02638a34e5a3dc9d5b664258619b019add6..d11b59a9eb7d6ae2148a6bbf9d670f2eabd85afc 100644 (file)
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -46,20 +46,20 @@
 #include "bandbi.h"
 #include "operhash.h"
 
-static int mo_kline(struct Client *, struct Client *, int, const char **);
-static int ms_kline(struct Client *, struct Client *, int, const char **);
-static int me_kline(struct Client *, struct Client *, int, const char **);
-static int mo_unkline(struct Client *, struct Client *, int, const char **);
-static int ms_unkline(struct Client *, struct Client *, int, const char **);
-static int me_unkline(struct Client *, struct Client *, int, const char **);
+static int mo_kline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int ms_kline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int me_kline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int mo_unkline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int ms_unkline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int me_unkline(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message kline_msgtab = {
-       "KLINE", 0, 0, 0, MFLG_SLOW,
+       "KLINE", 0, 0, 0, 0,
        {mg_unreg, mg_not_oper, {ms_kline, 5}, {ms_kline, 5}, {me_kline, 5}, {mo_kline, 3}}
 };
 
 struct Message unkline_msgtab = {
-       "UNKLINE", 0, 0, 0, MFLG_SLOW,
+       "UNKLINE", 0, 0, 0, 0,
        {mg_unreg, mg_not_oper, {ms_unkline, 4}, {ms_unkline, 4}, {me_unkline, 3}, {mo_unkline, 2}}
 };
 
@@ -95,7 +95,7 @@ static void remove_prop_kline(struct Client *, struct ConfItem *);
  *   parv[5] - reason
  */
 static int
-mo_kline(struct Client *client_p, struct Client *source_p, int parc, const char **parv)
+mo_kline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv)
 {
        char def[] = "No Reason";
        char user[USERLEN + 2];
@@ -240,7 +240,7 @@ mo_kline(struct Client *client_p, struct Client *source_p, int parc, const char
  *   parv[5] - reason
  */
 static int
-ms_kline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+ms_kline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        int tkline_time = atoi(parv[2]);
 
@@ -265,7 +265,7 @@ ms_kline(struct Client *client_p, struct Client *source_p, int parc, const char
 }
 
 static int
-me_kline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+me_kline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        /* <tkline_time> <user> <host> :<reason> */
        if(!IsPerson(source_p))
@@ -352,7 +352,7 @@ handle_remote_kline(struct Client *source_p, int tkline_time,
  *   parv[3] - optional target server
  */
 static int
-mo_unkline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_unkline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        const char *user;
        char *host;
@@ -453,7 +453,7 @@ mo_unkline(struct Client *client_p, struct Client *source_p, int parc, const cha
  *   parv[3] - host to unkline
  */
 static int
-ms_unkline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+ms_unkline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        /* parv[0]  parv[1]        parv[2]  parv[3]
         * oper     target server  user     host    */
@@ -470,7 +470,7 @@ ms_unkline(struct Client *client_p, struct Client *source_p, int parc, const cha
 }
 
 static int
-me_unkline(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+me_unkline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        /* user host */
        if(!IsPerson(source_p))
@@ -724,7 +724,7 @@ already_placed_kline(struct Client *source_p, const char *luser, const char *lho
        if(aconf == NULL && ConfigFileEntry.non_redundant_klines)
        {
                bits = 0;
-               if((t = parse_netmask(lhost, (struct sockaddr *) &iphost, &bits)) != HM_HOST)
+               if((t = parse_netmask(lhost, &iphost, &bits)) != HM_HOST)
                {
 #ifdef RB_IPV6
                        if(t == HM_IPV6)
@@ -834,6 +834,7 @@ static void
 remove_prop_kline(struct Client *source_p, struct ConfItem *aconf)
 {
        rb_dlink_node *ptr;
+       time_t now;
 
        ptr = rb_dlinkFind(aconf, &prop_bans);
        if (!ptr)
@@ -848,8 +849,9 @@ remove_prop_kline(struct Client *source_p, struct ConfItem *aconf)
 
        ilog(L_KLINE, "UK %s %s %s",
             get_oper_name(source_p), aconf->user, aconf->host);
-       if(aconf->created < rb_current_time())
-               aconf->created = rb_current_time();
+       now = rb_current_time();
+       if(aconf->created < now)
+               aconf->created = now;
        else
                aconf->created++;
        aconf->hold = aconf->created;
@@ -863,5 +865,5 @@ remove_prop_kline(struct Client *source_p, struct ConfItem *aconf)
                        0,
                        (int)(aconf->lifetime - aconf->created));
        remove_reject_mask(aconf->user, aconf->host);
-       deactivate_conf(aconf, ptr);
+       deactivate_conf(aconf, ptr, now);
 }