X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/c48eb01dbed808464cc3f702cc910f3962351825..b9c1b1b960374303ef3991d8c4da5d6ca2a3cc92:/src/s_serv.c

diff --git a/src/s_serv.c b/src/s_serv.c
index 033a0fd..9af385e 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -44,7 +44,7 @@
 #include "res.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"
@@ -54,6 +54,7 @@
 #include "hook.h"
 #include "msg.h"
 #include "reject.h"
+#include "sslproc.h"
 
 extern char *crypt();
 
@@ -71,10 +72,6 @@ int refresh_user_links = 0;
 
 static char buf[BUFSIZE];
 
-static void start_io(struct Client *server);
-
-static SlinkRplHnd slink_error;
-static SlinkRplHnd slink_zipstats;
 /*
  * list of recognized server capabilities.  "TS" is not on the list
  * because all servers that we talk to already do TS, and the kludged
@@ -87,7 +84,6 @@ struct Capability captab[] = {
 	{ "CHW",	CAP_CHW},
 	{ "IE", 	CAP_IE},
 	{ "KLN",	CAP_KLN},
-	{ "GLN",	CAP_GLN},
 	{ "KNOCK",	CAP_KNOCK},
 	{ "ZIP",	CAP_ZIP},
 	{ "TB",		CAP_TB},
@@ -101,128 +97,8 @@ struct Capability captab[] = {
 	{0, 0}
 };
 
-struct SlinkRplDef slinkrpltab[] = {
-	{SLINKRPL_ERROR, slink_error, SLINKRPL_FLAG_DATA},
-	{SLINKRPL_ZIPSTATS, slink_zipstats, SLINKRPL_FLAG_DATA},
-	{0, 0, 0},
-};
-
-static int fork_server(struct Client *client_p);
-
 static CNCB serv_connect_callback;
-
-void
-slink_error(unsigned int rpl, unsigned int len, unsigned char *data, struct Client *server_p)
-{
-	char squitreason[256];
-
-	s_assert(rpl == SLINKRPL_ERROR);
-
-	s_assert(len < 256);
-	data[len - 1] = '\0';
-
-	sendto_realops_snomask(SNO_GENERAL, L_ALL, "SlinkError for %s: %s", server_p->name, data);
-	snprintf(squitreason, sizeof squitreason, "servlink error: %s", data);
-	exit_client(server_p, server_p, &me, squitreason);
-}
-
-void
-slink_zipstats(unsigned int rpl, unsigned int len, unsigned char *data, struct Client *server_p)
-{
-	struct ZipStats zipstats;
-	u_int32_t in = 0, in_wire = 0, out = 0, out_wire = 0;
-	int i = 0;
-
-	s_assert(rpl == SLINKRPL_ZIPSTATS);
-	s_assert(len == 16);
-	s_assert(IsCapable(server_p, CAP_ZIP));
-
-	/* Yes, it needs to be done this way, no we cannot let the compiler
-	 * work with the pointer to the structure.  This works around a GCC
-	 * bug on SPARC that affects all versions at the time of this writing.
-	 * I will feed you to the creatures living in RMS's beard if you do
-	 * not leave this as is, without being sure that you are not causing
-	 * regression for most of our installed SPARC base.
-	 * -jmallett, 04/27/2002
-	 */
-	memcpy(&zipstats, &server_p->localClient->zipstats, sizeof(struct ZipStats));
-
-	in |= (data[i++] << 24);
-	in |= (data[i++] << 16);
-	in |= (data[i++] << 8);
-	in |= (data[i++]);
-
-	in_wire |= (data[i++] << 24);
-	in_wire |= (data[i++] << 16);
-	in_wire |= (data[i++] << 8);
-	in_wire |= (data[i++]);
-
-	out |= (data[i++] << 24);
-	out |= (data[i++] << 16);
-	out |= (data[i++] << 8);
-	out |= (data[i++]);
-
-	out_wire |= (data[i++] << 24);
-	out_wire |= (data[i++] << 16);
-	out_wire |= (data[i++] << 8);
-	out_wire |= (data[i++]);
-
-	zipstats.in += in;
-	zipstats.inK += zipstats.in >> 10;
-	zipstats.in &= 0x03ff;
-
-	zipstats.in_wire += in_wire;
-	zipstats.inK_wire += zipstats.in_wire >> 10;
-	zipstats.in_wire &= 0x03ff;
-
-	zipstats.out += out;
-	zipstats.outK += zipstats.out >> 10;
-	zipstats.out &= 0x03ff;
-
-	zipstats.out_wire += out_wire;
-	zipstats.outK_wire += zipstats.out_wire >> 10;
-	zipstats.out_wire &= 0x03ff;
-
-	if(zipstats.inK > 0)
-		zipstats.in_ratio =
-			(((double) (zipstats.inK - zipstats.inK_wire) /
-			  (double) zipstats.inK) * 100.00);
-	else
-		zipstats.in_ratio = 0;
-
-	if(zipstats.outK > 0)
-		zipstats.out_ratio =
-			(((double) (zipstats.outK - zipstats.outK_wire) /
-			  (double) zipstats.outK) * 100.00);
-	else
-		zipstats.out_ratio = 0;
-
-	memcpy(&server_p->localClient->zipstats, &zipstats, sizeof(struct ZipStats));
-}
-
-void
-collect_zipstats(void *unused)
-{
-	rb_dlink_node *ptr;
-	struct Client *target_p;
-
-	RB_DLINK_FOREACH(ptr, serv_list.head)
-	{
-		target_p = ptr->data;
-		if(IsCapable(target_p, CAP_ZIP))
-		{
-			/* only bother if we haven't already got something queued... */
-			if(!target_p->localClient->slinkq)
-			{
-				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);
-			}
-		}
-	}
-}
+static CNCB serv_connect_ssl_callback;
 
 /*
  * hunt_server - Do the basic thing in delivering the message (command)
@@ -361,6 +237,10 @@ try_connections(void *unused)
 		if(ServerConfIllegal(tmp_p) || !ServerConfAutoconn(tmp_p))
 			continue;
 
+		/* don't allow ssl connections if ssl isn't setup */
+		if(ServerConfSSL(tmp_p) && (!ssl_ok || !get_ssld_count()))
+			continue;
+
 		cltmp = tmp_p->class;
 
 		/*
@@ -488,6 +368,11 @@ check_server(const char *name, struct Client *client_p)
 	if(server_p == NULL)
 		return error;
 
+	if(ServerConfSSL(server_p) && client_p->localClient->ssl_ctl == NULL)
+	{
+		return -5;
+	}
+
 	attach_server_conf(client_p, server_p);
 
 	/* clear ZIP/TB if they support but we dont want them */
@@ -952,32 +837,25 @@ show_capabilities(struct Client *target_p)
 {
 	static char msgbuf[BUFSIZE];
 	struct Capability *cap;
-	char *t;
-	int tl;
 
-	t = msgbuf;
-	tl = rb_sprintf(msgbuf, "TS ");
-	t += tl;
+	if(has_id(target_p))
+		rb_strlcpy(msgbuf, " TS6", sizeof(msgbuf));
+	else
+		rb_strlcpy(msgbuf, " TS", sizeof(msgbuf));
+
+	if(IsSSL(target_p))
+		rb_strlcat(msgbuf, " SSL", sizeof(msgbuf));
 
 	if(!IsServer(target_p) || !target_p->serv->caps)	/* short circuit if no caps */
-	{
-		msgbuf[2] = '\0';
-		return msgbuf;
-	}
+		return msgbuf + 1;
 
 	for (cap = captab; cap->cap; ++cap)
 	{
 		if(cap->cap & target_p->serv->caps)
-		{
-			tl = rb_sprintf(t, "%s ", cap->name);
-			t += tl;
-		}
+			rb_snprintf_append(msgbuf, sizeof(msgbuf), " %s", cap->name);
 	}
 
-	t--;
-	*t = '\0';
-
-	return msgbuf;
+	return msgbuf + 1;
 }
 
 /*
@@ -995,6 +873,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)
@@ -1030,7 +909,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");
 		}
@@ -1059,27 +938,15 @@ 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 */
+	/* Enable compression now */
 	if(IsCapable(client_p, CAP_ZIP))
 	{
-		if(fork_server(client_p) < 0)
-		{
-			sendto_realops_snomask(SNO_GENERAL, is_remote_connect(client_p) ? L_NETWIDE : L_ALL,
-					     "Warning: fork failed for server %s -- check servlink_path (%s)",
-					     get_server_name(client_p, HIDE_IP),
-					     ConfigFileEntry.servlink_path);
-			return exit_client(client_p, client_p, client_p, "Fork failed");
-		}
-		start_io(client_p);
-		SetServlink(client_p);
+		start_zlib_session(client_p);
 	}
-
-	sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, rb_current_time());
+	sendto_one(client_p, "SVINFO %d %d 0 :%ld", TS_CURRENT, TS_MIN, (long int)rb_current_time());
 
 	client_p->servptr = &me;
 
@@ -1134,16 +1001,8 @@ server_estab(struct Client *client_p)
 	hdata.target = client_p;
 	call_hook(h_server_introduced, &hdata);
 
-	if(HasServlink(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);
-	}
-	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
@@ -1236,219 +1095,147 @@ server_estab(struct Client *client_p)
 
 	free_pre_client(client_p);
 
+	if (!IsCapable(client_p, CAP_ZIP))
+		send_pop_queue(client_p);
+
 	return 0;
 }
 
-static void
-start_io(struct Client *server)
-{
-	unsigned char *iobuf;
-	int c = 0;
-	int linecount = 0;
-	int linelen;
+/*
+ * New server connection code
+ * Based upon the stuff floating about in s_bsd.c
+ *   -- adrian
+ */
 
-	iobuf = rb_malloc(256);	/* XXX: This seems arbitrary. Perhaps make it IRCD_BUFSIZE? --nenolod */
+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(IsCapable(server, CAP_ZIP))
+	if((server_p = client_p->localClient->att_sconf) == NULL)
 	{
-		/* ziplink */
-		iobuf[c++] = SLINKCMD_SET_ZIP_OUT_LEVEL;
-		iobuf[c++] = 0;	/* |          */
-		iobuf[c++] = 1;	/* \ len is 1 */
-		iobuf[c++] = ConfigFileEntry.compression_level;
-		iobuf[c++] = SLINKCMD_START_ZIP_IN;
-		iobuf[c++] = SLINKCMD_START_ZIP_OUT;
+		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;
 	}
 
-	while (MyConnect(server))
-	{
-		linecount++;
-
-		iobuf = MyRealloc(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 */
+#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(linelen)
-		{
-			iobuf[c++] = SLINKCMD_INJECT_RECVQ;
-			iobuf[c++] = (linelen >> 8);
-			iobuf[c++] = (linelen & 0xff);
-			c += linelen;
-		}
-		else
-			break;
+	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;
+				
 	}
-
-	while (MyConnect(server))
+	else if(server_p->aftype == AF_INET && ServerInfo.specific_ipv4_vhost)
 	{
-		linecount++;
-
-		iobuf = MyRealloc(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, 
-				      (char *) (iobuf + c + 3), READBUF_SIZE, 
-				      LINEBUF_PARTIAL, LINEBUF_PARSED);	/* include partial lines */
-
-		if(linelen)
-		{
-			iobuf[c++] = SLINKCMD_INJECT_SENDQ;
-			iobuf[c++] = (linelen >> 8);
-			iobuf[c++] = (linelen & 0xff);
-			c += linelen;
-		}
-		else
-			break;
+		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));
 	}
-
-	/* start io */
-	iobuf[c++] = SLINKCMD_INIT;
-
-	server->localClient->slinkq = iobuf;
-	server->localClient->slinkq_ofs = 0;
-	server->localClient->slinkq_len = c;
-
-	/* schedule a write */
-	// send_queued_slink_write(server->localClient->ctrlfd, server);
-}
-
-/*
- * fork_server
- *
- * inputs       - struct Client *server
- * output       - success: 0 / failure: -1
- * side effect  - fork, and exec SERVLINK to handle this connection
- */
-static int
-fork_server(struct Client *server)
-{
-	int ret;
-	int i;
-	int ctrl_fds[2];
-	int data_fds[2];
-
-	char fd_str[4][6];
-	char *kid_argv[7];
-	char slink[] = "-slink";
-
-
-	/* ctrl */
-#ifdef HAVE_SOCKETPAIR
-	if(socketpair(AF_UNIX, SOCK_STREAM, 0, ctrl_fds) < 0)
-#else
-	if(inet_socketpair(AF_INET,SOCK_STREAM, 0, ctrl_fds) < 0)
-#endif
-		goto fork_error;
-
 	
-
-	/* data */
-#ifdef HAVE_SOCKETPAIR
-	if(socketpair(AF_UNIX, SOCK_STREAM, 0, data_fds) < 0)
-#else
-	if(inet_socketpair(AF_INET,SOCK_STREAM, 0, data_fds) < 0)
-#endif
-		goto fork_error;
-
-
-#ifdef __CYGWIN__
-	if((ret = vfork()) < 0)
-#else
-	if((ret = fork()) < 0)
+#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
-		goto fork_error;
-	else if(ret == 0)
+	else
 	{
-		int maxconn = rb_get_maxconnections();
+		/* 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" : "?"));
 
-		/* set our fds as non blocking and close everything else */
-		for (i = 0; i < maxconn; i++)
+		if(ServerConfSSL(server_p))
 		{
-				
-
-			if((i == ctrl_fds[1]) || (i == data_fds[1]) || (i == server->localClient->F->fd)) 
-			{
-				rb_set_nb(i);
-			}
-			else
-			{
-#ifdef __CYGWIN__
-				if(i > 2)	/* don't close std* */
-#endif
-					close(i);
-			}
+			rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip,
+					 NULL, 0, serv_connect_ssl_callback, 
+					 client_p, ConfigFileEntry.connect_timeout);
 		}
+		else
+			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;
+	}
 
-		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);
-		kid_argv[0] = slink;
-		kid_argv[1] = fd_str[0];
-		kid_argv[2] = fd_str[1];
-		kid_argv[3] = fd_str[2];
-		kid_argv[4] = NULL;
+	/* 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);
 
-		/* exec servlink program */
-		execv(ConfigFileEntry.servlink_path, kid_argv);
 
-		/* We're still here, abort. */
-		_exit(1);
-	}
+	if(ServerConfSSL(server_p))
+		rb_connect_tcp(client_p->localClient->F, (struct sockaddr *)&client_p->localClient->ip,
+				 (struct sockaddr *) &myipnum,
+				 GET_SS_LEN(&myipnum), serv_connect_ssl_callback, client_p,
+				 ConfigFileEntry.connect_timeout);
 	else
-	{
-		rb_close(server->localClient->F->fd);
-
-		/* 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]);
-
-		if(!rb_set_nb(server->localClient->F->fd))
-		{
-			report_error(NONB_ERROR_MSG,
-					get_server_name(server, SHOW_IP),
-					log_client_name(server, SHOW_IP),
-					errno);
-		}
+		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);
 
-		/* if(!rb_set_nb(server->localClient->ctrlfd))
-		{
-			report_error(NONB_ERROR_MSG,
-					get_server_name(server, SHOW_IP),
-					log_client_name(server, SHOW_IP),
-					errno);
-		}
+	return 1;
+}
 
-		rb_open(server->localClient->ctrlfd, FD_SOCKET, NULL);
-		*/
+static void
+serv_connect_dns_callback(void *vptr, struct DNSReply *reply)
+{
+	struct Client *client_p = vptr;
+	uint16_t port;
 
-		rb_open(server->localClient->F->fd, FD_SOCKET, NULL);
+	rb_free(client_p->localClient->dnsquery);
+	client_p->localClient->dnsquery = NULL;
 
-		read_packet(server->localClient->F->fd, server);
+	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;
 	}
-
-	return 0;
-
-      fork_error:
-	/* this is ugly, but nicer than repeating
-	 * about 50 close() statements everywhre... */
-	close(data_fds[0]);
-	close(data_fds[1]);
-	close(ctrl_fds[0]);
-	close(ctrl_fds[1]);
-	return -1;
+#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);
 }
 
-/*
- * New server connection code
- * Based upon the stuff floating about in s_bsd.c
- *   -- adrian
- */
-
 /*
  * serv_connect() - initiate a server connection
  *
@@ -1470,9 +1257,9 @@ int
 serv_connect(struct server_conf *server_p, struct Client *by)
 {
 	struct Client *client_p;
-	struct rb_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)
@@ -1493,16 +1280,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);
@@ -1514,7 +1299,8 @@ 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;
+	add_to_cli_fd_hash(client_p);
 
 	/*
 	 * Set up the initial server evilness, ripped straight from
@@ -1522,12 +1308,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");
 	}
 
 	/*
@@ -1562,61 +1345,65 @@ 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);
-
+				T_A);
+		return 1;
+	}
+}
 
-	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);
+static void
+serv_connect_ev(void *data)
+{
+	struct Client *client_p = data;
+	serv_connect_callback(client_p->localClient->F, RB_OK, client_p);
+}
 
-	return 1;
+static void
+serv_connect_ssl_callback(rb_fde_t *F, int status, void *data)
+{
+	struct Client *client_p = data;
+	rb_fde_t *xF[2];
+	if(status != RB_OK)
+	{
+		/* XXX deal with failure */
+		return;
+	}
+	rb_connect_sockaddr(F, (struct sockaddr *)&client_p->localClient->ip, sizeof(client_p->localClient->ip));
+	rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Outgoing ssld connection");
+	del_from_cli_fd_hash(client_p);
+	client_p->localClient->F = xF[0];
+	add_to_cli_fd_hash(client_p);
+
+	client_p->localClient->ssl_ctl = start_ssld_connect(F, xF[1], rb_get_fd(xF[0]));
+	SetSSL(client_p);
+	rb_event_addonce("serv_connect_ev", serv_connect_ev, client_p, 1);		
 }
 
 /*
@@ -1629,16 +1416,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;
@@ -1652,19 +1438,16 @@ 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);
-	
+	if(client_p->localClient->ssl_ctl == NULL)
+		rb_connect_sockaddr(F, (struct sockaddr *)&client_p->localClient->ip, sizeof(client_p->localClient->ip));
+
 	/* 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",
@@ -1681,7 +1464,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,
@@ -1746,7 +1529,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