X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/54015b5fea2584a35aa605ebe37217010b448cff..c88cdb00957d1bafae4587343b5ab7df14b75f8b:/src/listener.c

diff --git a/src/listener.c b/src/listener.c
index 7b92a6c..953f2b3 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: listener.c 3446 2007-05-14 22:21:16Z jilles $
+ *  $Id: listener.c 3460 2007-05-18 20:31:33Z jilles $
  */
 
 #include "stdinc.h"
@@ -41,6 +41,8 @@
 #include "memory.h"
 #include "s_auth.h"
 #include "reject.h"
+#include "s_conf.h"
+#include "hostmask.h"
 
 #ifndef INADDR_NONE
 #define INADDR_NONE ((unsigned int) 0xffffffff)
@@ -440,7 +442,7 @@ close_listeners()
  * any client list yet.
  */
 static void
-add_connection(listener_t *listener, int fd, struct sockaddr *sai)
+add_connection(listener_t *listener, int fd, struct sockaddr *sai, int exempt)
 {
 	struct Client *new_client;
 	s_assert(NULL != listener);
@@ -475,10 +477,13 @@ add_connection(listener_t *listener, int fd, struct sockaddr *sai)
 	new_client->localClient->listener = listener;
 	++listener->ref_count;
 
-	if(check_reject(new_client))
-		return; 
-	if(add_unknown_ip(new_client))
-		return;
+	if(!exempt)
+	{
+		if(check_reject(new_client))
+			return; 
+		if(add_unknown_ip(new_client))
+			return;
+	}
 
 	start_auth(new_client);
 }
@@ -550,7 +555,9 @@ accept_connection(int pfd, void *data)
 
 	/* Do an initial check we aren't connecting too fast or with too many
 	 * from this IP... */
-	if((aconf = conf_connect_allowed((struct sockaddr *)&sai, sai.ss_family)) != NULL)
+	aconf = find_dline((struct sockaddr *) &sai, sai.ss_family);
+	/* check it wasn't an exempt */
+	if (aconf != NULL && (aconf->status & CONF_EXEMPTDLINE) == 0)
 	{
 		ServerStats->is_ref++;
 
@@ -576,7 +583,7 @@ accept_connection(int pfd, void *data)
 	}
 
 	ServerStats->is_ac++;
-	add_connection(listener, fd, (struct sockaddr *)&sai);
+	add_connection(listener, fd, (struct sockaddr *)&sai, aconf ? 1 : 0);
 
 	/* Re-register a new IO request for the next accept .. */
 	comm_setselect(listener->fd, FDLIST_SERVICE, COMM_SELECT_READ,