ngIRCd GIT Updates Oktober 2012

ngircd-commits@lists.barton.de

1 Teilnehmer
28 Diskussionen

Alexander Barton : Fix warning message introduced when cleaning up IRC_SERVER()
by alex＠arthur.barton.de 29 Okt '12

29 Okt '12

Module: ngircd.git Branch: master Commit: 30b32e84fe352f7c39ceca1a9c6df60ca50e83ab URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=30b32e84… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 29 11:44:45 2012 +0100 Fix warning message introduced when cleaning up IRC_SERVER() This reverts a not intentional code change and fixes the following compiler warning message (tested with gcc 4.4.5): irc-server.c: In function "IRC_SERVER": irc-server.c:142: warning: suggest parentheses around operand of "!" or change "&" to "&&" or "!" to "~" --- src/ngircd/irc-server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 02e3ae8..a587c52 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -139,7 +139,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) if (Client_Type(Client) == CLIENT_GOTPASS) { /* We got a "simple" PASS command, so the peer is * using the protocol as defined in RFC 1459. */ - if (!Conn_Options(Client_Conn(Client)) & CONN_RFC1459) + if (! (Conn_Options(Client_Conn(Client)) & CONN_RFC1459)) Log(LOG_INFO, "Switching connection %d (\"%s\") to RFC 1459 compatibility mode.", Client_Conn(Client), Client_ID(Client));

1 0

Alexander Barton : Make server reconnect time a little bit more random
by alex＠arthur.barton.de 29 Okt '12

29 Okt '12

Module: ngircd.git Branch: master Commit: fb924933765238808feb05fb7178402058026897 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fb924933… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 28 20:19:57 2012 +0100 Make server reconnect time a little bit more random Add randomly up to 15 seconds to the reconnect delay for outgoing server links when the connection has been "short" and therefore the "ConnectRetry" delay is being enforced. This should make it even more unlikely that two servers deadlock each other when both are trying to connect to the other one at the same time, for example in test environments. --- src/ngircd/conf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 6a7f633..8152512 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -481,8 +481,12 @@ Conf_UnsetServer( CONN_ID Idx ) * require the next attempt to be delayed. */ Conf_Server[i].lasttry = t - Conf_ConnectRetry + RECONNECT_DELAY; - } else - Conf_Server[i].lasttry = t; + } else { + /* "Short" connection, enforce "ConnectRetry" + * but randomize it a little bit: 15 seconds. */ + Conf_Server[i].lasttry = + t + rand() / (RAND_MAX / 15); + } } } }

1 0

Alexander Barton : Don' t accept connections for servers already beeing linked
by alex＠arthur.barton.de 29 Okt '12

29 Okt '12

Module: ngircd.git Branch: master Commit: eb4f9eac0c35071838c9367f1204db0d0b98ad2e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=eb4f9eac… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 28 19:48:24 2012 +0100 Don't accept connections for servers already beeing linked If two servers try to link each other, there was a time frame that could result in one connection overwriting the other, e. g. the incoming connection overwriting the status of the outgoing one. And this could lead to all kind of weirdness (even crashes!) later on. So now such incoming connections are dropped. But this most probably prevents the two servers from linking until timing changes somehow (network latency?) because each server drops the incoming connection of the other one, so no connection survives in the end. But this has to be addressed by an other patch ... --- src/ngircd/conf.c | 14 ++++++++------ src/ngircd/conf.h | 2 +- src/ngircd/conn.c | 3 ++- src/ngircd/irc-server.c | 7 ++++--- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index b600570..6a7f633 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -490,7 +490,7 @@ Conf_UnsetServer( CONN_ID Idx ) /** * Set connection information for specified configured server. */ -GLOBAL void +GLOBAL bool Conf_SetServer( int ConfServer, CONN_ID Idx ) { assert( ConfServer > NONE ); @@ -498,13 +498,15 @@ Conf_SetServer( int ConfServer, CONN_ID Idx ) if (Conf_Server[ConfServer].conn_id > NONE && Conf_Server[ConfServer].conn_id != Idx) { - Log(LOG_ALERT, - "Trying to update connection index for already registered server \"%s\": %d/%d - ignored.", - Conf_Server[ConfServer].name, - Conf_Server[ConfServer].conn_id, Idx); - return; + Log(LOG_ERR, + "Connection %d: Server configuration of \"%s\" already in use by connection %d!", + Idx, Conf_Server[ConfServer].name, + Conf_Server[ConfServer].conn_id); + Conn_Close(Idx, NULL, "Server configuration already in use", true); + return false; } Conf_Server[ConfServer].conn_id = Idx; + return true; } /** diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 541fdb2..7860f01 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -242,7 +242,7 @@ GLOBAL bool Conf_Rehash PARAMS((void)); GLOBAL int Conf_Test PARAMS((void)); GLOBAL void Conf_UnsetServer PARAMS(( CONN_ID Idx )); -GLOBAL void Conf_SetServer PARAMS(( int ConfServer, CONN_ID Idx )); +GLOBAL bool Conf_SetServer PARAMS(( int ConfServer, CONN_ID Idx )); GLOBAL int Conf_GetServer PARAMS(( CONN_ID Idx )); GLOBAL bool Conf_EnableServer PARAMS(( const char *Name, UINT16 Port )); diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 5d08685..80b085a 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -2079,7 +2079,8 @@ New_Server( int Server , ng_ipaddr_t *dest) Client_SetToken( c, TOKEN_OUTBOUND ); /* Register connection */ - Conf_SetServer(Server, new_sock); + if (!Conf_SetServer(Server, new_sock)) + return; My_Connections[new_sock].sock = new_sock; My_Connections[new_sock].addr = *dest; My_Connections[new_sock].client = c; diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 79facf5..02e3ae8 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -104,6 +104,10 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) if (!Client_CheckID(Client, Req->argv[0])) return DISCONNECTED; + /* Mark this connection as belonging to an configured server */ + if (!Conf_SetServer(i, Client_Conn(Client))) + return DISCONNECTED; + Client_SetID( Client, Req->argv[0] ); Client_SetHops( Client, 1 ); Client_SetInfo( Client, Req->argv[Req->argc - 1] ); @@ -131,9 +135,6 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) Client_SetToken(Client, atoi(Req->argv[1])); } - /* Mark this connection as belonging to an configured server */ - Conf_SetServer(i, Client_Conn(Client)); - /* Check protocol level */ if (Client_Type(Client) == CLIENT_GOTPASS) { /* We got a "simple" PASS command, so the peer is

1 0

Alexander Barton : IRC_SERVER(): Code cleanup
by alex＠arthur.barton.de 29 Okt '12

29 Okt '12

Module: ngircd.git Branch: master Commit: d7b5dd1bbf44ff9c8537def6d2083891b4f7d102 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d7b5dd1b… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 28 18:52:37 2012 +0100 IRC_SERVER(): Code cleanup --- src/ngircd/irc-server.c | 63 +++++++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index d605745..79facf5 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -53,7 +53,6 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) char str[LINE_LEN]; CLIENT *from, *c; int i; - CONN_ID con; assert( Client != NULL ); assert( Req != NULL ); @@ -70,27 +69,40 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) LogDebug("Connection %d: got SERVER command (new server link) ...", Client_Conn(Client)); - if(( Req->argc != 2 ) && ( Req->argc != 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - /* Ist this server configured on out side? */ - for( i = 0; i < MAX_SERVERS; i++ ) if( strcasecmp( Req->argv[0], Conf_Server[i].name ) == 0 ) break; - if( i >= MAX_SERVERS ) - { - Log( LOG_ERR, "Connection %d: Server \"%s\" not configured here!", Client_Conn( Client ), Req->argv[0] ); - Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", true); + if (Req->argc != 2 && Req->argc != 3) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), + Req->command); + + /* Get configuration index of new remote server ... */ + for (i = 0; i < MAX_SERVERS; i++) + if (strcasecmp(Req->argv[0], Conf_Server[i].name) == 0) + break; + + /* Makre sure the remote server is configured here */ + if (i >= MAX_SERVERS) { + Log(LOG_ERR, + "Connection %d: Server \"%s\" not configured here!", + Client_Conn(Client), Req->argv[0]); + Conn_Close(Client_Conn(Client), NULL, + "Server not configured here", true); return DISCONNECTED; } - if( strcmp( Conn_Password( Client_Conn( Client ) ), - Conf_Server[i].pwd_in ) != 0 ) - { - /* wrong password */ - Log( LOG_ERR, "Connection %d: Got bad password from server \"%s\"!", Client_Conn( Client ), Req->argv[0] ); - Conn_Close( Client_Conn( Client ), NULL, "Bad password", true); + + /* Check server password */ + if (strcmp(Conn_Password(Client_Conn(Client)), + Conf_Server[i].pwd_in) != 0) { + Log(LOG_ERR, + "Connection %d: Got bad password from server \"%s\"!", + Client_Conn(Client), Req->argv[0]); + Conn_Close(Client_Conn(Client), NULL, + "Bad password", true); return DISCONNECTED; } /* Is there a registered server with this ID? */ - if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED; + if (!Client_CheckID(Client, Req->argv[0])) + return DISCONNECTED; Client_SetID( Client, Req->argv[0] ); Client_SetHops( Client, 1 ); @@ -98,7 +110,6 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) /* Is this server registering on our side, or are we connecting to * a remote server? */ - con = Client_Conn(Client); if (Client_Token(Client) != TOKEN_OUTBOUND) { /* Incoming connection, send user/pass */ if (!IRC_WriteStrClient(Client, "PASS %s %s", @@ -107,7 +118,8 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) || !IRC_WriteStrClient(Client, "SERVER %s 1 :%s", Conf_ServerName, Conf_ServerInfo)) { - Conn_Close(con, "Unexpected server behavior!", + Conn_Close(Client_Conn(Client), + "Unexpected server behavior!", NULL, false); return DISCONNECTED; } @@ -120,24 +132,27 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) } /* Mark this connection as belonging to an configured server */ - Conf_SetServer(i, con); + Conf_SetServer(i, Client_Conn(Client)); /* Check protocol level */ if (Client_Type(Client) == CLIENT_GOTPASS) { /* We got a "simple" PASS command, so the peer is * using the protocol as defined in RFC 1459. */ - if (! (Conn_Options(con) & CONN_RFC1459)) + if (!Conn_Options(Client_Conn(Client)) & CONN_RFC1459) Log(LOG_INFO, "Switching connection %d (\"%s\") to RFC 1459 compatibility mode.", - con, Client_ID(Client)); - Conn_SetOption(con, CONN_RFC1459); + Client_Conn(Client), Client_ID(Client)); + Conn_SetOption(Client_Conn(Client), CONN_RFC1459); } Client_SetType(Client, CLIENT_UNKNOWNSERVER); #ifdef ZLIB - if (strchr(Client_Flags(Client), 'Z') && !Zip_InitConn(con)) { - Conn_Close( con, "Can't inizialize compression (zlib)!", NULL, false ); + if (strchr(Client_Flags(Client), 'Z') + && !Zip_InitConn(Client_Conn(Client))) { + Conn_Close(Client_Conn(Client), + "Can't inizialize compression (zlib)!", + NULL, false ); return DISCONNECTED; } #endif

1 0

Alexander Barton : Use lowercase "package name" for syslog logging again
by alex＠arthur.barton.de 29 Okt '12

29 Okt '12

Module: ngircd.git Branch: master Commit: b18e81b6313b097101f35e9b69870be6f2467828 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b18e81b6… Author: Alexander Barton <alex(a)barton.de> Date: Mon Oct 29 10:24:27 2012 +0100 Use lowercase "package name" for syslog logging again This is how ngIRCd up to release 19.2 behaved; "bug" introduced by commit 67e882, "configure.in: require autoconf 2.67 and automake 1.11", which changed the "PACKAGE_NAME" to "ngIRCd"; so use "PACKAGE" which still is the lowercase version for initializing syslog logging. --- src/ngircd/log.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ngircd/log.c b/src/ngircd/log.c index 6f0c4c9..51bd2a5 100644 --- a/src/ngircd/log.c +++ b/src/ngircd/log.c @@ -80,9 +80,9 @@ Log_Init(bool Daemon_Mode) #define LOG_CONS 0 #endif #ifdef LOG_DAEMON - openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_DAEMON); + openlog(PACKAGE, LOG_CONS|LOG_PID, LOG_DAEMON); #else - openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, 0); + openlog(PACKAGE, LOG_CONS|LOG_PID, 0); #endif #endif } /* Log_Init */ @@ -99,7 +99,7 @@ Log_ReInit(void) #define LOG_CONS 0 #endif closelog(); - openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility); + openlog(PACKAGE, LOG_CONS|LOG_PID, Conf_SyslogFacility); #endif Log(LOG_NOTICE, "%s started.", NGIRCd_Version); Log(LOG_INFO, "Using configuration file \"%s\" ...", NGIRCd_ConfFile); @@ -218,7 +218,7 @@ GLOBAL void Log_Init_Subprocess(char UNUSED *Name) { #ifdef SYSLOG - openlog(PACKAGE_NAME, LOG_CONS|LOG_PID, Conf_SyslogFacility); + openlog(PACKAGE, LOG_CONS|LOG_PID, Conf_SyslogFacility); #endif #ifdef DEBUG Log_Subprocess(LOG_DEBUG, "%s sub-process starting, PID %ld.",

1 0

Alexander Barton : Document new configuration option "MaxListSize"
by alex＠arthur.barton.de 28 Okt '12

28 Okt '12

Module: ngircd.git Branch: master Commit: 8ff153d7d40e4933e5ac66016ac30d35cbde3227 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8ff153d7… Author: Alexander Barton <alex(a)barton.de> Date: Sun Oct 28 20:36:58 2012 +0100 Document new configuration option "MaxListSize" --- ChangeLog | 2 ++ NEWS | 2 ++ man/ngircd.conf.5.tmpl | 3 +++ 3 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index a14f9f7..1e2392e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ ngIRCd + - New configuration option "MaxListSize" to configure the maximum number + of channels returned by a LIST command. The default is 100, as before. - Implement user mode "b", "block messages": when a user has set mode "b", all private messages and notices to this user are blocked if they don't originate from a registered user, an IRC Op, server or service. The diff --git a/NEWS b/NEWS index fd906b2..95d5372 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,8 @@ ngIRCd + - New configuration option "MaxListSize" to configure the maximum number + of channels returned by a LIST command. The default is 100, as before. - Implement user mode "b", "block messages": when a user has set mode "b", all private messages and notices to this user are blocked if they don't originate from a registered user, an IRC Op, server or service. The diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 5f9d6dd..03fac57 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -182,6 +182,9 @@ Maximum length of an user nick name (Default: 9, as in RFC 2812). Please note that all servers in an IRC network MUST use the same maximum nick name length! .TP +\fBMaxListSize\fR (number) +Maximum number of channels returned in response to a LIST command. Default: 100. +.TP \fBPingTimeout\fR (number) After <PingTimeout> seconds of inactivity the server will send a PING to the peer to test whether it is alive or not. Default: 120.

1 0

Brett Smith : Make the maximum /list reply length a configurable limit.
by alex＠arthur.barton.de 28 Okt '12

28 Okt '12

Module: ngircd.git Branch: master Commit: 32f63abb59b5c9f47b4d517e0bbf9cc73fd044dc URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=32f63abb… Author: Brett Smith <brett(a)w3.org> Date: Thu Oct 25 14:46:29 2012 -0400 Make the maximum /list reply length a configurable limit. --- doc/sample-ngircd.conf.tmpl | 4 ++++ src/ngircd/conf.c | 8 ++++++++ src/ngircd/conf.h | 3 +++ src/ngircd/defines.h | 3 --- src/ngircd/irc-channel.c | 7 ++++--- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 018855d..77948af 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -100,6 +100,10 @@ # maximum nick name length! ;MaxNickLength = 9 + # Maximum number of channels returned in response to a /list + # command (0: unlimited): + ;MaxListSize = 100 + # After <PingTimeout> seconds of inactivity the server will send a # PING to the peer to test whether it is alive or not. ;PingTimeout = 120 diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 4ac37ad..b600570 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -350,6 +350,7 @@ Conf_Test( void ) printf(" MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP); printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1); printf(" MaxNickLength = %u\n", Conf_MaxNickLength - 1); + printf(" MaxListSize = %d\n", Conf_MaxListSize); printf(" PingTimeout = %d\n", Conf_PingTimeout); printf(" PongTimeout = %d\n", Conf_PongTimeout); puts(""); @@ -706,6 +707,7 @@ Set_Defaults(bool InitServers) Conf_MaxConnectionsIP = 5; Conf_MaxJoins = 10; Conf_MaxNickLength = CLIENT_NICK_LEN_DEFAULT; + Conf_MaxListSize = 100; Conf_PingTimeout = 120; Conf_PongTimeout = 20; @@ -1457,6 +1459,12 @@ Handle_LIMITS(int Line, char *Var, char *Arg) Conf_MaxNickLength = Handle_MaxNickLength(Line, Arg); return; } + if (strcasecmp(Var, "MaxListSize") == 0) { + Conf_MaxListSize = atoi(Arg); + if (!Conf_MaxListSize && strcmp(Arg, "0")) + Config_Error_NaN(Line, Var); + return; + } if (strcasecmp(Var, "PingTimeout") == 0) { Conf_PingTimeout = atoi(Arg); if (Conf_PingTimeout < 5) { diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 90d74d2..541fdb2 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -220,6 +220,9 @@ GLOBAL int Conf_MaxConnectionsIP; /** Maximum length of a nick name */ GLOBAL unsigned int Conf_MaxNickLength; +/** Maximum number of channels returned to /list */ +GLOBAL int Conf_MaxListSize; + #ifndef STRICT_RFC /** Require "AUTH PING-PONG" on login */ diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index b387493..345f1be 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -181,9 +181,6 @@ /* Defaults and limits for IRC commands */ -/** Max. number of LIST replies. */ -#define MAX_RPL_LIST 100 - /** Max. number of elemets allowed in channel invite and ban lists. */ #define MAX_HNDL_CHANNEL_LISTS 50 diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index f9d2dc1..ed4839a 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -679,9 +679,10 @@ IRC_LIST( CLIENT *Client, REQUEST *Req ) if (!strchr(Channel_Modes(chan), 's') || Channel_IsMemberOf(chan, from) || (!Conf_MorePrivacy && Client_OperByMe(Client))) { - if (IRC_CheckListTooBig(from, count, - MAX_RPL_LIST, - "LIST")) + if ((Conf_MaxListSize > 0) + && IRC_CheckListTooBig(from, count, + Conf_MaxListSize, + "LIST")) break; if (!IRC_WriteStrClient(from, RPL_LIST_MSG, Client_ID(from),

1 0

Alexander Barton : Update NEWS and ChangeLog files
by alex＠arthur.barton.de 24 Okt '12

24 Okt '12

Module: ngircd.git Branch: master Commit: 23572af942399288bcf4e67245563b05ff4fc0f7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=23572af9… Author: Alexander Barton <alex(a)barton.de> Date: Wed Oct 24 22:03:56 2012 +0200 Update NEWS and ChangeLog files --- ChangeLog | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- NEWS | 44 +++++++++++++++++++++++++- 2 files changed, 145 insertions(+), 3 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=2357…

1 0

Alexander Barton : Allow remote servers and IRC Ops to change channel topics
by alex＠arthur.barton.de 19 Okt '12

19 Okt '12

Module: ngircd.git Branch: master Commit: 8d9cfa157a7fd067dab3483614d427f35dfa4ad1 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8d9cfa15… Author: Alexander Barton <alex(a)barton.de> Date: Fri Oct 19 19:45:44 2012 +0200 Allow remote servers and IRC Ops to change channel topics Remote servers are always allowed to change all channel topics, and IRC Operators are allowed to change all channel topics if the configuration option "OperCanUseMode" is enabled. Bug introduced by commit 7b01bb8 and reported by DNS777. --- src/ngircd/irc-channel.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 4a157d6..f9d2dc1 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -512,7 +512,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) CHANNEL *chan; CLIENT *from; char *topic; - bool r, is_oper; + bool r, topic_power; assert( Client != NULL ); assert( Req != NULL ); @@ -535,11 +535,17 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) return IRC_WriteStrClient(from, ERR_NOSUCHCHANNEL_MSG, Client_ID(from), Req->argv[0]); - /* Only IRC opers and channel members allowed */ - is_oper = Client_OperByMe(from); - if (!Channel_IsMemberOf(chan, from) && !is_oper) - return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, - Client_ID(from), Req->argv[0]); + /* Only remote servers and channel members are allowed to change the + * channel topic, and IRC opreators when the Conf_OperCanMode option + * is set in the server configuration. */ + if (Client_Type(Client) != CLIENT_SERVER) { + topic_power = Client_HasMode(from, 'o'); + if (!Channel_IsMemberOf(chan, from) + && !(Conf_OperCanMode && topic_power)) + return IRC_WriteStrClient(from, ERR_NOTONCHANNEL_MSG, + Client_ID(from), Req->argv[0]); + } else + topic_power = true; if (Req->argc == 1) { /* Request actual topic */ @@ -567,11 +573,11 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) if (strchr(Channel_Modes(chan), 't')) { /* Topic Lock. Is the user a channel op or IRC operator? */ - if(!strchr(Channel_UserModes(chan, from), 'h') && + if(!topic_power && + !strchr(Channel_UserModes(chan, from), 'h') && !strchr(Channel_UserModes(chan, from), 'o') && !strchr(Channel_UserModes(chan, from), 'a') && - !strchr(Channel_UserModes(chan, from), 'q') && - !is_oper) + !strchr(Channel_UserModes(chan, from), 'q')) return IRC_WriteStrClient(from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID(from), Channel_Name(chan));

1 0

DNS : Increased maximum number of possible user and channel modes
by alex＠arthur.barton.de 19 Okt '12

19 Okt '12

Module: ngircd.git Branch: master Commit: 58abd0777b0924e5cb8fa6c01b56305d9b175608 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=58abd077… Author: DNS <dns(a)rbose.org> Date: Thu Oct 11 01:53:20 2012 +0200 Increased maximum number of possible user and channel modes Currntly ngIRCd supports 13 user and 15 channel modes, because there have been quite a few additions since our last release. But our data structures can only hold 15 user and -- even worse! -- only 9 channel modes! So enlarge the buffers to 20 bytes (actually 21 including NULL) to allow storing of all mode characters and to have some space left for more modes to come ... (cherry picked from commit 8996d777621d88d4bcc439ab4792b2814920687f) --- src/ngircd/defines.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 977bc74..b387493 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -108,7 +108,7 @@ #define CLIENT_HOST_LEN 64 /** Max. length of all client modes (including NULL). */ -#define CLIENT_MODE_LEN 16 +#define CLIENT_MODE_LEN 21 /** Max. length of server info texts (including NULL). */ #define CLIENT_INFO_LEN 64 @@ -123,7 +123,7 @@ #define CHANNEL_NAME_LEN 51 /** Max. length of channel modes (including NULL). */ -#define CHANNEL_MODE_LEN 9 +#define CHANNEL_MODE_LEN 21 /** Max. IRC command length (including NULL), see. RFC 2812 section 3.2. */ #define COMMAND_LEN 513

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates Oktober 2012