- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Generate WALLOPS message on SQUIT from IRC operator
by alex＠arthur.barton.de 22 Mär '11

22 Mär '11

Module: ngircd.git Branch: master Commit: 770a58ac6df8099cfa8e7cf3b105ef495f2cf437 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=770a58ac… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 21 23:51:53 2011 +0100 Generate WALLOPS message on SQUIT from IRC operator So SQUIT now behaves like CONNECT and DISCONNECT commands, when called by an IRC operator (and not received from an other server). --- src/ngircd/irc-server.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index b592eb9..cca295a 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -277,6 +277,7 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req) char msg[COMMAND_LEN], logmsg[COMMAND_LEN]; CLIENT *from, *target; CONN_ID con; + int loglevel; assert(Client != NULL); assert(Req != NULL); @@ -301,7 +302,11 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req) return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix); - Log(LOG_DEBUG, "Got SQUIT from %s for \"%s\": \"%s\" ...", + if (Client_Type(Client) == CLIENT_USER) + loglevel = LOG_NOTICE | LOG_snotice; + else + loglevel = LOG_DEBUG; + Log(loglevel, "Got SQUIT from %s for \"%s\": \"%s\" ...", Client_ID(from), Req->argv[0], Req->argv[1]); target = Client_Search(Req->argv[0]);

1 0

Alexander Barton : Allow servers to send more commands in the first 10 secods
by alex＠arthur.barton.de 21 Mär '11

21 Mär '11

Module: ngircd.git Branch: master Commit: 62f705f97e580fe61520793b3387081915f240ba URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=62f705f9… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 21 09:42:01 2011 +0100 Allow servers to send more commands in the first 10 secods This helps to speed up server login and network synchronisation. --- src/ngircd/conn.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 397bc91..63093c2 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1629,18 +1629,25 @@ Handle_Buffer(CONN_ID Idx) CLIENT *c; c = Conn_GetClient(Idx); - assert( c != NULL); + starttime = time(NULL); + + assert(c != NULL); /* Servers do get special command limits, so they can process * all the messages that are required while peering. */ switch (Client_Type(c)) { case CLIENT_SERVER: - maxcmd = MAX_COMMANDS_SERVER; break; + /* Allow servers to send more commands in the first 10 secods + * to speed up server login and network synchronisation. */ + if (starttime - Client_StartTime(c) < 10) + maxcmd = MAX_COMMANDS_SERVER * 5; + else + maxcmd = MAX_COMMANDS_SERVER; + break; case CLIENT_SERVICE: maxcmd = MAX_COMMANDS_SERVICE; break; } - starttime = time(NULL); for (i=0; i < maxcmd; i++) { /* Check penalty */ if (My_Connections[Idx].delaytime > starttime)

1 0

Alexander Barton : Commands received from other servers must have prefixes
by alex＠arthur.barton.de 21 Mär '11

21 Mär '11

Module: ngircd.git Branch: master Commit: 15775e67900d914cc174aa80e615fa24d65d115c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=15775e67… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 21 10:46:09 2011 +0100 Commands received from other servers must have prefixes Make sure that all commands received from other servers do have valid prefixes. Only exceptions are PING and ERROR commands that can occure without prefixes when generated by the remote peer itself. --- src/ngircd/parse.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 8203dd0..31f048c 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -276,11 +276,24 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) *Closed = false; - if( ! Req->prefix ) return true; - client = Conn_GetClient( Idx ); assert( client != NULL ); + if (!Req->prefix && Client_Type(client) == CLIENT_SERVER + && strcasecmp(Req->command, "ERROR") != 0 + && strcasecmp(Req->command, "PING") != 0) + { + Log(LOG_ERR, + "Received command without prefix (connection %d, command \"%s\")!?", + Idx, Req->command); + if (!Conn_WriteStr(Idx, "ERROR :Prefix missing")) + *Closed = true; + return false; + } + + if (!Req->prefix) + return true; + /* only validate if this connection is already registered */ if (Client_Type(client) != CLIENT_USER && Client_Type(client) != CLIENT_SERVER

1 0

Alexander Barton : Handle_GLOBAL(): don't use multi-line strings
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: dcb1951efdc21fc175817bca67aed01bee9749b4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dcb1951e… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 17:28:38 2011 +0100 Handle_GLOBAL(): don't use multi-line strings They aren't supported by elder C compilers ... --- src/ngircd/conf.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index fb8db2c..d27a2dd 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1128,8 +1128,7 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) } if (CheckLegacyNoOption(Var, Arg)) { - Config_Error(LOG_WARNING, "%s, line %d: \"No\"-Prefix has been removed, use " - "\"%s = %s\" in [FEATURES] section instead", + Config_Error(LOG_WARNING, "%s, line %d: \"No\"-Prefix has been removed, use \"%s = %s\" in [FEATURES] section instead", NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg)); if (strcasecmp(Var, "NoIdent") == 0) WarnIdent(Line);

1 0

Alexander Barton : IRC_CHANINFO(): Code cleanup
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: a39e2f22c928a8bd8d16c2e008a62800f6412fe6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a39e2f22… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 17:29:19 2011 +0100 IRC_CHANINFO(): Code cleanup --- src/ngircd/irc-channel.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 33ea68d..476c313 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -688,7 +688,9 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) assert( Req != NULL ); /* Bad number of parameters? */ - if(( Req->argc < 2 ) || ( Req->argc == 4 ) || ( Req->argc > 5 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); /* Compatibility kludge */ if( Req->argc == 5 ) arg_topic = 4;

1 0

Alexander Barton : Rename ClientHost to CloakHost, and ClientUserNick to CloakUserToNick
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: ae7470ceb546d87cbd366d508641276313ec9130 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ae7470ce… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 16:58:29 2011 +0100 Rename ClientHost to CloakHost, and ClientUserNick to CloakUserToNick --- doc/sample-ngircd.conf.tmpl | 6 +++--- man/ngircd.conf.5.tmpl | 4 ++-- src/ngircd/client.c | 8 ++++---- src/ngircd/conf.c | 19 ++++++++++--------- src/ngircd/conf.h | 12 +++++++----- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index fee3570..a2eeee9 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -154,11 +154,11 @@ # maximum nick name length! ;MaxNickLength = 9 - # Set this hostname for every client instead of the real one - ;ClientHost = irc.example.net + # Set this hostname for every client instead of the real one. + ;CloakHost = irc.example.net # Set every clients' user name to their nick name - ;ClientUserNick = yes + ;CloakUserToNick = yes [Features] # Do any DNS lookups when a client connects to the server. diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 3282476..fa77c64 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -237,11 +237,11 @@ 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 -\fBClientHost\fR +\fBCloakHost\fR Set this hostname for every client instead of the real one. Default: empty, don't change. .TP -\fBClientUserNick\fR +\fBCloakUserToNick\fR Set every clients' user name to their nick name and hide the one supplied by the IRC client. Default: no. .SH [OPERATOR] diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 1a6ad93..e01c424 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -319,8 +319,8 @@ Client_SetHostname( CLIENT *Client, const char *Hostname ) assert( Client != NULL ); assert( Hostname != NULL ); - if (strlen(Conf_ClientHost)) { - strlcpy( Client->host, Conf_ClientHost, sizeof( Client->host )); + if (strlen(Conf_CloakHost)) { + strlcpy( Client->host, Conf_CloakHost, sizeof( Client->host )); } else { strlcpy( Client->host, Hostname, sizeof( Client->host )); } @@ -335,7 +335,7 @@ Client_SetID( CLIENT *Client, const char *ID ) strlcpy( Client->id, ID, sizeof( Client->id )); - if (Conf_ClientUserNick) + if (Conf_CloakUserToNick) strlcpy( Client->user, ID, sizeof( Client->user )); /* Hash */ @@ -351,7 +351,7 @@ Client_SetUser( CLIENT *Client, const char *User, bool Idented ) assert( Client != NULL ); assert( User != NULL ); - if (Conf_ClientUserNick) return; + if (Conf_CloakUserToNick) return; if (Idented) { strlcpy(Client->user, User, sizeof(Client->user)); diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 12893ad..fb8db2c 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -352,8 +352,8 @@ 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(" ClientHost = %s\n", Conf_ClientHost); - printf(" ClientUserNick = %s\n\n", yesno_to_str(Conf_ClientUserNick)); + printf(" CloakHost = %s\n", Conf_CloakHost); + printf(" CloakUserToNick = %s\n\n", yesno_to_str(Conf_CloakUserToNick)); puts("[FEATURES]"); printf(" DNS = %s\n", yesno_to_str(Conf_DNS)); @@ -592,8 +592,6 @@ Set_Defaults(bool InitServers) int i; strcpy(Conf_ServerName, ""); - strcpy(Conf_ClientHost, ""); - Conf_ClientUserNick = false; snprintf(Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s", PACKAGE_NAME, PACKAGE_VERSION); strcpy(Conf_ServerPwd, ""); @@ -633,6 +631,9 @@ Set_Defaults(bool InitServers) Conf_MaxJoins = 10; Conf_MaxNickLength = CLIENT_NICK_LEN_DEFAULT; + strcpy(Conf_CloakHost, ""); + Conf_CloakUserToNick = false; + #ifdef SYSLOG #ifdef LOG_LOCAL5 Conf_SyslogFacility = LOG_LOCAL5; @@ -974,16 +975,16 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "ClientHost" ) == 0 ) { + if( strcasecmp( Var, "CloakHost" ) == 0 ) { /* Client hostname */ - len = strlcpy( Conf_ClientHost, Arg, sizeof( Conf_ClientHost )); - if (len >= sizeof( Conf_ClientHost )) + len = strlcpy( Conf_CloakHost, Arg, sizeof( Conf_CloakHost )); + if (len >= sizeof( Conf_CloakHost )) Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "ClientUserNick" ) == 0 ) { + if( strcasecmp( Var, "CloakUserToNick" ) == 0 ) { /* Use client nick name as user name */ - Conf_ClientUserNick = Check_ArgIsTrue( Arg ); + Conf_CloakUserToNick = Check_ArgIsTrue( Arg ); return; } if( strcasecmp( Var, "Info" ) == 0 ) { diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 10b6407..305ccaa 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. * * 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 @@ -97,10 +97,6 @@ struct Conf_Channel { /** Name (ID, "nick") of this server */ GLOBAL char Conf_ServerName[CLIENT_ID_LEN]; -/** Hostname of the clients */ -GLOBAL char Conf_ClientHost[CLIENT_ID_LEN]; -GLOBAL bool Conf_ClientUserNick; - /** Server info text */ GLOBAL char Conf_ServerInfo[CLIENT_INFO_LEN]; @@ -167,6 +163,12 @@ GLOBAL bool Conf_OperServerMode; /** Flag indicating if remote IRC operators are allowed to manage this server */ GLOBAL bool Conf_AllowRemoteOper; +/** Cloaked hostname of the clients */ +GLOBAL char Conf_CloakHost[CLIENT_ID_LEN]; + +/** Use nick name as user name? */ +GLOBAL bool Conf_CloakUserToNick; + /** Enable all DNS functions? */ GLOBAL bool Conf_DNS;

1 0

Alexander Barton : Add a note not to use a percent sign ("%") in CloakHost variable
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: acd7a5d6d41ca8017d3c2217b0c0bde129b4e041 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=acd7a5d6… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 17:02:39 2011 +0100 Add a note not to use a percent sign ("%") in CloakHost variable The percent sign is reserved for future extensions, for example to expand some variables like %H to a hash value of the real host name ... Idea by kaFux in #ngircd. --- doc/sample-ngircd.conf.tmpl | 2 ++ man/ngircd.conf.5.tmpl | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index a2eeee9..e07b520 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -155,6 +155,8 @@ ;MaxNickLength = 9 # Set this hostname for every client instead of the real one. + # Please note: don't use the percentage sign ("%"), it is reserved for + # future extensions! ;CloakHost = irc.example.net # Set every clients' user name to their nick name diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index fa77c64..131fa29 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -240,6 +240,12 @@ length! \fBCloakHost\fR Set this hostname for every client instead of the real one. Default: empty, don't change. +.PP +.RS +.B Please note: +.br +Don't use the percentage sign ("%"), it is reserved for future extensions! +.RE .TP \fBCloakUserToNick\fR Set every clients' user name to their nick name and hide the one supplied

1 0

Alexander Barton : Merge branches 'CloakUserHost', 'QuitOnHTTP' and ' bug72-WHOIS-List'
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: fa8b83e69b0d7edcfdcf8f0a4496c79f9c5ec161 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fa8b83e6… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 17:16:14 2011 +0100 Merge branches 'CloakUserHost', 'QuitOnHTTP' and 'bug72-WHOIS-List' * CloakUserHost: Add a note not to use a percent sign ("%") in CloakHost variable Rename ClientHost to CloakHost, and ClientUserNick to CloakUserToNick Don't use "the.net" in sample-ngircd.conf, use "example.net" ngircd.conf.5: document "ClientHost" and "ClientUserNick" Move "ClientHost" and "ClientUserNick" to end of [Global] section ClientUserNick setting ClientHost setting * QuitOnHTTP: Only "handle" HTTP commands on unregistered connections Don't use IRC_QUIT_HTTP() if STRICT_RFC is #define'd IRC_QUIT_HTTP(): enhance error message Move IRC_QUIT_HTTP() below IRC_QUIT() quit on HTTP commands: GET & POST * bug72-WHOIS-List: Add "whois-test" to testsuite and distribution archive Add support for up to 3 targets in WHOIS queries. ---

1 0

Alexander Barton : Move "ClientHost" and "ClientUserNick" to end of [Global ] section
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: 25dd193e9b49b38db39cf549f94df4ba11812fe9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=25dd193e… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 16 23:43:29 2011 +0100 Move "ClientHost" and "ClientUserNick" to end of [Global] section --- doc/sample-ngircd.conf.tmpl | 12 ++++++------ src/ngircd/conf.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 7cfe08f..8591759 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -24,12 +24,6 @@ # (".") and be unique in the IRC network. Required! Name = irc.the.net - # Set this hostname for every client instead of the real one - ;ClientHost = irc.the.net - - # Set every clients' user name to their nick name - ;ClientUserNick = yes - # Info text of the server. This will be shown by WHOIS and # LINKS requests for example. Info = Server Info Text @@ -160,6 +154,12 @@ # maximum nick name length! ;MaxNickLength = 9 + # Set this hostname for every client instead of the real one + ;ClientHost = irc.the.net + + # Set every clients' user name to their nick name + ;ClientUserNick = yes + [Features] # Do any DNS lookups when a client connects to the server. ;DNS = yes diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 487c1eb..12893ad 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -295,8 +295,6 @@ Conf_Test( void ) puts( "[GLOBAL]" ); printf(" Name = %s\n", Conf_ServerName); - printf(" ClientHost = %s\n", Conf_ClientHost); - printf(" ClientUserNick = %s\n", yesno_to_str(Conf_ClientUserNick)); printf(" Info = %s\n", Conf_ServerInfo); #ifndef PAM printf(" Password = %s\n", Conf_ServerPwd); @@ -353,7 +351,9 @@ Conf_Test( void ) printf(" MaxConnections = %ld\n", Conf_MaxConnections); printf(" MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP); printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1); - printf(" MaxNickLength = %u\n\n", Conf_MaxNickLength - 1); + printf(" MaxNickLength = %u\n", Conf_MaxNickLength - 1); + printf(" ClientHost = %s\n", Conf_ClientHost); + printf(" ClientUserNick = %s\n\n", yesno_to_str(Conf_ClientUserNick)); puts("[FEATURES]"); printf(" DNS = %s\n", yesno_to_str(Conf_DNS));

1 0

Alexander Barton : ngircd.conf.5: document "ClientHost" and "ClientUserNick "
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: c0d13c47135adb32be36226b64367447330b3d43 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=c0d13c47… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 16 23:44:00 2011 +0100 ngircd.conf.5: document "ClientHost" and "ClientUserNick" --- man/ngircd.conf.5.tmpl | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index c8bab5f..3282476 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -236,6 +236,14 @@ Default: 10. 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 +\fBClientHost\fR +Set this hostname for every client instead of the real one. Default: empty, +don't change. +.TP +\fBClientUserNick\fR +Set every clients' user name to their nick name and hide the one supplied +by the IRC client. Default: no. .SH [OPERATOR] .I [Operator] sections are used to define IRC Operators. There may be more than one

1 0