- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Add new class.{c|h} module to Xcode project
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 1e054e0b82f2d3037365bc212b917e3434dc1733 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1e054e0b… Author: Alexander Barton <alex(a)barton.de> Date: Sat Dec 24 14:24:07 2011 +0100 Add new class.{c|h} module to Xcode project --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 6ebe171..695eeee 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -40,6 +40,7 @@ FA99428C10E82A27007F27ED /* proc.c in Sources */ = {isa = PBXBuildFile; fileRef = FA99428B10E82A27007F27ED /* proc.c */; }; FAA3D27B0F139CDC00B2447E /* conn-ssl.c in Sources */ = {isa = PBXBuildFile; fileRef = FAA3D2790F139CDC00B2447E /* conn-ssl.c */; }; FAA97C57124A271400D5BBA9 /* sighandlers.c in Sources */ = {isa = PBXBuildFile; fileRef = FAA97C55124A271400D5BBA9 /* sighandlers.c */; }; + FAACD5F514A6099C006ED74F /* class.c in Sources */ = {isa = PBXBuildFile; fileRef = FAACD5F314A6099C006ED74F /* class.c */; }; FAE5CC2E0CF2308A007D69B6 /* numeric.c in Sources */ = {isa = PBXBuildFile; fileRef = FAE5CC2D0CF2308A007D69B6 /* numeric.c */; }; /* End PBXBuildFile section */ @@ -228,6 +229,8 @@ FAA3D28B0F139D2E00B2447E /* preinstall.sh */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.script.sh; path = preinstall.sh; sourceTree = "<group>"; }; FAA97C55124A271400D5BBA9 /* sighandlers.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = sighandlers.c; sourceTree = "<group>"; }; FAA97C56124A271400D5BBA9 /* sighandlers.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = sighandlers.h; sourceTree = "<group>"; }; + FAACD5F314A6099C006ED74F /* class.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = class.c; sourceTree = "<group>"; }; + FAACD5F414A6099C006ED74F /* class.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = class.h; sourceTree = "<group>"; }; FAE5CC2C0CF2308A007D69B6 /* numeric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = numeric.h; sourceTree = "<group>"; }; FAE5CC2D0CF2308A007D69B6 /* numeric.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = numeric.c; sourceTree = "<group>"; }; /* End PBXFileReference section */ @@ -295,17 +298,19 @@ FA322CD70CEF74B1001761B3 /* ngircd */ = { isa = PBXGroup; children = ( - FAA3D2780F139CDC00B2447E /* conf-ssl.h */, FAA3D2790F139CDC00B2447E /* conn-ssl.c */, FAA3D27A0F139CDC00B2447E /* conn-ssl.h */, FA322CD90CEF74B1001761B3 /* array.c */, FA322CDA0CEF74B1001761B3 /* array.h */, FA322CDB0CEF74B1001761B3 /* channel.c */, FA322CDC0CEF74B1001761B3 /* channel.h */, + FAACD5F314A6099C006ED74F /* class.c */, + FAACD5F414A6099C006ED74F /* class.h */, FA322CDD0CEF74B1001761B3 /* client.c */, FA322CDE0CEF74B1001761B3 /* client.h */, FA322CDF0CEF74B1001761B3 /* conf.c */, FA322CE00CEF74B1001761B3 /* conf.h */, + FAA3D2780F139CDC00B2447E /* conf-ssl.h */, FA322CE10CEF74B1001761B3 /* conn-func.c */, FA322CE20CEF74B1001761B3 /* conn-func.h */, FA322CE30CEF74B1001761B3 /* conn-zip.c */, @@ -712,6 +717,7 @@ FA99428C10E82A27007F27ED /* proc.c in Sources */, FA2D564A11EA158B00D37A35 /* pam.c in Sources */, FAA97C57124A271400D5BBA9 /* sighandlers.c in Sources */, + FAACD5F514A6099C006ED74F /* class.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };

1 0

Alexander Barton : List and class handling: add optional "reason" text
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: af70c3dbc927c77167a26c1f4d8ed6bf2b97e3c5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=af70c3db… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 14:19:45 2011 +0100 List and class handling: add optional "reason" text Adjust Lists_Add() and Class_AddMask() accordingly, implement Lists_GetReason() and Lists_GetValidity(). --- src/ngircd/channel.c | 4 ++-- src/ngircd/class.c | 6 ++++-- src/ngircd/class.h | 2 +- src/ngircd/lists.c | 45 +++++++++++++++++++++++++++++++++++++++++---- src/ngircd/lists.h | 7 +++++-- 5 files changed, 53 insertions(+), 11 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index 74c97a0..2dbf53a 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -1003,7 +1003,7 @@ Channel_AddBan(CHANNEL *c, const char *mask ) { struct list_head *h = Channel_GetListBans(c); LogDebug("Adding \"%s\" to \"%s\" %s list", mask, Channel_Name(c), "ban"); - return Lists_Add(h, mask, false); + return Lists_Add(h, mask, false, NULL); } @@ -1012,7 +1012,7 @@ Channel_AddInvite(CHANNEL *c, const char *mask, bool onlyonce) { struct list_head *h = Channel_GetListInvites(c); LogDebug("Adding \"%s\" to \"%s\" %s list", mask, Channel_Name(c), "invite"); - return Lists_Add(h, mask, onlyonce); + return Lists_Add(h, mask, onlyonce, NULL); } diff --git a/src/ngircd/class.c b/src/ngircd/class.c index ee034f2..aeecaae 100644 --- a/src/ngircd/class.c +++ b/src/ngircd/class.c @@ -56,12 +56,14 @@ Class_IsMember(const int Class, CLIENT *Client) } GLOBAL bool -Class_AddMask(const int Class, const char *Mask, time_t ValidUntil) +Class_AddMask(const int Class, const char *Mask, time_t ValidUntil, + const char *Reason) { assert(Class < CLASS_COUNT); assert(Mask != NULL); + assert(Reason != NULL); - return Lists_Add(&My_Classes[Class], Mask, ValidUntil); + return Lists_Add(&My_Classes[Class], Mask, ValidUntil, Reason); } GLOBAL void diff --git a/src/ngircd/class.h b/src/ngircd/class.h index 5b04eea..deb60f4 100644 --- a/src/ngircd/class.h +++ b/src/ngircd/class.h @@ -26,7 +26,7 @@ GLOBAL void Class_Init PARAMS((void)); GLOBAL void Class_Exit PARAMS((void)); GLOBAL bool Class_AddMask PARAMS((const int Class, const char *Mask, - const time_t ValidUntil)); + const time_t ValidUntil, const char *Reason)); GLOBAL void Class_DeleteMask PARAMS((const int Class, const char *Mask)); GLOBAL bool Class_IsMember PARAMS((const int Class, CLIENT *Client)); diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index 1101ea0..9a10ac7 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -39,6 +39,7 @@ struct list_elem { struct list_elem *next; char mask[MASK_LEN]; + char *reason; time_t valid_until; /** 0: unlimited; 1: once; t(>1): until t */ }; @@ -49,6 +50,19 @@ Lists_GetMask(const struct list_elem *e) return e->mask; } +GLOBAL const char * +Lists_GetReason(const struct list_elem *e) +{ + assert(e != NULL); + return e->reason; +} + +GLOBAL time_t +Lists_GetValidity(const struct list_elem *e) +{ + assert(e != NULL); + return e->valid_until; +} GLOBAL struct list_elem* Lists_GetFirst(const struct list_head *h) @@ -63,9 +77,18 @@ Lists_GetNext(const struct list_elem *e) return e->next; } - +/** + * Add a new mask to a list. + * + * @param header List head. + * @param Mask The IRC mask to add to the list. + * @param ValidUntil 0: unlimited, 1: only once, t>1: until given time_t. + * @param Reason Reason string or NULL, if no reason should be saved. + * @return true on success, false otherwise. + */ bool -Lists_Add(struct list_head *header, const char *Mask, time_t ValidUntil ) +Lists_Add(struct list_head *header, const char *Mask, time_t ValidUntil, + const char *Reason) { struct list_elem *e, *newelem; @@ -82,7 +105,17 @@ Lists_Add(struct list_head *header, const char *Mask, time_t ValidUntil ) return false; } - strlcpy( newelem->mask, Mask, sizeof( newelem->mask )); + strlcpy(newelem->mask, Mask, sizeof(newelem->mask)); + if (Reason) { + newelem->reason = malloc(strlen(Reason) + 1); + if (newelem->reason) + strlcpy(newelem->reason, Reason, strlen(Reason) + 1); + else + Log(LOG_EMERG, + "Can't allocate memory for new list reason text!"); + } + else + newelem->reason = NULL; newelem->valid_until = ValidUntil; newelem->next = e; header->first = newelem; @@ -100,6 +133,8 @@ Lists_Unlink(struct list_head *header, struct list_elem *p, struct list_elem *vi if (p) p->next = victim->next; else header->first = victim->next; + if (victim->reason) + free(victim->reason); free(victim); } @@ -141,7 +176,9 @@ Lists_Free(struct list_head *head) LogDebug("Deleted \"%s\" from invite list" , e->mask); victim = e; e = e->next; - free( victim ); + if (victim->reason) + free(victim->reason); + free(victim); } } diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index 7422d60..5dd1a68 100644 --- a/src/ngircd/lists.h +++ b/src/ngircd/lists.h @@ -32,7 +32,8 @@ GLOBAL struct list_elem *Lists_GetNext PARAMS((const struct list_elem *)); GLOBAL bool Lists_Check PARAMS((struct list_head *head, CLIENT *client )); GLOBAL bool Lists_CheckDupeMask PARAMS((const struct list_head *head, const char *mask )); -GLOBAL bool Lists_Add PARAMS((struct list_head *header, const char *Mask, time_t ValidUntil )); +GLOBAL bool Lists_Add PARAMS((struct list_head *header, const char *Mask, + time_t ValidUntil, const char *Reason)); GLOBAL void Lists_Del PARAMS((struct list_head *head, const char *Mask )); GLOBAL bool Lists_AlreadyRegistered PARAMS(( const struct list_head *head, const char *Mask)); @@ -40,7 +41,9 @@ GLOBAL bool Lists_AlreadyRegistered PARAMS(( const struct list_head *head, const GLOBAL void Lists_Free PARAMS(( struct list_head *head )); GLOBAL const char *Lists_MakeMask PARAMS((const char *Pattern)); -GLOBAL const char *Lists_GetMask PARAMS(( const struct list_elem *e )); +GLOBAL const char *Lists_GetMask PARAMS((const struct list_elem *e)); +GLOBAL const char *Lists_GetReason PARAMS((const struct list_elem *e)); +GLOBAL time_t Lists_GetValidity PARAMS((const struct list_elem *e)); #endif

1 0

Alexander Barton : lists.{c|h}: code cleanup; more documentation
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: 2b95c69ea19c6711bb98ee048ee71cee94c5dde9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2b95c69e… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 25 14:48:13 2011 +0100 lists.{c|h}: code cleanup; more documentation --- src/ngircd/lists.c | 189 +++++++++++++++++++++++++++++++++++----------------- src/ngircd/lists.h | 14 ++-- 2 files changed, 135 insertions(+), 68 deletions(-) Diff: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commitdiff;h=2b95…

1 0

Alexander Barton : Lists: change "only once" property into "valid until"
by alex＠arthur.barton.de 25 Dez '11

25 Dez '11

Module: ngircd.git Branch: master Commit: fea2194fc066af6f3b47fd94a93359dbd7aab8ff URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fea2194f… Author: Alexander Barton <alex(a)barton.de> Date: Sat Dec 24 13:34:25 2011 +0100 Lists: change "only once" property into "valid until" The old "only once" true/false behavior is still supported, so there are no other code changes required. --- src/ngircd/lists.c | 31 +++++++++++++++++++++---------- src/ngircd/lists.h | 4 ++-- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index b30326d..1101ea0 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2005 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 @@ -39,7 +39,7 @@ struct list_elem { struct list_elem *next; char mask[MASK_LEN]; - bool onlyonce; + time_t valid_until; /** 0: unlimited; 1: once; t(>1): until t */ }; @@ -65,7 +65,7 @@ Lists_GetNext(const struct list_elem *e) bool -Lists_Add(struct list_head *header, const char *Mask, bool OnlyOnce ) +Lists_Add(struct list_head *header, const char *Mask, time_t ValidUntil ) { struct list_elem *e, *newelem; @@ -83,7 +83,7 @@ Lists_Add(struct list_head *header, const char *Mask, bool OnlyOnce ) } strlcpy( newelem->mask, Mask, sizeof( newelem->mask )); - newelem->onlyonce = OnlyOnce; + newelem->valid_until = ValidUntil; newelem->next = e; header->first = newelem; @@ -213,23 +213,34 @@ Lists_MakeMask(const char *Pattern) bool Lists_Check( struct list_head *header, CLIENT *Client) { - struct list_elem *e, *last; + struct list_elem *e, *last, *next; assert( header != NULL ); e = header->first; last = NULL; - while( e ) { - if( Match( e->mask, Client_Mask( Client ))) { - if( e->onlyonce ) { /* delete entry */ - LogDebug("Deleted \"%s\" from list", e->mask); + while (e) { + next = e->next; + if (e->valid_until > 1 && e->valid_until < time(NULL)) { + /* Entry is expired, delete it */ + LogDebug("Deleted \"%s\" from list (expired).", + e->mask); + Lists_Unlink(header, last, e); + e = next; + continue; + } + if (Match(e->mask, Client_Mask(Client))) { + if (e->valid_until == 1 ) { + /* Entry is valid only once, delete it */ + LogDebug("Deleted \"%s\" from list (used).", + e->mask); Lists_Unlink(header, last, e); } return true; } last = e; - e = e->next; + e = next; } return false; diff --git a/src/ngircd/lists.h b/src/ngircd/lists.h index 28f5478..7422d60 100644 --- a/src/ngircd/lists.h +++ b/src/ngircd/lists.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by 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 @@ -32,7 +32,7 @@ GLOBAL struct list_elem *Lists_GetNext PARAMS((const struct list_elem *)); GLOBAL bool Lists_Check PARAMS((struct list_head *head, CLIENT *client )); GLOBAL bool Lists_CheckDupeMask PARAMS((const struct list_head *head, const char *mask )); -GLOBAL bool Lists_Add PARAMS((struct list_head *header, const char *Mask, bool OnlyOnce )); +GLOBAL bool Lists_Add PARAMS((struct list_head *header, const char *Mask, time_t ValidUntil )); GLOBAL void Lists_Del PARAMS((struct list_head *head, const char *Mask )); GLOBAL bool Lists_AlreadyRegistered PARAMS(( const struct list_head *head, const char *Mask));

1 0

Alexander Barton : Xcode: update project file for Xcode 4.2
by alex＠arthur.barton.de 24 Dez '11

24 Dez '11

Module: ngircd.git Branch: master Commit: 872dc5042d47a43f02c10df9c74ee2c0e7b28c81 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=872dc504… Author: Alexander Barton <alex(a)barton.de> Date: Sat Dec 24 13:22:34 2011 +0100 Xcode: update project file for Xcode 4.2 --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 42ddbf2..6ebe171 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -349,6 +349,8 @@ FAE5CC2C0CF2308A007D69B6 /* numeric.h */, FA85178B0FA061EC006A1F5A /* op.c */, FA85178A0FA061EC006A1F5A /* op.h */, + FA2D564911EA158B00D37A35 /* pam.c */, + FA2D564811EA158B00D37A35 /* pam.h */, FA322D080CEF74B1001761B3 /* parse.c */, FA322D090CEF74B1001761B3 /* parse.h */, FA99428B10E82A27007F27ED /* proc.c */, @@ -357,8 +359,6 @@ FA322D0D0CEF74B1001761B3 /* resolve.h */, FAA97C55124A271400D5BBA9 /* sighandlers.c */, FAA97C56124A271400D5BBA9 /* sighandlers.h */, - FA2D564811EA158B00D37A35 /* pam.h */, - FA2D564911EA158B00D37A35 /* pam.c */, ); path = ngircd; sourceTree = "<group>"; @@ -648,7 +648,7 @@ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0410; + LastUpgradeCheck = 0420; }; buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "ngIRCd" */; compatibilityVersion = "Xcode 3.2"; @@ -722,6 +722,7 @@ isa = XCBuildConfiguration; buildSettings = { GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -765,7 +766,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; - SDKROOT = ""; + SDKROOT = macosx; }; name = Debug; }; @@ -773,6 +774,7 @@ isa = XCBuildConfiguration; buildSettings = { GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;

1 0

Alexander Barton : define HAVE_GAI_STRERROR for Mac OS X Xcode builds
by alex＠arthur.barton.de 24 Dez '11

24 Dez '11

Module: ngircd.git Branch: master Commit: e1315f30fd2e1984907dc42cf1fd0370354d4f55 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e1315f30… Author: Alexander Barton <alex(a)barton.de> Date: Sat Dec 24 13:16:38 2011 +0100 define HAVE_GAI_STRERROR for Mac OS X Xcode builds On Mac OS X 10.7 Lion, this fixes In file included from .../contrib/MacOSX/../../src/ngircd/client.c:28: /Developer/SDKs/MacOSX10.7.sdk/usr/include/netdb.h:272:13: error: expected identifier or '(' --- contrib/MacOSX/config.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/contrib/MacOSX/config.h b/contrib/MacOSX/config.h index 86b460b..5b47e9d 100644 --- a/contrib/MacOSX/config.h +++ b/contrib/MacOSX/config.h @@ -74,6 +74,8 @@ /* Define to 1 if you have the <netinet/ip.h> header file. */ #define HAVE_NETINET_IP_H 1 +/* Define to 1 if you have the `gai_strerror' function. */ +#define HAVE_GAI_STRERROR 1 /* Define to 1 if you have the `kqueue' function. */ #define HAVE_KQUEUE 1 /* Define to 1 if you have the `inet_ntoa' function. */

1 0

Alexander Barton : Configuration: get rid of Conf_Oper_Count and Conf_Channel_Count
by alex＠arthur.barton.de 07 Dez '11

07 Dez '11

Module: ngircd.git Branch: master Commit: 0a85c58878a594ed0b0767771b128d4e288057cf URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0a85c588… Author: Alexander Barton <alex(a)barton.de> Date: Sat Aug 27 17:03:30 2011 +0200 Configuration: get rid of Conf_Oper_Count and Conf_Channel_Count Count elements dynamically when needed. --- src/ngircd/conf.c | 65 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index dccc9c7..b930b6c 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -55,8 +55,6 @@ static bool Use_Log = true, Using_MotdFile = true; static CONF_SERVER New_Server; static int New_Server_Idx; -static size_t Conf_Oper_Count; -static size_t Conf_Channel_Count; static char Conf_MotdFile[FNAME_LEN]; static void Set_Defaults PARAMS(( bool InitServers )); @@ -265,18 +263,18 @@ static void opers_puts(void) { struct Conf_Oper *op; - size_t len; + size_t count, i; - len = array_length(&Conf_Opers, sizeof(*op)); + count = array_length(&Conf_Opers, sizeof(*op)); op = array_start(&Conf_Opers); - while (len--) { - assert(op->name[0]); + for (i = 0; i < count; i++, op++) { + if (!op->name[0]) + continue; puts("[OPERATOR]"); printf(" Name = %s\n", op->name); printf(" Password = %s\n", op->pwd); printf(" Mask = %s\n\n", op->mask ? op->mask : ""); - op++; } } @@ -709,10 +707,6 @@ Set_Defaults(bool InitServers) #endif #endif - /* Initialize IRC operators and channels */ - Conf_Oper_Count = 0; - Conf_Channel_Count = 0; - /* Initialize server configuration structures */ if (InitServers) { for (i = 0; i < MAX_SERVERS; @@ -787,6 +781,7 @@ Read_Config( bool ngircd_starting ) char section[LINE_LEN], str[LINE_LEN], *var, *arg, *ptr; const UINT16 defaultport = 6667; int line, i, n; + size_t count; FILE *fd; /* Open configuration file */ @@ -887,12 +882,30 @@ Read_Config( bool ngircd_starting ) else New_Server_Idx = i; continue; } + if (strcasecmp(section, "[CHANNEL]") == 0) { - Conf_Channel_Count++; + count = array_length(&Conf_Channels, + sizeof(struct Conf_Channel)); + if (!array_alloc(&Conf_Channels, + sizeof(struct Conf_Channel), + count)) { + Config_Error(LOG_ERR, + "Could not allocate memory for new operator (line %d)", + line); + } continue; } + if (strcasecmp(section, "[OPERATOR]") == 0) { - Conf_Oper_Count++; + count = array_length(&Conf_Opers, + sizeof(struct Conf_Oper)); + if (!array_alloc(&Conf_Opers, + sizeof(struct Conf_Oper), + count)) { + Config_Error(LOG_ERR, + "Could not allocate memory for new channel (line &d)", + line); + } continue; } @@ -1584,13 +1597,11 @@ Handle_OPERATOR( int Line, char *Var, char *Arg ) assert( Line > 0 ); assert( Var != NULL ); assert( Arg != NULL ); - assert( Conf_Oper_Count > 0 ); - op = array_alloc(&Conf_Opers, sizeof(*op), Conf_Oper_Count - 1); - if (!op) { - Config_Error(LOG_ERR, "Could not allocate memory for operator (%d:%s = %s)", Line, Var, Arg); + op = array_get(&Conf_Opers, sizeof(*op), + array_length(&Conf_Opers, sizeof(*op)) - 1); + if (!op) return; - } if (strcasecmp(Var, "Name") == 0) { /* Name of IRC operator */ @@ -1756,21 +1767,17 @@ static void Handle_CHANNEL(int Line, char *Var, char *Arg) { size_t len; - size_t chancount; struct Conf_Channel *chan; assert( Line > 0 ); assert( Var != NULL ); assert( Arg != NULL ); - assert(Conf_Channel_Count > 0); - chancount = Conf_Channel_Count - 1; - - chan = array_alloc(&Conf_Channels, sizeof(*chan), chancount); - if (!chan) { - Config_Error(LOG_ERR, "Could not allocate memory for predefined channel (%d:%s = %s)", Line, Var, Arg); + chan = array_get(&Conf_Channels, sizeof(*chan), + array_length(&Conf_Channels, sizeof(*chan)) - 1); + if (!chan) return; - } + if (strcasecmp(Var, "Name") == 0) { if (!Handle_Channelname(chan, Arg)) Config_Error_TooLong(Line, Var); @@ -1917,8 +1924,10 @@ Validate_Config(bool Configtest, bool Rehash) } } Log(LOG_DEBUG, - "Configuration: Operators=%d, Servers=%d[%d], Channels=%d", - Conf_Oper_Count, servers, servers_once, Conf_Channel_Count); + "Configuration: Operators=%ld, Servers=%d[%d], Channels=%ld", + array_length(&Conf_Opers, sizeof(struct Conf_Oper)), + servers, servers_once, + array_length(&Conf_Channels, sizeof(struct Conf_Channel))); #endif return config_valid;

1 0

Alexander Barton : ./configure: Fix logic and quoting of poll() detection code
by alex＠arthur.barton.de 05 Dez '11

05 Dez '11

Module: ngircd.git Branch: master Commit: ee21490887690a4c1dcdd7aafd3ffc745c2ca0ca URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ee214908… Author: Alexander Barton <alex(a)barton.de> Date: Mon Dec 5 00:19:32 2011 +0100 ./configure: Fix logic and quoting of poll() detection code This fixes commit 8e193df ... --- configure.in | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index f3dbd72..d2241f6 100644 --- a/configure.in +++ b/configure.in @@ -252,22 +252,21 @@ AC_ARG_WITH(poll, CPPFLAGS="-I$withval/include $CPPFLAGS" LDFLAGS="-L$withval/lib $LDFLAGS" fi - AC_CHECK_FUNCS(poll, + AC_CHECK_FUNCS(poll, [ AC_CHECK_HEADERS(poll.h, x_io_backend=poll, - AC_MSG_ERROR( - [Can't enable poll IO support!]) - , AC_MSG_ERROR( - [Can't enable poll IO support!]) + [Can't enable poll IO support!]) ) - ) + ], [ + AC_MSG_ERROR([Can't enable poll IO support!]) + ]) fi ], [ - AC_CHECK_FUNCS(poll, + AC_CHECK_FUNCS(poll, [ AC_CHECK_HEADERS(poll.h, x_io_backend=poll) - ) + ]) ] )

1 0

Alexander Barton : Suppress 'Can't create pre-defined channel: invalid name : ""' messages
by alex＠arthur.barton.de 04 Dez '11

04 Dez '11

Module: ngircd.git Branch: master Commit: 8fa92f0a24bb97a972ef82b8fa057d737c9f55b7 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8fa92f0a… Author: Alexander Barton <alex(a)barton.de> Date: Sun Dec 4 22:30:32 2011 +0100 Suppress 'Can't create pre-defined channel: invalid name: ""' messages Skip predefined channel structures that have configured no name, like the "--configtest" does. --- src/ngircd/channel.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c index a36131c..74c97a0 100644 --- a/src/ngircd/channel.c +++ b/src/ngircd/channel.c @@ -110,9 +110,12 @@ Channel_InitPredefined( void ) assert(channel_count == 0 || conf_chan != NULL); for (i = 0; i < channel_count; i++, conf_chan++) { - if (!conf_chan->name[0] || !Channel_IsValidName(conf_chan->name)) { - Log(LOG_ERR, "Can't create pre-defined channel: invalid name: \"%s\"", - conf_chan->name); + if (!conf_chan->name[0]) + continue; + if (!Channel_IsValidName(conf_chan->name)) { + Log(LOG_ERR, + "Can't create pre-defined channel: invalid name: \"%s\"", + conf_chan->name); continue; }

1 0

Alexander Barton : Only use poll() when poll.h exists as well
by alex＠arthur.barton.de 25 Nov '11

25 Nov '11

Module: ngircd.git Branch: master Commit: 8e193df973bef0765754ccf4d6cb3ea21c226955 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=8e193df9… Author: Alexander Barton <alex(a)barton.de> Date: Fri Nov 25 22:06:44 2011 +0100 Only use poll() when poll.h exists as well --- src/ngircd/io.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/io.c b/src/ngircd/io.c index 7e78e49..f44dfbf 100644 --- a/src/ngircd/io.c +++ b/src/ngircd/io.c @@ -54,7 +54,7 @@ typedef struct { # ifdef HAVE_SYS_DEVPOLL_H # define IO_USE_DEVPOLL 1 # else -# ifdef HAVE_POLL +# if defined(HAVE_POLL) && defined(HAVE_POLL_H) # define IO_USE_POLL 1 # else # ifdef HAVE_SELECT

1 0