From 55744b1863107a2f54a5e7c974d797fef9720af9 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Mon, 26 Dec 2022 17:38:10 +0100 Subject: [PATCH] Refactor join_send_topic() into IRC_Send_Channel_Info() and use it for JOIN and NJOIN handlers This reduces code duplication and brings the order of messages on JOIN and NJOIN in line. Fixes #288. --- src/ngircd/irc-channel.c | 51 ++++++++++++++++++++-------------------- src/ngircd/irc-channel.h | 4 +++- src/ngircd/irc-server.c | 30 +++++++---------------- 3 files changed, 36 insertions(+), 49 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index b9f0bdcd..a1bb4ef5 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -248,46 +248,38 @@ join_forward(CLIENT *Client, CLIENT *target, CHANNEL *chan, } /* join_forward */ /** - * Acknowledge user JOIN request and send "channel info" numerics. + * Send channel TOPIC and NAMES list to a newly (N)JOIN'ed client. * * @param Client Client used to prefix the generated commands - * @param target Forward commands/numerics to this user - * @param chan Channel structure - * @param channame Channel name + * @param Chan Channel structure */ -static bool -join_send_topic(CLIENT *Client, CLIENT *target, CHANNEL *chan, - const char *channame) +GLOBAL bool +IRC_Send_Channel_Info(CLIENT *Client, CHANNEL *Chan) { const char *topic; - if (Client_Type(Client) != CLIENT_USER) - return true; - /* acknowledge join */ - if (!IRC_WriteStrClientPrefix(Client, target, "JOIN :%s", channame)) - return false; - - /* Send topic to client, if any */ - topic = Channel_Topic(chan); + /* Send the topic (if any) to the new client: */ + topic = Channel_Topic(Chan); assert(topic != NULL); if (*topic) { if (!IRC_WriteStrClient(Client, RPL_TOPIC_MSG, - Client_ID(Client), channame, topic)) + Client_ID(Client), Channel_Name(Chan), topic)) return false; #ifndef STRICT_RFC if (!IRC_WriteStrClient(Client, RPL_TOPICSETBY_MSG, - Client_ID(Client), channame, - Channel_TopicWho(chan), - Channel_TopicTime(chan))) + Client_ID(Client), Channel_Name(Chan), + Channel_TopicWho(Chan), + Channel_TopicTime(Chan))) return false; #endif } - /* send list of channel members to client */ - if (!IRC_Send_NAMES(Client, chan)) + + /* Send list of channel members to the new client: */ + if (!IRC_Send_NAMES(Client, Chan)) return false; - return IRC_WriteStrClient(Client, RPL_ENDOFNAMES_MSG, Client_ID(Client), - Channel_Name(chan)); -} /* join_send_topic */ + return IRC_WriteStrClient(Client, RPL_ENDOFNAMES_MSG, + Client_ID(Client), Channel_Name(Chan)); +} /** * Handler for the IRC "JOIN" command. @@ -408,8 +400,15 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) join_forward(Client, target, chan, channame); - if (!join_send_topic(Client, target, chan, channame)) - break; /* write error */ + if (Client_Type(Client) == CLIENT_USER) { + /* Acknowledge join ... */ + if (!IRC_WriteStrClientPrefix(Client, target, + "JOIN :%s", channame)) + break; /* write error */ + /* ... and greet new user: */ + if (!IRC_Send_Channel_Info(Client, chan)) + break; /* write error */ + } join_next: /* next channel? */ diff --git a/src/ngircd/irc-channel.h b/src/ngircd/irc-channel.h index 685ec0c3..77f00f86 100644 --- a/src/ngircd/irc-channel.h +++ b/src/ngircd/irc-channel.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2022 by Alexander Barton (alex@barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,6 +25,8 @@ GLOBAL bool IRC_LIST PARAMS((CLIENT *Client, REQUEST *Req )); GLOBAL bool IRC_CHANINFO PARAMS((CLIENT *Client, REQUEST *Req )); +GLOBAL bool IRC_Send_Channel_Info PARAMS((CLIENT *Client, CHANNEL *Chan)); + #endif /* -eof- */ diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 3e839782..b78d0502 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors. + * Copyright (c)2001-2022 Alexander Barton (alex@barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,6 +32,7 @@ #include "numeric.h" #include "ngircd.h" #include "irc.h" +#include "irc-channel.h" #include "irc-info.h" #include "irc-write.h" #include "op.h" @@ -250,7 +251,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) GLOBAL bool IRC_NJOIN( CLIENT *Client, REQUEST *Req ) { - char nick_in[COMMAND_LEN], nick_out[COMMAND_LEN], *channame, *ptr, modes[8], *topic; + char nick_in[COMMAND_LEN], nick_out[COMMAND_LEN], *channame, *ptr, modes[8]; bool is_owner, is_chanadmin, is_op, is_halfop, is_voiced; CHANNEL *chan; CLIENT *c; @@ -320,26 +321,11 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) IRC_WriteStrChannelPrefix(Client, chan, c, false, "JOIN :%s", channame); - /* If the client is connected to me... */ - if(Client_Conn(c) != NONE) { - /* Send NAMES list to the joined user */ - if(IRC_Send_NAMES(c, chan)) - IRC_WriteStrClient(c, RPL_ENDOFNAMES_MSG, Client_ID(Client), - Channel_Name(chan)); - - /* Send topic to the joined user */ - topic = Channel_Topic(chan); - assert(topic != NULL); - if (*topic) { - IRC_WriteStrClient(c, RPL_TOPIC_MSG, Client_ID(c), channame, topic); -#ifndef STRICT_RFC - IRC_WriteStrClient(c, RPL_TOPICSETBY_MSG, - Client_ID(c), channame, - Channel_TopicWho(chan), - Channel_TopicTime(chan)); -#endif - } - } + /* If the client is connected to this server, it was remotely + * joined to the channel by another server/service: So send + * TOPIC and NAMES messages like on a regular JOIN command! */ + if(Client_Conn(c) != NONE) + IRC_Send_Channel_Info(c, chan); /* Announce "channel user modes" to the channel, if any */ strlcpy(modes, Channel_UserModes(chan, c), sizeof(modes)); -- 2.39.2