X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fnumeric.c;h=0dcfe75b6e3d9c0bca6ad9d7b7a0ead4876aaa74;hb=01e40f4b55ee8b5ee5e6f32d41f53989e858f54a;hp=ab6476654bc08c25a84f2e1789324bd0b633b03a;hpb=178f9cbdac3bbeb58600268791916f3bfbcbd958;p=ngircd-alex.git

diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c
index ab647665..0dcfe75b 100644
--- a/src/ngircd/numeric.c
+++ b/src/ngircd/numeric.c
@@ -20,12 +20,10 @@
 #include <string.h>
 
 #include "defines.h"
-#include "resolve.h"
 #include "conn.h"
 #include "conf.h"
 #include "conn.h"
 #include "conn-func.h"
-#include "client.h"
 #include "channel.h"
 #include "irc-write.h"
 #include "lists.h"
@@ -37,6 +35,77 @@
 #include "numeric.h"
 
 
+/**
+ * Announce a channel and its users in the network.
+ */
+static bool
+Announce_Channel(CLIENT *Client, CHANNEL *Chan)
+{
+	CL2CHAN *cl2chan;
+	CLIENT *cl;
+	char str[LINE_LEN], *ptr;
+	bool njoin;
+
+	if (Conn_Options(Client_Conn(Client)) & CONN_RFC1459)
+		njoin = false;
+	else
+		njoin = true;
+
+	/* Get all the members of this channel */
+	cl2chan = Channel_FirstMember(Chan);
+	snprintf(str, sizeof(str), "NJOIN %s :", Channel_Name(Chan));
+	while (cl2chan) {
+		cl = Channel_GetClient(cl2chan);
+		assert(cl != NULL);
+
+		if (njoin) {
+			/* RFC 2813: send NJOIN with nick names and modes
+			 * (if user is channel operator or has voice) */
+			if (str[strlen(str) - 1] != ':')
+				strlcat(str, ",", sizeof(str));
+			if (strchr(Channel_UserModes(Chan, cl), 'v'))
+				strlcat(str, "+", sizeof(str));
+			if (strchr(Channel_UserModes(Chan, cl), 'o'))
+				strlcat(str, "@", sizeof(str));
+			strlcat(str, Client_ID(cl), sizeof(str));
+
+			/* Send the data if the buffer is "full" */
+			if (strlen(str) > (LINE_LEN - CLIENT_NICK_LEN - 8)) {
+				if (!IRC_WriteStrClient(Client, "%s", str))
+					return DISCONNECTED;
+				snprintf(str, sizeof(str), "NJOIN %s :",
+					 Channel_Name(Chan));
+			}
+		} else {
+			/* RFC 1459: no NJOIN, send JOIN and MODE */
+			if (!IRC_WriteStrClientPrefix(Client, cl, "JOIN %s",
+						Channel_Name(Chan)))
+				return DISCONNECTED;
+			ptr = Channel_UserModes(Chan, cl);
+			while (*ptr) {
+				if (!IRC_WriteStrClientPrefix(Client, cl,
+						   "MODE %s +%c %s",
+						   Channel_Name(Chan), ptr[0],
+						   Client_ID(cl)))
+					return DISCONNECTED;
+				ptr++;
+			}
+		}
+
+		cl2chan = Channel_NextMember(Chan, cl2chan);
+	}
+
+	/* Data left in the buffer? */
+	if (str[strlen(str) - 1] != ':') {
+		/* Yes, send it ... */
+		if (!IRC_WriteStrClient(Client, "%s", str))
+			return DISCONNECTED;
+	}
+
+	return CONNECTED;
+} /* Announce_Channel */
+
+
 /**
  * Announce new server in the network
  * @param Client New server
@@ -60,7 +129,7 @@ Announce_Server(CLIENT * Client, CLIENT * Server)
 	if (Client_Hops(Server) == 1)
 		c = Client_ThisServer();
 	else
-		c = Client_Introducer(Server);
+		c = Client_TopServer(Server);
 
 	/* Inform new server about the one already registered in the network */
 	return IRC_WriteStrClientPrefix(Client, c, "SERVER %s %d %d :%s",
@@ -219,11 +288,9 @@ Send_CHANINFO(CLIENT * Client, CHANNEL * Chan)
 GLOBAL bool
 IRC_Num_ENDOFMOTD(CLIENT * Client, UNUSED REQUEST * Req)
 {
-	char str[LINE_LEN];
 	int max_hops, i;
-	CLIENT *c, *cl;
+	CLIENT *c;
 	CHANNEL *chan;
-	CL2CHAN *cl2chan;
 
 	Client_SetType(Client, CLIENT_SERVER);
 
@@ -272,6 +339,10 @@ IRC_Num_ENDOFMOTD(CLIENT * Client, UNUSED REQUEST * Req)
 	/* Announce all channels to the new server */
 	chan = Channel_First();
 	while (chan) {
+		if (Channel_IsLocal(chan)) {
+			chan = Channel_Next(chan);
+			continue;
+		}
 #ifdef IRCPLUS
 		/* Send CHANINFO if the peer supports it */
 		if (strchr(Client_Flags(Client), 'C')) {
@@ -280,39 +351,8 @@ IRC_Num_ENDOFMOTD(CLIENT * Client, UNUSED REQUEST * Req)
 		}
 #endif
 
-		/* Get all the members of this channel */
-		cl2chan = Channel_FirstMember(chan);
-		snprintf(str, sizeof(str), "NJOIN %s :", Channel_Name(chan));
-		while (cl2chan) {
-			cl = Channel_GetClient(cl2chan);
-			assert(cl != NULL);
-
-			/* Nick name, with modes (if applicable) */
-			if (str[strlen(str) - 1] != ':')
-				strlcat(str, ",", sizeof(str));
-			if (strchr(Channel_UserModes(chan, cl), 'v'))
-				strlcat(str, "+", sizeof(str));
-			if (strchr(Channel_UserModes(chan, cl), 'o'))
-				strlcat(str, "@", sizeof(str));
-			strlcat(str, Client_ID(cl), sizeof(str));
-
-			/* Send the data if the buffer is "full" */
-			if (strlen(str) > (LINE_LEN - CLIENT_NICK_LEN - 8)) {
-				if (!IRC_WriteStrClient(Client, "%s", str))
-					return DISCONNECTED;
-				snprintf(str, sizeof(str), "NJOIN %s :",
-					 Channel_Name(chan));
-			}
-
-			cl2chan = Channel_NextMember(chan, cl2chan);
-		}
-
-		/* Data left in the buffer? */
-		if (str[strlen(str) - 1] != ':') {
-			/* Yes, send it ... */
-			if (!IRC_WriteStrClient(Client, "%s", str))
-				return DISCONNECTED;
-		}
+		if (!Announce_Channel(Client, chan))
+			return DISCONNECTED;
 
 		/* Get next channel ... */
 		chan = Channel_Next(chan);