Make DNSBL hits snote on hit. The snote displays nick, IP and what DNSBL they hit.

[irc/rqf/shadowircd.git] / src / channel.c

diff --git a/src/channel.c b/src/channel.c
index 8152b5f5ddb07a4281512308fe5b4f5d6e4a6c12..39d2f85d828dd80ddd5e9f9b7cd82f31ae560795 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: channel.c 3580 2007-11-07 23:45:14Z jilles $
  */
 
 #include "stdinc.h"
@@ -826,7 +825,7 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
        char src_host[NICKLEN + USERLEN + HOSTLEN + 6];
        char src_iphost[NICKLEN + USERLEN + HOSTLEN + 6];
        char src_althost[NICKLEN + USERLEN + HOSTLEN + 6];
-       char *text = rb_strdup("");
+       char text[10];
        int use_althost = 0;
        int i = 0;
        hook_data_channel moduledata;
@@ -857,6 +856,17 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
        if((is_banned(chptr, source_p, NULL, src_host, src_iphost)) == CHFL_BAN)
                return (ERR_BANNEDFROMCHAN);
 
+       rb_snprintf(text, sizeof(text), "K%s", source_p->id);
+
+       DICTIONARY_FOREACH(md, &iter, chptr->metadata)
+       {
+               if(!strcmp(md->value, "KICKNOREJOIN") && !strcmp(md->name, text) && (md->timevalue + 2 > rb_current_time()))
+                       return ERR_KICKNOREJOIN;
+               /* cleanup any stale KICKNOREJOIN metadata we find while we're at it */
+               if(!strcmp(md->value, "KICKNOREJOIN") && !(md->timevalue + 2 > rb_current_time()))  
+                       channel_metadata_delete(chptr, md->name, 0);
+       }
+
        if(chptr->mode.mode & MODE_INVITEONLY)
        {
                RB_DLINK_FOREACH(invite, source_p->user->invited.head)