mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2024-10-27 20:36:18 +00:00
Code Issues Releases Wiki Activity

Fix channel symbol returned by RPL_NAMREPLY for secret channels

Browse Source 
References:

- https://modern.ircdocs.horse/#rplnamreply-353
- https://datatracker.ietf.org/doc/html/rfc2812#page-47
- (RFC 1459 is irrelevant here, as
  https://datatracker.ietf.org/doc/html/rfc1459#page-51 uses a different
  format)

Closes #313.
This commit is contained in:
Val Lorentz 2024-04-19 23:00:20 +02:00 committed by GitHub
parent 90fb3cf0a2
commit d4fb21f354
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ngircd/irc-info.c
View File

@ -818,7 +818,7 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
/* Now print all clients which are not in any channel */
c = Client_First();
snprintf(rpl, sizeof(rpl), RPL_NAMREPLY_MSG, Client_ID(from), "*", "*");
snprintf(rpl, sizeof(rpl), RPL_NAMREPLY_MSG, Client_ID(from), '*', "*");
while (c) {
if (Client_Type(c) == CLIENT_USER
&& Channel_FirstChannelOf(c) == NULL
@ -830,11 +830,11 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
strlcat(rpl, Client_ID(c), sizeof(rpl));
if (strlen(rpl) > COMMAND_LEN - CLIENT_NICK_LEN - 4) {
/* Line is gwoing too long, send now */
/* Line is going too long, send now */
if (!IRC_WriteStrClient(from, "%s", rpl))
return DISCONNECTED;
snprintf(rpl, sizeof(rpl), RPL_NAMREPLY_MSG,
Client_ID(from), "*", "*");
Client_ID(from), '*', "*");
}
}
c = Client_Next(c);
@ -1500,6 +1500,8 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
char str[COMMAND_LEN];
CL2CHAN *cl2chan;
CLIENT *cl;
bool secret_channel;
char chan_symbol;
assert(Client != NULL);
assert(Chan != NULL);
@ -1514,10 +1516,13 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
return CONNECTED;
/* Secret channel? */
if (!is_member && Channel_HasMode(Chan, 's'))
secret_channel = Channel_HasMode(Chan, 's');
if (!is_member && secret_channel)
return CONNECTED;
snprintf(str, sizeof(str), RPL_NAMREPLY_MSG, Client_ID(Client), "=",
chan_symbol = secret_channel ? '@' : '=';
snprintf(str, sizeof(str), RPL_NAMREPLY_MSG, Client_ID(Client), chan_symbol,
Channel_Name(Chan));
cl2chan = Channel_FirstMember(Chan);
while (cl2chan) {
@ -1540,7 +1545,7 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
if (!IRC_WriteStrClient(Client, "%s", str))
return DISCONNECTED;
snprintf(str, sizeof(str), RPL_NAMREPLY_MSG,
Client_ID(Client), "=",
Client_ID(Client), chan_symbol,
Channel_Name(Chan));
}
}

2
src/ngircd/messages.h
View File

@ -84,7 +84,7 @@
#define RPL_ENDOFEXCEPTLIST_MSG "349 %s %s :End of channel exception list"
#define RPL_VERSION_MSG "351 %s %s-%s.%s %s :%s"
#define RPL_WHOREPLY_MSG "352 %s %s %s %s %s %s %s :%d %s"
#define RPL_NAMREPLY_MSG "353 %s %s %s :"
#define RPL_NAMREPLY_MSG "353 %s %c %s :"
#define RPL_LINKS_MSG "364 %s %s %s :%d %s"
#define RPL_ENDOFLINKS_MSG "365 %s %s :End of LINKS list"
#define RPL_ENDOFNAMES_MSG "366 %s %s :End of NAMES list"