X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=d6542e23528ab48920ca787ddaa0de5140d21264;hb=2a790861a1334c17f87405c60c1417b15bbce392;hp=07c8078374af0512ce69211b13fb363b9646dcf5;hpb=82d32ffb28262b302fb435739e4c81bd3c1a1b85;p=ngircd-alex.git

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 07c80783..d6542e23 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -17,7 +17,7 @@
 #include "portab.h"
 #include "io.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.215 2007/11/23 16:26:04 fw Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.221 2008/02/26 22:04:17 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -41,12 +41,6 @@ static char UNUSED id[] = "$Id: conn.c,v 1.215 2007/11/23 16:26:04 fw Exp $";
 # include <netinet/ip.h>
 #endif
 
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#else
-# define PF_INET AF_INET
-#endif
-
 #ifdef HAVE_STDINT_H
 # include <stdint.h>			/* e.g. for Mac OS X */
 #endif
@@ -92,10 +86,9 @@ static void Check_Connections PARAMS(( void ));
 static void Check_Servers PARAMS(( void ));
 static void Init_Conn_Struct PARAMS(( CONN_ID Idx ));
 static bool Init_Socket PARAMS(( int Sock ));
-static void New_Server PARAMS(( int Server ));
+static void New_Server PARAMS(( int Server, ng_ipaddr_t *dest ));
 static void Simple_Message PARAMS(( int Sock, const char *Msg ));
-static int Count_Connections PARAMS(( struct sockaddr_in addr ));
-static int NewListener PARAMS(( const UINT16 Port ));
+static int NewListener PARAMS(( int af, const UINT16 Port ));
 
 static array My_Listeners;
 static array My_ConnArray;
@@ -150,10 +143,28 @@ cb_connserver(int sock, UNUSED short what)
  			    Conf_Server[Conf_GetServer(idx)].port,
  			    idx, strerror(err));
 
+		res = Conf_GetServer(idx);
+		assert(res >= 0);
+
 		Conn_Close(idx, "Can't connect!", NULL, false);
+
+		if (res < 0)
+			return;
+		if (ng_ipaddr_af(&Conf_Server[res].dst_addr[0])) {
+			/* more addresses to try... */
+			New_Server(res, &Conf_Server[res].dst_addr[0]);
+			/* connection to dst_addr[0] in progress, remove this address... */
+			Conf_Server[res].dst_addr[0] = Conf_Server[res].dst_addr[1];
+
+			memset(&Conf_Server[res].dst_addr[1], 0, sizeof(&Conf_Server[res].dst_addr[1]));
+		}
 		return;
 	}
 
+	res = Conf_GetServer(idx);
+	assert(res >= 0);
+	if (res >= 0) /* connect succeeded, remove all additional addresses */
+		memset(&Conf_Server[res].dst_addr, 0, sizeof(&Conf_Server[res].dst_addr));
 	Conn_OPTION_DEL( &My_Connections[idx], CONN_ISCONNECTING );
 	server_login(idx);
 }
@@ -261,7 +272,7 @@ Conn_Exit( void )
 
 
 static unsigned int
-ports_initlisteners(array *a, void (*func)(int,short))
+ports_initlisteners(array *a, int af, void (*func)(int,short))
 {
 	unsigned int created = 0;
 	size_t len;
@@ -271,7 +282,7 @@ ports_initlisteners(array *a, void (*func)(int,short))
 	len = array_length(a, sizeof (UINT16));
 	port = array_start(a);
 	while(len--) {
-		fd = NewListener( *port );
+		fd = NewListener(af, *port);
 		if (fd < 0) {
 			port++;
 			continue;
@@ -296,14 +307,19 @@ Conn_InitListeners( void )
 {
 	/* Initialize ports on which the server should accept connections */
 
-	unsigned int created;
+	unsigned int created = 0;
 
 	if (!io_library_init(CONNECTION_POOL)) {
 		Log(LOG_EMERG, "Cannot initialize IO routines: %s", strerror(errno));
 		return -1;
 	}
 
-	created = ports_initlisteners(&Conf_ListenPorts, cb_listen);
+#ifdef WANT_IPV6
+	if (Conf_ListenIPv6)
+		created = ports_initlisteners(&Conf_ListenPorts, AF_INET6, cb_listen);
+#endif
+	if (Conf_ListenIPv4)
+		created += ports_initlisteners(&Conf_ListenPorts, AF_INET, cb_listen);
 
 	return created;
 } /* Conn_InitListeners */
@@ -333,68 +349,75 @@ Conn_ExitListeners( void )
 } /* Conn_ExitListeners */
 
 
-static void
-InitSinaddr(struct sockaddr_in *addr, UINT16 Port)
+static bool
+InitSinaddrListenAddr(int af, ng_ipaddr_t *addr, UINT16 Port)
 {
-	struct in_addr inaddr;
-
-	memset(addr, 0, sizeof(*addr));
-	memset( &inaddr, 0, sizeof(inaddr));
-
-	addr->sin_family = AF_INET;
-	addr->sin_port = htons(Port);
-	inaddr.s_addr = htonl(INADDR_ANY);
-	addr->sin_addr = inaddr;
+	bool ret;
+	const char *listen_addrstr = NULL;
+#ifdef WANT_IPV6
+	if (af == AF_INET)
+		listen_addrstr = "0.0.0.0";
+#else
+	(void)af;
+#endif
+	if (Conf_ListenAddress[0]) /* overrides V4/V6 atm */
+		listen_addrstr = Conf_ListenAddress;
+
+	ret = ng_ipaddr_init(addr, listen_addrstr, Port);
+	if (!ret) {
+		if (!listen_addrstr)
+			listen_addrstr = "";
+		Log(LOG_CRIT, "Can't bind to %s:%u: can't convert ip address \"%s\"",
+					listen_addrstr, Port, listen_addrstr);
+	}
+	return ret;
 }
 
 
-static bool
-InitSinaddrListenAddr(struct sockaddr_in *addr, UINT16 Port)
+static void
+set_v6_only(int af, int sock)
 {
-	struct in_addr inaddr;
+#if defined(IPV6_V6ONLY) && defined(WANT_IPV6)
+	int on = 1;
 
-	InitSinaddr(addr, Port);
-
-	if (!Conf_ListenAddress[0])
-		return true;
-
-	if (!ngt_IPStrToBin(Conf_ListenAddress, &inaddr)) {
-		Log( LOG_CRIT, "Can't bind to %s:%u: can't convert ip address \"%s\"",
-				Conf_ListenAddress, Port, Conf_ListenAddress);
-		return false;
-	}
+	if (af != AF_INET6)
+		return;
 
-	addr->sin_addr = inaddr;
-	return true;
+	if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)))
+		Log(LOG_ERR, "Could not set IPV6_V6ONLY: %s", strerror(errno));
+#else
+	(void)af;
+	(void)sock;
+#endif
 }
 
 
 /* return new listening port file descriptor or -1 on failure */
 static int
-NewListener( const UINT16 Port )
+NewListener(int af, const UINT16 Port)
 {
 	/* Create new listening socket on specified port */
-
-	struct sockaddr_in addr;
+	ng_ipaddr_t addr;
 	int sock;
 #ifdef ZEROCONF
 	char name[CLIENT_ID_LEN], *info;
 #endif
+	if (!InitSinaddrListenAddr(af, &addr, Port))
+		return -1;
 
-	InitSinaddrListenAddr(&addr, Port);
-
-	addr.sin_family = AF_INET;
-	addr.sin_port = htons( Port );
-
-	sock = socket( PF_INET, SOCK_STREAM, 0);
+	sock = socket(ng_ipaddr_af(&addr), SOCK_STREAM, 0);
 	if( sock < 0 ) {
 		Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
 		return -1;
 	}
 
+	af = ng_ipaddr_af(&addr);
+
+	set_v6_only(af, sock);
+
 	if( ! Init_Socket( sock )) return -1;
 
-	if (bind(sock, (struct sockaddr *)&addr, (socklen_t)sizeof(addr)) != 0) {
+	if (bind(sock, (struct sockaddr *)&addr, ng_ipaddr_salen(&addr)) != 0) {
 		Log( LOG_CRIT, "Can't bind socket (port %d) : %s!", Port, strerror( errno ));
 		close( sock );
 		return -1;
@@ -413,8 +436,12 @@ NewListener( const UINT16 Port )
 		return -1;
 	}
 
-	if( Conf_ListenAddress[0]) Log( LOG_INFO, "Now listening on %s:%d (socket %d).", Conf_ListenAddress, Port, sock );
-	else Log( LOG_INFO, "Now listening on 0.0.0.0:%d (socket %d).", Port, sock );
+#ifdef WANT_IPV6
+	if (af == AF_INET6)
+		Log(LOG_INFO, "Now listening on [%s]:%d (socket %d).", ng_ipaddr_tostr(&addr), Port, sock);
+	else
+#endif
+		Log(LOG_INFO, "Now listening on %s:%d (socket %d).", ng_ipaddr_tostr(&addr), Port, sock);
 
 #ifdef ZEROCONF
 	/* Get best server description text */
@@ -715,6 +742,7 @@ Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
 	CLIENT *c;
 	char *txt;
 	double in_k, out_k;
+	UINT16 port;
 #ifdef ZLIB
 	double in_z_k, out_z_k;
 	int in_p, out_p;
@@ -742,9 +770,9 @@ Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
 	if (! txt)
 		txt = "Reason unknown";
 
+	port = ng_ipaddr_getport(&My_Connections[Idx].addr);
 	Log(LOG_INFO, "Shutting down connection %d (%s) with %s:%d ...", Idx,
-	    LogMsg ? LogMsg : FwdMsg, My_Connections[Idx].host,
-	    ntohs(My_Connections[Idx].addr.sin_port));
+	    LogMsg ? LogMsg : FwdMsg, My_Connections[Idx].host, port);
 
 	/* Search client, if any */
 	c = Conn_GetClient( Idx );
@@ -784,7 +812,7 @@ Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
 		Log(LOG_CRIT,
 		    "Error closing connection %d (socket %d) with %s:%d - %s! (ignored)",
 		    Idx, My_Connections[Idx].sock, My_Connections[Idx].host,
-		    ntohs(My_Connections[Idx].addr.sin_port), strerror(errno));
+		    port, strerror(errno));
 	}
 
 	/* Mark socket as invalid: */
@@ -813,8 +841,7 @@ Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
 		out_p = (int)(( out_k * 100 ) / out_z_k );
 		Log(LOG_INFO,
 		    "Connection %d with %s:%d closed (in: %.1fk/%.1fk/%d%%, out: %.1fk/%.1fk/%d%%).",
-		    Idx, My_Connections[Idx].host,
-		    ntohs(My_Connections[Idx].addr.sin_port),
+		    Idx, My_Connections[Idx].host, port,
 		    in_k, in_z_k, in_p, out_k, out_z_k, out_p);
 	}
 	else
@@ -822,8 +849,7 @@ Conn_Close( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient )
 	{
 		Log(LOG_INFO,
 		    "Connection %d with %s:%d closed (in: %.1fk, out: %.1fk).",
-		    Idx, My_Connections[Idx].host,
-		    ntohs(My_Connections[Idx].addr.sin_port),
+		    Idx, My_Connections[Idx].host, port,
 		    in_k, out_k);
 	}
 
@@ -946,6 +972,22 @@ Handle_Write( CONN_ID Idx )
 } /* Handle_Write */
 
 
+static int
+Count_Connections(ng_ipaddr_t *a)
+{
+	int i, cnt;
+
+	cnt = 0;
+	for (i = 0; i < Pool_Size; i++) {
+		if (My_Connections[i].sock <= NONE)
+			continue;
+		if (ng_ipaddr_ipequal(&My_Connections[i].addr, a))
+			cnt++;
+	}
+	return cnt;
+} /* Count_Connections */
+
+
 static int
 New_Connection( int Sock )
 {
@@ -955,14 +997,16 @@ New_Connection( int Sock )
 #ifdef TCPWRAP
 	struct request_info req;
 #endif
-	struct sockaddr_in new_addr;
+	ng_ipaddr_t new_addr;
+	char ip_str[NG_INET_ADDRSTRLEN];
 	int new_sock, new_sock_len, new_Pool_Size;
 	CLIENT *c;
 	long cnt;
 
 	assert( Sock > NONE );
 	/* Connection auf Listen-Socket annehmen */
-	new_sock_len = (int)sizeof new_addr;
+	new_sock_len = (int)sizeof(new_addr);
+
 	new_sock = accept(Sock, (struct sockaddr *)&new_addr,
 			  (socklen_t *)&new_sock_len);
 	if (new_sock < 0) {
@@ -970,14 +1014,18 @@ New_Connection( int Sock )
 		return -1;
 	}
 
+	if (!ng_ipaddr_tostr_r(&new_addr, ip_str)) {
+		Log(LOG_CRIT, "fd %d: Can't convert IP address!", new_sock);
+		Simple_Message(new_sock, "ERROR :Internal Server Error");
+		close(new_sock);
+	}
+
 #ifdef TCPWRAP
 	/* Validate socket using TCP Wrappers */
 	request_init( &req, RQ_DAEMON, PACKAGE_NAME, RQ_FILE, new_sock, RQ_CLIENT_SIN, &new_addr, NULL );
 	fromhost(&req);
-	if( ! hosts_access( &req ))
-	{
-		/* Access denied! */
-		Log( deny_severity, "Refused connection from %s (by TCP Wrappers)!", inet_ntoa( new_addr.sin_addr ));
+	if (!hosts_access(&req)) {
+		Log (deny_severity, "Refused connection from %s (by TCP Wrappers)!", ip_str);
 		Simple_Message( new_sock, "ERROR :Connection refused" );
 		close( new_sock );
 		return -1;
@@ -987,13 +1035,12 @@ New_Connection( int Sock )
 	/* Socket initialisieren */
 	if (!Init_Socket( new_sock ))
 		return -1;
-	
+
 	/* Check IP-based connection limit */
-	cnt = Count_Connections( new_addr );
-	if(( Conf_MaxConnectionsIP > 0 ) && ( cnt >= Conf_MaxConnectionsIP ))
-	{
+	cnt = Count_Connections(&new_addr);
+	if ((Conf_MaxConnectionsIP > 0) && (cnt >= Conf_MaxConnectionsIP)) {
 		/* Access denied, too many connections from this IP address! */
-		Log( LOG_ERR, "Refused connection from %s: too may connections (%ld) from this IP address!", inet_ntoa( new_addr.sin_addr ), cnt);
+		Log( LOG_ERR, "Refused connection from %s: too may connections (%ld) from this IP address!", ip_str, cnt);
 		Simple_Message( new_sock, "ERROR :Connection refused, too many connections from your IP address!" );
 		close( new_sock );
 		return -1;
@@ -1035,7 +1082,7 @@ New_Connection( int Sock )
 		return -1;
 	}
 
-	c = Client_NewLocal( new_sock, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWN, false );
+	c = Client_NewLocal(new_sock, ip_str, CLIENT_UNKNOWN, false );
 	if( ! c ) {
 		Log(LOG_ALERT, "Can't accept connection: can't create client structure!");
 		Simple_Message(new_sock, "ERROR :Internal error");
@@ -1049,13 +1096,12 @@ New_Connection( int Sock )
 	My_Connections[new_sock].client = c;
 
 	Log( LOG_INFO, "Accepted connection %d from %s:%d on socket %d.", new_sock,
-			inet_ntoa( new_addr.sin_addr ), ntohs( new_addr.sin_port), Sock );
+			ip_str, ng_ipaddr_getport(&new_addr), Sock);
 
 	/* Hostnamen ermitteln */
-	strlcpy( My_Connections[new_sock].host, inet_ntoa( new_addr.sin_addr ),
-						sizeof( My_Connections[new_sock].host ));
+	strlcpy(My_Connections[new_sock].host, ip_str, sizeof(My_Connections[new_sock].host));
 
-	Client_SetHostname( c, My_Connections[new_sock].host );
+	Client_SetHostname(c, My_Connections[new_sock].host);
 
 	if (!Conf_NoDNS)
 		Resolve_Addr(&My_Connections[new_sock].res_stat, &new_addr,
@@ -1113,10 +1159,10 @@ Read_Request( CONN_ID Idx )
 
 	len = read(My_Connections[Idx].sock, readbuf, sizeof(readbuf));
 	if (len == 0) {
-		Log(LOG_INFO, "%s:%d (%s) is closing the connection ...",
-		    My_Connections[Idx].host,
-		    ntohs(My_Connections[Idx].addr.sin_port),
-		    inet_ntoa( My_Connections[Idx].addr.sin_addr));
+		Log(LOG_INFO, "%s:%u (%s) is closing the connection ...",
+				My_Connections[Idx].host,
+				(unsigned int) ng_ipaddr_getport(&My_Connections[Idx].addr),
+				ng_ipaddr_tostr(&My_Connections[Idx].addr));
 		Conn_Close(Idx,
 			   "Socket closed!", "Client closed connection",
 			   false);
@@ -1172,11 +1218,13 @@ Read_Request( CONN_ID Idx )
 } /* Read_Request */
 
 
+/**
+ * Handle data in connection read-buffer.
+ * @return true if a reuqest was handled, false otherwise (and on errors).
+ */
 static bool
-Handle_Buffer( CONN_ID Idx )
+Handle_Buffer(CONN_ID Idx)
 {
-	/* Handle Data in Connections Read-Buffer.
-	 * Return true if a reuqest was handled, false otherwise (also returned on errors). */
 #ifndef STRICT_RFC
 	char *ptr1, *ptr2;
 #endif
@@ -1192,86 +1240,104 @@ Handle_Buffer( CONN_ID Idx )
 	result = false;
 	for (;;) {
 		/* Check penalty */
-		if( My_Connections[Idx].delaytime > starttime) return result;
+		if (My_Connections[Idx].delaytime > starttime)
+			return result;
 #ifdef ZLIB
-		/* unpack compressed data */
-		if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP ))
-			if( ! Unzip_Buffer( Idx )) return false;
+		/* Unpack compressed data, if compression is in use */
+		if (Conn_OPTION_ISSET(&My_Connections[Idx], CONN_ZIP)) {
+			if (!Unzip_Buffer(Idx))
+				return false;
+		}
 #endif
 
 		if (0 == array_bytes(&My_Connections[Idx].rbuf))
 			break;
 
-		if (!array_cat0_temporary(&My_Connections[Idx].rbuf)) /* make sure buf is NULL terminated */
+		/* Make sure that the buffer is NULL terminated */
+		if (!array_cat0_temporary(&My_Connections[Idx].rbuf))
 			return false;
 
-		/* A Complete Request end with CR+LF, see RFC 2812. */
-		ptr = strstr( array_start(&My_Connections[Idx].rbuf), "\r\n" );
+		/* RFC 2812, section "2.3 Messages", 5th paragraph:
+		 * "IRC messages are always lines of characters terminated
+		 * with a CR-LF (Carriage Return - Line Feed) pair [...]". */
+		delta = 2;
+		ptr = strstr(array_start(&My_Connections[Idx].rbuf), "\r\n");
 
-		if( ptr ) delta = 2; /* complete request */
 #ifndef STRICT_RFC
-		else {
-			/* Check for non-RFC-compliant request (only CR or LF)? Unfortunately,
-			 * there are quite a few clients that do this (incl. "mIRC" :-( */
-			ptr1 = strchr( array_start(&My_Connections[Idx].rbuf), '\r' );
-			ptr2 = strchr( array_start(&My_Connections[Idx].rbuf), '\n' );
+		if (!ptr) {
+			/* Check for non-RFC-compliant request (only CR or
+			 * LF)? Unfortunately, there are quite a few clients
+			 * out there that do this -- incl. "mIRC" :-( */
 			delta = 1;
-			if( ptr1 && ptr2 ) ptr = ptr1 > ptr2 ? ptr2 : ptr1;
-			else if( ptr1 ) ptr = ptr1;
-			else if( ptr2 ) ptr = ptr2;
+			ptr1 = strchr(array_start(&My_Connections[Idx].rbuf), '\r');
+			ptr2 = strchr(array_start(&My_Connections[Idx].rbuf), '\n');
+			if (ptr1 && ptr2)
+				ptr = ptr1 > ptr2 ? ptr2 : ptr1;
+			else if (ptr1)
+				ptr = ptr1;
+			else if (ptr2)
+				ptr = ptr2;
 		}
 #endif
 
-		if( ! ptr )
+		if (!ptr)
 			break;
 
-		/* End of request found */
+		/* Complete (=line terminated) request found, handle it! */
 		*ptr = '\0';
 
-		len = ( ptr - (char*) array_start(&My_Connections[Idx].rbuf)) + delta;
+		len = ptr - (char *)array_start(&My_Connections[Idx].rbuf) + delta;
 
-		if( len > ( COMMAND_LEN - 1 )) {
-			/* Request must not exceed 512 chars (incl. CR+LF!), see
-			 * RFC 2812. Disconnect Client if this happens. */
-			Log( LOG_ERR, "Request too long (connection %d): %d bytes (max. %d expected)!",
-						Idx, array_bytes(&My_Connections[Idx].rbuf), COMMAND_LEN - 1 );
-			Conn_Close( Idx, NULL, "Request too long", true );
+		if (len > (COMMAND_LEN - 1)) {
+			/* Request must not exceed 512 chars (incl. CR+LF!),
+			 * see RFC 2812. Disconnect Client if this happens. */
+			Log(LOG_ERR,
+			    "Request too long (connection %d): %d bytes (max. %d expected)!",
+			    Idx, array_bytes(&My_Connections[Idx].rbuf),
+			    COMMAND_LEN - 1);
+			Conn_Close(Idx, NULL, "Request too long", true);
 			return false;
 		}
 
-		if (len <= 2) { /* request was empty (only '\r\n') */
-			array_moveleft(&My_Connections[Idx].rbuf, 1, delta); /* delta is either 1 or 2 */
+		if (len <= delta) {
+			/* Request is empty (only '\r\n', '\r' or '\n');
+			 * delta is 2 ('\r\n') or 1 ('\r' or '\n'), see above */
+			array_moveleft(&My_Connections[Idx].rbuf, 1, len);
 			break;
 		}
+
 #ifdef ZLIB
 		/* remember if stream is already compressed */
 		old_z = My_Connections[Idx].options & CONN_ZIP;
 #endif
 
 		My_Connections[Idx].msg_in++;
-		if (!Parse_Request(Idx, (char*)array_start(&My_Connections[Idx].rbuf) ))
+		if (!Parse_Request
+		    (Idx, (char *)array_start(&My_Connections[Idx].rbuf)))
 			return false;
 
 		result = true;
 
 		array_moveleft(&My_Connections[Idx].rbuf, 1, len);
 		LogDebug("Connection %d: %d bytes left in read buffer.",
-		    Idx, array_bytes(&My_Connections[Idx].rbuf));
+			 Idx, array_bytes(&My_Connections[Idx].rbuf));
 #ifdef ZLIB
-		if(( ! old_z ) && ( My_Connections[Idx].options & CONN_ZIP ) &&
-				( array_bytes(&My_Connections[Idx].rbuf) > 0 ))
-		{
-			/* The last Command activated Socket-Compression.
-			 * Data that was read after that needs to be copied to Unzip-buf
-			 * for decompression */
-			if (!array_copy( &My_Connections[Idx].zip.rbuf, &My_Connections[Idx].rbuf ))
+		if ((!old_z) && (My_Connections[Idx].options & CONN_ZIP) &&
+		    (array_bytes(&My_Connections[Idx].rbuf) > 0)) {
+			/* The last command activated socket compression.
+			 * Data that was read after that needs to be copied
+			 * to the unzip buffer for decompression: */
+			if (!array_copy
+			    (&My_Connections[Idx].zip.rbuf,
+			     &My_Connections[Idx].rbuf))
 				return false;
 
 			array_trunc(&My_Connections[Idx].rbuf);
-			LogDebug("Moved already received data (%u bytes) to uncompression buffer.",
-								array_bytes(&My_Connections[Idx].zip.rbuf));
+			LogDebug
+			    ("Moved already received data (%u bytes) to uncompression buffer.",
+			     array_bytes(&My_Connections[Idx].zip.rbuf));
 		}
-#endif /* ZLIB */
+#endif
 	}
 	return result;
 } /* Handle_Buffer */
@@ -1373,55 +1439,44 @@ Check_Servers( void )
 
 
 static void
-New_Server( int Server )
+New_Server( int Server , ng_ipaddr_t *dest)
 {
 	/* Establish new server link */
-	struct sockaddr_in local_addr;
-	struct sockaddr_in new_addr;
-	struct in_addr inaddr;
-	int res, new_sock;
+	char ip_str[NG_INET_ADDRSTRLEN];
+	int af_dest, res, new_sock;
 	CLIENT *c;
 
 	assert( Server > NONE );
 
-	Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d ... ", Conf_Server[Server].host,
-							Conf_Server[Server].ip, Conf_Server[Server].port );
-
-#ifdef HAVE_INET_ATON
-	if( inet_aton( Conf_Server[Server].ip, &inaddr ) == 0 )
-#else
-	memset( &inaddr, 0, sizeof( inaddr ));
-	inaddr.s_addr = inet_addr( Conf_Server[Server].ip );
-	if( inaddr.s_addr == (unsigned)-1 )
-#endif
-	{
-		Log( LOG_ERR, "Can't connect to \"%s\": can't convert ip address %s!",
-				Conf_Server[Server].host, Conf_Server[Server].ip );
+	if (!ng_ipaddr_tostr_r(dest, ip_str)) {
+		Log(LOG_WARNING, "New_Server: Could not convert IP to string");
 		return;
 	}
 
-	memset(&new_addr, 0, sizeof( new_addr ));
-	new_addr.sin_family = AF_INET;
-	new_addr.sin_addr = inaddr;
-	new_addr.sin_port = htons( Conf_Server[Server].port );
-
+	Log( LOG_INFO, "Establishing connection to \"%s\", %s, port %d ... ",
+			Conf_Server[Server].host, ip_str, Conf_Server[Server].port );
 
-	new_sock = socket( PF_INET, SOCK_STREAM, 0 );
-	if ( new_sock < 0 ) {
+	af_dest = ng_ipaddr_af(dest);
+	new_sock = socket(af_dest, SOCK_STREAM, 0);
+	if (new_sock < 0) {
 		Log( LOG_CRIT, "Can't create socket: %s!", strerror( errno ));
 		return;
 	}
 
-	if( ! Init_Socket( new_sock )) return;
-
-	/* if we fail to bind, just continue and let connect() pick a source address */
-	InitSinaddr(&local_addr, 0);
-	local_addr.sin_addr = Conf_Server[Server].bind_addr;
-	if (bind(new_sock, (struct sockaddr *)&local_addr, (socklen_t)sizeof(local_addr)))
-		Log(LOG_WARNING, "Can't bind socket to %s!", Conf_ListenAddress, strerror( errno ));
+	if (!Init_Socket(new_sock))
+		return;
 
-	res = connect(new_sock, (struct sockaddr *)&new_addr,
-			(socklen_t)sizeof(new_addr));
+	/* is a bind address configured? */
+	res = ng_ipaddr_af(&Conf_Server[Server].bind_addr);
+	/* if yes, bind now. If it fails, warn and let connect() pick a source address */
+	if (res && bind(new_sock, (struct sockaddr *) &Conf_Server[Server].bind_addr,
+				ng_ipaddr_salen(&Conf_Server[Server].bind_addr)))
+	{
+		ng_ipaddr_tostr_r(&Conf_Server[Server].bind_addr, ip_str);
+		Log(LOG_WARNING, "Can't bind socket to %s: %s!", ip_str, strerror(errno));
+	}
+	ng_ipaddr_setport(dest, Conf_Server[Server].port);
+	res = connect(new_sock, (struct sockaddr *) dest, ng_ipaddr_salen(dest));
 	if(( res != 0 ) && ( errno != EINPROGRESS )) {
 		Log( LOG_CRIT, "Can't connect socket: %s!", strerror( errno ));
 		close( new_sock );
@@ -1442,8 +1497,9 @@ New_Server( int Server )
 
 	Init_Conn_Struct(new_sock);
 
-	c = Client_NewLocal( new_sock, inet_ntoa( new_addr.sin_addr ), CLIENT_UNKNOWNSERVER, false );
-	if( ! c ) {
+	ng_ipaddr_tostr_r(dest, ip_str);
+	c = Client_NewLocal(new_sock, ip_str, CLIENT_UNKNOWNSERVER, false);
+	if (!c) {
 		Log( LOG_ALERT, "Can't establish connection: can't create client structure!" );
 		close( new_sock );
 		return;
@@ -1455,7 +1511,7 @@ New_Server( int Server )
 	/* Register connection */
 	Conf_Server[Server].conn_id = new_sock;
 	My_Connections[new_sock].sock = new_sock;
-	My_Connections[new_sock].addr = new_addr;
+	My_Connections[new_sock].addr = *dest;
 	My_Connections[new_sock].client = c;
 	strlcpy( My_Connections[new_sock].host, Conf_Server[Server].host,
 				sizeof(My_Connections[new_sock].host ));
@@ -1534,7 +1590,9 @@ cb_Connect_to_Server(int fd, UNUSED short events)
 	/* Read result of resolver sub-process from pipe and start connection */
 	int i;
 	size_t len;
-	char readbuf[HOST_LEN + 1];
+	ng_ipaddr_t dest_addrs[4];	/* we can handle at most 3; but we read up to
+					   four so we can log the 'more than we can handle'
+					   condition */
 
 	LogDebug("Resolver: Got forward lookup callback on fd %d, events %d", fd, events);
 
@@ -1542,7 +1600,7 @@ cb_Connect_to_Server(int fd, UNUSED short events)
 		  if (Resolve_Getfd(&Conf_Server[i].res_stat) == fd )
 			  break;
 	}
-	
+
 	if( i >= MAX_SERVERS) {
 		/* Ops, no matching server found?! */
 		io_close( fd );
@@ -1551,16 +1609,28 @@ cb_Connect_to_Server(int fd, UNUSED short events)
 	}
 
 	/* Read result from pipe */
-	len = Resolve_Read(&Conf_Server[i].res_stat, readbuf, sizeof readbuf -1);
+	len = Resolve_Read(&Conf_Server[i].res_stat, dest_addrs, sizeof(dest_addrs));
 	if (len == 0)
 		return;
-	
-	readbuf[len] = '\0';
-	LogDebug("Got result from resolver: \"%s\" (%u bytes read).", readbuf, len);
-	strlcpy( Conf_Server[i].ip, readbuf, sizeof( Conf_Server[i].ip ));
 
+	assert((len % sizeof(ng_ipaddr_t)) == 0);
+
+	LogDebug("Got result from resolver: %u structs (%u bytes).", len/sizeof(ng_ipaddr_t), len);
+
+	memset(&Conf_Server[i].dst_addr, 0, sizeof(&Conf_Server[i].dst_addr));
+	if (len > sizeof(ng_ipaddr_t)) {
+		/* more than one address for this hostname, remember them
+		 * in case first address is unreachable/not available */
+		len -= sizeof(ng_ipaddr_t);
+		if (len > sizeof(&Conf_Server[i].dst_addr)) {
+			len = sizeof(&Conf_Server[i].dst_addr);
+			Log(LOG_NOTICE, "Notice: Resolver returned more IP Addresses for host than we can handle,"
+					" additional addresses dropped");
+		}
+		memcpy(&Conf_Server[i].dst_addr, &dest_addrs[1], len);
+	}
 	/* connect() */
-	New_Server(i);
+	New_Server(i, dest_addrs);
 } /* cb_Read_Forward_Lookup */
 
 
@@ -1627,10 +1697,10 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
 #ifdef IDENTAUTH
 		++identptr;
 		if (*identptr) {
-			Log( LOG_INFO, "IDENT lookup for connection %ld: \"%s\".", i, identptr);
-			Client_SetUser( c, identptr, true );
+			Log(LOG_INFO, "IDENT lookup for connection %d: \"%s\".", i, identptr);
+			Client_SetUser(c, identptr, true);
 		} else {
-			Log( LOG_INFO, "IDENT lookup for connection %ld: no result.", i );
+			Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i);
 		}
 #endif
 	}
@@ -1659,19 +1729,6 @@ Simple_Message( int Sock, const char *Msg )
 } /* Simple_Error */
 
 
-static int
-Count_Connections( struct sockaddr_in addr_in )
-{
-	int i, cnt;
-	
-	cnt = 0;
-	for( i = 0; i < Pool_Size; i++ ) {
-		if(( My_Connections[i].sock > NONE ) && ( My_Connections[i].addr.sin_addr.s_addr == addr_in.sin_addr.s_addr )) cnt++;
-	}
-	return cnt;
-} /* Count_Connections */
-
-
 GLOBAL CLIENT *
 Conn_GetClient( CONN_ID Idx ) 
 {