X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/f8283571ad0eba2e8848728cb9e204bdfe7bdead..6abfcc55d0633e93af512c2679dc33a767960334:/src/s_serv.c

diff --git a/src/s_serv.c b/src/s_serv.c
index f45be64..88fecdd 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -59,10 +59,6 @@
 #define INADDR_NONE ((unsigned int) 0xffffffff)
 #endif
 
-#ifndef HAVE_SOCKETPAIR
-static int inet_socketpair(int d, int type, int protocol, int sv[2]);
-#endif
-
 int MaxConnectionCount = 1;
 int MaxClientCount = 1;
 int refresh_user_links = 0;
@@ -91,6 +87,7 @@ struct Capability captab[] = {
 	{ "RSFNC",	CAP_RSFNC },
 	{ "SAVE",	CAP_SAVE },
 	{ "EUID",	CAP_EUID },
+	{ "EOPMOD",	CAP_EOPMOD },
 	{0, 0}
 };
 
@@ -477,6 +474,8 @@ burst_TS6(struct Client *client_p)
 
 	RB_DLINK_FOREACH(ptr, global_client_list.head)
 	{
+		const char *awaymsg = NULL;
+
 		target_p = ptr->data;
 
 		if(!IsPerson(target_p))
@@ -519,10 +518,10 @@ burst_TS6(struct Client *client_p)
 						use_id(target_p), target_p->user->suser);
 		}
 
-		if(ConfigFileEntry.burst_away && !EmptyString(target_p->user->away))
+		if(ConfigFileEntry.burst_away && (awaymsg = get_metadata(target_p, "away")) != NULL)
 			sendto_one(client_p, ":%s AWAY :%s",
 				   use_id(target_p),
-				   target_p->user->away);
+				   awaymsg);
 
 		hclientinfo.target = target_p;
 		call_hook(h_burst_client, &hclientinfo);
@@ -1160,7 +1159,13 @@ serv_connect_ssl_callback(rb_fde_t *F, int status, void *data)
 		serv_connect_callback(F, status, data);
 		return;
 	}
-	rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Outgoing ssld connection");
+	if(rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Outgoing ssld connection") == -1)
+	{
+                ilog_error("rb_socketpair failed for server");
+		serv_connect_callback(F, RB_ERROR, data);
+		return;
+		
+	}
 	del_from_cli_fd_hash(client_p);
 	client_p->localClient->F = xF[0];
 	add_to_cli_fd_hash(client_p);
@@ -1252,9 +1257,6 @@ serv_connect_callback(rb_fde_t *F, int status, void *data)
 	/* Next, send the initial handshake */
 	SetHandshake(client_p);
 
-	/* kludge, if we're not using TS6, dont ever send
-	 * ourselves as being TS6 capable.
-	 */
 	if(!EmptyString(server_p->spasswd))
 	{
 		sendto_one(client_p, "PASS %s TS %d :%s", 
@@ -1287,60 +1289,3 @@ serv_connect_callback(rb_fde_t *F, int status, void *data)
 	/* If we get here, we're ok, so lets start reading some data */
 	read_packet(F, client_p);
 }
-
-#ifndef HAVE_SOCKETPAIR
-static int
-inet_socketpair(int d, int type, int protocol, int sv[2])
-{
-	struct sockaddr_in addr1, addr2, addr3;
-	int addr3_len = sizeof(addr3);
-	int fd, rc;
-	int port_no = 20000;
-	
-	if(d != AF_INET || type != SOCK_STREAM || protocol)
-	{
-		errno = EAFNOSUPPORT;
-		return -1;
-	}
-	if(((sv[0] = socket(AF_INET, SOCK_STREAM, 0)) < 0) || ((sv[1] = socket(AF_INET, SOCK_STREAM, 0)) < 0))
-		return -1;
-	
-	addr1.sin_port = htons(port_no);
-	addr1.sin_family = AF_INET;
-	addr1.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-	while ((rc = bind (sv[0], (struct sockaddr *) &addr1, sizeof (addr1))) < 0 && errno == EADDRINUSE)
-		addr1.sin_port = htons(++port_no);
-	
-	if(rc < 0)
-		return -1;
-	
-	if(listen(sv[0], 1) < 0)
-	{
-		close(sv[0]);
-		close(sv[1]);
-		return -1;
-	}
-	
-	addr2.sin_port = htons(port_no);
-	addr2.sin_family = AF_INET;
-	addr2.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-	if(connect (sv[1], (struct sockaddr *) &addr2, sizeof (addr2)) < 0) 
-	{
-		close(sv[0]);
-		close(sv[1]);
-		return -1;
-	}
-	
-	if((fd = accept(sv[1], (struct sockaddr *) &addr3, &addr3_len)) < 0)
-	{
-		close(sv[0]);
-		close(sv[1]);
-		return -1;
-	}
-	close(sv[0]);
-	sv[0] = fd;
-	
-	return(0);
-
-}
-#endif