- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : LINKS command: support <mask> parameter
by alex＠arthur.barton.de 04 Jan '12

04 Jan '12

Module: ngircd.git Branch: master Commit: 5e3449a241b3ee1e8f60bc33c0b1342543254397 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5e3449a2… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 4 22:51:02 2012 +0100 LINKS command: support <mask> parameter The <mask> can be used to limit the servers shown in the listing. --- src/ngircd/irc-info.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index dfc67b9..5e56949 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -254,7 +254,8 @@ IRC_LINKS(CLIENT *Client, REQUEST *Req) c = Client_First(); while (c) { - if (Client_Type(c) == CLIENT_SERVER) { + if (Client_Type(c) == CLIENT_SERVER + && MatchCaseInsensitive(mask, Client_ID(c))) { if (!IRC_WriteStrClient(from, RPL_LINKS_MSG, Client_ID(from), Client_ID(c), Client_ID(Client_TopServer(c)

1 0

Alexander Barton : IRC_LINKS(): Code cleanup; more documentation
by alex＠arthur.barton.de 04 Jan '12

04 Jan '12

Module: ngircd.git Branch: master Commit: 762b0325df921622686096affc7ead41ba028959 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=762b0325… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 4 22:49:18 2012 +0100 IRC_LINKS(): Code cleanup; more documentation --- src/ngircd/irc-info.c | 86 ++++++++++++++++++++++++++++++------------------ 1 files changed, 54 insertions(+), 32 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 092ca0a..dfc67b9 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -200,51 +200,73 @@ IRC_ISON( CLIENT *Client, REQUEST *Req ) } /* IRC_ISON */ +/** + * Handler for the IRC "LINKS" command. + * + * See RFC 2812, 3.4.5 "Links message". + * + * @param Client The client from which this command has been received. + * @param Req Request structure with prefix and all parameters. + * @return CONNECTED or DISCONNECTED. + */ GLOBAL bool -IRC_LINKS( CLIENT *Client, REQUEST *Req ) +IRC_LINKS(CLIENT *Client, REQUEST *Req) { CLIENT *target, *from, *c; char *mask; - assert( Client != NULL ); - assert( Req != NULL ); + assert(Client != NULL); + assert(Req != NULL); - if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + IRC_SetPenalty(Client, 1); - /* Server-Mask ermitteln */ - if( Req->argc > 0 ) mask = Req->argv[Req->argc - 1]; - else mask = "*"; + if (Req->argc > 2) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - /* Absender ermitteln */ - if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); - else from = Client; - if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + /* Get pointer to server mask or "*", if none given */ + if (Req->argc > 0) + mask = Req->argv[Req->argc - 1]; + else + mask = "*"; - /* An anderen Server forwarden? */ - if( Req->argc == 2 ) - { - target = Client_Search( Req->argv[0] ); - if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] ); - else if( target != Client_ThisServer( )) return IRC_WriteStrClientPrefix( target, from, "LINKS %s %s", Req->argv[0], Req->argv[1] ); - } + if (Client_Type(Client) == CLIENT_SERVER) + from = Client_Search(Req->prefix); + else + from = Client; + if (!from) + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); - /* Wer ist der Absender? */ - if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_Search( Req->prefix ); - else target = Client; - if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + /* Forward? */ + if (Req->argc == 2) { + target = Client_Search(Req->argv[0]); + if (! target || Client_Type(target) != CLIENT_SERVER) + return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG, + Client_ID(from), + Req->argv[0] ); + else + if (target != Client_ThisServer()) + return IRC_WriteStrClientPrefix(target, from, + "LINKS %s %s", Req->argv[0], + Req->argv[1]); + } - c = Client_First( ); - while( c ) - { - if( Client_Type( c ) == CLIENT_SERVER ) - { - if( ! IRC_WriteStrClient( target, RPL_LINKS_MSG, Client_ID( target ), Client_ID( c ), Client_ID( Client_TopServer( c ) ? Client_TopServer( c ) : Client_ThisServer( )), Client_Hops( c ), Client_Info( c ))) return DISCONNECTED; + c = Client_First(); + while (c) { + if (Client_Type(c) == CLIENT_SERVER) { + if (!IRC_WriteStrClient(from, RPL_LINKS_MSG, + Client_ID(from), Client_ID(c), + Client_ID(Client_TopServer(c) + ? Client_TopServer(c) + : Client_ThisServer()), + Client_Hops(c), Client_Info(c))) + return DISCONNECTED; } - c = Client_Next( c ); + c = Client_Next(c); } - - IRC_SetPenalty( target, 1 ); - return IRC_WriteStrClient( target, RPL_ENDOFLINKS_MSG, Client_ID( target ), mask ); + return IRC_WriteStrClient(from, RPL_ENDOFLINKS_MSG, + Client_ID(from), mask); } /* IRC_LINKS */

1 0

Alexander Barton : Add 1 second penalty for every further target on PRIVMSG /NOTICE
by alex＠arthur.barton.de 04 Jan '12

04 Jan '12

Module: ngircd.git Branch: master Commit: 6b62a5ec4f39238068b440fd7f6877582c54ec77 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6b62a5ec… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 4 21:43:32 2012 +0100 Add 1 second penalty for every further target on PRIVMSG/NOTICE This reduces the possibility of flooding channels with commands like "PRIVMSG/NOTICE #a,#n,#c,... :message" a little bit. Problem noticed by Cahata -- thanks! --- src/ngircd/irc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 69dd61a..7a87137 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -494,6 +494,8 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) } currentTarget = strtok_r(NULL, ",", &lastCurrentTarget); + if (currentTarget) + Conn_SetPenalty(Client_Conn(Client), 1); } return CONNECTED;

1 0

Alexander Barton : Conn_SetPenalty(): Add new "penalty time" on each function call
by alex＠arthur.barton.de 04 Jan '12

04 Jan '12

Module: ngircd.git Branch: master Commit: b24d645ca183194b0158cd7bba1e0c1f468a7de9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b24d645c… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 4 21:39:46 2012 +0100 Conn_SetPenalty(): Add new "penalty time" on each function call Until now, the penalty time has only been set when longer as the already set one, so it didn't accumulate. And add documentation for and clean up code in Conn_SetPenalty() and Conn_ResetPenalty() functions. --- src/ngircd/conn-func.c | 51 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 36 insertions(+), 15 deletions(-) diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c index 8b0b6f7..32001f0 100644 --- a/src/ngircd/conn-func.c +++ b/src/ngircd/conn-func.c @@ -65,35 +65,56 @@ Conn_LastPing( CONN_ID Idx ) } /* Conn_LastPing */ +/** + * Add "penalty time" for a connection. + * + * During the "penalty time" the socket is ignored completely, no new data + * is read. This function only increases the penalty, it is not possible to + * decrease the penalty time. + * + * @param Idex Connection index. + * @param Seconds Seconds to add. + * @see Conn_ResetPenalty + */ GLOBAL void -Conn_SetPenalty( CONN_ID Idx, time_t Seconds ) +Conn_SetPenalty(CONN_ID Idx, time_t Seconds) { - /* set Penalty-Delay for a socket. - * during the penalty, the socket is ignored completely, no new - * data is read. This function only increases the penalty, it is - * not possible to decrease the penalty time. - */ time_t t; - - assert( Idx > NONE ); - assert( Seconds >= 0 ); - t = time( NULL ) + Seconds; - if (t > My_Connections[Idx].delaytime) + assert(Idx > NONE); + assert(Seconds >= 0); + + t = time(NULL); + if (My_Connections[Idx].delaytime < t) My_Connections[Idx].delaytime = t; + My_Connections[Idx].delaytime += Seconds; + #ifdef DEBUG - Log(LOG_DEBUG, "Add penalty time on connection %d: %ld second(s).", - Idx, (long)Seconds); + Log(LOG_DEBUG, + "Add penalty time on connection %d: %ld second%s, total %ld second%s.", + Idx, (long)Seconds, Seconds != 1 ? "s" : "", + My_Connections[Idx].delaytime - t, + My_Connections[Idx].delaytime - t != 1 ? "s" : ""); #endif } /* Conn_SetPenalty */ +/** + * Reset the "penalty time" for one connection. + * + * @param Idx Connection index. + * @see Conn_SetPenalty + */ GLOBAL void -Conn_ResetPenalty( CONN_ID Idx ) +Conn_ResetPenalty(CONN_ID Idx) { - assert( Idx > NONE ); + assert(Idx > NONE); + My_Connections[Idx].delaytime = 0; +#ifdef DEBUG + Log(LOG_DEBUG, "Penalty time on connection %d has been reset."); +#endif } /* Conn_ResetPenalty */

1 0

Alexander Barton : main(): Code cleanup
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: 9069380ddfe8f1cf92ad711fbf050d2d65242091 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9069380d… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 19:25:31 2012 +0100 main(): Code cleanup --- src/ngircd/ngircd.c | 193 +++++++++++++++++++++++++-------------------------- 1 files changed, 96 insertions(+), 97 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index a1f1d88..e8370a1 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -74,12 +74,12 @@ static bool NGIRCd_Init PARAMS(( bool )); * Here all starts: this function is called by the operating system loader, * it is the first portion of code executed of ngIRCd. * - * @param argc The number of arguments passed to ngIRCd on the command line. - * @param argv An array containing all the arguments passed to ngIRCd. - * @return Global exit code of ngIRCd, zero on success. + * @param argc The number of arguments passed to ngIRCd on the command line. + * @param argv An array containing all the arguments passed to ngIRCd. + * @return Global exit code of ngIRCd, zero on success. */ GLOBAL int -main( int argc, const char *argv[] ) +main(int argc, const char *argv[]) { bool ok, configtest = false; bool NGIRCd_NoDaemon = false; @@ -92,7 +92,7 @@ main( int argc, const char *argv[] ) mtrace(); #endif - umask( 0077 ); + umask(0077); NGIRCd_SignalQuit = NGIRCd_SignalRestart = false; NGIRCd_Passive = false; @@ -102,75 +102,62 @@ main( int argc, const char *argv[] ) #ifdef SNIFFER NGIRCd_Sniffer = false; #endif - strlcpy( NGIRCd_ConfFile, SYSCONFDIR, sizeof( NGIRCd_ConfFile )); - strlcat( NGIRCd_ConfFile, CONFIG_FILE, sizeof( NGIRCd_ConfFile )); + strlcpy(NGIRCd_ConfFile, SYSCONFDIR, sizeof(NGIRCd_ConfFile)); + strlcat(NGIRCd_ConfFile, CONFIG_FILE, sizeof(NGIRCd_ConfFile)); - Fill_Version( ); + Fill_Version(); /* parse conmmand line */ - for( i = 1; i < argc; i++ ) - { + for (i = 1; i < argc; i++) { ok = false; - if(( argv[i][0] == '-' ) && ( argv[i][1] == '-' )) - { + if (argv[i][0] == '-' && argv[i][1] == '-') { /* long option */ - if( strcmp( argv[i], "--config" ) == 0 ) - { - if( i + 1 < argc ) - { + if (strcmp(argv[i], "--config") == 0) { + if (i + 1 < argc) { /* Ok, there's an parameter left */ - strlcpy( NGIRCd_ConfFile, argv[i + 1], sizeof( NGIRCd_ConfFile )); - + strlcpy(NGIRCd_ConfFile, argv[i+1], + sizeof(NGIRCd_ConfFile)); /* next parameter */ i++; ok = true; } } - if( strcmp( argv[i], "--configtest" ) == 0 ) - { + if (strcmp(argv[i], "--configtest") == 0) { configtest = true; ok = true; } #ifdef DEBUG - if( strcmp( argv[i], "--debug" ) == 0 ) - { + if (strcmp(argv[i], "--debug") == 0) { NGIRCd_Debug = true; ok = true; } #endif - if( strcmp( argv[i], "--help" ) == 0 ) - { - Show_Version( ); - puts( "" ); Show_Help( ); puts( "" ); - exit( 1 ); + if (strcmp(argv[i], "--help") == 0) { + Show_Version(); + puts(""); Show_Help( ); puts( "" ); + exit(1); } - if( strcmp( argv[i], "--nodaemon" ) == 0 ) - { + if (strcmp(argv[i], "--nodaemon") == 0) { NGIRCd_NoDaemon = true; ok = true; } - if( strcmp( argv[i], "--passive" ) == 0 ) - { + if (strcmp(argv[i], "--passive") == 0) { NGIRCd_Passive = true; ok = true; } #ifdef SNIFFER - if( strcmp( argv[i], "--sniffer" ) == 0 ) - { + if (strcmp(argv[i], "--sniffer") == 0) { NGIRCd_Sniffer = true; ok = true; } #endif - if( strcmp( argv[i], "--version" ) == 0 ) - { - Show_Version( ); - exit( 1 ); + if (strcmp(argv[i], "--version") == 0) { + Show_Version(); + exit(1); } } - else if(( argv[i][0] == '-' ) && ( argv[i][1] != '-' )) - { + else if(argv[i][0] == '-' && argv[i][1] != '-') { /* short option */ - for( n = 1; n < strlen( argv[i] ); n++ ) - { + for (n = 1; n < strlen(argv[i]); n++) { ok = false; #ifdef DEBUG if (argv[i][n] == 'd') { @@ -179,14 +166,14 @@ main( int argc, const char *argv[] ) } #endif if (argv[i][n] == 'f') { - if(( ! argv[i][n + 1] ) && ( i + 1 < argc )) - { + if (!argv[i][n+1] && i+1 < argc) { /* Ok, next character is a blank */ - strlcpy( NGIRCd_ConfFile, argv[i + 1], sizeof( NGIRCd_ConfFile )); + strlcpy(NGIRCd_ConfFile, argv[i+1], + sizeof(NGIRCd_ConfFile)); /* go to the following parameter */ i++; - n = strlen( argv[i] ); + n = strlen(argv[i]); ok = true; } } @@ -221,46 +208,49 @@ main( int argc, const char *argv[] ) exit(1); } - if (! ok) { - printf( "%s: invalid option \"-%c\"!\n", PACKAGE_NAME, argv[i][n] ); - printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME ); - exit( 1 ); + if (!ok) { + printf("%s: invalid option \"-%c\"!\n", + PACKAGE_NAME, argv[i][n]); + printf("Try \"%s --help\" for more information.\n", + PACKAGE_NAME); + exit(1); } } } - if( ! ok ) - { - printf( "%s: invalid option \"%s\"!\n", PACKAGE_NAME, argv[i] ); - printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME ); - exit( 1 ); + if (!ok) { + printf("%s: invalid option \"%s\"!\n", + PACKAGE_NAME, argv[i]); + printf("Try \"%s --help\" for more information.\n", + PACKAGE_NAME); + exit(1); } } /* Debug level for "VERSION" command */ NGIRCd_DebugLevel[0] = '\0'; #ifdef DEBUG - if( NGIRCd_Debug ) strcpy( NGIRCd_DebugLevel, "1" ); + if (NGIRCd_Debug) + strcpy(NGIRCd_DebugLevel, "1"); #endif #ifdef SNIFFER - if( NGIRCd_Sniffer ) - { + if (NGIRCd_Sniffer) { NGIRCd_Debug = true; - strcpy( NGIRCd_DebugLevel, "2" ); + strcpy(NGIRCd_DebugLevel, "2"); } #endif - if( configtest ) - { - Show_Version( ); puts( "" ); - exit( Conf_Test( )); + if (configtest) { + Show_Version(); puts(""); + exit(Conf_Test()); } - - while( ! NGIRCd_SignalQuit ) - { + + while (!NGIRCd_SignalQuit) { /* Initialize global variables */ - NGIRCd_Start = time( NULL ); - (void)strftime( NGIRCd_StartStr, 64, "%a %b %d %Y at %H:%M:%S (%Z)", localtime( &NGIRCd_Start )); + NGIRCd_Start = time(NULL); + (void)strftime(NGIRCd_StartStr, 64, + "%a %b %d %Y at %H:%M:%S (%Z)", + localtime(&NGIRCd_Start)); NGIRCd_SignalRestart = false; NGIRCd_SignalQuit = false; @@ -268,8 +258,8 @@ main( int argc, const char *argv[] ) Random_Init(); /* Initialize modules, part I */ - Log_Init( ! NGIRCd_NoDaemon ); - Conf_Init( ); + Log_Init(!NGIRCd_NoDaemon); + Conf_Init(); /* Initialize the "main program": chroot environment, user and * group ID, ... */ @@ -280,18 +270,22 @@ main( int argc, const char *argv[] ) /* Initialize modules, part II: these functions are eventually * called with already dropped privileges ... */ - Channel_Init( ); - Client_Init( ); - Conn_Init( ); - Class_Init( ); + Channel_Init(); + Client_Init(); + Conn_Init(); + Class_Init(); if (!io_library_init(CONNECTION_POOL)) { - Log(LOG_ALERT, "Fatal: Cannot initialize IO routines: %s", strerror(errno)); + Log(LOG_ALERT, + "Fatal: Could not initialize IO routines: %s", + strerror(errno)); exit(1); } if (!Signals_Init()) { - Log(LOG_ALERT, "Fatal: Could not set up signal handlers: %s", strerror(errno)); + Log(LOG_ALERT, + "Fatal: Could not set up signal handlers: %s", + strerror(errno)); exit(1); } @@ -299,40 +293,45 @@ main( int argc, const char *argv[] ) * used by ngIRCd in PASS commands and the known "extended * flags" are described in doc/Protocol.txt. */ #ifdef IRCPLUS - snprintf( NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS ); + snprintf(NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s:%s", + PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, + IRCPLUSFLAGS); #ifdef ZLIB - strcat( NGIRCd_ProtoID, "Z" ); -#endif - if( Conf_OperCanMode ) strcat( NGIRCd_ProtoID, "o" ); -#else - snprintf( NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE_NAME, PACKAGE_VERSION ); + strcat(NGIRCd_ProtoID, "Z"); #endif - strlcat( NGIRCd_ProtoID, " P", sizeof NGIRCd_ProtoID ); + if (Conf_OperCanMode) + strcat(NGIRCd_ProtoID, "o"); +#else /* IRCPLUS */ + snprintf(NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s", + PROTOVER, PROTOIRC, PACKAGE_NAME, PACKAGE_VERSION); +#endif /* IRCPLUS */ + strlcat(NGIRCd_ProtoID, " P", sizeof NGIRCd_ProtoID); #ifdef ZLIB - strlcat( NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID ); + strlcat(NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID); #endif LogDebug("Protocol and server ID is \"%s\".", NGIRCd_ProtoID); - Channel_InitPredefined( ); + Channel_InitPredefined(); - if( Conn_InitListeners( ) < 1 ) - { - Log( LOG_ALERT, "Server isn't listening on a single port!" ); - Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); - Pidfile_Delete( ); - exit( 1 ); + if (Conn_InitListeners() < 1) { + Log(LOG_ALERT, + "Server isn't listening on a single port!" ); + Log(LOG_ALERT, + "%s exiting due to fatal errors!", PACKAGE_NAME); + Pidfile_Delete(); + exit(1); } /* Main Run Loop */ - Conn_Handler( ); + Conn_Handler(); - Conn_Exit( ); - Client_Exit( ); - Channel_Exit( ); - Class_Exit( ); - Log_Exit( ); + Conn_Exit(); + Client_Exit(); + Channel_Exit(); + Class_Exit(); + Log_Exit(); } - Pidfile_Delete( ); + Pidfile_Delete(); return 0; } /* main */

1 0

Alexander Barton : NGIRCd_Init(): Code cleanup
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: e4006a93e3999ce5ab9dc82b29ef7e01ac370948 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e4006a93… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 19:34:54 2012 +0100 NGIRCd_Init(): Code cleanup --- src/ngircd/ngircd.c | 115 +++++++++++++++++++++++++++++---------------------- 1 files changed, 66 insertions(+), 49 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index e8370a1..170a3cd 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -602,12 +602,12 @@ Random_Init(void) /** * Initialize ngIRCd daemon. * - * @param NGIRCd_NoDaemon Set to true if ngIRCd should run in the - * foreground and not as a daemon. - * @return true on success. + * @param NGIRCd_NoDaemon Set to true if ngIRCd should run in the + * foreground (and not as a daemon). + * @return true on success. */ static bool -NGIRCd_Init( bool NGIRCd_NoDaemon ) +NGIRCd_Init(bool NGIRCd_NoDaemon) { static bool initialized; bool chrooted = false; @@ -623,57 +623,70 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) /* open /dev/null before chroot() */ fd = open( "/dev/null", O_RDWR); if (fd < 0) - Log(LOG_WARNING, "Could not open /dev/null: %s", strerror(errno)); + Log(LOG_WARNING, "Could not open /dev/null: %s", + strerror(errno)); } + /* SSL initialization */ if (!ConnSSL_InitLibrary()) Log(LOG_WARNING, "Warning: Error during SSL initialization, continuing ..."); - if( Conf_Chroot[0] ) { - if( chdir( Conf_Chroot ) != 0 ) { - Log( LOG_ERR, "Can't chdir() in ChrootDir (%s): %s", Conf_Chroot, strerror( errno )); + /* Change root */ + if (Conf_Chroot[0]) { + if (chdir(Conf_Chroot) != 0) { + Log(LOG_ERR, "Can't chdir() in ChrootDir (%s): %s", + Conf_Chroot, strerror(errno)); goto out; } - if( chroot( Conf_Chroot ) != 0 ) { + if (chroot(Conf_Chroot) != 0) { if (errno != EPERM) { - Log( LOG_ERR, "Can't change root directory to \"%s\": %s", - Conf_Chroot, strerror( errno )); + Log(LOG_ERR, + "Can't change root directory to \"%s\": %s", + Conf_Chroot, strerror(errno)); goto out; } } else { chrooted = true; - Log( LOG_INFO, "Changed root and working directory to \"%s\".", Conf_Chroot ); + Log(LOG_INFO, + "Changed root and working directory to \"%s\".", + Conf_Chroot); } } + /* Check user ID */ if (Conf_UID == 0) { - Log(LOG_INFO, "ServerUID must not be 0, using \"nobody\" instead.", Conf_UID); - - if (! NGIRCd_getNobodyID(&Conf_UID, &Conf_GID)) { - Log(LOG_WARNING, "Could not get user/group ID of user \"nobody\": %s", - errno ? strerror(errno) : "not found" ); + Log(LOG_INFO, + "ServerUID must not be 0, using \"nobody\" instead.", + Conf_UID); + + if (!NGIRCd_getNobodyID(&Conf_UID, &Conf_GID)) { + Log(LOG_WARNING, + "Could not get user/group ID of user \"nobody\": %s", + errno ? strerror(errno) : "not found" ); goto out; } } + /* Change group ID */ if (getgid() != Conf_GID) { - /* Change group ID */ if (setgid(Conf_GID) != 0) { real_errno = errno; - Log( LOG_ERR, "Can't change group ID to %u: %s", Conf_GID, strerror( errno )); + Log(LOG_ERR, "Can't change group ID to %u: %s", + Conf_GID, strerror(errno)); if (real_errno != EPERM) goto out; } } + /* Change user ID */ if (getuid() != Conf_UID) { - /* Change user ID */ if (setuid(Conf_UID) != 0) { real_errno = errno; - Log(LOG_ERR, "Can't change user ID to %u: %s", Conf_UID, strerror(errno)); - if (real_errno != EPERM) + Log(LOG_ERR, "Can't change user ID to %u: %s", + Conf_UID, strerror(errno)); + if (real_errno != EPERM) goto out; } } @@ -683,26 +696,27 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) /* Normally a child process is forked which isn't any longer * connected to ther controlling terminal. Use "--nodaemon" * to disable this "daemon mode" (useful for debugging). */ - if ( ! NGIRCd_NoDaemon ) { - pid = fork( ); - if( pid > 0 ) { + if (!NGIRCd_NoDaemon) { + pid = fork(); + if (pid > 0) { /* "Old" process: exit. */ - exit( 0 ); + exit(0); } - if( pid < 0 ) { + if (pid < 0) { /* Error!? */ - fprintf( stderr, "%s: Can't fork: %s!\nFatal error, exiting now ...\n", - PACKAGE_NAME, strerror( errno )); - exit( 1 ); + fprintf(stderr, + "%s: Can't fork: %s!\nFatal error, exiting now ...\n", + PACKAGE_NAME, strerror(errno)); + exit(1); } /* New child process */ #ifndef NeXT - (void)setsid( ); + (void)setsid(); #else setpgrp(0, getpid()); #endif - if (chdir( "/" ) != 0) + if (chdir("/") != 0) Log(LOG_ERR, "Can't change directory to '/': %s", strerror(errno)); @@ -713,19 +727,19 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) } pid = getpid(); - Pidfile_Create( pid ); + Pidfile_Create(pid); /* Check UID/GID we are running as, can be different from values * configured (e. g. if we were already started with a UID>0. */ Conf_UID = getuid(); Conf_GID = getgid(); - pwd = getpwuid( Conf_UID ); - grp = getgrgid( Conf_GID ); + pwd = getpwuid(Conf_UID); + grp = getgrgid(Conf_GID); Log(LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.", - pwd ? pwd->pw_name : "unknown", (long)Conf_UID, - grp ? grp->gr_name : "unknown", (long)Conf_GID, (long)pid); + pwd ? pwd->pw_name : "unknown", (long)Conf_UID, + grp ? grp->gr_name : "unknown", (long)Conf_GID, (long)pid); if (chrooted) { Log(LOG_INFO, "Running with root directory \"%s\".", @@ -734,20 +748,23 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) } else Log(LOG_INFO, "Not running with changed root directory."); - /* Change working directory to home directory of the user - * we are running as (only when running in daemon mode and not in chroot) */ + /* Change working directory to home directory of the user we are + * running as (only when running in daemon mode and not in chroot) */ + + if (NGIRCd_NoDaemon) + return true; if (pwd) { - if (!NGIRCd_NoDaemon ) { - if( chdir( pwd->pw_dir ) == 0 ) - Log( LOG_DEBUG, "Changed working directory to \"%s\" ...", pwd->pw_dir ); - else - Log( LOG_INFO, "Notice: Can't change working directory to \"%s\": %s", - pwd->pw_dir, strerror( errno )); - } - } else { - Log( LOG_ERR, "Can't get user informaton for UID %d!?", Conf_UID ); - } + if (chdir(pwd->pw_dir) == 0) + Log(LOG_DEBUG, + "Changed working directory to \"%s\" ...", + pwd->pw_dir); + else + Log(LOG_INFO, + "Notice: Can't change working directory to \"%s\": %s", + pwd->pw_dir, strerror(errno)); + } else + Log(LOG_ERR, "Can't get user informaton for UID %d!?", Conf_UID); return true; out:

1 0

Alexander Barton : NGIRCd_getNobodyID(): Code cleanup
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: 3193d5477c9f70e34f7ae636e51771b8e6039138 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3193d547… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 20:49:42 2012 +0100 NGIRCd_getNobodyID(): Code cleanup --- src/ngircd/ngircd.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 170a3cd..ec2462a 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -555,9 +555,10 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid ) #endif pwd = getpwnam("nobody"); - if (!pwd) return false; + if (!pwd) + return false; - if ( !pwd->pw_uid || !pwd->pw_gid) + if (!pwd->pw_uid || !pwd->pw_gid) return false; *uid = pwd->pw_uid;

1 0

Alexander Barton : Display correct error message when "Server{UID|GID}" is invalid
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: edab86e0f843dc07815477e25a0a6184d7500120 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=edab86e0… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 20:37:41 2012 +0100 Display correct error message when "Server{UID|GID}" is invalid This partly closes bug #118. ngIRCd still starts up even when Server{UID|GID} is invalid: then the daemon falls back to "nobody" when running with root(0) privileges (as before). --- src/ngircd/conf.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index b0c7fb4..f18016b 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1308,7 +1308,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) else { Conf_GID = (unsigned int)atoi(Arg); if (!Conf_GID && strcmp(Arg, "0")) - Config_Error_NaN(Line, Var); + Config_Error(LOG_WARNING, + "%s, line %d: Value of \"%s\" is not a valid group name or ID!", + NGIRCd_ConfFile, Line, Var); } return; } @@ -1319,7 +1321,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) else { Conf_UID = (unsigned int)atoi(Arg); if (!Conf_UID && strcmp(Arg, "0")) - Config_Error_NaN(Line, Var); + Config_Error(LOG_WARNING, + "%s, line %d: Value of \"%s\" is not a valid user name or ID!", + NGIRCd_ConfFile, Line, Var); } return; }

1 0

Alexander Barton : Enhance log messages when setting user and group
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: 1bb2fbedcc975aa6e424fd201f59a178a03d45b0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1bb2fbed… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 21:05:35 2012 +0100 Enhance log messages when setting user and group --- src/ngircd/ngircd.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index ec2462a..874dfa3 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -658,10 +658,10 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) /* Check user ID */ if (Conf_UID == 0) { + pwd = getpwuid(0); Log(LOG_INFO, - "ServerUID must not be 0, using \"nobody\" instead.", - Conf_UID); - + "ServerUID must not be %s(0), using \"nobody\" instead.", + pwd ? pwd->pw_name : "?"); if (!NGIRCd_getNobodyID(&Conf_UID, &Conf_GID)) { Log(LOG_WARNING, "Could not get user/group ID of user \"nobody\": %s", @@ -674,8 +674,10 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) if (getgid() != Conf_GID) { if (setgid(Conf_GID) != 0) { real_errno = errno; - Log(LOG_ERR, "Can't change group ID to %u: %s", - Conf_GID, strerror(errno)); + grp = getgrgid(Conf_GID); + Log(LOG_ERR, "Can't change group ID to %s(%u): %s", + grp ? grp->gr_name : "?", Conf_GID, + strerror(errno)); if (real_errno != EPERM) goto out; } @@ -685,8 +687,10 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) if (getuid() != Conf_UID) { if (setuid(Conf_UID) != 0) { real_errno = errno; - Log(LOG_ERR, "Can't change user ID to %u: %s", - Conf_UID, strerror(errno)); + pwd = getpwuid(Conf_UID); + Log(LOG_ERR, "Can't change user ID to %s(%u): %s", + pwd ? pwd->pw_name : "?", Conf_UID, + strerror(errno)); if (real_errno != EPERM) goto out; }

1 0

Alexander Barton : README: point to included COPYING file, not gnu.org
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: ab188c148659959060fb7a27ffa00214093ced6f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ab188c14… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 18:56:31 2012 +0100 README: point to included COPYING file, not gnu.org --- README | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README b/README index 53b4205..f9b3662 100644 --- a/README +++ b/README @@ -14,9 +14,10 @@ I. Introduction ngIRCd is an Open Source server for the Internet Relay Chat (IRC), which is developed and published under the terms of the GNU General Public -Licence (URL: http://www.gnu.org/licenses/gpl.html) ngIRCd means "next -generation IRC daemon", it's written from scratch and not deduced from the -"grandfather of IRC daemons", the daemon of the IRCNet. +Licence, see the file COPYING for details. ngIRCd means "next generation +IRC daemon" (which is a little bit exaggerated, "lightweight Internet Relay +Chat server" would be better), it's written from scratch and not deduced +from the "grandfather of IRC daemons", the daemon of the IRCNet. Please see the INSTALL document for installation and upgrade information!

1 0