- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : IRC_Send_LUSERS(): Code cleanup
by alex＠arthur.barton.de 28 Dez '11

28 Dez '11

Module: ngircd.git Branch: master Commit: 43509fd22c30e0ce1f1eb02fd584a0693177d880 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=43509fd2… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 28 14:52:21 2011 +0100 IRC_Send_LUSERS(): Code cleanup --- src/ngircd/irc-info.c | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 1d91609..cdd03bb 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1277,38 +1277,54 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req ) } /* IRC_WHOWAS */ +/** + * Send LUSERS reply to a client. + * + * @param Client The receipient of the information. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool -IRC_Send_LUSERS( CLIENT *Client ) +IRC_Send_LUSERS(CLIENT *Client) { unsigned long cnt; #ifndef STRICT_RFC unsigned long max; #endif - assert( Client != NULL ); + assert(Client != NULL); /* Users, services and serevers in the network */ - if( ! IRC_WriteStrClient( Client, RPL_LUSERCLIENT_MSG, Client_ID( Client ), Client_UserCount( ), Client_ServiceCount( ), Client_ServerCount( ))) return DISCONNECTED; + if (!IRC_WriteStrClient(Client, RPL_LUSERCLIENT_MSG, Client_ID(Client), + Client_UserCount(), Client_ServiceCount(), + Client_ServerCount())) + return DISCONNECTED; /* Number of IRC operators */ cnt = Client_OperCount( ); - if( cnt > 0 ) - { - if( ! IRC_WriteStrClient( Client, RPL_LUSEROP_MSG, Client_ID( Client ), cnt )) return DISCONNECTED; + if (cnt > 0) { + if (!IRC_WriteStrClient(Client, RPL_LUSEROP_MSG, + Client_ID(Client), cnt)) + return DISCONNECTED; } /* Unknown connections */ cnt = Client_UnknownCount( ); - if( cnt > 0 ) - { - if( ! IRC_WriteStrClient( Client, RPL_LUSERUNKNOWN_MSG, Client_ID( Client ), cnt )) return DISCONNECTED; + if (cnt > 0) { + if (!IRC_WriteStrClient(Client, RPL_LUSERUNKNOWN_MSG, + Client_ID(Client), cnt)) + return DISCONNECTED; } /* Number of created channels */ - if( ! IRC_WriteStrClient( Client, RPL_LUSERCHANNELS_MSG, Client_ID( Client ), Channel_Count( ))) return DISCONNECTED; + if (!IRC_WriteStrClient(Client, RPL_LUSERCHANNELS_MSG, + Client_ID(Client), Channel_Count())) + return DISCONNECTED; /* Number of local users, services and servers */ - if( ! IRC_WriteStrClient( Client, RPL_LUSERME_MSG, Client_ID( Client ), Client_MyUserCount( ), Client_MyServiceCount( ), Client_MyServerCount( ))) return DISCONNECTED; + if (!IRC_WriteStrClient(Client, RPL_LUSERME_MSG, Client_ID(Client), + Client_MyUserCount(), Client_MyServiceCount(), + Client_MyServerCount())) + return DISCONNECTED; #ifndef STRICT_RFC /* Maximum number of local users */

1 0

Alexander Barton : LUSERS reply: only count "visible" channels
by alex＠arthur.barton.de 28 Dez '11

28 Dez '11

Module: ngircd.git Branch: master Commit: 3593c1dfabd944197a79dd964f8005b8265a20a8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3593c1df… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 28 15:07:24 2011 +0100 LUSERS reply: only count "visible" channels Rename Channel_Count() to Channel_CountVisible() and only count channels that are visible to the requesting client, so the existence of secret channels is no longer revealed by using LUSERS. --- src/ngircd/channel.c | 21 ++++++++++++++++----- src/ngircd/channel.h | 2 +- src/ngircd/irc-info.c | 3 ++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 2dbf53a..4d323f2 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -352,20 +352,31 @@ Channel_Quit( CLIENT *Client, const char *Reason ) } /* Channel_Quit */ +/** + * Get number of channels this server knows and that are "visible" to + * the given client. If no client is given, all channels will be counted. + * + * @param Client The client to check or NULL. + * @return Number of channels visible to the client. + */ GLOBAL unsigned long -Channel_Count( void ) +Channel_CountVisible (CLIENT *Client) { CHANNEL *c; unsigned long count = 0; c = My_Channels; - while( c ) - { - count++; + while(c) { + if (Client) { + if (!strchr(Channel_Modes(c), 's') + || Channel_IsMemberOf(c, Client)) + count++; + } else + count++; c = c->next; } return count; -} /* Channel_Count */ +} GLOBAL unsigned long diff --git a/src/ngircd/channel.h b/src/ngircd/channel.h index f44e194..ba3f2ca 100644 --- a/src/ngircd/channel.h +++ b/src/ngircd/channel.h @@ -72,7 +72,7 @@ GLOBAL void Channel_Quit PARAMS(( CLIENT *Client, const char *Reason )); GLOBAL void Channel_Kick PARAMS((CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name, const char *Reason)); -GLOBAL unsigned long Channel_Count PARAMS(( void )); +GLOBAL unsigned long Channel_CountVisible PARAMS((CLIENT *Client)); GLOBAL unsigned long Channel_MemberCount PARAMS(( CHANNEL *Chan )); GLOBAL int Channel_CountForUser PARAMS(( CLIENT *Client )); diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index cdd03bb..0119257 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1317,7 +1317,8 @@ IRC_Send_LUSERS(CLIENT *Client) /* Number of created channels */ if (!IRC_WriteStrClient(Client, RPL_LUSERCHANNELS_MSG, - Client_ID(Client), Channel_Count())) + Client_ID(Client), + Channel_CountVisible(Client))) return DISCONNECTED; /* Number of local users, services and servers */

1 0

Alexander Barton : Don't stop mode handling on unknown modes; skip it
by alex＠arthur.barton.de 28 Dez '11

28 Dez '11

Module: ngircd.git Branch: master Commit: a71abfef4b82aace4989db6a4ed3c94d1266b287 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a71abfef… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 28 14:39:47 2011 +0100 Don't stop mode handling on unknown modes; skip it Unknown user and channel modes no longer stop the mode parser, but are simply ignored. Therefore modes after the unknown one are now handled. This is how ircd2.10/ircd2.11/ircd-seven behave, at least. Reported by Cahata -- thanks! --- src/ngircd/irc-mode.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index ba44a3b..d8329b1 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -253,7 +253,6 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) set ? '+' : '-', *mode_ptr); x[0] = '\0'; - goto client_exit; } else { Log(LOG_DEBUG, "Handling unknown mode \"%c%c\" from \"%s\" for \"%s\" ...", @@ -278,7 +277,6 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) strlcat(the_modes, x, sizeof(the_modes)); } } -client_exit: /* Are there changed modes? */ if (the_modes[1]) { @@ -671,7 +669,6 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Client_ID(Origin), set ? '+' : '-', *mode_ptr); x[0] = '\0'; - goto chan_exit; } else { Log(LOG_DEBUG, "Handling unknown mode \"%c%c\" from \"%s\" on %s ...",

1 0

Alexander Barton : Don't stop mode handling on unknown modes; skip it
by alex＠arthur.barton.de 28 Dez '11

28 Dez '11

Module: ngircd.git Branch: master Commit: 6ff3b9f1f5086960ac8efb0ae122a7ce90554b71 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6ff3b9f1… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 28 14:39:47 2011 +0100 Don't stop mode handling on unknown modes; skip it Unknown user and channel modes no longer stop the mode parser, but are simply ignored. Therefore modes after the unknown one are now handled. This is how ircd2.10/ircd2.10/ircd-seven behave, at least. --- src/ngircd/irc-mode.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index ba44a3b..d8329b1 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -253,7 +253,6 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) set ? '+' : '-', *mode_ptr); x[0] = '\0'; - goto client_exit; } else { Log(LOG_DEBUG, "Handling unknown mode \"%c%c\" from \"%s\" for \"%s\" ...", @@ -278,7 +277,6 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) strlcat(the_modes, x, sizeof(the_modes)); } } -client_exit: /* Are there changed modes? */ if (the_modes[1]) { @@ -671,7 +669,6 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Client_ID(Origin), set ? '+' : '-', *mode_ptr); x[0] = '\0'; - goto chan_exit; } else { Log(LOG_DEBUG, "Handling unknown mode \"%c%c\" from \"%s\" on %s ...",

1 0

Alexander Barton : IRC_xLINE(): output an error message for unexpected " lines"
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 8a8e8a3a23576ccdf06aec7d0a2e6a0d8584a9d8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8a8e8a3a… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 20:11:43 2011 +0100 IRC_xLINE(): output an error message for unexpected "lines" This fixes: irc-oper.c: In function ‘IRC_xLINE’: irc-oper.c:429: warning: ‘class’ may be used uninitialized in this function irc-oper.c:430: warning: ‘class_c’ may be used uninitialized in this function --- src/ngircd/irc-oper.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c index 1b269e3..21577f0 100644 --- a/src/ngircd/irc-oper.c +++ b/src/ngircd/irc-oper.c @@ -450,6 +450,11 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req) case 'K': class = CLASS_KLINE; class_c = 'K'; break; + default: + Log(LOG_CRIT, + "IRC_xLINE() called for unknown line: %c!? Ignored.", + Req->command[0]); + return CONNECTED; } if (Req->argc == 1) {

1 0

Alexander Barton : README: Update list of implemented commands
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 65befdafaa53843eacf5abf9c079cf8f0d2597b0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=65befdaf… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 20:01:28 2011 +0100 README: Update list of implemented commands --- README | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index 3c39cad..888385c 100644 --- a/README +++ b/README @@ -33,12 +33,12 @@ used in real IRC networks. Implemented IRC-commands are: -ADMIN, AWAY, CHANINFO, CONNECT, DIE, DISCONNECT, ERROR, HELP, INFO, INVITE, -ISON, JOIN, KICK, KILL, LINKS, LIST, LUSERS, MODE, MOTD, NAMES, NICK, NJOIN, -NOTICE, OPER, PART, PASS, PING, PONG, PRIVMSG, QUIT, REHASH, RESTART, SERVER, -SERVICE, SERVLIST, SQUERY, SQUIT, STATS, SUMMON, TIME, TOPIC, TRACE, USER, -USERHOST, USERS, VERSION, WALLOPS, WEBIRC, WHO, WHOIS, WHOWAS. - +ADMIN, AWAY, CHANINFO, CONNECT, DIE, DISCONNECT, ERROR, GLINE, HELP, INFO, +INVITE, ISON, JOIN, KICK, KILL, KLINE, LINKS, LIST, LUSERS, MODE, MOTD, +NAMES, NICK, NJOIN, NOTICE, OPER, PART, PASS, PING, PONG, PRIVMSG, QUIT, +REHASH, RESTART, SERVER, SERVICE, SERVLIST, SQUERY, SQUIT, STATS, SUMMON, +TIME, TOPIC, TRACE, USER, USERHOST, USERS, VERSION, WALLOPS, WEBIRC, WHO, +WHOIS, WHOWAS. III. Features (or: why use ngIRCd?) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 0

Alexander Barton : Update list item, if it already exists
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 15fec92ed75c3de0b32c40d005e93e3f61aef77e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=15fec92e… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 19:43:00 2011 +0100 Update list item, if it already exists This updates the "validity" (timeout) as well as the "reason" text, if given. --- src/ngircd/lists.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 11f8e88..27a51dc 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -126,8 +126,19 @@ Lists_Add(struct list_head *h, const char *Mask, time_t ValidUntil, assert(h != NULL); assert(Mask != NULL); - if (Lists_CheckDupeMask(h, Mask)) + e = Lists_CheckDupeMask(h, Mask); + if (e) { + e->valid_until = ValidUntil; + if (e->reason) + free(e->reason); + e->reason = malloc(strlen(Reason) + 1); + if (e->reason) + strlcpy(e->reason, Reason, strlen(Reason) + 1); + else + Log(LOG_EMERG, + "Can't allocate memory for new list reason text!"); return true; + } e = Lists_GetFirst(h);

1 0

Alexander Barton : Synchronize G-Lines on server login
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 164e15b8c6eb86d4ae640d64a849945e0b4395b0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=164e15b8… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 19:12:40 2011 +0100 Synchronize G-Lines on server login --- src/ngircd/numeric.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/ngircd/numeric.c b/src/ngircd/numeric.c index ba6c025..0440768 100644 --- a/src/ngircd/numeric.c +++ b/src/ngircd/numeric.c @@ -28,6 +28,7 @@ #include "conn.h" #include "conn-func.h" #include "channel.h" +#include "class.h" #include "irc-write.h" #include "lists.h" #include "log.h" @@ -194,8 +195,10 @@ Announce_User(CLIENT * Client, CLIENT * User) #ifdef IRCPLUS /** - * Synchronize invite and ban lists between servers - * @param Client New server + * Synchronize invite, ban, G- and K-Line lists between servers. + * + * @param Client New server. + * @return CONNECTED or DISCONNECTED. */ static bool Synchronize_Lists(CLIENT * Client) @@ -206,6 +209,18 @@ Synchronize_Lists(CLIENT * Client) assert(Client != NULL); + /* g-lines */ + head = Class_GetList(CLASS_GLINE); + elem = Lists_GetFirst(head); + while (elem) { + if (!IRC_WriteStrClient(Client, "GLINE %s %ld :%s", + Lists_GetMask(elem), + Lists_GetValidity(elem) - time(NULL), + Lists_GetReason(elem))) + return DISCONNECTED; + elem = Lists_GetNext(elem); + } + c = Channel_First(); while (c) { /* ban list */

1 0

Alexander Barton : Log better error messages when rejecting clients
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 338758799d601a4f70c379d2d692b0178cea882f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=33875879… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 19:27:06 2011 +0100 Log better error messages when rejecting clients --- src/ngircd/irc-login.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 140d68e..8d82160 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -47,7 +47,7 @@ static bool Hello_User PARAMS(( CLIENT *Client )); static bool Hello_User_PostAuth PARAMS(( CLIENT *Client )); static void Kill_Nick PARAMS(( char *Nick, char *Reason )); static void Introduce_Client PARAMS((CLIENT *To, CLIENT *Client, int Type)); -static void Reject_Client PARAMS((CLIENT *Client)); +static void Reject_Client PARAMS((CLIENT *Client, const char *InternalReason)); static void cb_introduceClient PARAMS((CLIENT *Client, CLIENT *Prefix, void *i)); @@ -945,7 +945,7 @@ Hello_User(CLIENT * Client) * passwords supplied are classified as "wrong". */ if(Client_Password(Client)[0] == '\0') return Hello_User_PostAuth(Client); - Reject_Client(Client); + Reject_Client(Client, "non-empty password"); return DISCONNECTED; } @@ -972,7 +972,7 @@ Hello_User(CLIENT * Client) /* Check global server password ... */ if (strcmp(Client_Password(Client), Conf_ServerPwd) != 0) { /* Bad password! */ - Reject_Client(Client); + Reject_Client(Client, "bad server password"); return DISCONNECTED; } return Hello_User_PostAuth(Client); @@ -1017,7 +1017,7 @@ cb_Read_Auth_Result(int r_fd, UNUSED short events) if (len != sizeof(result)) { Log(LOG_CRIT, "Auth: Got malformed result!"); - Reject_Client(client); + Reject_Client(client, "internal error"); return; } @@ -1025,7 +1025,7 @@ cb_Read_Auth_Result(int r_fd, UNUSED short events) Client_SetUser(client, Client_OrigUser(client), true); (void)Hello_User_PostAuth(client); } else - Reject_Client(client); + Reject_Client(client, "bad password"); } #endif @@ -1040,12 +1040,12 @@ cb_Read_Auth_Result(int r_fd, UNUSED short events) * @param Client The client to reject. */ static void -Reject_Client(CLIENT *Client) +Reject_Client(CLIENT *Client, const char *InternalReason) { Log(LOG_ERR, - "User \"%s\" rejected (connection %d): Access denied!", - Client_Mask(Client), Client_Conn(Client)); - Conn_Close(Client_Conn(Client), NULL, + "User \"%s\" rejected (connection %d): %s!", + Client_Mask(Client), Client_Conn(Client), InternalReason); + Conn_Close(Client_Conn(Client), InternalReason, "Access denied! Bad password?", true); } @@ -1062,9 +1062,12 @@ Reject_Client(CLIENT *Client) static bool Hello_User_PostAuth(CLIENT *Client) { - if (Class_IsMember(CLASS_GLINE, Client) || - Class_IsMember(CLASS_KLINE, Client)) { - Reject_Client(Client); + if (Class_IsMember(CLASS_GLINE, Client)) { + Reject_Client(Client, "G-Line'd"); + return DISCONNECTED; + } + if (Class_IsMember(CLASS_KLINE, Client)) { + Reject_Client(Client, "K-Line'd"); return DISCONNECTED; }

1 0

Alexander Barton : Lists_CheckDupeMask(): return pointer to already existing item
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 1e4a00f94f32edf5c2240864b7e56f69636312f4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1e4a00f9… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 19:42:03 2011 +0100 Lists_CheckDupeMask(): return pointer to already existing item The old behavior of returning true/false is compatible to this change, so there are no other code changes required. --- src/ngircd/lists.c | 6 +++--- src/ngircd/lists.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 63c16b0..11f8e88 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -240,17 +240,17 @@ Lists_Free(struct list_head *head) * @param Mask IRC mask to test. * @return true if mask is already stored in the list, false otherwise. */ -GLOBAL bool +GLOBAL struct list_elem * Lists_CheckDupeMask(const struct list_head *h, const char *Mask ) { struct list_elem *e; e = h->first; while (e) { if (strcasecmp(e->mask, Mask) == 0) - return true; + return e; e = e->next; } - return false; + return NULL; } /** diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index f9a4c91..f709f3f 100644 --- a/src/ngircd/lists.h +++ b/src/ngircd/lists.h @@ -30,7 +30,7 @@ GLOBAL struct list_elem *Lists_GetFirst PARAMS((const struct list_head *)); GLOBAL struct list_elem *Lists_GetNext PARAMS((const struct list_elem *)); GLOBAL bool Lists_Check PARAMS((struct list_head *head, CLIENT *client)); -GLOBAL bool Lists_CheckDupeMask PARAMS((const struct list_head *head, +GLOBAL struct list_elem *Lists_CheckDupeMask PARAMS((const struct list_head *head, const char *mask)); GLOBAL bool Lists_Add PARAMS((struct list_head *h, const char *Mask,

1 0