X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/af81d5a0b09446188fd6f9c292b51519f2c1cedd..1d39b466d4ddd974674c9397589d45935c746ed0:/src/s_serv.c

diff --git a/src/s_serv.c b/src/s_serv.c
index 47f67fd..0f6839a 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -30,12 +30,10 @@
 #include <openssl/rsa.h>
 #endif
 
-#include "tools.h"
 #include "s_serv.h"
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "sprintf_irc.h"
@@ -44,16 +42,14 @@
 #include "numeric.h"
 #include "packet.h"
 #include "res.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_stats.h"
 #include "s_user.h"
 #include "scache.h"
 #include "send.h"
 #include "client.h"
-#include "memory.h"
 #include "channel.h"		/* chcap_usage_counts stuff... */
 #include "hook.h"
 #include "msg.h"
@@ -210,7 +206,7 @@ collect_zipstats(void *unused)
 	rb_dlink_node *ptr;
 	struct Client *target_p;
 
-	DLINK_FOREACH(ptr, serv_list.head)
+	RB_DLINK_FOREACH(ptr, serv_list.head)
 	{
 		target_p = ptr->data;
 		if(IsCapable(target_p, CAP_ZIP))
@@ -218,11 +214,11 @@ collect_zipstats(void *unused)
 			/* only bother if we haven't already got something queued... */
 			if(!target_p->localClient->slinkq)
 			{
-				target_p->localClient->slinkq = MyMalloc(1);	/* sigh.. */
+				target_p->localClient->slinkq = rb_malloc(1);	/* sigh.. */
 				target_p->localClient->slinkq[0] = SLINKCMD_ZIPSTATS;
 				target_p->localClient->slinkq_ofs = 0;
 				target_p->localClient->slinkq_len = 1;
-				send_queued_slink_write(target_p->localClient->ctrlfd, target_p);
+				send_queued_slink_write(target_p->localClient->ctrlF, target_p);
 			}
 		}
 	}
@@ -301,7 +297,7 @@ hunt_server(struct Client *client_p, struct Client *source_p,
 		{
 			target_p = NULL;
 
-			DLINK_FOREACH(ptr, global_client_list.head)
+			RB_DLINK_FOREACH(ptr, global_client_list.head)
 			{
 				if(match(new, ((struct Client *) (ptr->data))->name))
 				{
@@ -358,7 +354,7 @@ try_connections(void *unused)
 	int confrq = 0;
 	time_t next = 0;
 
-	DLINK_FOREACH(ptr, server_conf_list.head)
+	RB_DLINK_FOREACH(ptr, server_conf_list.head)
 	{
 		tmp_p = ptr->data;
 
@@ -374,7 +370,7 @@ try_connections(void *unused)
 		 * made one successfull connection... [this algorithm is
 		 * a bit fuzzy... -- msa >;) ]
 		 */
-		if(tmp_p->hold > CurrentTime)
+		if(tmp_p->hold > rb_current_time())
 		{
 			if(next > tmp_p->hold || next == 0)
 				next = tmp_p->hold;
@@ -382,7 +378,7 @@ try_connections(void *unused)
 		}
 
 		confrq = get_con_freq(cltmp);
-		tmp_p->hold = CurrentTime + confrq;
+		tmp_p->hold = rb_current_time() + confrq;
 
 		/*
 		 * Found a CONNECT config with port specified, scan clients
@@ -453,7 +449,7 @@ check_server(const char *name, struct Client *client_p)
 	if(strlen(name) > HOSTLEN)
 		return -4;
 
-	DLINK_FOREACH(ptr, server_conf_list.head)
+	RB_DLINK_FOREACH(ptr, server_conf_list.head)
 	{
 		tmp_p = ptr->data;
 
@@ -566,7 +562,7 @@ burst_modes_TS5(struct Client *client_p, char *chname, rb_dlink_list *list, char
 	mp = mbuf;
 	pp = pbuf;
 
-	DLINK_FOREACH(ptr, list->head)
+	RB_DLINK_FOREACH(ptr, list->head)
 	{
 		banptr = ptr->data;
 		tlen = strlen(banptr->banstr) + 3;
@@ -617,7 +613,7 @@ burst_modes_TS6(struct Client *client_p, struct Channel *chptr,
 				    me.id, (long) chptr->channelts, chptr->chname, flag);
 	t = buf + mlen;
 
-	DLINK_FOREACH(ptr, list->head)
+	RB_DLINK_FOREACH(ptr, list->head)
 	{
 		banptr = ptr->data;
 
@@ -677,7 +673,7 @@ burst_TS5(struct Client *client_p)
 
 	hclientinfo.client = hchaninfo.client = client_p;
 
-	DLINK_FOREACH(ptr, global_client_list.head)
+	RB_DLINK_FOREACH(ptr, global_client_list.head)
 	{
 		target_p = ptr->data;
 
@@ -712,7 +708,7 @@ burst_TS5(struct Client *client_p)
 		call_hook(h_burst_client, &hclientinfo);
 	}
 
-	DLINK_FOREACH(ptr, global_channel_list.head)
+	RB_DLINK_FOREACH(ptr, global_channel_list.head)
 	{
 		chptr = ptr->data;
 
@@ -725,7 +721,7 @@ burst_TS5(struct Client *client_p)
 
 		t = buf + mlen;
 
-		DLINK_FOREACH(uptr, chptr->members.head)
+		RB_DLINK_FOREACH(uptr, chptr->members.head)
 		{
 			msptr = uptr->data;
 
@@ -809,7 +805,7 @@ burst_TS6(struct Client *client_p)
 
 	hclientinfo.client = hchaninfo.client = client_p;
 
-	DLINK_FOREACH(ptr, global_client_list.head)
+	RB_DLINK_FOREACH(ptr, global_client_list.head)
 	{
 		target_p = ptr->data;
 
@@ -870,7 +866,7 @@ burst_TS6(struct Client *client_p)
 		call_hook(h_burst_client, &hclientinfo);
 	}
 
-	DLINK_FOREACH(ptr, global_channel_list.head)
+	RB_DLINK_FOREACH(ptr, global_channel_list.head)
 	{
 		chptr = ptr->data;
 
@@ -883,7 +879,7 @@ burst_TS6(struct Client *client_p)
 
 		t = buf + mlen;
 
-		DLINK_FOREACH(uptr, chptr->members.head)
+		RB_DLINK_FOREACH(uptr, chptr->members.head)
 		{
 			msptr = uptr->data;
 
@@ -999,6 +995,7 @@ server_estab(struct Client *client_p)
 	hook_data_client hdata;
 	char *host;
 	rb_dlink_node *ptr;
+	char note[HOSTLEN + 15];
 
 	s_assert(NULL != client_p);
 	if(client_p == NULL)
@@ -1020,7 +1017,7 @@ server_estab(struct Client *client_p)
 	if(client_p->localClient->passwd)
 	{
 		memset(client_p->localClient->passwd, 0, strlen(client_p->localClient->passwd));
-		MyFree(client_p->localClient->passwd);
+		rb_free(client_p->localClient->passwd);
 		client_p->localClient->passwd = NULL;
 	}
 
@@ -1034,7 +1031,7 @@ server_estab(struct Client *client_p)
 	{
 		if(client_p != serv_list.head->data || serv_list.head->next)
 		{
-			ServerStats->is_ref++;
+			ServerStats.is_ref++;
 			sendto_one(client_p, "ERROR :I'm a leaf not a hub");
 			return exit_client(client_p, client_p, client_p, "I'm a leaf");
 		}
@@ -1063,10 +1060,8 @@ server_estab(struct Client *client_p)
 			   (me.info[0]) ? (me.info) : "IRCers United");
 	}
 
-	if(!rb_set_buffers(client_p->localClient->F->fd, READBUF_SIZE))
-		report_error(SETBUF_ERROR_MSG, 
-			     get_server_name(client_p, SHOW_IP), 
-			     log_client_name(client_p, SHOW_IP), errno);
+	if(!rb_set_buffers(client_p->localClient->F, READBUF_SIZE))
+		ilog_error("rb_set_buffers failed for server");
 
 	/* Hand the server off to servlink now */
 	if(IsCapable(client_p, CAP_ZIP))
@@ -1083,7 +1078,7 @@ server_estab(struct Client *client_p)
 		SetServlink(client_p);
 	}
 
-	sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, CurrentTime);
+	sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, rb_current_time());
 
 	client_p->servptr = &me;
 
@@ -1111,13 +1106,13 @@ server_estab(struct Client *client_p)
 
 	if(client_p->localClient->fullcaps)
 	{
-		DupString(client_p->serv->fullcaps, client_p->localClient->fullcaps);
-		MyFree(client_p->localClient->fullcaps);
+		client_p->serv->fullcaps = rb_strdup(client_p->localClient->fullcaps);
+		rb_free(client_p->localClient->fullcaps);
 		client_p->localClient->fullcaps = NULL;
 	}
 
 	client_p->serv->nameinfo = scache_connect(client_p->name, client_p->info, IsHidden(client_p));
-	client_p->localClient->firsttime = CurrentTime;
+	client_p->localClient->firsttime = rb_current_time();
 	/* fixing eob timings.. -gnp */
 
 	if((rb_dlink_list_length(&lclient_list) + rb_dlink_list_length(&serv_list)) >
@@ -1143,18 +1138,23 @@ server_estab(struct Client *client_p)
 		/* we won't overflow FD_DESC_SZ here, as it can hold
 		 * client_p->name + 64
 		 */
-		rb_note(client_p->localClient->F->fd, "slink data: %s", client_p->name);
-		rb_note(client_p->localClient->ctrlfd, "slink ctrl: %s", client_p->name);
+		rb_snprintf(note, sizeof note, "slink data: %s", client_p->name);
+		rb_note(client_p->localClient->F, note);
+		rb_snprintf(note, sizeof note, "slink ctrl: %s", client_p->name);
+		rb_note(client_p->localClient->ctrlF, note);
 	}
 	else
-		rb_note(client_p->localClient->F->fd, "Server: %s", client_p->name);
+	{
+		rb_snprintf(note, sizeof note, "Server: %s", client_p->name);
+		rb_note(client_p->localClient->F, note);
+	}
 
 	/*
 	 ** Old sendto_serv_but_one() call removed because we now
 	 ** need to send different names to different servers
 	 ** (domain name matching) Send new server to other servers.
 	 */
-	DLINK_FOREACH(ptr, serv_list.head)
+	RB_DLINK_FOREACH(ptr, serv_list.head)
 	{
 		target_p = ptr->data;
 
@@ -1203,7 +1203,7 @@ server_estab(struct Client *client_p)
 	 **    see previous *WARNING*!!! (Also, original inpath
 	 **    is destroyed...)
 	 */
-	DLINK_FOREACH(ptr, global_serv_list.head)
+	RB_DLINK_FOREACH(ptr, global_serv_list.head)
 	{
 		target_p = ptr->data;
 
@@ -1251,7 +1251,7 @@ start_io(struct Client *server)
 	int linecount = 0;
 	int linelen;
 
-	iobuf = MyMalloc(256);	/* XXX: This seems arbitrary. Perhaps make it IRCD_BUFSIZE? --nenolod */
+	iobuf = rb_malloc(256);	/* XXX: This seems arbitrary. Perhaps make it IRCD_BUFSIZE? --nenolod */
 
 	if(IsCapable(server, CAP_ZIP))
 	{
@@ -1268,10 +1268,10 @@ start_io(struct Client *server)
 	{
 		linecount++;
 
-		iobuf = MyRealloc(iobuf, (c + READBUF_SIZE + 64));
+		iobuf = rb_realloc(iobuf, (c + READBUF_SIZE + 64));
 
 		/* store data in c+3 to allow for SLINKCMD_INJECT_RECVQ and len u16 */
-		linelen = linebuf_get(&server->localClient->buf_recvq, (char *) (iobuf + c + 3), READBUF_SIZE, LINEBUF_PARTIAL, LINEBUF_RAW);	/* include partial lines */
+		linelen = rb_linebuf_get(&server->localClient->buf_recvq, (char *) (iobuf + c + 3), READBUF_SIZE, LINEBUF_PARTIAL, LINEBUF_RAW);	/* include partial lines */
 
 		if(linelen)
 		{
@@ -1288,10 +1288,10 @@ start_io(struct Client *server)
 	{
 		linecount++;
 
-		iobuf = MyRealloc(iobuf, (c + BUF_DATA_SIZE + 64));
+		iobuf = rb_realloc(iobuf, (c + BUF_DATA_SIZE + 64));
 
 		/* store data in c+3 to allow for SLINKCMD_INJECT_RECVQ and len u16 */
-		linelen = linebuf_get(&server->localClient->buf_sendq, 
+		linelen = rb_linebuf_get(&server->localClient->buf_sendq, 
 				      (char *) (iobuf + c + 3), READBUF_SIZE, 
 				      LINEBUF_PARTIAL, LINEBUF_PARSED);	/* include partial lines */
 
@@ -1314,7 +1314,7 @@ start_io(struct Client *server)
 	server->localClient->slinkq_len = c;
 
 	/* schedule a write */
-	send_queued_slink_write(server->localClient->ctrlfd, server);
+	send_queued_slink_write(server->localClient->ctrlF, server);
 }
 
 /*
@@ -1364,16 +1364,16 @@ fork_server(struct Client *server)
 		goto fork_error;
 	else if(ret == 0)
 	{
-		int maxconn = rb_get_maxconnections();
+		int maxconn = maxconnections;
 
 		/* set our fds as non blocking and close everything else */
 		for (i = 0; i < maxconn; i++)
 		{
 				
 
-			if((i == ctrl_fds[1]) || (i == data_fds[1]) || (i == server->localClient->F->fd)) 
+			if((i == ctrl_fds[1]) || (i == data_fds[1]) || (i == rb_get_fd(server->localClient->F))) 
 			{
-				rb_set_nb(i);
+				// XXX rb_set_nb(i);
 			}
 			else
 			{
@@ -1386,7 +1386,7 @@ fork_server(struct Client *server)
 
 		rb_snprintf(fd_str[0], sizeof(fd_str[0]), "%d", ctrl_fds[1]);
 		rb_snprintf(fd_str[1], sizeof(fd_str[1]), "%d", data_fds[1]);
-		rb_snprintf(fd_str[2], sizeof(fd_str[2]), "%d", server->localClient->F->fd);
+		rb_snprintf(fd_str[2], sizeof(fd_str[2]), "%d", rb_get_fd(server->localClient->F));
 		kid_argv[0] = slink;
 		kid_argv[1] = fd_str[0];
 		kid_argv[2] = fd_str[1];
@@ -1401,37 +1401,28 @@ fork_server(struct Client *server)
 	}
 	else
 	{
-		rb_close(server->localClient->F->fd);
+		rb_close(server->localClient->F);
 
 		/* close the childs end of the pipes */
 		close(ctrl_fds[1]);
 		close(data_fds[1]);
 		
 		s_assert(server->localClient);
-		server->localClient->ctrlfd = ctrl_fds[0];
-		server->localClient->F = rb_add_fd(data_fds[0]);
+		server->localClient->ctrlF = rb_open(ctrl_fds[0], RB_FD_PIPE, "servlink ctrl");
+		server->localClient->F = rb_open(data_fds[0], RB_FD_PIPE, "servlink data");
 
-		if(!rb_set_nb(server->localClient->F->fd))
+		if(!rb_set_nb(server->localClient->ctrlF))
 		{
-			report_error(NONB_ERROR_MSG,
-					get_server_name(server, SHOW_IP),
-					log_client_name(server, SHOW_IP),
-					errno);
+			ilog_error("setting a slink fd nonblocking");
 		}
 
-		if(!rb_set_nb(server->localClient->ctrlfd))
+		if(!rb_set_nb(server->localClient->F))
 		{
-			report_error(NONB_ERROR_MSG,
-					get_server_name(server, SHOW_IP),
-					log_client_name(server, SHOW_IP),
-					errno);
+			ilog_error("setting a slink fd nonblocking");
 		}
 
-		rb_open(server->localClient->ctrlfd, FD_SOCKET, NULL);
-		rb_open(server->localClient->F->fd, FD_SOCKET, NULL);
-
-		read_ctrl_packet(server->localClient->ctrlfd, server);
-		read_packet(server->localClient->F->fd, server);
+		read_ctrl_packet(server->localClient->ctrlF, server);
+		read_packet(server->localClient->F, server);
 	}
 
 	return 0;
@@ -1452,6 +1443,125 @@ fork_server(struct Client *server)
  *   -- adrian
  */
 
+static int
+serv_connect_resolved(struct Client *client_p)
+{
+	struct rb_sockaddr_storage myipnum;
+	char vhoststr[HOSTIPLEN];
+	struct server_conf *server_p;
+	uint16_t port;
+
+	if((server_p = client_p->localClient->att_sconf) == NULL)
+	{
+		sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Lost connect{} block for %s",
+				get_server_name(client_p, HIDE_IP));
+		exit_client(client_p, client_p, &me, "Lost connect{} block");
+		return 0;
+	}
+
+#ifdef RB_IPV6
+	if(client_p->localClient->ip.ss_family == AF_INET6)
+		port = ntohs(((struct sockaddr_in6 *)&client_p->localClient->ip)->sin6_port);
+	else
+#endif
+		port = ntohs(((struct sockaddr_in *)&client_p->localClient->ip)->sin_port);
+
+	if(ServerConfVhosted(server_p))
+	{
+		memcpy(&myipnum, &server_p->my_ipnum, sizeof(myipnum));
+		((struct sockaddr_in *)&myipnum)->sin_port = 0;
+		myipnum.ss_family = server_p->aftype;
+				
+	}
+	else if(server_p->aftype == AF_INET && ServerInfo.specific_ipv4_vhost)
+	{
+		memcpy(&myipnum, &ServerInfo.ip, sizeof(myipnum));
+		((struct sockaddr_in *)&myipnum)->sin_port = 0;
+		myipnum.ss_family = AF_INET;
+		SET_SS_LEN(&myipnum, sizeof(struct sockaddr_in));
+	}
+	
+#ifdef RB_IPV6
+	else if((server_p->aftype == AF_INET6) && ServerInfo.specific_ipv6_vhost)
+	{
+		memcpy(&myipnum, &ServerInfo.ip6, sizeof(myipnum));
+		((struct sockaddr_in6 *)&myipnum)->sin6_port = 0;
+		myipnum.ss_family = AF_INET6;
+		SET_SS_LEN(&myipnum, sizeof(struct sockaddr_in6));
+	}
+#endif
+	else
+	{
+		/* log */
+		ilog(L_SERVER, "Connecting to %s[%s] port %d (%s)", client_p->name, client_p->sockhost, port,
+#ifdef RB_IPV6
+				server_p->aftype == AF_INET6 ? "IPv6" :
+#endif
+				(server_p->aftype == AF_INET ? "IPv4" : "?"));
+
+		rb_connect_tcp(client_p->localClient->F,
+				(struct sockaddr *) &client_p->localClient->ip,
+				NULL, 0,
+				serv_connect_callback, client_p,
+				ConfigFileEntry.connect_timeout);
+		 return 1;
+	}
+
+	/* log */
+	inetntop_sock((struct sockaddr *)&myipnum, vhoststr, sizeof vhoststr);
+	ilog(L_SERVER, "Connecting to %s[%s] port %d (%s) (vhost %s)", client_p->name, client_p->sockhost, port,
+#ifdef RB_IPV6
+			server_p->aftype == AF_INET6 ? "IPv6" :
+#endif
+			(server_p->aftype == AF_INET ? "IPv4" : "?"), vhoststr);
+
+
+	rb_connect_tcp(client_p->localClient->F,
+			(struct sockaddr *) &client_p->localClient->ip,
+			(struct sockaddr *) &myipnum, GET_SS_LEN(&myipnum),
+			serv_connect_callback, client_p,
+			ConfigFileEntry.connect_timeout);
+
+	return 1;
+}
+
+static void
+serv_connect_dns_callback(void *vptr, struct DNSReply *reply)
+{
+	struct Client *client_p = vptr;
+	uint16_t port;
+
+	rb_free(client_p->localClient->dnsquery);
+	client_p->localClient->dnsquery = NULL;
+
+	if (reply == NULL)
+	{
+		sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL, "Cannot resolve hostname for %s",
+				get_server_name(client_p, HIDE_IP));
+		ilog(L_SERVER, "Cannot resolve hostname for %s",
+				log_client_name(client_p, HIDE_IP));
+		exit_client(client_p, client_p, &me, "Cannot resolve hostname");
+		return;
+	}
+#ifdef RB_IPV6
+	if(reply->addr.ss_family == AF_INET6)
+		port = ((struct sockaddr_in6 *)&client_p->localClient->ip)->sin6_port;
+	else
+#endif
+		port = ((struct sockaddr_in *)&client_p->localClient->ip)->sin_port;
+	memcpy(&client_p->localClient->ip, &reply->addr, sizeof(client_p->localClient->ip));
+#ifdef RB_IPV6
+	if(reply->addr.ss_family == AF_INET6)
+		((struct sockaddr_in6 *)&client_p->localClient->ip)->sin6_port = port;
+	else
+#endif
+		((struct sockaddr_in *)&client_p->localClient->ip)->sin_port = port;
+	/* Set sockhost properly now -- jilles */
+	inetntop_sock((struct sockaddr *)&client_p->localClient->ip,
+			client_p->sockhost, sizeof client_p->sockhost);
+	serv_connect_resolved(client_p);
+}
+
 /*
  * serv_connect() - initiate a server connection
  *
@@ -1473,9 +1583,9 @@ int
 serv_connect(struct server_conf *server_p, struct Client *by)
 {
 	struct Client *client_p;
-	struct irc_sockaddr_storage myipnum; 
-	int fd;
-	char vhoststr[HOSTIPLEN];
+	struct rb_sockaddr_storage theiripnum;
+	rb_fde_t *F;
+	char note[HOSTLEN + 10];
 
 	s_assert(server_p != NULL);
 	if(server_p == NULL)
@@ -1496,16 +1606,14 @@ serv_connect(struct server_conf *server_p, struct Client *by)
 	}
 
 	/* create a socket for the server connection */
-	if((fd = rb_socket(server_p->aftype, SOCK_STREAM, 0, NULL)) < 0)
+	if((F = rb_socket(server_p->aftype, SOCK_STREAM, 0, NULL)) == NULL)
 	{
-		/* Eek, failure to create the socket */
-		report_error("opening stream socket to %s: %s", 
-			     server_p->name, server_p->name, errno);
+		ilog_error("opening a stream socket");
 		return 0;
 	}
 
-	/* servernames are always guaranteed under HOSTLEN chars */
-	rb_note(fd, "Server: %s", server_p->name);
+	rb_snprintf(note, sizeof note, "Server: %s", server_p->name);
+	rb_note(F, note);
 
 	/* Create a local client */
 	client_p = make_client(NULL);
@@ -1517,7 +1625,7 @@ serv_connect(struct server_conf *server_p, struct Client *by)
 	strlcpy(client_p->name, server_p->name, sizeof(client_p->name));
 	strlcpy(client_p->host, server_p->host, sizeof(client_p->host));
 	strlcpy(client_p->sockhost, server_p->host, sizeof(client_p->sockhost));
-	client_p->localClient->F = rb_add_fd(fd);
+	client_p->localClient->F = F;
 
 	/*
 	 * Set up the initial server evilness, ripped straight from
@@ -1525,12 +1633,9 @@ serv_connect(struct server_conf *server_p, struct Client *by)
 	 *   -- adrian
 	 */
 
-	if(!rb_set_buffers(client_p->localClient->F->fd, READBUF_SIZE))
+	if(!rb_set_buffers(client_p->localClient->F, READBUF_SIZE))
 	{
-		report_error(SETBUF_ERROR_MSG,
-				get_server_name(client_p, SHOW_IP),
-				log_client_name(client_p, SHOW_IP),
-				errno);
+		ilog_error("setting the buffer size for a server connection");
 	}
 
 	/*
@@ -1565,61 +1670,37 @@ serv_connect(struct server_conf *server_p, struct Client *by)
 	SetConnecting(client_p);
 	rb_dlinkAddTail(client_p, &client_p->node, &global_client_list);
 
-	if(ServerConfVhosted(server_p))
-	{
-		memcpy(&myipnum, &server_p->my_ipnum, sizeof(myipnum));
-		((struct sockaddr_in *)&myipnum)->sin_port = 0;
-		myipnum.ss_family = server_p->aftype;
-				
-	}
-	else if(server_p->aftype == AF_INET && ServerInfo.specific_ipv4_vhost)
-	{
-		memcpy(&myipnum, &ServerInfo.ip, sizeof(myipnum));
-		((struct sockaddr_in *)&myipnum)->sin_port = 0;
-		myipnum.ss_family = AF_INET;
-		SET_SS_LEN(myipnum, sizeof(struct sockaddr_in));
-	}
-	
-#ifdef IPV6
-	else if((server_p->aftype == AF_INET6) && ServerInfo.specific_ipv6_vhost)
+	if (rb_inet_pton_sock(server_p->host, (struct sockaddr *)&theiripnum) > 0)
 	{
-		memcpy(&myipnum, &ServerInfo.ip6, sizeof(myipnum));
-		((struct sockaddr_in6 *)&myipnum)->sin6_port = 0;
-		myipnum.ss_family = AF_INET6;
-		SET_SS_LEN(myipnum, sizeof(struct sockaddr_in6));
-	}
+		memcpy(&client_p->localClient->ip, &theiripnum, sizeof(client_p->localClient->ip));
+#ifdef RB_IPV6
+		if(theiripnum.ss_family == AF_INET6)
+			((struct sockaddr_in6 *)&client_p->localClient->ip)->sin6_port = htons(server_p->port);
+		else
 #endif
+			((struct sockaddr_in *)&client_p->localClient->ip)->sin_port = htons(server_p->port);
+
+		return serv_connect_resolved(client_p);
+	}
 	else
 	{
-		/* log */
-		ilog(L_SERVER, "Connecting to %s[%s] port %d (%s)", server_p->name, server_p->host, server_p->port,
-#ifdef IPV6
-				server_p->aftype == AF_INET6 ? "IPv6" :
+#ifdef RB_IPV6
+		if(theiripnum.ss_family == AF_INET6)
+			((struct sockaddr_in6 *)&client_p->localClient->ip)->sin6_port = htons(server_p->port);
+		else
 #endif
-				(server_p->aftype == AF_INET ? "IPv4" : "?"));
-
-		rb_connect_tcp(client_p->localClient->F->fd, server_p->host,
-				 server_p->port, NULL, 0, serv_connect_callback, 
-				 client_p, server_p->aftype, 
-				 ConfigFileEntry.connect_timeout);
-		 return 1;
-	}
-
-	/* log */
-	inetntop_sock((struct sockaddr *)&myipnum, vhoststr, sizeof vhoststr);
-	ilog(L_SERVER, "Connecting to %s[%s] port %d (%s) (vhost %s)", server_p->name, server_p->host, server_p->port,
-#ifdef IPV6
-			server_p->aftype == AF_INET6 ? "IPv6" :
+			((struct sockaddr_in *)&client_p->localClient->ip)->sin_port = htons(server_p->port);
+
+		client_p->localClient->dnsquery = rb_malloc(sizeof(struct DNSQuery));
+		client_p->localClient->dnsquery->ptr = client_p;
+		client_p->localClient->dnsquery->callback = serv_connect_dns_callback;
+		gethost_byname_type(server_p->host, client_p->localClient->dnsquery,
+#ifdef RB_IPV6
+				server_p->aftype == AF_INET6 ? T_AAAA :
 #endif
-			(server_p->aftype == AF_INET ? "IPv4" : "?"), vhoststr);
-
-
-	rb_connect_tcp(client_p->localClient->F->fd, server_p->host,
-			 server_p->port, (struct sockaddr *) &myipnum,
-			 GET_SS_LEN(myipnum), serv_connect_callback, client_p,
-			 myipnum.ss_family, ConfigFileEntry.connect_timeout);
-
-	return 1;
+				T_A);
+		return 1;
+	}
 }
 
 /*
@@ -1632,16 +1713,15 @@ serv_connect(struct server_conf *server_p, struct Client *by)
  * marked for reading.
  */
 static void
-serv_connect_callback(int fd, int status, void *data)
+serv_connect_callback(rb_fde_t *F, int status, void *data)
 {
 	struct Client *client_p = data;
 	struct server_conf *server_p;
 	char *errstr;
-	fde_t *F = rb_locate_fd(fd);
 
 	/* First, make sure its a real client! */
 	s_assert(client_p != NULL);
-	s_assert(client_p->localClient->F->fd == fd);
+	s_assert(client_p->localClient->F == F);
 
 	if(client_p == NULL)
 		return;
@@ -1655,19 +1735,13 @@ serv_connect_callback(int fd, int status, void *data)
 		return;
 	}
 
-	/* Next, for backward purposes, record the ip of the server */
-	memcpy(&client_p->localClient->ip, &F->connect.hostaddr, sizeof client_p->localClient->ip);
-	/* Set sockhost properly now -- jilles */
-	inetntop_sock((struct sockaddr *)&F->connect.hostaddr,
-			client_p->sockhost, sizeof client_p->sockhost);
-	
 	/* Check the status */
-	if(status != COMM_OK)
+	if(status != RB_OK)
 	{
 		/* COMM_ERR_TIMEOUT wont have an errno associated with it,
 		 * the others will.. --fl
 		 */
-		if(status == COMM_ERR_TIMEOUT)
+		if(status == RB_ERR_TIMEOUT)
 		{
 			sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
 					"Error connecting to %s[%s]: %s",
@@ -1684,7 +1758,7 @@ serv_connect_callback(int fd, int status, void *data)
 		}
 		else
 		{
-			errstr = strerror(rb_get_sockerr(fd));
+			errstr = strerror(rb_get_sockerr(F));
 			sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
 					"Error connecting to %s[%s]: %s (%s)",
 					client_p->name,
@@ -1749,7 +1823,7 @@ serv_connect_callback(int fd, int status, void *data)
 	/* don't move to serv_list yet -- we haven't sent a burst! */
 
 	/* If we get here, we're ok, so lets start reading some data */
-	read_packet(fd, client_p);
+	read_packet(F, client_p);
 }
 
 #ifndef HAVE_SOCKETPAIR