X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/2f5fa92127fcfead0d7876a99eb62ba0fb957610..d1275a8fd6d1fb76ef0eb67e2be48f5f7208202e:/src/listener.c

diff --git a/src/listener.c b/src/listener.c
index e8a9260..0849ab6 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -28,8 +28,7 @@
 #include "setup.h"
 #include "listener.h"
 #include "client.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"
@@ -41,6 +40,8 @@
 #include "reject.h"
 #include "s_conf.h"
 #include "hostmask.h"
+#include "sslproc.h"
+#include "hash.h"
 
 #ifndef INADDR_NONE
 #define INADDR_NONE ((unsigned int) 0xffffffff)
@@ -145,7 +146,8 @@ show_ports(struct Client *source_p)
 			   ntohs(((struct sockaddr_in *)&listener->addr)->sin_port),
 #endif
 			   IsOperAdmin(source_p) ? listener->name : me.name,
-			   listener->ref_count, (listener->active) ? "active" : "disabled");
+			   listener->ref_count, (listener->active) ? "active" : "disabled",
+			   listener->ssl ? " ssl" : "");
 	}
 }
 
@@ -181,7 +183,7 @@ inetport(listener_t *listener)
 		struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&listener->addr;
 		if(!IN6_ARE_ADDR_EQUAL(&in6->sin6_addr, &in6addr_any))
 		{
-			inetntop(AF_INET6, &in6->sin6_addr, listener->vhost, sizeof(listener->vhost));
+			rb_inet_ntop(AF_INET6, &in6->sin6_addr, listener->vhost, sizeof(listener->vhost));
 			listener->name = listener->vhost;
 		}
 	} else
@@ -190,7 +192,7 @@ inetport(listener_t *listener)
 		struct sockaddr_in *in = (struct sockaddr_in *)&listener->addr;
 		if(in->sin_addr.s_addr != INADDR_ANY)
 		{
-			inetntop(AF_INET, &in->sin_addr, listener->vhost, sizeof(listener->vhost));
+			rb_inet_ntop(AF_INET, &in->sin_addr, listener->vhost, sizeof(listener->vhost));
 			listener->name = listener->vhost;
 		}	
 	}
@@ -303,7 +305,7 @@ find_listener(struct rb_sockaddr_storage *addr)
  * the format "255.255.255.255"
  */
 void
-add_listener(int port, const char *vhost_ip, int family)
+add_listener(int port, const char *vhost_ip, int family, int ssl)
 {
 	listener_t *listener;
 	struct rb_sockaddr_storage vaddr;
@@ -320,13 +322,13 @@ add_listener(int port, const char *vhost_ip, int family)
 	{
 		if(family == AF_INET)
 		{
-			if(inetpton(family, vhost_ip, &((struct sockaddr_in *)&vaddr)->sin_addr) <= 0)
+			if(rb_inet_pton(family, vhost_ip, &((struct sockaddr_in *)&vaddr)->sin_addr) <= 0)
 				return;
 		} 
 #ifdef RB_IPV6
 		else
 		{
-			if(inetpton(family, vhost_ip, &((struct sockaddr_in6 *)&vaddr)->sin6_addr) <= 0)
+			if(rb_inet_pton(family, vhost_ip, &((struct sockaddr_in6 *)&vaddr)->sin6_addr) <= 0)
 				return;
 		
 		}
@@ -375,6 +377,7 @@ add_listener(int port, const char *vhost_ip, int family)
 	}
 
 	listener->F = NULL;
+	listener->ssl = ssl;
 
 	if(inetport(listener))
 		listener->active = 1;
@@ -432,7 +435,7 @@ close_listeners()
  * any client list yet.
  */
 static void
-add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, int exempt)
+add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, void *ssl_ctl)
 {
 	struct Client *new_client;
 	s_assert(NULL != listener);
@@ -449,28 +452,26 @@ add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, int
 	 * copy address to 'sockhost' as a string, copy it to host too
 	 * so we have something valid to put into error messages...
 	 */
-	inetntop_sock((struct sockaddr *)&new_client->localClient->ip, new_client->sockhost, 
+	rb_inet_ntop_sock((struct sockaddr *)&new_client->localClient->ip, new_client->sockhost, 
 		sizeof(new_client->sockhost));
 
 
-	strlcpy(new_client->host, new_client->sockhost, sizeof(new_client->host));
+	rb_strlcpy(new_client->host, new_client->sockhost, sizeof(new_client->host));
 
 	new_client->localClient->F = F;
-
+	add_to_cli_fd_hash(new_client);
 	new_client->localClient->listener = listener;
-	++listener->ref_count;
+	new_client->localClient->ssl_ctl = ssl_ctl;
+	if(ssl_ctl != NULL || rb_fd_ssl(F))
+		SetSSL(new_client);
 
-	if(!exempt)
-	{
-		if(check_reject(new_client))
-			return; 
-		if(add_unknown_ip(new_client))
-			return;
-	}
+	++listener->ref_count;
 
 	start_auth(new_client);
 }
 
+static const char *toofast = "ERROR :Reconnecting too fast, throttled.\r\n";
+
 static int
 accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, void *data)
 {
@@ -479,6 +480,12 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
 	struct ConfItem *aconf;
 	static time_t last_oper_notice = 0;
 
+	if(listener->ssl && (!ssl_ok || !get_ssld_count()))
+	{
+		rb_close(F);
+		return 0;
+	}
+
 	if((maxconnections - 10) < rb_get_fd(F)) /* XXX this is kinda bogus */
 	{
 		++ServerStats.is_ref;
@@ -487,7 +494,7 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
 		 */
 		if((last_oper_notice + 20) <= rb_current_time())
 		{
-			sendto_realops_flags(SNO_GENERAL, L_ALL,
+			sendto_realops_snomask(SNO_GENERAL, L_ALL,
 					     "All connections in use. (%s)",
 					     get_listener_name(listener));
 			last_oper_notice = rb_current_time();
@@ -499,7 +506,7 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
 		return 0;
 	}
 
-	aconf = find_dline(addr, AF_INET);
+	aconf = find_dline(addr, addr->sa_family);
 	if(aconf != NULL && (aconf->status & CONF_EXEMPTDLINE))
 		return 1;
 	
@@ -526,9 +533,29 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
 		return 0;
 	}
 
+	if(check_reject(F, addr))
+		return 0;
+		
+	if(throttle_add(addr))
+	{
+		rb_write(F, toofast, strlen(toofast));
+		rb_close(F);
+		return 0;
+	}
+
 	return 1;
 }
 
+static void
+accept_ssld(rb_fde_t *F, struct sockaddr *addr, struct sockaddr *laddr, struct Listener *listener)
+{
+	ssl_ctl_t *ctl;
+	rb_fde_t *xF[2];
+	rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Incoming ssld Connection");
+	ctl = start_ssld_accept(F, xF[1], rb_get_fd(xF[0])); /* this will close F for us */
+	add_connection(listener, xF[0], addr, ctl);
+}
+
 static void
 accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t addrlen, void *data)
 {
@@ -545,5 +572,8 @@ accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t add
 		rb_close(F);
 	}
 	
-	add_connection(listener, F, addr, 1);
+	if(listener->ssl)
+		accept_ssld(F, addr, (struct sockaddr *)&lip, listener);
+	else
+		add_connection(listener, F, addr, NULL);
 }