From 4998e3d6dc88c99c2c94e82a5a8e5445140b6423 Mon Sep 17 00:00:00 2001
From: Valery Yatsko <darkwire.tl@gmail.com>
Date: Wed, 2 Apr 2008 15:02:45 +0400
Subject: [PATCH] More charybdis -> ratbox3

---
 include/reject.h | 100 ++++++++++++++++++++++++++---------------------
 src/reject.c     |   3 +-
 2 files changed, 58 insertions(+), 45 deletions(-)

diff --git a/include/reject.h b/include/reject.h
index f47a1f30c..e450891c1 100644
--- a/include/reject.h
+++ b/include/reject.h
@@ -1,44 +1,56 @@
-/*
- *  ircd-ratbox: A slightly useful ircd
- *  reject.h: header to a file which rejects users with prejudice
- *
- *  Copyright (C) 2003 Aaron Sethman <androsyn@ratbox.org>
- *  Copyright (C) 2003-2004 ircd-ratbox development team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- *  USA
- *
- *
- *  $Id: reject.h 3446 2007-05-14 22:21:16Z jilles $
- */
-#ifndef INCLUDED_reject_h
-#define INCLUDED_reject_h
-
-/* amount of time to delay a rejected clients exit */
-#define DELAYED_EXIT_TIME	10
-
-extern rb_dlink_list delay_exit;
-
-void init_reject(void);
-int check_reject(struct Client *);
-void add_reject(struct Client *, const char *mask1, const char *mask2);
-void flush_reject(void);
-int remove_reject_ip(const char *ip);
-int remove_reject_mask(const char *mask1, const char *mask2);
-
-int add_unknown_ip(struct Client *client_p);
-void del_unknown_ip(struct Client *client_p);
-
-#endif
+/*
+ *  ircd-ratbox: A slightly useful ircd
+ *  reject.h: header to a file which rejects users with prejudice
+ *
+ *  Copyright (C) 2003 Aaron Sethman <androsyn@ratbox.org>
+ *  Copyright (C) 2003-2005 ircd-ratbox development team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ *  USA
+ *
+ *
+ *  $Id: reject.h 25056 2008-02-06 20:47:40Z androsyn $
+ */
+#ifndef INCLUDED_reject_h
+#define INCLUDED_reject_h
+
+/* amount of time to delay a rejected clients exit */
+#define DELAYED_EXIT_TIME	10
+
+void init_reject(void);
+int check_reject(rb_fde_t *F, struct sockaddr *addr);
+void add_reject(struct Client *);
+void flush_reject(void);
+int remove_reject(const char *ip);
+struct ConfItem *find_dline(struct sockaddr *addr);
+struct ConfItem *find_dline_exact(struct sockaddr *addr, unsigned int bitlen);
+void remove_dline(struct ConfItem *aconf);
+int add_dline(struct ConfItem *aconf);
+int add_eline(struct ConfItem *aconf);
+void report_dlines(struct Client *);
+void report_tdlines(struct Client *);
+void report_elines(struct Client *);
+unsigned long delay_exit_length(void);
+
+int throttle_add(struct sockaddr *addr);
+
+int inc_global_cidr_count(struct Client *client_p);
+void dec_global_cidr_count(struct Client *client_p);
+int check_global_cidr_count(struct Client *client_p);
+void rehash_global_cidr_tree(void);
+
+
+#endif
+
diff --git a/src/reject.c b/src/reject.c
index 8f589f303..4f051c97e 100644
--- a/src/reject.c
+++ b/src/reject.c
@@ -24,6 +24,7 @@
  */
 
 #include "stdinc.h"
+#include "struct.h"
 #include "client.h"
 #include "s_conf.h"
 #include "reject.h"
@@ -33,6 +34,7 @@
 #include "numeric.h"
 #include "parse.h"
 #include "hostmask.h"
+#include "match.h"
 
 static rb_patricia_tree_t *global_tree;
 static rb_patricia_tree_t *reject_tree;
@@ -587,4 +589,3 @@ rehash_global_cidr_tree(void)
 	}
 	return;
 }
-