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

diff --git a/src/s_serv.c b/src/s_serv.c
index 033a0fd..0b41768 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"
@@ -218,7 +218,7 @@ collect_zipstats(void *unused)
 				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);
 			}
 		}
 	}
@@ -995,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)
@@ -1030,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");
 		}
@@ -1059,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))
@@ -1139,11 +1138,16 @@ 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
@@ -1264,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)
 		{
@@ -1284,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 */
 
@@ -1310,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);
 }
 
 /*
@@ -1360,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
 			{
@@ -1382,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];
@@ -1397,38 +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_packet(server->localClient->F->fd, server);
+		read_ctrl_packet(server->localClient->ctrlF, server);
+		read_packet(server->localClient->F, server);
 	}
 
 	return 0;
@@ -1470,9 +1464,10 @@ int
 serv_connect(struct server_conf *server_p, struct Client *by)
 {
 	struct Client *client_p;
-	struct rb_sockaddr_storage myipnum; 
-	int fd;
+	struct rb_sockaddr_storage myipnum, theiripnum;
+	rb_fde_t *F;
 	char vhoststr[HOSTIPLEN];
+	char note[HOSTLEN + 10];
 
 	s_assert(server_p != NULL);
 	if(server_p == NULL)
@@ -1492,17 +1487,33 @@ serv_connect(struct server_conf *server_p, struct Client *by)
 		return 0;
 	}
 
+	if (rb_inet_pton_sock(server_p->host, (struct sockaddr *)&theiripnum) <= 0)
+	{
+		sendto_realops_snomask(SNO_GENERAL, L_ALL,
+				     "Server %s host is a DNS name which is currently not implemented",
+				     server_p->name);
+		if(by && IsPerson(by) && !MyClient(by))
+			sendto_one_notice(by, ":Server %s host is a DNS name which is currently not implemented",
+					  server_p->name);
+		return 0;
+	}
+
+#ifdef RB_IPV6
+	if(theiripnum.ss_family == AF_INET6)
+		((struct sockaddr_in6 *)&theiripnum)->sin6_port = htons(server_p->port);
+	else
+#endif
+		((struct sockaddr_in *)&theiripnum)->sin_port = htons(server_p->port);
+
 	/* 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 +1525,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);
+	memcpy(&client_p->localClient->ip, &theiripnum, sizeof(client_p->localClient->ip));
+	client_p->localClient->F = F;
 
 	/*
 	 * Set up the initial server evilness, ripped straight from
@@ -1522,12 +1534,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");
 	}
 
 	/*
@@ -1574,47 +1583,49 @@ serv_connect(struct server_conf *server_p, struct Client *by)
 		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));
+		SET_SS_LEN(&myipnum, sizeof(struct sockaddr_in));
 	}
 	
-#ifdef IPV6
+#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));
+		SET_SS_LEN(&myipnum, sizeof(struct sockaddr_in6));
 	}
 #endif
 	else
 	{
 		/* log */
 		ilog(L_SERVER, "Connecting to %s[%s] port %d (%s)", server_p->name, server_p->host, server_p->port,
-#ifdef IPV6
+#ifdef RB_IPV6
 				server_p->aftype == AF_INET6 ? "IPv6" :
 #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);
+		rb_connect_tcp(client_p->localClient->F,
+				(struct sockaddr *) &theiripnum,
+				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)", server_p->name, server_p->host, server_p->port,
-#ifdef IPV6
+#ifdef RB_IPV6
 			server_p->aftype == AF_INET6 ? "IPv6" :
 #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);
+	rb_connect_tcp(client_p->localClient->F,
+			(struct sockaddr *) &theiripnum,
+			(struct sockaddr *) &myipnum, GET_SS_LEN(&myipnum),
+			serv_connect_callback, client_p,
+			ConfigFileEntry.connect_timeout);
 
 	return 1;
 }
@@ -1629,16 +1640,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 +1662,21 @@ serv_connect_callback(int fd, int status, void *data)
 		return;
 	}
 
+#if 0
 	/* 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);
+#endif
 	
 	/* 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 +1693,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 +1758,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