- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : IRC_MODE(), Client_Mode(): code cleanup [1/2]
by alex＠arthur.barton.de 13 Aug '11

13 Aug '11

Module: ngircd.git Branch: master Commit: d692286d7a5a31f5ccef4f8d6b3ddee2188950ff URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d692286d… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 1 09:07:32 2011 +0200 IRC_MODE(), Client_Mode(): code cleanup [1/2] --- src/ngircd/irc-mode.c | 146 ++++++++++++++++++++++++++++++------------------- 1 files changed, 89 insertions(+), 57 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 50b0db0..2cc60f4 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -50,25 +50,39 @@ static bool Send_ListChange PARAMS((const char *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Mask)); +/** + * Handler for the IRC "MODE" command. + * + * See RFC 2812 section 3.1.5 ("user mode message") and section 3.2.3 + * ("channel mode message"), and RFC 2811 section 4 ("channel modes"). + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @returns CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_MODE( CLIENT *Client, REQUEST *Req ) { CLIENT *cl, *origin; CHANNEL *chan; - assert( Client != NULL ); - assert( Req != NULL ); + assert(Client != NULL); + assert(Req != NULL); /* No parameters? */ - if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc < 1) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); /* Origin for answers */ - if( Client_Type( Client ) == CLIENT_SERVER ) - { - origin = Client_Search( Req->prefix ); - if( ! origin ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); - } - else origin = Client; + if (Client_Type(Client) == CLIENT_SERVER) { + origin = Client_Search(Req->prefix); + if (!origin) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), + Req->prefix); + } else + origin = Client; /* Channel or user mode? */ cl = NULL; chan = NULL; @@ -88,51 +102,65 @@ IRC_MODE( CLIENT *Client, REQUEST *Req ) } /* IRC_MODE */ +/** + * Handle client mode requests + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @param Origin The originator of the MODE command (prefix). + * @param Target The target (client) of this MODE command. + * @returns CONNECTED or DISCONNECTED. + */ static bool Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) { - /* Handle client mode requests */ - char the_modes[COMMAND_LEN], x[2], *mode_ptr; bool ok, set; int mode_arg; size_t len; /* Is the client allowed to request or change the modes? */ - if( Client_Type( Client ) == CLIENT_USER ) - { + if (Client_Type(Client) == CLIENT_USER) { /* Users are only allowed to manipulate their own modes! */ - if( Target != Client ) return IRC_WriteStrClient( Client, ERR_USERSDONTMATCH_MSG, Client_ID( Client )); + if (Target != Client) + return IRC_WriteStrClient(Client, + ERR_USERSDONTMATCH_MSG, + Client_ID(Client)); } /* Mode request: let's answer it :-) */ - if( Req->argc == 1 ) return IRC_WriteStrClient( Origin, RPL_UMODEIS_MSG, Client_ID( Origin ), Client_Modes( Target )); + if (Req->argc == 1) + return IRC_WriteStrClient(Origin, RPL_UMODEIS_MSG, + Client_ID(Origin), + Client_Modes(Target)); mode_arg = 1; mode_ptr = Req->argv[mode_arg]; /* Initial state: set or unset modes? */ - if( *mode_ptr == '+' ) set = true; - else if( *mode_ptr == '-' ) set = false; - else return IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Origin )); - - /* Prepare reply string */ - if( set ) strcpy( the_modes, "+" ); - else strcpy( the_modes, "-" ); + if (*mode_ptr == '+') { + set = true; + strcpy(the_modes, "+"); + } else if (*mode_ptr == '-') { + set = false; + strcpy(the_modes, "-"); + } else + return IRC_WriteStrClient(Origin, ERR_UMODEUNKNOWNFLAG_MSG, + Client_ID(Origin)); x[1] = '\0'; ok = CONNECTED; - while( mode_ptr ) - { + while (mode_ptr) { mode_ptr++; - if( ! *mode_ptr ) - { + if (!*mode_ptr) { /* Try next argument if there's any */ mode_arg++; - if( mode_arg < Req->argc ) mode_ptr = Req->argv[mode_arg]; - else break; + if (mode_arg < Req->argc) + mode_ptr = Req->argv[mode_arg]; + else + break; } - + switch( *mode_ptr ) { case '+': @@ -217,49 +245,53 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) x[0] = '\0'; goto client_exit; } - if( ! ok ) break; + if (!ok) + break; /* Is there a valid mode change? */ - if( ! x[0] ) continue; - - if( set ) - { - /* Set mode */ - if( Client_ModeAdd( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes )); + if (!x[0]) + continue; + if (set) { + if (Client_ModeAdd(Target, x[0])) + strlcat(the_modes, x, sizeof(the_modes)); + } else { + if (Client_ModeDel(Target, x[0])) + strlcat(the_modes, x, sizeof(the_modes)); } - else - { - /* Unset mode */ - if( Client_ModeDel( Target, x[0] )) strlcat( the_modes, x, sizeof( the_modes )); - } } client_exit: - + /* Are there changed modes? */ - if( the_modes[1] ) - { + if (the_modes[1]) { /* Remoce needless action modifier characters */ - len = strlen( the_modes ) - 1; - if(( the_modes[len] == '+' ) || ( the_modes[len] == '-' )) the_modes[len] = '\0'; + len = strlen(the_modes) - 1; + if (the_modes[len] == '+' || the_modes[len] == '-') + the_modes[len] = '\0'; - if( Client_Type( Client ) == CLIENT_SERVER ) - { + if (Client_Type(Client) == CLIENT_SERVER) { /* Forward modes to other servers */ - IRC_WriteStrServersPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes ); - } - else - { + IRC_WriteStrServersPrefix(Client, Origin, + "MODE %s :%s", + Client_ID(Target), + the_modes); + } else { /* Send reply to client and inform other servers */ - ok = IRC_WriteStrClientPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes ); - IRC_WriteStrServersPrefix( Client, Origin, "MODE %s :%s", Client_ID( Target ), the_modes ); + ok = IRC_WriteStrClientPrefix(Client, Origin, + "MODE %s :%s", + Client_ID(Target), + the_modes); + IRC_WriteStrServersPrefix(Client, Origin, + "MODE %s :%s", + Client_ID(Target), + the_modes); } LogDebug("%s \"%s\": Mode change, now \"%s\".", Client_TypeText(Target), Client_Mask(Target), Client_Modes(Target)); } - - IRC_SetPenalty( Client, 1 ); + + IRC_SetPenalty(Client, 1); return ok; } /* Client_Mode */

1 0

Alexander Barton : Infom clients when other servers change their user modes
by alex＠arthur.barton.de 13 Aug '11

13 Aug '11

Module: ngircd.git Branch: master Commit: 3dc3a035386789852ba5a9fbc22b9b3c2793f0b0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3dc3a035… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 1 21:10:16 2011 +0200 Infom clients when other servers change their user modes --- src/ngircd/irc-mode.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 2cc60f4..1222bc5 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -271,6 +271,14 @@ client_exit: if (Client_Type(Client) == CLIENT_SERVER) { /* Forward modes to other servers */ + if (Client_Conn(Target) != NONE) { + /* Remote server (service?) changed modes + * for one of our clients. Inform it! */ + IRC_WriteStrClientPrefix(Target, Origin, + "MODE %s :%s", + Client_ID(Target), + the_modes); + } IRC_WriteStrServersPrefix(Client, Origin, "MODE %s :%s", Client_ID(Target),

1 0

Alexander Barton : Enlarge client user mode buffer, reduce client flags buffer
by alex＠arthur.barton.de 13 Aug '11

13 Aug '11

Module: ngircd.git Branch: master Commit: ea725b99b7cc308de6a035e016e4d89e268cbf1f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ea725b99… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 1 21:21:01 2011 +0200 Enlarge client user mode buffer, reduce client flags buffer We have to enlage our user mode buffer, so we can handle even unknown user modes in the future; and reduce the client flags buffer, because I can't imagine why we ever would need ~100 flags!? Now we support up to 15 user modes (was: 8) and up to 15 flags (was: 99). So in the end, we even save 99-15+8-15=77 bytes for each client structure! --- src/ngircd/defines.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 688f2d3..8f62279 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -44,10 +44,10 @@ see RFC 2812, section 1.2.1 */ #define CLIENT_NAME_LEN 32 /* Max. length of "real names" */ #define CLIENT_HOST_LEN 64 /* Max. host name length */ -#define CLIENT_MODE_LEN 9 /* Max. lenth of all client modes */ +#define CLIENT_MODE_LEN 16 /* Max. lenth of all client modes */ #define CLIENT_INFO_LEN 64 /* Max. length of server info texts */ #define CLIENT_AWAY_LEN 128 /* Max. length of away messages */ -#define CLIENT_FLAGS_LEN 100 /* Max. length of client flags */ +#define CLIENT_FLAGS_LEN 16 /* Max. length of client flags */ #define CHANNEL_NAME_LEN 51 /* Max. length of a channel name, see RFC 2812 section 1.3 */

1 0

Alexander Barton : IRC_MODE(), Client_Mode(): code cleanup [2/2]
by alex＠arthur.barton.de 13 Aug '11

13 Aug '11

Module: ngircd.git Branch: master Commit: 1ed602eb47ef7c9257559209407a5b9363c532f8 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1ed602eb… Author: Alexander Barton <alex(a)barton.de> Date: Mon Aug 1 21:51:31 2011 +0200 IRC_MODE(), Client_Mode(): code cleanup [2/2] --- src/ngircd/irc-mode.c | 163 ++++++++++++++++++++++++++----------------------- 1 files changed, 86 insertions(+), 77 deletions(-) diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 1222bc5..7861868 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -161,90 +161,99 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) break; } - switch( *mode_ptr ) - { - case '+': - case '-': - if((( *mode_ptr == '+' ) && ( ! set )) || (( *mode_ptr == '-' ) && ( set ))) - { - /* Action modifier ("+"/"-") must be changed ... */ - len = strlen( the_modes ) - 1; - if(( the_modes[len] == '+' ) || ( the_modes[len] == '-' )) - { - /* Adjust last action modifier in result */ - the_modes[len] = *mode_ptr; - } - else - { - /* Append modifier character to result string */ - x[0] = *mode_ptr; - strlcat( the_modes, x, sizeof( the_modes )); - } - if( *mode_ptr == '+' ) set = true; - else set = false; + switch(*mode_ptr) { + case '+': + case '-': + if ((*mode_ptr == '+' && !set) + || (*mode_ptr == '-' && set)) { + /* Action modifier ("+"/"-") must be changed */ + len = strlen(the_modes) - 1; + if (the_modes[len] == '+' + || the_modes[len] == '-') { + /* Last character in the "result + * string" was an "action", so just + * overwrite it with the new action */ + the_modes[len] = *mode_ptr; + } else { + /* Append new modifier character to + * the resulting mode string */ + x[0] = *mode_ptr; + strlcat(the_modes, x, + sizeof(the_modes)); } - continue; + if (*mode_ptr == '+') + set = true; + else + set = false; + } + continue; } - + /* Validate modes */ x[0] = '\0'; - switch( *mode_ptr ) - { - case 'i': /* Invisible */ - case 's': /* Server messages */ - case 'w': /* Wallops messages */ - x[0] = *mode_ptr; - break; - - case 'a': /* Away */ - if( Client_Type( Client ) == CLIENT_SERVER ) - { - x[0] = 'a'; - Client_SetAway( Origin, DEFAULT_AWAY_MSG ); - } - else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin )); - break; - - case 'c': /* Receive connect notices - * (only settable by IRC operators!) */ - if(!set || Client_OperByMe(Origin) - || Client_Type(Client) == CLIENT_SERVER) - x[0] = 'c'; - else - ok = IRC_WriteStrClient(Origin, + switch (*mode_ptr) { + case 'i': /* Invisible */ + case 's': /* Server messages */ + case 'w': /* Wallops messages */ + x[0] = *mode_ptr; + break; + case 'a': /* Away */ + if (Client_Type(Client) == CLIENT_SERVER) { + x[0] = 'a'; + Client_SetAway(Origin, DEFAULT_AWAY_MSG); + } else + ok = IRC_WriteStrClient(Origin, ERR_NOPRIVILEGES_MSG, Client_ID(Origin)); - break; - - case 'o': /* IRC operator (only unsettable!) */ - if(( ! set ) || ( Client_Type( Client ) == CLIENT_SERVER )) - { - Client_SetOperByMe( Target, false ); - x[0] = 'o'; - } - else ok = IRC_WriteStrClient( Origin, ERR_NOPRIVILEGES_MSG, Client_ID( Origin )); - break; - - case 'r': /* Restricted (only settable) */ - if(( set ) || ( Client_Type( Client ) == CLIENT_SERVER )) x[0] = 'r'; - else ok = IRC_WriteStrClient( Origin, ERR_RESTRICTED_MSG, Client_ID( Origin )); - break; - - case 'x': /* Cloak hostname */ - if (Client_HasMode(Client, 'r')) - ok = IRC_WriteStrClient(Origin, - ERR_RESTRICTED_MSG, - Client_ID(Origin)); - else - x[0] = 'x'; - break; - - default: - Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin )); - if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr ); - x[0] = '\0'; - goto client_exit; + break; + case 'c': /* Receive connect notices + * (only settable by IRC operators!) */ + if (!set || Client_Type(Client) == CLIENT_SERVER + || Client_OperByMe(Origin)) + x[0] = 'c'; + else + ok = IRC_WriteStrClient(Origin, + ERR_NOPRIVILEGES_MSG, + Client_ID(Origin)); + break; + case 'o': /* IRC operator (only unsettable!) */ + if (!set || Client_Type(Client) == CLIENT_SERVER) { + Client_SetOperByMe(Target, false); + x[0] = 'o'; + } else + ok = IRC_WriteStrClient(Origin, + ERR_NOPRIVILEGES_MSG, + Client_ID(Origin)); + break; + case 'r': /* Restricted (only settable) */ + if (set || Client_Type(Client) == CLIENT_SERVER) + x[0] = 'r'; + else + ok = IRC_WriteStrClient(Origin, + ERR_RESTRICTED_MSG, + Client_ID(Origin)); + break; + case 'x': /* Cloak hostname */ + if (Client_HasMode(Client, 'r')) + ok = IRC_WriteStrClient(Origin, + ERR_RESTRICTED_MSG, + Client_ID(Origin)); + else + x[0] = 'x'; + break; + default: + Log(LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", + set ? '+' : '-', *mode_ptr, Client_ID(Origin)); + if (Client_Type(Client) != CLIENT_SERVER) + ok = IRC_WriteStrClient(Origin, + ERR_UMODEUNKNOWNFLAG2_MSG, + Client_ID(Origin), + set ? '+' : '-', + *mode_ptr); + x[0] = '\0'; + goto client_exit; } + if (!ok) break;

1 0

Alexander Barton : Spoofed prefixes: close connection on non-server links only
by alex＠arthur.barton.de 09 Aug '11

09 Aug '11

Module: ngircd.git Branch: master Commit: 6cbe13085d3c8767a70d2394840a0a03ac6f290a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6cbe1308… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jul 19 16:00:55 2011 +0200 Spoofed prefixes: close connection on non-server links only On server-links, spoofed prefixes can happen because of the asynchronous nature of the IRC protocol. So don't break server-links, only log a message and ignore the command. This fixes bug 113, see: <https://arthur.barton.de/bugzilla/show_bug.cgi?id=113> --- src/ngircd/parse.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 72e3430..be3c864 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -325,13 +325,21 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) /* check if the client named in the prefix is expected * to come from that direction */ if (Client_NextHop(c) != client) { - Log(LOG_ERR, - "Spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!", - Req->prefix, Client_Mask(Conn_GetClient(Idx)), Idx, - Req->command); - Conn_Close(Idx, NULL, "Spoofed prefix", true); - *Closed = true; + if (Client_Type(c) != CLIENT_SERVER) { + Log(LOG_ERR, + "Spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\")!", + Req->prefix, Client_Mask(Conn_GetClient(Idx)), Idx, + Req->command); + Conn_Close(Idx, NULL, "Spoofed prefix", true); + *Closed = true; + } else { + Log(LOG_INFO, + "Ignoring spoofed prefix \"%s\" from \"%s\" (connection %d, command \"%s\").", + Req->prefix, Client_Mask(Conn_GetClient(Idx)), Idx, + Req->command); + } return false; + } return true;

1 0

Alexander Barton : Slightly change (and document!) IRC_KILL() calling convention
by alex＠arthur.barton.de 09 Aug '11

09 Aug '11

Module: ngircd.git Branch: master Commit: 456e55921dddb4ae24bfc887b668c0e6407caace URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=456e5592… Author: Alexander Barton <alex(a)barton.de> Date: Sat Jul 30 19:47:59 2011 +0200 Slightly change (and document!) IRC_KILL() calling convention --- src/ngircd/irc-login.c | 14 ++++--- src/ngircd/irc.c | 86 ++++++++++++++++++++++++------------------------ 2 files changed, 51 insertions(+), 49 deletions(-) diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 067703a..c90a7c1 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -1096,20 +1096,22 @@ Hello_User_PostAuth(CLIENT *Client) * @param Reason Reason for the KILL. */ static void -Kill_Nick( char *Nick, char *Reason ) +Kill_Nick(char *Nick, char *Reason) { REQUEST r; - assert( Nick != NULL ); - assert( Reason != NULL ); + assert (Nick != NULL); + assert (Reason != NULL); - r.prefix = (char *)Client_ThisServer( ); + r.prefix = NULL; r.argv[0] = Nick; r.argv[1] = Reason; r.argc = 2; - Log( LOG_ERR, "User(s) with nick \"%s\" will be disconnected: %s", Nick, Reason ); - IRC_KILL( Client_ThisServer( ), &r ); + Log(LOG_ERR, "User(s) with nick \"%s\" will be disconnected: %s", + Nick, Reason); + + IRC_KILL(Client_ThisServer(), &r); } /* Kill_Nick */ diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 8dd9bf7..69dd61a 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -63,13 +63,21 @@ IRC_ERROR( CLIENT *Client, REQUEST *Req ) /** - * Kill client on request. + * Handler for the IRC "KILL" command. + * * This function implements the IRC command "KILL" wich is used to selectively * disconnect clients. It can be used by IRC operators and servers, for example - * to "solve" nick collisions after netsplits. + * to "solve" nick collisions after netsplits. See RFC 2812 section 3.7.1. + * * Please note that this function is also called internally, without a real * KILL command being received over the network! Client is Client_ThisServer() - * in this case. */ + * in this case, and the prefix in Req is NULL. + * + * @param Client The client from which this command has been received + * or Client_ThisServer() when generated interanlly. + * @param Req Request structure with prefix and all parameters. + * @returns CONNECTED or DISCONNECTED. + */ GLOBAL bool IRC_KILL( CLIENT *Client, REQUEST *Req ) { @@ -77,55 +85,47 @@ IRC_KILL( CLIENT *Client, REQUEST *Req ) char reason[COMMAND_LEN], *msg; CONN_ID my_conn, conn; - assert( Client != NULL ); - assert( Req != NULL ); + assert (Client != NULL); + assert (Req != NULL); - if(( Client_Type( Client ) != CLIENT_SERVER ) && - ( ! Client_OperByMe( Client ))) - { - /* The originator of the KILL is neither an IRC operator of - * this server nor a server. */ - return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, - Client_ID( Client )); - } + if (Client_Type(Client) != CLIENT_SERVER && !Client_OperByMe(Client)) + return IRC_WriteStrClient(Client, ERR_NOPRIVILEGES_MSG, + Client_ID(Client)); - if( Req->argc != 2 ) - { - /* This command requires exactly 2 parameters! */ - return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID( Client ), Req->command ); - } + if (Req->argc != 2) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - if( Req->prefix ) prefix = Client_Search( Req->prefix ); - else prefix = Client; - if( ! prefix ) - { - Log( LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!", - Req->prefix ); - prefix = Client_ThisServer( ); + /* Get prefix (origin); use the client if no prefix is given. */ + if (Req->prefix) + prefix = Client_Search(Req->prefix); + else + prefix = Client; + + /* Log a warning message and use this server as origin when the + * prefix (origin) is invalid. */ + if (!prefix) { + Log(LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!", + Req->prefix ); + prefix = Client_ThisServer(); } - if( Client != Client_ThisServer( )) - { - /* This is a "real" KILL received from the network. */ - Log( LOG_NOTICE|LOG_snotice, "Got KILL command from \"%s\" for \"%s\": %s", - Client_Mask( prefix ), Req->argv[0], Req->argv[1] ); - } + if (Client != Client_ThisServer()) + Log(LOG_NOTICE|LOG_snotice, + "Got KILL command from \"%s\" for \"%s\": %s", + Client_Mask(prefix), Req->argv[0], Req->argv[1]); - /* Build reason string */ - if( Client_Type( Client ) == CLIENT_USER ) - { - /* Prefix the "reason" if the originator is a regular user, - * so users can't spoof KILLs of servers. */ - snprintf( reason, sizeof( reason ), "KILLed by %s: %s", - Client_ID( Client ), Req->argv[1] ); - } + /* Build reason string: Prefix the "reason" if the originator is a + * regular user, so users can't spoof KILLs of servers. */ + if (Client_Type(Client) == CLIENT_USER) + snprintf(reason, sizeof(reason), "KILLed by %s: %s", + Client_ID(Client), Req->argv[1]); else - strlcpy( reason, Req->argv[1], sizeof( reason )); + strlcpy(reason, Req->argv[1], sizeof(reason)); /* Inform other servers */ - IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", - Req->argv[0], reason ); + IRC_WriteStrServersPrefix(Client, prefix, "KILL %s :%s", + Req->argv[0], reason); /* Save ID of this connection */ my_conn = Client_Conn( Client );

1 0

Alexander Barton : Merge branch 'bug113-SrvPrefix'
by alex＠arthur.barton.de 09 Aug '11

09 Aug '11

Module: ngircd.git Branch: master Commit: d9325e803010d9a305182a4216bfbde168094dfa URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d9325e80… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 9 10:16:56 2011 +0200 Merge branch 'bug113-SrvPrefix' * bug113-SrvPrefix: Slightly change (and document!) IRC_KILL() calling convention Spoofed prefixes: close connection on non-server links only ---

1 0

Alexander Barton : Xcode: update project file to Xcode 3.2 or newer
by alex＠arthur.barton.de 07 Aug '11

07 Aug '11

Module: ngircd.git Branch: master Commit: 641045249cb4c11244b772012dc5b36005c89517 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=64104524… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 7 14:42:49 2011 +0200 Xcode: update project file to Xcode 3.2 or newer Xcode requires Mac OS X 10.6 or newer; Xcode 4 supports this project format as well, so effectively you can use Mac OS X 10.6.x or 10.7.x for building ngIRCd with the Apple Xcode IDE. --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 8da2a81..42ddbf2 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 44; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -647,8 +647,11 @@ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0410; + }; buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "ngIRCd" */; - compatibilityVersion = "Xcode 3.0"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -744,13 +747,11 @@ 1DEB928B08733DD80010E9CD /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; - GCC_VERSION = 4.0; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_VERSION = 4.2; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; + SDKROOT = macosx10.6; }; name = Default; }; @@ -760,11 +761,10 @@ ARCHS = "$(NATIVE_ARCH_ACTUAL)"; GCC_DEBUGGING_SYMBOLS = full; GCC_OPTIMIZATION_LEVEL = 0; - GCC_VERSION = 4.0; + GCC_VERSION = 4.2; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; SDKROOT = ""; }; name = Debug;

1 0

Alexander Barton : Xcode: Mac OS X config.h: support 10.5 as well as 10.6/ 10.7 SDK
by alex＠arthur.barton.de 07 Aug '11

07 Aug '11

Module: ngircd.git Branch: master Commit: 69f81a359a0a9b764200172c004e41fa357f3e75 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=69f81a35… Author: Alexander Barton <alex(a)barton.de> Date: Sun Aug 7 14:41:11 2011 +0200 Xcode: Mac OS X config.h: support 10.5 as well as 10.6/10.7 SDK --- contrib/MacOSX/config.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index af0a34c..86b460b 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.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 @@ -103,10 +103,15 @@ #ifdef PAM /* Define to 1 if you have the `pam_authenticate' function. */ #define HAVE_PAM_AUTHENTICATE 1 +#if (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1060) /* Define to 1 if you have the <pam/pam_appl.h> header file. */ #define HAVE_PAM_PAM_APPL_H 1 /* Mac OS X <10.6 doesn't have pam_fail_delay() */ #define NO_PAM_FAIL_DELAY 1 +#else +/* Define to 1 if you have the <security/pam_appl.h> header file. */ +#define HAVE_SECURITY_PAM_APPL_H 1 +#endif #endif /* -eof- */

1 0

Alexander Barton : Xcode: exclude more Xcode 4 specific directories in ". gitignore"
by alex＠arthur.barton.de 02 Aug '11

02 Aug '11

Module: ngircd.git Branch: master Commit: be03bc672cf37881afe31c466576595f2976f5e7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=be03bc67… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 2 16:04:23 2011 +0200 Xcode: exclude more Xcode 4 specific directories in ".gitignore" --- contrib/MacOSX/ngIRCd.xcodeproj/.gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/.gitignore b/contrib/MacOSX/ngIRCd.xcodeproj/.gitignore index d82a5e4..d6d065a 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/.gitignore +++ b/contrib/MacOSX/ngIRCd.xcodeproj/.gitignore @@ -1,2 +1,4 @@ +project.xcworkspace +xcuserdata *.mode1v3 *.pbxuser

1 0