albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add new IRC+ server flag "X": "XOP modes supported" 

This flag indicates, that the server supports the enhanced "xop channel
user modes", like channel owner, admin, and halfop. This information is
used to make sure that no unsupported CHANINFO commands are sent to
servers not supporting such mode prefixes, for example.
This commit is contained in:
Alexander Barton 2012-11-10 23:33:19 +01:00
parent 646218e6f4
commit 53917fa4b8
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/Protocol.txt
View File

@ -89,6 +89,9 @@ The following <serverflags> are defined at the moment:
- S: The server supports the SERVICE command (on this link).
- X: Server supports XOP channel modes (owner, admin, halfop) and supports
these user prefixes in CHANINFO commands, for example.
- Z: Compressed server links are supported by the server.
Example for a complete <flags> string: "ngircd|0.7.5:CZ".

2
src/ngircd/defines.h
View File

@ -157,7 +157,7 @@
#ifdef IRCPLUS
/** Standard IRC+ flags. */
# define IRCPLUSFLAGS "CHLMS"
# define IRCPLUSFLAGS "CHLMSX"
#endif
/** Supported user modes. */

17
src/ngircd/numeric.c
View File

@ -48,12 +48,11 @@ Announce_Channel(CLIENT *Client, CHANNEL *Chan)
CL2CHAN *cl2chan;
CLIENT *cl;
char str[LINE_LEN], *ptr;
bool njoin;
bool njoin, xop;
if (Conn_Options(Client_Conn(Client)) & CONN_RFC1459)
njoin = false;
else
njoin = true;
/* Check features of remote server */
njoin = Conn_Options(Client_Conn(Client)) & CONN_RFC1459 ? false : true;
xop = strchr(Client_Flags(Client), 'X') ? true : false;
/* Get all the members of this channel */
cl2chan = Channel_FirstMember(Chan);
@ -67,13 +66,15 @@ Announce_Channel(CLIENT *Client, CHANNEL *Chan)
* (if user is channel operator or has voice) */
if (str[strlen(str) - 1] != ':')
strlcat(str, ",", sizeof(str));
if (strchr(Channel_UserModes(Chan, cl), 'q'))
/* Prepare user prefix (ChanOp, voiced, ...) */
if (xop && strchr(Channel_UserModes(Chan, cl), 'q'))
strlcat(str, "~", sizeof(str));
if (strchr(Channel_UserModes(Chan, cl), 'a'))
if (xop && strchr(Channel_UserModes(Chan, cl), 'a'))
strlcat(str, "&", sizeof(str));
if (strchr(Channel_UserModes(Chan, cl), 'o'))
strlcat(str, "@", sizeof(str));
if (strchr(Channel_UserModes(Chan, cl), 'h'))
if (xop && strchr(Channel_UserModes(Chan, cl), 'h'))
strlcat(str, "%", sizeof(str));
if (strchr(Channel_UserModes(Chan, cl), 'v'))
strlcat(str, "+", sizeof(str));