- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Clean up and document IRC_JOIN() and join_allowed() functions
by alex＠arthur.barton.de 16 Jan '10

16 Jan '10

Module: ngircd.git Branch: master Commit: ecad9f32c82f50312010ab41f7702d1329bc511e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ecad9f32… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 16 22:30:55 2010 +0100 Clean up and document IRC_JOIN() and join_allowed() functions --- src/ngircd/irc-channel.c | 72 ++++++++++++++++++++++++++++++---------------- 1 files changed, 47 insertions(+), 25 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index af0f066..010be35 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -62,9 +62,18 @@ part_from_all_channels(CLIENT* client, CLIENT *target) } +/** + * Check weather a local client is allowed to join an already existing + * channel or not. + * @param Client Client that sent the JOIN command + * @param chan Channel to check + * @param channame Name of the channel + * @param key Provided channel key (or NULL if none has been provided) + * @return true if client is allowed to join channel, false otherwise + */ static bool -join_allowed(CLIENT *Client, CLIENT *target, CHANNEL *chan, - const char *channame, const char *key) +join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame, + const char *key) { bool is_invited, is_banned; const char *channel_modes; @@ -73,32 +82,40 @@ join_allowed(CLIENT *Client, CLIENT *target, CHANNEL *chan, if (strchr(Client_Modes(Client), 'o')) return true; - is_banned = Lists_Check(Channel_GetListBans(chan), target); - is_invited = Lists_Check(Channel_GetListInvites(chan), target); + is_banned = Lists_Check(Channel_GetListBans(chan), Client); + is_invited = Lists_Check(Channel_GetListInvites(chan), Client); if (is_banned && !is_invited) { - IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame); + /* Client is banned from channel (and not on invite list) */ + IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, + Client_ID(Client), channame); return false; } channel_modes = Channel_Modes(chan); if ((strchr(channel_modes, 'i')) && !is_invited) { - /* Channel is "invite-only" (and Client wasn't invited) */ - IRC_WriteStrClient(Client, ERR_INVITEONLYCHAN_MSG, Client_ID(Client), channame); + /* Channel is "invite-only" and client is not on invite list */ + IRC_WriteStrClient(Client, ERR_INVITEONLYCHAN_MSG, + Client_ID(Client), channame); return false; } - /* Is the channel protected by a key? */ - if (!Channel_CheckKey(chan, target, key ? key : "")) { + if (!Channel_CheckKey(chan, Client, key ? key : "")) { + /* Channel is protected by a channel key and the client + * didn't specify the correct one */ IRC_WriteStrClient(Client, ERR_BADCHANNELKEY_MSG, Client_ID(Client), channame); return false; } - /* Are there already too many members? */ - if ((strchr(channel_modes, 'l')) && (Channel_MaxUsers(chan) <= Channel_MemberCount(chan))) { - IRC_WriteStrClient(Client, ERR_CHANNELISFULL_MSG, Client_ID(Client), channame); + + if ((strchr(channel_modes, 'l')) && + (Channel_MaxUsers(chan) <= Channel_MemberCount(chan))) { + /* There are more clints joined to this channel than allowed */ + IRC_WriteStrClient(Client, ERR_CHANNELISFULL_MSG, + Client_ID(Client), channame); return false; } + return true; } @@ -270,20 +287,23 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) /* Local client? */ if (Client_Type(Client) == CLIENT_USER) { - /* Test if the user has reached his maximum channel count */ - if ((Conf_MaxJoins > 0) && (Channel_CountForUser(Client) >= Conf_MaxJoins)) - return IRC_WriteStrClient(Client, ERR_TOOMANYCHANNELS_MSG, - Client_ID(Client), channame); - if (!chan) { - /* - * New Channel: first user will be channel operator - * unless this is a modeless channel. - */ + /* Test if the user has reached the channel limit */ + if ((Conf_MaxJoins > 0) && + (Channel_CountForUser(Client) >= Conf_MaxJoins)) + return IRC_WriteStrClient(Client, + ERR_TOOMANYCHANNELS_MSG, + Client_ID(Client), channame); + if (chan) { + /* Already existing channel: check if the + * client is allowed to join */ + if (!join_allowed(Client, chan, channame, key)) + break; + } else { + /* New channel: first user will become channel + * operator unless this is a modeless channel */ if (*channame != '+') flags = "o"; - } else - if (!join_allowed(Client, target, chan, channame, key)) - break; + } /* Local client: update idle time */ Conn_UpdateIdle(Client_Conn(Client)); @@ -293,7 +313,9 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) * that the "one shot" entries (generated by INVITE * commands) in this list become deleted when a user * joins a channel this way. */ - if (chan) (void)Lists_Check(Channel_GetListInvites(chan), target); + if (chan) + (void)Lists_Check(Channel_GetListInvites(chan), + target); } /* Join channel (and create channel if it doesn't exist) */

1 0

Alexander Barton : Show our name (IRCD=ngIRCd) in ISUPPORT (005) numeric
by alex＠arthur.barton.de 16 Jan '10

16 Jan '10

Module: ngircd.git Branch: master Commit: f58c8b94d9f4052c280a776797cd02e199e34f7e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f58c8b94… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 16 14:59:07 2010 +0100 Show our name (IRCD=ngIRCd) in ISUPPORT (005) numeric Inspired by Hyperion IRC daemon. --- src/ngircd/messages.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 9e15b81..59c6cdb 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2008 Alexander Barton <alex(a)barton.de> + * Copyright (c)2001-2010 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 @@ -20,7 +20,7 @@ #define RPL_YOURHOST_MSG "002 %s :Your host is %s, running version ngircd-%s (%s/%s/%s)" #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 CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=bI,k,l,imnPst CHANLIMIT=#&+:%d :are supported on this server" +#define RPL_ISUPPORT1_MSG "005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=bI,k,l,imnPst CHANLIMIT=#&+:%d :are supported on this server" #define RPL_ISUPPORT2_MSG "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d PENALTY :are supported on this server" #define RPL_TRACELINK_MSG "200 %s Link %s-%s %s %s V%s %ld %d %d"

1 0

Alexander Barton : Added missing modes to USERMODES #define
by alex＠arthur.barton.de 16 Jan '10

16 Jan '10

Module: ngircd.git Branch: master Commit: 3a2ac66f7ff5985cae4de390a8e510ae7ff2a5a6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3a2ac66f… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jan 16 14:07:27 2010 +0100 Added missing modes to USERMODES #define Now the numeric 004 correctly reports all the supported user and channel modes (user modes "r" and "w" were missing), e. g.: :a.irc.net 004 a a.irc.net ngircd-15 aiorsw biIklmnoPstv --- src/ngircd/defines.h | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index f0cf2ac..010dd8e 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -1,14 +1,12 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2007 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2010 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 * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * Please read the file COPYING, README and AUTHORS for more information. - * - * $Id: defines.h,v 1.62 2007/11/21 12:16:36 alex Exp $ */ @@ -82,7 +80,7 @@ #define RECONNECT_DELAY 3 /* Time to delay re-connect attempts in seconds. */ -#define USERMODES "aios" /* Supported user modes. */ +#define USERMODES "aiorsw" /* Supported user modes. */ #define CHANMODES "biIklmnoPstv" /* Supported channel modes. */ #define CONNECTED true /* Internal status codes. */

1 0

Alexander Barton : Updated links to ngIRCd homepage (bug tracker, mailing list)
by alex＠arthur.barton.de 01 Jan '10

01 Jan '10

Module: ngircd.git Branch: master Commit: cf05bf31a7dbcb9228d07bb21c4673d515d908f3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cf05bf31… Author: Alexander Barton <alex(a)barton.de> Date: Fri Jan 1 18:58:56 2010 +0100 Updated links to ngIRCd homepage (bug tracker, mailing list) --- README | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 2eff7bc..dc11a9f 100644 --- a/README +++ b/README @@ -78,10 +78,10 @@ VI. Bugs If you find bugs in the ngIRCd (which might be there :-), please report them at the following URL: -<http://ngircd.barton.de/#bugs> +<http://ngircd.barton.de/bugtracker.php> There you can read about known bugs and limitations, too. If you have critics, patches or something else, please feel free to post a mail to the ngIRCd mailing list: <ngircd-ml(a)arthur.ath.cx> (please see -<http://ngircd.barton.de/#ml> for details). +<http://ngircd.barton.de/support.php#ml> for details).

1 0

Alexander Barton : Really test for netinet/ip.h and set HAVE_NETINET_IP_H
by alex＠arthur.barton.de 31 Dez '09

31 Dez '09

Module: ngircd.git Branch: master Commit: 1ddc74f13e3feb5be6af4294e1f6a8162edca8a7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1ddc74f1… Author: Alexander Barton <alex(a)barton.de> Date: Thu Dec 31 00:38:47 2009 +0100 Really test for netinet/ip.h and set HAVE_NETINET_IP_H --- configure.in | 3 ++- contrib/MacOSX/config.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 3d4c640..10a72d3 100644 --- a/configure.in +++ b/configure.in @@ -105,7 +105,8 @@ AC_CHECK_HEADERS([ \ strings.h sys/socket.h sys/time.h unistd.h \ ],,AC_MSG_ERROR([required C header missing!])) -AC_CHECK_HEADERS([arpa/inet.h ctype.h malloc.h stdbool.h stddef.h varargs.h]) +AC_CHECK_HEADERS([ \ + arpa/inet.h ctype.h malloc.h netinet/ip.h stdbool.h stddef.h varargs.h]) # -- Datatypes -- diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index 60b0618..66465e2 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -71,6 +71,8 @@ #define HAVE_STDBOOL_H 1 /* Define to 1 if you have the <arpa/inet.h> header file. */ #define HAVE_ARPA_INET_H 1 +/* Define to 1 if you have the <netinet/ip.h> header file. */ +#define HAVE_NETINET_IP_H 1 /* Define to 1 if you have the `kqueue' function. */ #define HAVE_KQUEUE 1

1 0

Alexander Barton : setsockopt(): use IPPROTO_IP instead of SOL_IP to set IPTOS_LOWDELAY
by alex＠arthur.barton.de 31 Dez '09

31 Dez '09

Module: ngircd.git Branch: master Commit: a4d7c6f14594e1331885ff83afd584f7573c1a6c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a4d7c6f1… Author: Alexander Barton <alex(a)barton.de> Date: Thu Dec 31 00:55:42 2009 +0100 setsockopt(): use IPPROTO_IP instead of SOL_IP to set IPTOS_LOWDELAY --- src/ngircd/conn.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index e82b717..1e4ba0a 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1877,12 +1877,13 @@ Init_Socket( int Sock ) } /* Set type of service (TOS) */ -#if defined(IP_TOS) && defined(IPTOS_LOWDELAY) +#if defined(IPPROTO_IP) && defined(IPTOS_LOWDELAY) value = IPTOS_LOWDELAY; - LogDebug("Setting option IP_TOS on socket %d to IPTOS_LOWDELAY (%d).", Sock, value ); - if( setsockopt( Sock, SOL_IP, IP_TOS, &value, (socklen_t)sizeof( value )) != 0 ) - { - Log( LOG_ERR, "Can't set socket option IP_TOS: %s!", strerror( errno )); + LogDebug("Setting IP_TOS on socket %d to IPTOS_LOWDELAY.", Sock); + if (setsockopt(Sock, IPPROTO_IP, IP_TOS, &value, + (socklen_t) sizeof(value))) { + Log(LOG_ERR, "Can't set socket option IP_TOS: %s!", + strerror(errno)); /* ignore this error */ } #endif

1 0

Alexander Barton : ReverseLookup(): fix documentation comment
by alex＠arthur.barton.de 30 Dez '09

30 Dez '09

Module: ngircd.git Branch: master Commit: 75dabcaae52eb9f2dcfbccc19743670962dbafb3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=75dabcaa… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 30 23:45:02 2009 +0100 ReverseLookup(): fix documentation comment --- src/ngircd/resolve.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c index b1487be..37d1c51 100644 --- a/src/ngircd/resolve.c +++ b/src/ngircd/resolve.c @@ -203,7 +203,7 @@ Do_IdentQuery(int identsock, array *resolved_addr) * the IP address in resbuf and returns false. * @param IpAddr ip address to resolve * @param resbuf result buffer to store DNS name/string representation of ip address - * @reslen size of result buffer (must be >= NGT_INET_ADDRSTRLEN) + * @param reslen size of result buffer (must be >= NGT_INET_ADDRSTRLEN) * @return true if reverse lookup successful, false otherwise */ static bool

1 0

Alexander Barton : Clean up conn.{c|h} a little bit
by alex＠arthur.barton.de 30 Dez '09

30 Dez '09

Module: ngircd.git Branch: master Commit: cb6faed61c770f3af73e96658ef46c0627ba6cfd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cb6faed6… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 30 23:32:47 2009 +0100 Clean up conn.{c|h} a little bit --- src/ngircd/conn.c | 124 ++++++++++++++++++++++++++++++---------------------- src/ngircd/conn.h | 2 +- 2 files changed, 72 insertions(+), 54 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 731647d..cb7c2c6 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -109,8 +109,8 @@ extern struct SSLOptions Conf_SSLOptions; static void cb_connserver_login_ssl PARAMS((int sock, short what)); static void cb_clientserver_ssl PARAMS((int sock, short what)); #endif -static void cb_Read_Resolver_Result PARAMS(( int sock, UNUSED short what)); -static void cb_Connect_to_Server PARAMS(( int sock, UNUSED short what)); +static void cb_Read_Resolver_Result PARAMS((int sock, UNUSED short what)); +static void cb_Connect_to_Server PARAMS((int sock, UNUSED short what)); static void cb_clientserver PARAMS((int sock, short what)); static void @@ -128,6 +128,7 @@ static void cb_listen_ssl(int sock, short irrelevant) { int fd; + (void) irrelevant; fd = New_Connection(sock); if (fd < 0) @@ -270,14 +271,18 @@ cb_clientserver(int sock, short what) return; } #ifdef SSL_SUPPORT - if (what & IO_WANTREAD || (Conn_OPTION_ISSET(&My_Connections[idx], CONN_SSL_WANT_WRITE))) - Read_Request( idx ); /* if TLS layer needs to write additional data, call Read_Request instead so SSL/TLS can continue */ + if (what & IO_WANTREAD + || (Conn_OPTION_ISSET(&My_Connections[idx], CONN_SSL_WANT_WRITE))) { + /* if TLS layer needs to write additional data, call + * Read_Request() instead so that SSL/TLS can continue */ + Read_Request(idx); + } #else if (what & IO_WANTREAD) - Read_Request( idx ); + Read_Request(idx); #endif if (what & IO_WANTWRITE) - Handle_Write( idx ); + Handle_Write(idx); } @@ -295,11 +300,13 @@ cb_clientserver_ssl(int sock, short what) } switch (ConnSSL_Accept(&My_Connections[idx])) { - case 1: break; /* OK */ - case 0: return; /* EAGAIN: this callback will be invoked again by the io layer */ - default: - Conn_Close( idx, "Socket closed!", "SSL accept error", false ); - return; + case 1: + break; /* OK */ + case 0: + return; /* EAGAIN: callback will be invoked again by IO layer */ + default: + Conn_Close(idx, "Socket closed!", "SSL accept error", false); + return; } if (what & IO_WANTREAD) Read_Request(idx); @@ -433,13 +440,12 @@ Conn_InitListeners( void ) listen_addr = strtok(NULL, ","); } - /* - * can't free() Conf_ListenAddress here. On /REHASH, if the config file + /* Can't free() Conf_ListenAddress here: on REHASH, if the config file * cannot be re-loaded, we'd end up with a NULL Conf_ListenAddress. * Instead, free() takes place in conf.c, before the config file - * is being parsed. - */ + * is being parsed. */ free(copy); + return created; } /* Conn_InitListeners */ @@ -582,6 +588,7 @@ NewListener(const char *listen_addr, UINT16 Port) return sock; } /* NewListener */ + #ifdef SSL_SUPPORT /* * SSL/TLS connections require extra treatment: @@ -1164,7 +1171,7 @@ Count_Connections(ng_ipaddr_t *a) static int -New_Connection( int Sock ) +New_Connection(int Sock) { /* Neue Client-Verbindung von Listen-Socket annehmen und * CLIENT-Struktur anlegen. */ @@ -1178,10 +1185,9 @@ New_Connection( int Sock ) CLIENT *c; long cnt; - assert( Sock > NONE ); - /* Connection auf Listen-Socket annehmen */ - new_sock_len = (int)sizeof(new_addr); + assert(Sock > NONE); + new_sock_len = (int)sizeof(new_addr); new_sock = accept(Sock, (struct sockaddr *)&new_addr, (socklen_t *)&new_sock_len); if (new_sock < 0) { @@ -1198,49 +1204,56 @@ New_Connection( int Sock ) #ifdef TCPWRAP /* Validate socket using TCP Wrappers */ - request_init( &req, RQ_DAEMON, PACKAGE_NAME, RQ_FILE, new_sock, RQ_CLIENT_SIN, &new_addr, NULL ); + request_init(&req, RQ_DAEMON, PACKAGE_NAME, RQ_FILE, new_sock, + RQ_CLIENT_SIN, &new_addr, NULL); fromhost(&req); if (!hosts_access(&req)) { - Log (deny_severity, "Refused connection from %s (by TCP Wrappers)!", ip_str); - Simple_Message( new_sock, "ERROR :Connection refused" ); - close( new_sock ); + Log(deny_severity, + "Refused connection from %s (by TCP Wrappers)!", ip_str); + Simple_Message(new_sock, "ERROR :Connection refused"); + close(new_sock); return -1; } #endif - /* Socket initialisieren */ - if (!Init_Socket( new_sock )) + if (!Init_Socket(new_sock)) + return -1; + + /* Check global connection limit */ + if ((Conf_MaxConnections > 0) && + (NumConnections >= (size_t) Conf_MaxConnections)) { + Log(LOG_ALERT, "Can't accept connection: limit (%d) reached!", + Conf_MaxConnections); + Simple_Message(new_sock, "ERROR :Connection limit reached"); + close(new_sock); return -1; + } /* Check IP-based connection limit */ cnt = Count_Connections(&new_addr); if ((Conf_MaxConnectionsIP > 0) && (cnt >= Conf_MaxConnectionsIP)) { /* Access denied, too many connections from this IP address! */ - Log( LOG_ERR, "Refused connection from %s: too may connections (%ld) from this IP address!", ip_str, cnt); - Simple_Message( new_sock, "ERROR :Connection refused, too many connections from your IP address!" ); - close( new_sock ); - return -1; - } - - if ((Conf_MaxConnections > 0) && - (NumConnections >= (size_t) Conf_MaxConnections)) - { - Log( LOG_ALERT, "Can't accept connection: limit (%d) reached!", Conf_MaxConnections); - Simple_Message( new_sock, "ERROR :Connection limit reached" ); - close( new_sock ); + Log(LOG_ERR, + "Refused connection from %s: too may connections (%ld) from this IP address!", + ip_str, cnt); + Simple_Message(new_sock, + "ERROR :Connection refused, too many connections from your IP address!"); + close(new_sock); return -1; } - if( new_sock >= Pool_Size ) { + if (new_sock >= Pool_Size) { if (!array_alloc(&My_ConnArray, sizeof(CONNECTION), - (size_t)new_sock)) { - Log( LOG_EMERG, "Can't allocate memory! [New_Connection]" ); - Simple_Message( new_sock, "ERROR: Internal error" ); - close( new_sock ); + (size_t) new_sock)) { + Log(LOG_EMERG, + "Can't allocate memory! [New_Connection]"); + Simple_Message(new_sock, "ERROR: Internal error"); + close(new_sock); return -1; } LogDebug("Bumped connection pool to %ld items (internal: %ld items, %ld bytes)", - new_sock, array_length(&My_ConnArray, sizeof(CONNECTION)), array_bytes(&My_ConnArray)); + new_sock, array_length(&My_ConnArray, + sizeof(CONNECTION)), array_bytes(&My_ConnArray)); /* Adjust pointer to new block */ My_Connections = array_start(&My_ConnArray); @@ -1249,22 +1262,24 @@ New_Connection( int Sock ) } /* register callback */ - if (!io_event_create( new_sock, IO_WANTREAD, cb_clientserver)) { - Log(LOG_ALERT, "Can't accept connection: io_event_create failed!"); + if (!io_event_create(new_sock, IO_WANTREAD, cb_clientserver)) { + Log(LOG_ALERT, + "Can't accept connection: io_event_create failed!"); Simple_Message(new_sock, "ERROR :Internal error"); close(new_sock); return -1; } - c = Client_NewLocal(new_sock, ip_str, CLIENT_UNKNOWN, false ); - if( ! c ) { - Log(LOG_ALERT, "Can't accept connection: can't create client structure!"); + c = Client_NewLocal(new_sock, ip_str, CLIENT_UNKNOWN, false); + if (!c) { + Log(LOG_ALERT, + "Can't accept connection: can't create client structure!"); Simple_Message(new_sock, "ERROR :Internal error"); io_close(new_sock); return -1; } - Init_Conn_Struct( new_sock ); + Init_Conn_Struct(new_sock); My_Connections[new_sock].sock = new_sock; My_Connections[new_sock].addr = new_addr; My_Connections[new_sock].client = c; @@ -1292,6 +1307,10 @@ New_Connection( int Sock ) if (!Conf_NoDNS) Resolve_Addr(&My_Connections[new_sock].res_stat, &new_addr, identsock, cb_Read_Resolver_Result); + + /* ngIRCd waits up to 4 seconds for the result of the asynchronous + * DNS and IDENT resolver subprocess using the "penalty" mechanism. + * If there are results earlier, the delay is aborted. */ Conn_SetPenalty(new_sock, 4); return new_sock; } /* New_Connection */ @@ -1825,7 +1844,6 @@ Init_Socket( int Sock ) } /* Init_Socket */ - static void cb_Connect_to_Server(int fd, UNUSED short events) { @@ -1979,15 +1997,14 @@ Conn_GetClient( CONN_ID Idx ) * If none is found, return NULL. */ CONNECTION *c; - assert( Idx >= 0 ); + assert(Idx >= 0); c = array_get(&My_ConnArray, sizeof (CONNECTION), (size_t)Idx); - assert(c != NULL); - return c ? c->client : NULL; } + #ifdef SSL_SUPPORT /* we cannot access My_Connections in irc-info.c */ GLOBAL bool @@ -2008,6 +2025,7 @@ Conn_UsesSSL(CONN_ID Idx) assert(Idx < (int) array_length(&My_ConnArray, sizeof(CONNECTION))); return Conn_OPTION_ISSET(&My_Connections[Idx], CONN_SSL); } + #endif diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 983c884..b94b10d 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -88,7 +88,7 @@ typedef struct _Connection ZIPDATA zip; /* Compression information */ #endif /* ZLIB */ #ifdef SSL_SUPPORT - struct ConnSSL_State ssl_state; /* SSL/GNUTLS state information */ + struct ConnSSL_State ssl_state; /* SSL/GNUTLS state information */ #endif } CONNECTION;

1 0

Alexander Barton : Connection functions: add some more documentation comments
by alex＠arthur.barton.de 30 Dez '09

30 Dez '09

Module: ngircd.git Branch: master Commit: 03cde2efd3044a226b94b72810113080a3250d05 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=03cde2ef… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 30 23:35:17 2009 +0100 Connection functions: add some more documentation comments --- src/ngircd/conn.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 72 insertions(+), 7 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index cb7c2c6..7b07114 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -113,6 +113,13 @@ static void cb_Read_Resolver_Result PARAMS((int sock, UNUSED short what)); static void cb_Connect_to_Server PARAMS((int sock, UNUSED short what)); static void cb_clientserver PARAMS((int sock, short what)); + +/** + * IO callback for listening sockets: handle new connections. This callback + * gets called when a new non-SSL connection should be accepted. + * @param sock Socket descriptor + * @param irrelevant (ignored IO specification) + */ static void cb_listen(int sock, short irrelevant) { @@ -124,6 +131,12 @@ cb_listen(int sock, short irrelevant) #ifdef SSL_SUPPORT +/** + * IO callback for listening SSL sockets: handle new connections. This callback + * gets called when a new SSL-enabled connection should be accepted. + * @param sock Socket descriptor + * @param irrelevant (ignored IO specification) + */ static void cb_listen_ssl(int sock, short irrelevant) { @@ -141,6 +154,11 @@ cb_listen_ssl(int sock, short irrelevant) #endif +/** + * IO callback for new outgoing non-SSL server connections. + * @param sock Socket descriptor + * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...) + */ static void cb_connserver(int sock, UNUSED short what) { @@ -214,6 +232,10 @@ cb_connserver(int sock, UNUSED short what) } +/** + * Login to a remote server. + * @param idx Connection index + */ static void server_login(CONN_ID idx) { @@ -230,6 +252,11 @@ server_login(CONN_ID idx) #ifdef SSL_SUPPORT +/** + * IO callback for new outgoing SSL-enabled server connections. + * @param sock Socket descriptor + * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...) + */ static void cb_connserver_login_ssl(int sock, short unused) { @@ -259,6 +286,11 @@ cb_connserver_login_ssl(int sock, short unused) #endif +/** + * IO callback for established non-SSL client and server connections. + * @param sock Socket descriptor + * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...) + */ static void cb_clientserver(int sock, short what) { @@ -287,6 +319,11 @@ cb_clientserver(int sock, short what) #ifdef SSL_SUPPORT +/** + * IO callback for established SSL-enabled client and server connections. + * @param sock Socket descriptor + * @param what IO specification (IO_WANTREAD/IO_WANTWRITE/...) + */ static void cb_clientserver_ssl(int sock, short what) { @@ -319,6 +356,9 @@ cb_clientserver_ssl(int sock, short what) #endif +/** + * Initialite connecion module. + */ GLOBAL void Conn_Init( void ) { @@ -354,6 +394,9 @@ Conn_Init( void ) } /* Conn_Init */ +/** + * Clean up connection module. + */ GLOBAL void Conn_Exit( void ) { @@ -406,6 +449,10 @@ ports_initlisteners(array *a, const char *listen_addr, void (*func)(int,short)) } +/** + * Initialize all listening sockets. + * @return Number of created listening sockets + */ GLOBAL unsigned int Conn_InitListeners( void ) { @@ -1170,12 +1217,14 @@ Count_Connections(ng_ipaddr_t *a) } /* Count_Connections */ +/** + * Initialize new client connection on a listening socket. + * @param Sock Listening socket descriptor + * @return Accepted socket descriptor or -1 on error + */ static int New_Connection(int Sock) { - /* Neue Client-Verbindung von Listen-Socket annehmen und - * CLIENT-Struktur anlegen. */ - #ifdef TCPWRAP struct request_info req; #endif @@ -1990,12 +2039,16 @@ Simple_Message( int Sock, const char *Msg ) } /* Simple_Error */ +/** + * Get CLIENT structure that belongs to a local connection identified by its + * index number. Each connection belongs to a client by definition, so it is + * not required that the caller checks for NULL return values. + * @param Idx Connection index number + * @return Pointer to CLIENT structure + */ GLOBAL CLIENT * Conn_GetClient( CONN_ID Idx ) { - /* return Client-Structure that belongs to the local Connection Idx. - * If none is found, return NULL. - */ CONNECTION *c; assert(Idx >= 0); @@ -2006,7 +2059,14 @@ Conn_GetClient( CONN_ID Idx ) #ifdef SSL_SUPPORT -/* we cannot access My_Connections in irc-info.c */ + +/** + * Get information about used SSL chiper. + * @param Idx Connection index number + * @param buf Buffer for returned information text + * @param len Size of return buffer "buf" + * @return true on success, false otherwise + */ GLOBAL bool Conn_GetCipherInfo(CONN_ID Idx, char *buf, size_t len) { @@ -2017,6 +2077,11 @@ Conn_GetCipherInfo(CONN_ID Idx, char *buf, size_t len) } +/** + * Check if a connection is SSL-enabled or not. + * @param Idx Connection index number + * @return true if connection is SSL-enabled, false otherwise. + */ GLOBAL bool Conn_UsesSSL(CONN_ID Idx) {

1 0

Alexander Barton : Move NewConnection handling from callbacks to New_Connection()
by alex＠arthur.barton.de 30 Dez '09

30 Dez '09

Module: ngircd.git Branch: master Commit: 1b73e68e6eb82693c4821758879ae632aff3664f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1b73e68e… Author: Alexander Barton <alex(a)barton.de> Date: Wed Dec 30 23:42:43 2009 +0100 Move NewConnection handling from callbacks to New_Connection() --- src/ngircd/conn.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 7b07114..e82b717 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -124,9 +124,7 @@ static void cb_listen(int sock, short irrelevant) { (void) irrelevant; - if (New_Connection( sock ) >= 0) - NumConnections++; - LogDebug("Total number of connections now %ld.", NumConnections); + (void) New_Connection(sock); } @@ -146,9 +144,6 @@ cb_listen_ssl(int sock, short irrelevant) fd = New_Connection(sock); if (fd < 0) return; - - NumConnections++; - LogDebug("Total number of connections now %ld.", NumConnections); io_event_setcb(My_Connections[fd].sock, cb_clientserver_ssl); } #endif @@ -1361,6 +1356,9 @@ New_Connection(int Sock) * DNS and IDENT resolver subprocess using the "penalty" mechanism. * If there are results earlier, the delay is aborted. */ Conn_SetPenalty(new_sock, 4); + + NumConnections++; + LogDebug("Total number of connections now %ld.", NumConnections); return new_sock; } /* New_Connection */

1 0