Januar 2012 - ngIRCd GIT Updates

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

Alexander Barton : Update Copyright notices for 2012
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: 5eb9f2e7172620874d5ad4c247b82fc2aee3ac1b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5eb9f2e7… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 11:30:45 2012 +0100 Update Copyright notices for 2012 --- AUTHORS | 2 +- INSTALL | 2 +- NEWS | 2 +- README | 2 +- src/ngircd/ngircd.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 03a19dd..241d3a4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2011 Alexander Barton and Contributors. + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/INSTALL b/INSTALL index 99fe33d..45ebe99 100644 --- a/INSTALL +++ b/INSTALL @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2011 Alexander Barton and Contributors. + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/NEWS b/NEWS index 3a8d1c5..d44b4a8 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2011 Alexander Barton and Contributors. + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/README b/README index 888385c..53b4205 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2011 Alexander Barton and Contributors. + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 3e64f35..a1f1d88 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2012 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 @@ -424,7 +424,7 @@ static void Show_Version( void ) { puts( NGIRCd_Version ); - puts( "Copyright (c)2001-2011 Alexander Barton (<alex(a)barton.de>) and Contributors." ); + puts( "Copyright (c)2001-2012 Alexander Barton (<alex(a)barton.de>) and Contributors." ); puts( "Homepage: <http://ngircd.barton.de/>\n" ); puts( "This is free software; see the source for copying conditions. There is NO" ); puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." );

1 0

Florian Westphal : lists: don't crash if reason ptr is NULL
by fw＠arthur.barton.de 02 Jan '12

02 Jan '12

Module: ngircd.git Branch: master Commit: abfc5c6e27bcabec450b7e91ebc0bdca48ac8ef6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=abfc5c6e… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Jan 2 23:37:46 2012 +0100 lists: don't crash if reason ptr is NULL commit 15fec92ed75c3de0b32c40d005e93e3f61aef77e (Update list item, if it already exists) can make ngircd crash because 'Reason' can be NULL, as reported by Cahata on the ngircd mailing list. Doesn't affect any released ngircd versions. Also, make sure that we do not pass NULL as arguments to a '%s' printf-like function. --- src/ngircd/lists.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index d3f26e2..fd86f30 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -60,13 +60,13 @@ Lists_GetMask(const struct list_elem *e) * Get optional "reason" text stored in list element. * * @param list_elem List element. - * @return Pointer to "reason" text or NULL. + * @return Pointer to "reason" text or empty string (""). */ GLOBAL const char * Lists_GetReason(const struct list_elem *e) { assert(e != NULL); - return e->reason; + return e->reason ? e->reason : ""; } /** @@ -129,14 +129,10 @@ Lists_Add(struct list_head *h, const char *Mask, time_t ValidUntil, e = Lists_CheckDupeMask(h, Mask); if (e) { e->valid_until = ValidUntil; - if (e->reason) + if (Reason) { free(e->reason); - e->reason = malloc(strlen(Reason) + 1); - if (e->reason) - strlcpy(e->reason, Reason, strlen(Reason) + 1); - else - Log(LOG_EMERG, - "Can't allocate memory for new list reason text!"); + e->reason = strdup(Reason); + } return true; }

1 0

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

02 Jan '12

Module: ngircd.git Branch: master Commit: 013298d4c68cc82c8b723fedb81ea87ced7fb306 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=013298d4… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 2 15:22:52 2012 +0100 IRC_JOIN(): Code cleanup --- src/ngircd/irc-channel.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index cc70eb4..a41f1d4 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -301,9 +301,9 @@ join_send_topic(CLIENT *Client, CLIENT *target, CHANNEL *chan, * * See RFC 2812, 3.2.1 "Join message"; RFC 2813, 4.2.1 "Join message". * - * @param Client The client from which this command has been received - * @param Req Request structure with prefix and all parameters - * @returns CONNECTED or DISCONNECTED + * @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_JOIN( CLIENT *Client, REQUEST *Req ) @@ -312,8 +312,8 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) CLIENT *target; CHANNEL *chan; - assert( Client != NULL ); - assert( Req != NULL ); + assert (Client != NULL); + assert (Req != NULL); /* Bad number of arguments? */ if (Req->argc < 1 || Req->argc > 2) @@ -327,7 +327,8 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) target = Client; if (!target) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix); + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); /* Is argument "0"? */ if (Req->argc == 1 && !strncmp("0", Req->argv[0], 2)) @@ -359,8 +360,9 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) chan = Channel_Search(channame); if (!chan && Conf_PredefChannelsOnly) { - /* channel must be created, but server does not allow this */ - IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame); + /* channel must be created, but forbidden by config */ + IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, + Client_ID(Client), channame); break; }

1 0

Alexander Barton : Don't stop join handling on faulty channel, skip it
by alex＠arthur.barton.de 02 Jan '12

02 Jan '12

Module: ngircd.git Branch: master Commit: 565523cbb4a5e2f34d584002916faba411a94187 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=565523cb… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 2 15:23:17 2012 +0100 Don't stop join handling on faulty channel, skip it When JOIN is received with more than one channel name, don't stop processing on the first error (e.g. bad name, wrong channel key, ...) but report an error and continue with the other given channel names. Reported by Cahata -- thanks! --- src/ngircd/irc-channel.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index a41f1d4..6ddad88 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -401,7 +401,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) /* Join channel (and create channel if it doesn't exist) */ if (!Channel_Join(target, channame)) - break; + goto join_next; if (!chan) { /* channel is new; it has been created above */ chan = Channel_Search(channame); @@ -420,6 +420,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) if (!join_send_topic(Client, target, chan, channame)) break; /* write error */ + join_next: /* next channel? */ channame = strtok_r(NULL, ",", &lastchan); if (channame && key)

1 0

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

02 Jan '12

Module: ngircd.git Branch: master Commit: 408a74b86582a2fc315d61880f30d4ac050d8d8a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=408a74b8… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 2 15:04:40 2012 +0100 IRC_ISON(): Code cleanup --- src/ngircd/irc-info.c | 47 ++++++++++++++++++++++++++++------------------- 1 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index ebb7be4..48000ba 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -154,6 +154,15 @@ IRC_INFO(CLIENT * Client, REQUEST * Req) } /* IRC_INFO */ +/** + * Handler for the IRC "ISON" command. + * + * See RFC 2812, 4.9 "Ison 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_ISON( CLIENT *Client, REQUEST *Req ) { @@ -162,32 +171,32 @@ IRC_ISON( CLIENT *Client, REQUEST *Req ) char *ptr; int i; - assert( Client != NULL ); - assert( Req != NULL ); + assert(Client != NULL); + assert(Req != NULL); - /* Falsche Anzahl Parameter? */ - if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + /* Bad number of arguments? */ + if (Req->argc < 1) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - strlcpy( rpl, RPL_ISON_MSG, sizeof rpl ); - for( i = 0; i < Req->argc; i++ ) - { - ptr = strtok( Req->argv[i], " " ); - while( ptr ) - { - ngt_TrimStr( ptr ); - c = Client_Search( ptr ); - if( c && ( Client_Type( c ) == CLIENT_USER )) - { - /* Dieser Nick ist "online" */ - strlcat( rpl, ptr, sizeof( rpl )); - strlcat( rpl, " ", sizeof( rpl )); + strlcpy(rpl, RPL_ISON_MSG, sizeof rpl); + for (i = 0; i < Req->argc; i++) { + /* "All" ircd even parse ":<x> <y> ..." arguments and split + * them up; so we do the same ... */ + ptr = strtok(Req->argv[i], " "); + while (ptr) { + ngt_TrimStr(ptr); + c = Client_Search(ptr); + if (c && Client_Type(c) == CLIENT_USER) { + strlcat(rpl, ptr, sizeof(rpl)); + strlcat(rpl, " ", sizeof(rpl)); } - ptr = strtok( NULL, " " ); + ptr = strtok(NULL, " "); } } ngt_TrimLastChr(rpl, ' '); - return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) ); + return IRC_WriteStrClient(Client, rpl, Client_ID(Client)); } /* IRC_ISON */

1 0