ngIRCd GIT Updates April 2012

ngircd-commits@lists.barton.de

1 Teilnehmer
22 Diskussionen

Alexander Barton : IRC_Send_NAMES(): Code cleanup
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: f0a9dbe3ad59d3518f406f0b32a90246977ac58e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f0a9dbe3… Author: Alexander Barton <alex(a)barton.de> Date: Sat Apr 28 00:20:42 2012 +0200 IRC_Send_NAMES(): Code cleanup --- src/ngircd/irc-info.c | 77 ++++++++++++++++++++++++++++--------------------- 1 files changed, 44 insertions(+), 33 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index … [View More]841e6e6..38b9a7d 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1524,60 +1524,71 @@ IRC_Show_MOTD( CLIENT *Client ) } /* IRC_Show_MOTD */ +/** + * Send NAMES reply for a specific client and channel. + * + * @param Client The client requesting the NAMES information. + * @param Chan The channel + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool -IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan ) +IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan) { bool is_visible, is_member; char str[LINE_LEN + 1]; CL2CHAN *cl2chan; CLIENT *cl; - assert( Client != NULL ); - assert( Chan != NULL ); + assert(Client != NULL); + assert(Chan != NULL); - if( Channel_IsMemberOf( Chan, Client )) is_member = true; - else is_member = false; + if (Channel_IsMemberOf(Chan, Client)) + is_member = true; + else + is_member = false; /* Do not print info on channel memberships to anyone that is not member? */ if (Conf_MorePrivacy && !is_member) return CONNECTED; /* Secret channel? */ - if( ! is_member && strchr( Channel_Modes( Chan ), 's' )) return CONNECTED; - - /* Alle Mitglieder suchen */ - snprintf( str, sizeof( str ), RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan )); - cl2chan = Channel_FirstMember( Chan ); - while( cl2chan ) - { - cl = Channel_GetClient( cl2chan ); + if (!is_member && strchr(Channel_Modes(Chan), 's')) + return CONNECTED; - if( strchr( Client_Modes( cl ), 'i' )) is_visible = false; - else is_visible = true; + snprintf(str, sizeof(str), RPL_NAMREPLY_MSG, Client_ID(Client), "=", + Channel_Name(Chan)); + cl2chan = Channel_FirstMember(Chan); + while (cl2chan) { + cl = Channel_GetClient(cl2chan); - if( is_member || is_visible ) - { - /* Nick anhaengen */ - if( str[strlen( str ) - 1] != ':' ) strlcat( str, " ", sizeof( str )); - if( strchr( Channel_UserModes( Chan, cl ), 'o' )) strlcat( str, "@", sizeof( str )); - else if( strchr( Channel_UserModes( Chan, cl ), 'v' )) strlcat( str, "+", sizeof( str )); - strlcat( str, Client_ID( cl ), sizeof( str )); + if (strchr(Client_Modes(cl), 'i')) + is_visible = false; + else + is_visible = true; - if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 )) - { - /* Zeile wird zu lang: senden! */ - if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED; - snprintf( str, sizeof( str ), RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan )); + if (is_member || is_visible) { + if (str[strlen(str) - 1] != ':') + strlcat(str, " ", sizeof(str)); + if (strchr(Channel_UserModes(Chan, cl), 'o')) + strlcat(str, "@", sizeof(str)); + else if (strchr(Channel_UserModes(Chan, cl), 'v')) + strlcat(str, "+", sizeof(str)); + strlcat(str, Client_ID(cl), sizeof(str)); + + if (strlen(str) > (LINE_LEN - CLIENT_NICK_LEN - 4)) { + if (!IRC_WriteStrClient(Client, "%s", str)) + return DISCONNECTED; + snprintf(str, sizeof(str), RPL_NAMREPLY_MSG, + Client_ID(Client), "=", + Channel_Name(Chan)); } } - /* naechstes Mitglied suchen */ - cl2chan = Channel_NextMember( Chan, cl2chan ); + cl2chan = Channel_NextMember(Chan, cl2chan); } - if( str[strlen( str ) - 1] != ':') - { - /* Es sind noch Daten da, die gesendet werden muessen */ - if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED; + if (str[strlen(str) - 1] != ':') { + if (!IRC_WriteStrClient(Client, "%s", str)) + return DISCONNECTED; } return CONNECTED; [View Less]

1 0

Alexander Barton : New function Client_CapSet() in addition to Client_Cap{Add|Del}
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: 245782897b4a8ca092a87bf6d3961cbda1dea962 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=24578289… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 27 23:56:56 2012 +0200 New function Client_CapSet() in addition to Client_Cap{Add|Del} --- src/ngircd/client-cap.c | 11 +++++++++++ src/ngircd/client-cap.h | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/ngircd/client-cap.c … [View More]

1 0

Alexander Barton : "CAP REQ" starts capability negotiation and delays user registration
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: 2327b17656b329d6210628f24c77f51533c05620 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2327b176… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 27 22:47:22 2012 +0200 "CAP REQ" starts capability negotiation and delays user registration New helper function Set_CAP_Negotiation(). --- src/ngircd/irc-cap.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git … [View More]

1 0

Alexander Barton : Correctly handle "CAP END", new client type CLIENT_WAITCAPEND
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: da4c1ebe81bbd1335356ef40c91741b953c9f8d8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=da4c1ebe… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 31 16:37:31 2012 +0200 Correctly handle "CAP END", new client type CLIENT_WAITCAPEND --- src/ngircd/client.h | 1 + src/ngircd/irc-cap.c | 2 +- src/ngircd/login.c | 5 ++++- src/ngircd/parse.c | 2 +- 4 files changed, 7 insertions(+), 3 … [View More]

1 0

Alexander Barton : Implement core IRC capability handling and "CAP" command
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: bd3a7ccb158c9f2eac1af77804529b76d99c3e79 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=bd3a7ccb… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 31 15:59:06 2012 +0200 Implement core IRC capability handling and "CAP" command This patch implements the core functions to support "IRC Capabilities" and the IRC "CAP" command as used by other servers and specified here: <http://www.leeh.co.uk/draft-… [View More]

1 0

Alexander Barton : New "login" source file
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: edfcc2f9d5b796fd30f60138591e4f96d54cfcf6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=edfcc2f9… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 31 15:38:46 2012 +0200 New "login" source file Rename Hello_User[_PostAuth] to Login_User[_PostAuth] and move it to the new login.c; and move cb_Read_Auth_Result(), too. This will enable further code to easily call Login_User() when required. --- contrib/… [View More]

1 0

Alexander Barton : Introduce_Client() => Client_Introduce(), and move it to client.c
by alex＠arthur.barton.de 28 Apr '12

28 Apr '12

Module: ngircd.git Branch: master Commit: ee362b3bd2e31db4cb6b7832ca01e64a643f9b96 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ee362b3b… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 31 15:24:30 2012 +0200 Introduce_Client() => Client_Introduce(), and move it to client.c --- src/ngircd/client.c | 96 +++++++++++++++++++++++++++++++++++++++++++ src/ngircd/client.h | 4 +- src/ngircd/irc-login.c | 106 ++--------------------… [View More]-------------------------- 3 files changed, 103 insertions(+), 103 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 7e28e8f..1b35684 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -37,6 +37,7 @@ #include "ngircd.h" #include "channel.h" #include "conf.h" +#include "conn-func.h" #include "hash.h" #include "irc-write.h" #include "log.h" @@ -69,6 +70,8 @@ static CLIENT *Init_New_Client PARAMS((CONN_ID Idx, CLIENT *Introducer, static void Destroy_UserOrService PARAMS((CLIENT *Client,const char *Txt, const char *FwdMsg, bool SendQuit)); +static void cb_introduceClient PARAMS((CLIENT *Client, CLIENT *Prefix, + void *i)); GLOBAL void Client_Init( void ) @@ -1142,6 +1145,46 @@ Client_Reject(CLIENT *Client, const char *Reason, bool InformClient) } +/** + * Introduce a new user or service client in the network. + * + * @param From Remote server introducing the client or NULL (local). + * @param Client New client. + * @param Type Type of the client (CLIENT_USER or CLIENT_SERVICE). + */ +GLOBAL void +Client_Introduce(CLIENT *From, CLIENT *Client, int Type) +{ + /* Set client type (user or service) */ + Client_SetType(Client, Type); + + if (From) { + if (Conf_IsService(Conf_GetServer(Client_Conn(From)), + Client_ID(Client))) + Client_SetType(Client, CLIENT_SERVICE); + LogDebug("%s \"%s\" (+%s) registered (via %s, on %s, %d hop%s).", + Client_TypeText(Client), Client_Mask(Client), + Client_Modes(Client), Client_ID(From), + Client_ID(Client_Introducer(Client)), + Client_Hops(Client), Client_Hops(Client) > 1 ? "s": ""); + } else { + Log(LOG_NOTICE, "%s \"%s\" registered (connection %d).", + Client_TypeText(Client), Client_Mask(Client), + Client_Conn(Client)); + Log_ServerNotice('c', "Client connecting: %s (%s@%s) [%s] - %s", + Client_ID(Client), Client_User(Client), + Client_Hostname(Client), + Conn_IPA(Client_Conn(Client)), + Client_TypeText(Client)); + } + + /* Inform other servers */ + IRC_WriteStrServersPrefixFlag_CB(From, + From != NULL ? From : Client_ThisServer(), + '\0', cb_introduceClient, (void *)Client); +} /* Client_Introduce */ + + static unsigned long Count( CLIENT_TYPE Type ) { @@ -1361,6 +1404,59 @@ Destroy_UserOrService(CLIENT *Client, const char *Txt, const char *FwdMsg, bool } /* Destroy_UserOrService */ +/** + * Introduce a new user or service client to a remote server. + * + * This function differentiates between RFC1459 and RFC2813 server links and + * generates the appropriate commands to register the new user or service. + * + * @param To The remote server to inform. + * @param Prefix Prefix for the generated commands. + * @param data CLIENT structure of the new client. + */ +static void +cb_introduceClient(CLIENT *To, CLIENT *Prefix, void *data) +{ + CLIENT *c = (CLIENT *)data; + CONN_ID conn; + char *modes, *user, *host; + + modes = Client_Modes(c); + user = Client_User(c) ? Client_User(c) : "-"; + host = Client_Hostname(c) ? Client_Hostname(c) : "-"; + + conn = Client_Conn(To); + if (Conn_Options(conn) & CONN_RFC1459) { + /* RFC 1459 mode: separate NICK and USER commands */ + Conn_WriteStr(conn, "NICK %s :%d", Client_ID(c), + Client_Hops(c) + 1); + Conn_WriteStr(conn, ":%s USER %s %s %s :%s", + Client_ID(c), user, host, + Client_ID(Client_Introducer(c)), Client_Info(c)); + if (modes[0]) + Conn_WriteStr(conn, ":%s MODE %s +%s", + Client_ID(c), Client_ID(c), modes); + } else { + /* RFC 2813 mode: one combined NICK or SERVICE command */ + if (Client_Type(c) == CLIENT_SERVICE + && strchr(Client_Flags(To), 'S')) + IRC_WriteStrClientPrefix(To, Prefix, + "SERVICE %s %d * +%s %d :%s", + Client_Mask(c), + Client_MyToken(Client_Introducer(c)), + Client_Modes(c), Client_Hops(c) + 1, + Client_Info(c)); + else + IRC_WriteStrClientPrefix(To, Prefix, + "NICK %s %d %s %s %d +%s :%s", + Client_ID(c), Client_Hops(c) + 1, + user, host, + Client_MyToken(Client_Introducer(c)), + modes, Client_Info(c)); + } +} /* cb_introduceClient */ + + #ifdef DEBUG GLOBAL void diff --git a/src/ngircd/client.h b/src/ngircd/client.h index 7bb230b..def0549 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -165,6 +165,8 @@ GLOBAL const char *Client_TypeText PARAMS((CLIENT *Client)); GLOBAL void Client_Reject PARAMS((CLIENT *Client, const char *Reason, bool InformClient)); +GLOBAL void Client_Introduce PARAMS((CLIENT *From, CLIENT *Client, int Type)); + #ifdef DEBUG GLOBAL void Client_DebugDump PARAMS((void)); diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 133a0e5..53069f0 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -46,11 +46,6 @@ 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 cb_introduceClient PARAMS((CLIENT *Client, CLIENT *Prefix, - void *i)); - #ifdef PAM static void cb_Read_Auth_Result PARAMS((int r_fd, UNUSED short events)); #endif @@ -395,7 +390,7 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) Client_Mask(c)); Client_SetType(c, CLIENT_GOTNICK); } else - Introduce_Client(Client, c, CLIENT_USER); + Client_Introduce(Client, c, CLIENT_USER); return CONNECTED; } @@ -487,7 +482,7 @@ IRC_USER(CLIENT * Client, REQUEST * Req) /* RFC 1459 style user registration? * Introduce client to network: */ if (Client_Type(c) == CLIENT_GOTNICK) - Introduce_Client(Client, c, CLIENT_USER); + Client_Introduce(Client, c, CLIENT_USER); return CONNECTED; } else if (Client_Type(Client) == CLIENT_USER) { @@ -601,7 +596,7 @@ IRC_SERVICE(CLIENT *Client, REQUEST *Req) return CONNECTED; } - Introduce_Client(Client, c, CLIENT_SERVICE); + Client_Introduce(Client, c, CLIENT_SERVICE); return CONNECTED; } /* IRC_SERVICE */ @@ -1057,7 +1052,7 @@ Hello_User_PostAuth(CLIENT *Client) if (Class_HandleServerBans(Client) != CONNECTED) return DISCONNECTED; - Introduce_Client(NULL, Client, CLIENT_USER); + Client_Introduce(NULL, Client, CLIENT_USER); if (!IRC_WriteStrClient (Client, RPL_WELCOME_MSG, Client_ID(Client), Client_Mask(Client))) @@ -1119,97 +1114,4 @@ Kill_Nick(char *Nick, char *Reason) } /* Kill_Nick */ -/** - * Introduce a new user or service client in the network. - * - * @param From Remote server introducing the client or NULL (local). - * @param Client New client. - * @param Type Type of the client (CLIENT_USER or CLIENT_SERVICE). - */ -static void -Introduce_Client(CLIENT *From, CLIENT *Client, int Type) -{ - /* Set client type (user or service) */ - Client_SetType(Client, Type); - - if (From) { - if (Conf_IsService(Conf_GetServer(Client_Conn(From)), - Client_ID(Client))) - Client_SetType(Client, CLIENT_SERVICE); - LogDebug("%s \"%s\" (+%s) registered (via %s, on %s, %d hop%s).", - Client_TypeText(Client), Client_Mask(Client), - Client_Modes(Client), Client_ID(From), - Client_ID(Client_Introducer(Client)), - Client_Hops(Client), Client_Hops(Client) > 1 ? "s": ""); - } else { - Log(LOG_NOTICE, "%s \"%s\" registered (connection %d).", - Client_TypeText(Client), Client_Mask(Client), - Client_Conn(Client)); - Log_ServerNotice('c', "Client connecting: %s (%s@%s) [%s] - %s", - Client_ID(Client), Client_User(Client), - Client_Hostname(Client), - Conn_IPA(Client_Conn(Client)), - Client_TypeText(Client)); - } - - /* Inform other servers */ - IRC_WriteStrServersPrefixFlag_CB(From, - From != NULL ? From : Client_ThisServer(), - '\0', cb_introduceClient, (void *)Client); -} /* Introduce_Client */ - - -/** - * Introduce a new user or service client to a remote server. - * - * This function differentiates between RFC1459 and RFC2813 server links and - * generates the appropriate commands to register the new user or service. - * - * @param To The remote server to inform. - * @param Prefix Prefix for the generated commands. - * @param data CLIENT structure of the new client. - */ -static void -cb_introduceClient(CLIENT *To, CLIENT *Prefix, void *data) -{ - CLIENT *c = (CLIENT *)data; - CONN_ID conn; - char *modes, *user, *host; - - modes = Client_Modes(c); - user = Client_User(c) ? Client_User(c) : "-"; - host = Client_Hostname(c) ? Client_Hostname(c) : "-"; - - conn = Client_Conn(To); - if (Conn_Options(conn) & CONN_RFC1459) { - /* RFC 1459 mode: separate NICK and USER commands */ - Conn_WriteStr(conn, "NICK %s :%d", Client_ID(c), - Client_Hops(c) + 1); - Conn_WriteStr(conn, ":%s USER %s %s %s :%s", - Client_ID(c), user, host, - Client_ID(Client_Introducer(c)), Client_Info(c)); - if (modes[0]) - Conn_WriteStr(conn, ":%s MODE %s +%s", - Client_ID(c), Client_ID(c), modes); - } else { - /* RFC 2813 mode: one combined NICK or SERVICE command */ - if (Client_Type(c) == CLIENT_SERVICE - && strchr(Client_Flags(To), 'S')) - IRC_WriteStrClientPrefix(To, Prefix, - "SERVICE %s %d * +%s %d :%s", - Client_Mask(c), - Client_MyToken(Client_Introducer(c)), - Client_Modes(c), Client_Hops(c) + 1, - Client_Info(c)); - else - IRC_WriteStrClientPrefix(To, Prefix, - "NICK %s %d %s %s %d +%s :%s", - Client_ID(c), Client_Hops(c) + 1, - user, host, - Client_MyToken(Client_Introducer(c)), - modes, Client_Info(c)); - } -} /* cb_introduceClient */ - - /* -eof- */ [View Less]

1 0

Alexander Barton : Xcode: update project file for Xcode 4.3
by alex＠arthur.barton.de 27 Apr '12

27 Apr '12

Module: ngircd.git Branch: master Commit: 359732af85e8566d919a2e0bc580a490ead49d9e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=359732af… Author: Alexander Barton <alex(a)barton.de> Date: Fri Apr 27 15:52:09 2012 +0200 Xcode: update project file for Xcode 4.3 (No changes needed) --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.… [View More]

1 0

Alexander Barton : platformtest.sh: Detect Open64 C compiler
by alex＠arthur.barton.de 24 Apr '12

24 Apr '12

Module: ngircd.git Branch: master Commit: 1dea0d91a0547fe5c0a9cb025b205cf1d9b1d3b8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1dea0d91… Author: Alexander Barton <alex(a)barton.de> Date: Tue Apr 24 12:08:01 2012 +0200 platformtest.sh: Detect Open64 C compiler --- contrib/platformtest.sh | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/contrib/platformtest.sh b/contrib/platformtest.sh index 6449a67..201ed41 100755 -… [View More]

1 0

Alexander Barton : Fix 8ec17063: "Lists_Add(): use size of destination when copying data"
by alex＠arthur.barton.de 18 Apr '12

18 Apr '12

Module: ngircd.git Branch: master Commit: d67d077a711f21e722d969dc1bf7ab787042d70b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d67d077a… Author: Alexander Barton <alex(a)barton.de> Date: Wed Apr 18 17:54:54 2012 +0200 Fix 8ec17063: "Lists_Add(): use size of destination when copying data" Thanks to Florian Westphal for spotting my silliness ... --- src/ngircd/lists.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/… [View More]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates April 2012