X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/ae4091d2f9246e6b2bb73200f4392c5d9568f365..7bab07d4d30245bf5ba272b236dc7b1c1e309c4d:/src/listener.c

diff --git a/src/listener.c b/src/listener.c
index 764a5c1..e8a9260 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -46,7 +46,7 @@
 #define INADDR_NONE ((unsigned int) 0xffffffff)
 #endif
 
-#if defined(NO_IN6ADDR_ANY) && defined(IPV6)
+#if defined(NO_IN6ADDR_ANY) && defined(RB_IPV6)
 static const struct in6_addr in6addr_any =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
 #endif 
@@ -112,7 +112,7 @@ get_listener_name(const listener_t *listener)
 	if(listener == NULL)
 		return NULL;
 
-#ifdef IPV6
+#ifdef RB_IPV6
 	if(listener->addr.ss_family == AF_INET6)
 		port = ntohs(((const struct sockaddr_in6 *)&listener->addr)->sin6_port);
 	else
@@ -138,7 +138,7 @@ show_ports(struct Client *source_p)
 	{
 		sendto_one_numeric(source_p, RPL_STATSPLINE, 
 				   form_str(RPL_STATSPLINE), 'P',
-#ifdef IPV6
+#ifdef RB_IPV6
 			   ntohs(listener->addr.ss_family == AF_INET ? ((struct sockaddr_in *)&listener->addr)->sin_port :
 			   	 ((struct sockaddr_in6 *)&listener->addr)->sin6_port),
 #else
@@ -175,7 +175,7 @@ inetport(listener_t *listener)
 	
 	F = rb_socket(GET_SS_FAMILY(&listener->addr), SOCK_STREAM, 0, "Listener socket");
 
-#ifdef IPV6
+#ifdef RB_IPV6
 	if(listener->addr.ss_family == AF_INET6)
 	{
 		struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&listener->addr;
@@ -197,16 +197,12 @@ inetport(listener_t *listener)
 
 	if(F == NULL)
 	{
-		report_error("opening listener socket %s:%s",
-			     get_listener_name(listener), 
-			     get_listener_name(listener), errno);
+		ilog_error("opening listener socket");
 		return 0;
 	}
 	else if((maxconnections - 10) < rb_get_fd(F)) /* XXX this is kinda bogus*/
 	{
-		report_error("no more connections left for listener %s:%s",
-			     get_listener_name(listener), 
-			     get_listener_name(listener), errno);
+		ilog_error("no more connections left for listener");
 		rb_close(F);
 		return 0;
 	}
@@ -217,9 +213,7 @@ inetport(listener_t *listener)
 	 */
 	if(setsockopt(rb_get_fd(F), SOL_SOCKET, SO_REUSEADDR, (char *) &opt, sizeof(opt)))
 	{
-		report_error("setting SO_REUSEADDR for listener %s:%s",
-			     get_listener_name(listener), 
-			     get_listener_name(listener), errno);
+		ilog_error("setting SO_REUSEADDR for listener");
 		rb_close(F);
 		return 0;
 	}
@@ -231,18 +225,14 @@ inetport(listener_t *listener)
 
 	if(bind(rb_get_fd(F), (struct sockaddr *) &listener->addr, GET_SS_LEN(&listener->addr)))
 	{
-		report_error("binding listener socket %s:%s",
-			     get_listener_name(listener), 
-			     get_listener_name(listener), errno);
+		ilog_error("binding listener socket");
 		rb_close(F);
 		return 0;
 	}
 
 	if((ret = rb_listen(F, RATBOX_SOMAXCONN)))
 	{
-		report_error("listen failed for %s:%s", 
-			     get_listener_name(listener), 
-			     get_listener_name(listener), errno);
+		ilog_error("listen()");
 		rb_close(F);
 		return 0;
 	}
@@ -280,7 +270,7 @@ find_listener(struct rb_sockaddr_storage *addr)
 				}
 				break;
 			}
-#ifdef IPV6
+#ifdef RB_IPV6
 			case AF_INET6:
 			{
 				struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr;
@@ -333,7 +323,7 @@ add_listener(int port, const char *vhost_ip, int family)
 			if(inetpton(family, vhost_ip, &((struct sockaddr_in *)&vaddr)->sin_addr) <= 0)
 				return;
 		} 
-#ifdef IPV6
+#ifdef RB_IPV6
 		else
 		{
 			if(inetpton(family, vhost_ip, &((struct sockaddr_in6 *)&vaddr)->sin6_addr) <= 0)
@@ -348,7 +338,7 @@ add_listener(int port, const char *vhost_ip, int family)
 			case AF_INET:
 				((struct sockaddr_in *)&vaddr)->sin_addr.s_addr = INADDR_ANY;
 				break;
-#ifdef IPV6
+#ifdef RB_IPV6
 			case AF_INET6:
 				memcpy(&((struct sockaddr_in6 *)&vaddr)->sin6_addr, &in6addr_any, sizeof(struct in6_addr));
 				break;
@@ -363,7 +353,7 @@ add_listener(int port, const char *vhost_ip, int family)
 			SET_SS_LEN(&vaddr, sizeof(struct sockaddr_in));
 			((struct sockaddr_in *)&vaddr)->sin_port = htons(port);
 			break;
-#ifdef IPV6
+#ifdef RB_IPV6
 		case AF_INET6:
 			SET_SS_LEN(&vaddr, sizeof(struct sockaddr_in6));
 			((struct sockaddr_in6 *)&vaddr)->sin6_port = htons(port);
@@ -491,7 +481,7 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
 
 	if((maxconnections - 10) < rb_get_fd(F)) /* XXX this is kinda bogus */
 	{
-		++ServerStats->is_ref;
+		++ServerStats.is_ref;
 		/*
 		 * slow down the whining to opers bit
 		 */
@@ -517,7 +507,7 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
 	 * from this IP... */
 	if(aconf != NULL)
 	{
-		ServerStats->is_ref++;
+		ServerStats.is_ref++;
 			
 		if(ConfigFileEntry.dline_with_reason)
 		{
@@ -546,7 +536,7 @@ accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t add
 	struct rb_sockaddr_storage lip;
 	unsigned int locallen = sizeof(struct rb_sockaddr_storage);
 	
-	ServerStats->is_ac++;
+	ServerStats.is_ac++;
 
 	if(getsockname(rb_get_fd(F), (struct sockaddr *) &lip, &locallen) < 0)
 	{