ngIRCd GIT Updates Januar 2012

ngircd-commits@lists.barton.de

2 Teilnehmer
75 Diskussionen

Alexander Barton : New_Connection(): don't set the client hostname twice
by alex＠arthur.barton.de 25 Jan '12

25 Jan '12

Module: ngircd.git Branch: master Commit: c16133c5ee72256ef5b8fa586e72e5e3598e75bb URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c16133c5… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 25 17:11:44 2012 +0100 New_Connection(): don't set the client hostname twice Setting the hostname twice doesn't do much harm a lot, but isn't elegant. And for IPv6 addresses, it isn't correct the first time (missing []) ... --- src/ngircd/client.c | 1 - src/ngircd/conn.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 078449c..7e28e8f 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -186,7 +186,6 @@ Init_New_Client(CONN_ID Idx, CLIENT *Introducer, CLIENT *TopServer, assert(Idx >= NONE); assert(Introducer != NULL); - assert(Hostname != NULL); client = New_Client_Struct(); if (!client) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 71dc939..82dbb28 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1438,7 +1438,7 @@ New_Connection(int Sock) return -1; } - c = Client_NewLocal(new_sock, ip_str, CLIENT_UNKNOWN, false); + c = Client_NewLocal(new_sock, NULL, CLIENT_UNKNOWN, false); if (!c) { Log(LOG_ALERT, "Can't accept connection: can't create client structure!");

1 0

Alexander Barton : Client_SetHostname(): Code cleanup, more debug logging
by alex＠arthur.barton.de 25 Jan '12

25 Jan '12

Module: ngircd.git Branch: master Commit: 48889844299e036515e567aa5f992df18ccdf2d7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=48889844… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 25 17:11:00 2012 +0100 Client_SetHostname(): Code cleanup, more debug logging --- src/ngircd/client.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 1aaf687..078449c 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -313,16 +313,29 @@ Client_Destroy( CLIENT *Client, const char *LogMsg, const char *FwdMsg, bool Sen } /* Client_Destroy */ +/** + * Set client hostname. + * + * If global hostname cloaking is in effect, don't set the real hostname + * but the configured one. + * + * @param Client The client of which the hostname should be set. + * @param Hostname The new hostname. + */ GLOBAL void Client_SetHostname( CLIENT *Client, const char *Hostname ) { - assert( Client != NULL ); - assert( Hostname != NULL ); + assert(Client != NULL); + assert(Hostname != NULL); if (strlen(Conf_CloakHost)) { - strlcpy( Client->host, Conf_CloakHost, sizeof( Client->host )); + LogDebug("Updating hostname of \"%s\": \"%s\" -> \"%s\"", + Client_ID(Client), Client->host, Conf_CloakHost); + strlcpy(Client->host, Conf_CloakHost, sizeof(Client->host)); } else { - strlcpy( Client->host, Hostname, sizeof( Client->host )); + LogDebug("Updating hostname of \"%s\": \"%s\" -> \"%s\"", + Client_ID(Client), Client->host, Hostname); + strlcpy(Client->host, Hostname, sizeof(Client->host)); } } /* Client_SetHostname */

1 0

Florian Westphal : io: remove outer do {} while loops for epoll/kqueue/ devpoll backends
by fw＠arthur.barton.de 24 Jan '12

24 Jan '12

Module: ngircd.git Branch: master Commit: c7dd5ea0baeff589a569cdc7ffd46fc83e885ab2 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c7dd5ea0… Author: Florian Westphal <fw(a)strlen.de> Date: Tue Jan 24 21:57:23 2012 +0100 io: remove outer do {} while loops for epoll/kqueue/devpoll backends simplifies things a bit. io_dispatch() is called repeatedly from the main loop. --- src/ngircd/io.c | 156 ++++++++++++++++++++++++------------------------------- 1 files changed, 68 insertions(+), 88 deletions(-) diff --git a/src/ngircd/io.c b/src/ngircd/io.c index f44dfbf..f061ce0 100644 --- a/src/ngircd/io.c +++ b/src/ngircd/io.c @@ -160,39 +160,34 @@ io_dispatch_devpoll(struct timeval *tv) { struct dvpoll dvp; time_t sec = tv->tv_sec * 1000; - int i, total, ret, timeout = tv->tv_usec + sec; + int i, ret, timeout = tv->tv_usec + sec; short what; struct pollfd p[100]; if (timeout < 0) timeout = 1000; - total = 0; - do { - dvp.dp_timeout = timeout; - dvp.dp_nfds = 100; - dvp.dp_fds = p; - ret = ioctl(io_masterfd, DP_POLL, &dvp); - total += ret; - if (ret <= 0) - return total; - for (i=0; i < ret ; i++) { - what = 0; - if (p[i].revents & (POLLIN|POLLPRI)) - what = IO_WANTREAD; - - if (p[i].revents & POLLOUT) - what |= IO_WANTWRITE; - - if (p[i].revents && !what) { - /* other flag is set, probably POLLERR */ - what = IO_ERROR; - } - io_docallback(p[i].fd, what); + dvp.dp_timeout = timeout; + dvp.dp_nfds = 100; + dvp.dp_fds = p; + ret = ioctl(io_masterfd, DP_POLL, &dvp); + + for (i=0; i < ret ; i++) { + what = 0; + if (p[i].revents & (POLLIN|POLLPRI)) + what = IO_WANTREAD; + + if (p[i].revents & POLLOUT) + what |= IO_WANTWRITE; + + if (p[i].revents && !what) { + /* other flag is set, probably POLLERR */ + what = IO_ERROR; } - } while (ret == 100); + io_docallback(p[i].fd, what); + } - return total; + return ret; } @@ -462,37 +457,30 @@ static int io_dispatch_epoll(struct timeval *tv) { time_t sec = tv->tv_sec * 1000; - int i, total = 0, ret, timeout = tv->tv_usec + sec; + int i, ret, timeout = tv->tv_usec + sec; struct epoll_event epoll_ev[100]; short type; if (timeout < 0) timeout = 1000; - do { - ret = epoll_wait(io_masterfd, epoll_ev, 100, timeout); - total += ret; - if (ret <= 0) - return total; - - for (i = 0; i < ret; i++) { - type = 0; - if (epoll_ev[i].events & (EPOLLERR | EPOLLHUP)) - type = IO_ERROR; + ret = epoll_wait(io_masterfd, epoll_ev, 100, timeout); - if (epoll_ev[i].events & (EPOLLIN | EPOLLPRI)) - type |= IO_WANTREAD; + for (i = 0; i < ret; i++) { + type = 0; + if (epoll_ev[i].events & (EPOLLERR | EPOLLHUP)) + type = IO_ERROR; - if (epoll_ev[i].events & EPOLLOUT) - type |= IO_WANTWRITE; + if (epoll_ev[i].events & (EPOLLIN | EPOLLPRI)) + type |= IO_WANTREAD; - io_docallback(epoll_ev[i].data.fd, type); - } + if (epoll_ev[i].events & EPOLLOUT) + type |= IO_WANTWRITE; - timeout = 0; - } while (ret == 100); + io_docallback(epoll_ev[i].data.fd, type); + } - return total; + return ret; } static void @@ -576,7 +564,7 @@ io_event_change_kqueue(int fd, short what, const int action) static int io_dispatch_kqueue(struct timeval *tv) { - int i, total = 0, ret; + int i, ret; struct kevent kev[100]; struct kevent *newevents; struct timespec ts; @@ -584,50 +572,42 @@ io_dispatch_kqueue(struct timeval *tv) ts.tv_sec = tv->tv_sec; ts.tv_nsec = tv->tv_usec * 1000; - do { - newevents_len = (int) array_length(&io_evcache, sizeof (struct kevent)); - newevents = (newevents_len > 0) ? array_start(&io_evcache) : NULL; - assert(newevents_len >= 0); - - ret = kevent(io_masterfd, newevents, newevents_len, kev, 100, &ts); - if (newevents && ret != -1) - array_trunc(&io_evcache); - - total += ret; - if (ret <= 0) - return total; - - for (i = 0; i < ret; i++) { - io_debug("dispatch_kqueue: fd, kev.flags", (int)kev[i].ident, kev[i].flags); - if (kev[i].flags & (EV_EOF|EV_ERROR)) { - if (kev[i].flags & EV_ERROR) - Log(LOG_ERR, "kevent fd %d: EV_ERROR (%s)", - (int)kev[i].ident, strerror((int)kev[i].data)); - io_docallback((int)kev[i].ident, IO_ERROR); - continue; - } - - switch (kev[i].filter) { - case EVFILT_READ: - io_docallback((int)kev[i].ident, IO_WANTREAD); - break; - case EVFILT_WRITE: - io_docallback((int)kev[i].ident, IO_WANTWRITE); - break; - default: - LogDebug("Unknown kev.filter number %d for fd %d", - kev[i].filter, kev[i].ident); - /* Fall through */ - case EV_ERROR: - io_docallback((int)kev[i].ident, IO_ERROR); - break; - } + newevents_len = (int) array_length(&io_evcache, sizeof (struct kevent)); + newevents = (newevents_len > 0) ? array_start(&io_evcache) : NULL; + assert(newevents_len >= 0); + + ret = kevent(io_masterfd, newevents, newevents_len, kev, 100, &ts); + if (newevents && ret != -1) + array_trunc(&io_evcache); + + for (i = 0; i < ret; i++) { + io_debug("dispatch_kqueue: fd, kev.flags", (int)kev[i].ident, kev[i].flags); + if (kev[i].flags & (EV_EOF|EV_ERROR)) { + if (kev[i].flags & EV_ERROR) + Log(LOG_ERR, "kevent fd %d: EV_ERROR (%s)", + (int)kev[i].ident, strerror((int)kev[i].data)); + io_docallback((int)kev[i].ident, IO_ERROR); + continue; + } + + switch (kev[i].filter) { + case EVFILT_READ: + io_docallback((int)kev[i].ident, IO_WANTREAD); + break; + case EVFILT_WRITE: + io_docallback((int)kev[i].ident, IO_WANTWRITE); + break; + default: + LogDebug("Unknown kev.filter number %d for fd %d", + kev[i].filter, kev[i].ident); + /* Fall through */ + case EV_ERROR: + io_docallback((int)kev[i].ident, IO_ERROR); + break; } - ts.tv_sec = 0; - ts.tv_nsec = 0; - } while (ret == 100); + } - return total; + return ret; } static void

1 0

Florian Westphal : io: use define for number of possible events
by fw＠arthur.barton.de 24 Jan '12

24 Jan '12

Module: ngircd.git Branch: master Commit: 44bb22d23ec6841457db41732caa6f5f9129b615 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=44bb22d2… Author: Florian Westphal <fw(a)strlen.de> Date: Tue Jan 24 22:24:47 2012 +0100 io: use define for number of possible events --- src/ngircd/io.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ngircd/io.c b/src/ngircd/io.c index f061ce0..9ffdfd6 100644 --- a/src/ngircd/io.c +++ b/src/ngircd/io.c @@ -41,6 +41,7 @@ typedef struct { #define INIT_IOEVENT { NULL, -1, 0, NULL } #define IO_ERROR 4 +#define MAX_EVENTS 100 #ifdef HAVE_EPOLL_CREATE # define IO_USE_EPOLL 1 @@ -162,13 +163,13 @@ io_dispatch_devpoll(struct timeval *tv) time_t sec = tv->tv_sec * 1000; int i, ret, timeout = tv->tv_usec + sec; short what; - struct pollfd p[100]; + struct pollfd p[MAX_EVENTS]; if (timeout < 0) timeout = 1000; dvp.dp_timeout = timeout; - dvp.dp_nfds = 100; + dvp.dp_nfds = MAX_EVENTS; dvp.dp_fds = p; ret = ioctl(io_masterfd, DP_POLL, &dvp); @@ -458,13 +459,13 @@ io_dispatch_epoll(struct timeval *tv) { time_t sec = tv->tv_sec * 1000; int i, ret, timeout = tv->tv_usec + sec; - struct epoll_event epoll_ev[100]; + struct epoll_event epoll_ev[MAX_EVENTS]; short type; if (timeout < 0) timeout = 1000; - ret = epoll_wait(io_masterfd, epoll_ev, 100, timeout); + ret = epoll_wait(io_masterfd, epoll_ev, MAX_EVENTS, timeout); for (i = 0; i < ret; i++) { type = 0; @@ -565,7 +566,7 @@ static int io_dispatch_kqueue(struct timeval *tv) { int i, ret; - struct kevent kev[100]; + struct kevent kev[MAX_EVENTS]; struct kevent *newevents; struct timespec ts; int newevents_len; @@ -576,7 +577,7 @@ io_dispatch_kqueue(struct timeval *tv) newevents = (newevents_len > 0) ? array_start(&io_evcache) : NULL; assert(newevents_len >= 0); - ret = kevent(io_masterfd, newevents, newevents_len, kev, 100, &ts); + ret = kevent(io_masterfd, newevents, newevents_len, kev, MAX_EVENTS, &ts); if (newevents && ret != -1) array_trunc(&io_evcache);

1 0

Alexander Barton : Enhance server command limits
by alex＠arthur.barton.de 24 Jan '12

24 Jan '12

Module: ngircd.git Branch: master Commit: 871760583cb4f90e908d3dac94679ce876d78c83 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=87176058… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 24 02:55:53 2012 +0100 Enhance server command limits This patch updates the limits for handling commands from a remote server: - "<user count> / 5 + <min>" using "<min>=10" during normal operation, - the above count multiplied with 5 while servers are syncing. The intention is to a) make the limit dependent of the number of users in the network (the more users, the more commands required to sync) and b) to significantly rise this limit while servers are joining the network to make the login and synchronization faster. --- src/ngircd/conn.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index f743d1f..71dc939 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -82,8 +82,8 @@ #define SERVER_WAIT (NONE - 1) #define MAX_COMMANDS 3 -#define MAX_COMMANDS_SERVER 10 -#define MAX_COMMANDS_SERVICE MAX_COMMANDS_SERVER +#define MAX_COMMANDS_SERVER_MIN 10 +#define MAX_COMMANDS_SERVICE 10 static bool Handle_Write PARAMS(( CONN_ID Idx )); @@ -1674,16 +1674,15 @@ Handle_Buffer(CONN_ID Idx) assert(c != NULL); - /* Servers do get special command limits, so they can process - * all the messages that are required while peering. */ + /* Servers get special command limits that depend on the user count */ switch (Client_Type(c)) { case CLIENT_SERVER: - /* Allow servers to send more commands in the first 10 secods + maxcmd = (int)(Client_UserCount() / 5) + + MAX_COMMANDS_SERVER_MIN; + /* Allow servers to handle even more commands while peering * to speed up server login and network synchronisation. */ - if (starttime - Client_StartTime(c) < 10) - maxcmd = MAX_COMMANDS_SERVER * 5; - else - maxcmd = MAX_COMMANDS_SERVER; + if (Conn_LastPing(Idx) == 0) + maxcmd *= 5; break; case CLIENT_SERVICE: maxcmd = MAX_COMMANDS_SERVICE; break;

1 0

Alexander Barton : Send a PING at the end of the server sync to detect it
by alex＠arthur.barton.de 24 Jan '12

24 Jan '12

Module: ngircd.git Branch: master Commit: bc20f9ec1076a67a81ed8e7c3489ffbdf3387e53 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bc20f9ec… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 24 02:46:12 2012 +0100 Send a PING at the end of the server sync to detect it At the end of sending all "state" to the remote server, a PING command is sent to request a PONG reply. Until then, no "regual" PING was sent, so Conn_LastPing(<connection>) is null and now becomes non-null in the PONG command handler. So the servers are still synchronizing when Conn_LastPing(<connection>) is 0, which could easily be tested. --- src/ngircd/irc-login.c | 19 ++++++++++--------- src/ngircd/numeric.c | 4 ++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 54818fe..133a0e5 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -889,15 +889,16 @@ IRC_PONG(CLIENT *Client, REQUEST *Req) } #endif -#ifdef DEBUG - if (conn > NONE) - Log(LOG_DEBUG, - "Connection %d: received PONG. Lag: %ld seconds.", conn, - time(NULL) - Conn_LastPing(Client_Conn(Client))); - else - Log(LOG_DEBUG, - "Connection %d: received PONG.", conn); -#endif + if (Client_Type(Client) == CLIENT_SERVER && Conn_LastPing(conn) == 0) { + Log(LOG_INFO, + "Synchronization with \"%s\" done (connection %d): %ld seconds [%ld users, %ld channels]", + Client_ID(Client), conn, time(NULL) - Conn_GetSignon(conn), + Client_UserCount(), Channel_CountVisible(NULL)); + Conn_UpdatePing(conn); + } else + LogDebug("Connection %d: received PONG. Lag: %ld seconds.", + conn, time(NULL) - Conn_LastPing(conn)); + return CONNECTED; } /* IRC_PONG */ diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c index 0440768..d59a1dc 100644 --- a/src/ngircd/numeric.c +++ b/src/ngircd/numeric.c @@ -384,6 +384,10 @@ IRC_Num_ENDOFMOTD(CLIENT * Client, UNUSED REQUEST * Req) } #endif + if (!IRC_WriteStrClient(Client, "PING :%s", + Client_ID(Client_ThisServer()))) + return DISCONNECTED; + return CONNECTED; } /* IRC_Num_ENDOFMOTD */

1 0

Alexander Barton : New function Conn_UpdatePing() to update the " ping timestamp"
by alex＠arthur.barton.de 24 Jan '12

24 Jan '12

Module: ngircd.git Branch: master Commit: 5a200e154347bde2a885ad1ede620d8d946b6420 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5a200e15… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 24 02:44:57 2012 +0100 New function Conn_UpdatePing() to update the "ping timestamp" --- src/ngircd/conn-func.c | 11 +++++++++++ src/ngircd/conn-func.h | 4 +++- src/ngircd/conn.c | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c index 23c2075..e81a79e 100644 --- a/src/ngircd/conn-func.c +++ b/src/ngircd/conn-func.c @@ -43,6 +43,17 @@ Conn_UpdateIdle(CONN_ID Idx) My_Connections[Idx].lastprivmsg = time(NULL); } +/** + * Update "ping timestamp", the time of the last outgoing PING request. + * + * @param Idx Connection index. + */ +GLOBAL void +Conn_UpdatePing(CONN_ID Idx) +{ + assert(Idx > NONE); + My_Connections[Idx].lastping = time(NULL); +} /* * Get signon time of a connection. diff --git a/src/ngircd/conn-func.h b/src/ngircd/conn-func.h index 729860e..21bbcdb 100644 --- a/src/ngircd/conn-func.h +++ b/src/ngircd/conn-func.h @@ -29,7 +29,9 @@ #endif -GLOBAL void Conn_UpdateIdle PARAMS(( CONN_ID Idx )); +GLOBAL void Conn_UpdateIdle PARAMS((CONN_ID Idx)); +GLOBAL void Conn_UpdatePing PARAMS((CONN_ID Idx)); + GLOBAL time_t Conn_GetSignon PARAMS((CONN_ID Idx)); GLOBAL time_t Conn_GetIdle PARAMS(( CONN_ID Idx )); GLOBAL time_t Conn_LastPing PARAMS(( CONN_ID Idx )); diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 35d7400..f743d1f 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1850,7 +1850,7 @@ Check_Connections(void) time(NULL) - Conf_PingTimeout) { /* We need to send a PING ... */ LogDebug("Connection %d: sending PING ...", i); - My_Connections[i].lastping = time(NULL); + Conn_UpdatePing(i); Conn_WriteStr(i, "PING :%s", Client_ID(Client_ThisServer())); }

1 0

Alexander Barton : Conn_UpdateIdle(): Code cleanup
by alex＠arthur.barton.de 24 Jan '12

24 Jan '12

Module: ngircd.git Branch: master Commit: d2df7396a89b3e8de44379c305916bfee93ceb9b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d2df7396… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 24 02:43:55 2012 +0100 Conn_UpdateIdle(): Code cleanup --- src/ngircd/conn-func.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c index 32001f0..23c2075 100644 --- a/src/ngircd/conn-func.c +++ b/src/ngircd/conn-func.c @@ -30,11 +30,17 @@ #include "conn-func.h" +/** + * Update "idle timestamp", the time of the last visible user action + * (e. g. like sending messages, joining or leaving channels). + * + * @param Idx Connection index. + */ GLOBAL void -Conn_UpdateIdle( CONN_ID Idx ) +Conn_UpdateIdle(CONN_ID Idx) { - assert( Idx > NONE ); - My_Connections[Idx].lastprivmsg = time( NULL ); + assert(Idx > NONE); + My_Connections[Idx].lastprivmsg = time(NULL); }

1 0

Alexander Barton : RPL_ISUPPORT_MSG(005): add "EXCEPTS=e INVEX=I"
by alex＠arthur.barton.de 23 Jan '12

23 Jan '12

Module: ngircd.git Branch: master Commit: 3d27073d61ab52277a3237c9a2375e5deda9d690 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3d27073d… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 23 22:07:40 2012 +0100 RPL_ISUPPORT_MSG(005): add "EXCEPTS=e INVEX=I" Thanks to Cahata for the idea! --- src/ngircd/messages.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index f059077..90e0fdc 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -22,7 +22,7 @@ #define RPL_CREATED_MSG "003 %s :This server has been started %s" #define RPL_MYINFO_MSG "004 %s %s ngircd-%s %s %s" #define RPL_ISUPPORT1_MSG "005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=beI,k,l,imnOPRstz CHANLIMIT=#&+:%d :are supported on this server" -#define RPL_ISUPPORT2_MSG "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d MAXLIST=beI:%d PENALTY :are supported on this server" +#define RPL_ISUPPORT2_MSG "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d MAXLIST=beI:%d EXCEPTS=e INVEX=I PENALTY :are supported on this server" #define RPL_TRACELINK_MSG "200 %s Link %s-%s %s %s V%s %ld %d %d" #define RPL_TRACEOPERATOR_MSG "204 %s Oper 2 :%s"

1 0

Alexander Barton : Fix "MAXLIST=beI:50": the limit is the sum of all lists
by alex＠arthur.barton.de 23 Jan '12

23 Jan '12

Module: ngircd.git Branch: master Commit: b6f19ea8feceeb2246995222f03790e6f00b0dfd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b6f19ea8… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 23 21:51:38 2012 +0100 Fix "MAXLIST=beI:50": the limit is the sum of all lists "Modes which are specified in the same pair share the same maximum size", so "beI:50" means a total of 50 entries, regardless of the list. See <http://www.irc.org/tech_docs/draft-brocklesby-irc-isupport-03.txt>, thanks to Cahata for reporting this! --- src/ngircd/irc-mode.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index ad83ae9..80b2949 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -857,6 +857,7 @@ Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, { const char *mask; struct list_head *list; + long int current_count; assert(Client != NULL); assert(Channel != NULL); @@ -864,6 +865,9 @@ Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, assert(what == 'I' || what == 'b' || what == 'e'); mask = Lists_MakeMask(Pattern); + current_count = Lists_Count(Channel_GetListInvites(Channel)) + + Lists_Count(Channel_GetListExcepts(Channel)) + + Lists_Count(Channel_GetListBans(Channel)); switch(what) { case 'I': @@ -880,7 +884,7 @@ Add_To_List(char what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, if (Lists_CheckDupeMask(list, mask)) return CONNECTED; if (Client_Type(Client) == CLIENT_USER && - Lists_Count(list) >= MAX_HNDL_CHANNEL_LISTS) + current_count >= MAX_HNDL_CHANNEL_LISTS) return IRC_WriteStrClient(Client, ERR_LISTFULL_MSG, Client_ID(Client), Channel_Name(Channel), mask,

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 Januar 2012