X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=71f0fe8ee81551c8e843f7927937f48e938a0176;hb=8fd0e29d463c934756dce7a562f09ea831b5d968;hp=fe0593803f1344c67831e48de3496cafd74a76d1;hpb=4c113d8850dfc423e3dae2d2f90e7e9a9d42f0b0;p=ngircd.git diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index fe059380..71f0fe8e 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 Alexander Barton (alex@barton.de) + * Copyright (c)2001-2009 Alexander Barton (alex@barton.de) * * 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 @@ -40,6 +40,7 @@ #include "ngircd.h" #include "conn.h" #include "client.h" +#include "channel.h" #include "defines.h" #include "log.h" #include "match.h" @@ -54,7 +55,7 @@ static bool Use_Log = true; static CONF_SERVER New_Server; static int New_Server_Idx; - +static size_t Conf_Channel_Count; static void Set_Defaults PARAMS(( bool InitServers )); static bool Read_Config PARAMS(( bool ngircd_starting )); static bool Validate_Config PARAMS(( bool TestOnly, bool Rehash )); @@ -151,8 +152,8 @@ ports_parse(array *a, int Line, char *Arg) * must be separated by "," */ ptr = strtok( Arg, "," ); while (ptr) { - ngt_TrimStr( ptr ); - port = atol( ptr ); + ngt_TrimStr(ptr); + port = atoi(ptr); if (port > 0 && port < 0xFFFF) { port16 = (UINT16) port; if (!array_catb(a, (char*)&port16, sizeof port16)) @@ -206,8 +207,9 @@ Conf_Test( void ) struct passwd *pwd; struct group *grp; unsigned int i; - char *topic; bool config_valid; + size_t predef_channel_count; + struct Conf_Channel *predef_chan; Use_Log = false; @@ -299,18 +301,21 @@ Conf_Test( void ) printf( " Passive = %s\n\n", Conf_Server[i].flags & CONF_SFLAG_DISABLED ? "yes" : "no"); } - for( i = 0; i < Conf_Channel_Count; i++ ) { - if( ! Conf_Channel[i].name[0] ) continue; + predef_channel_count = array_length(&Conf_Channels, sizeof(*predef_chan)); + predef_chan = array_start(&Conf_Channels); + + for (i = 0; i < predef_channel_count; i++, predef_chan++) { + if (!predef_chan->name[0]) + continue; /* Valid "Channel" section */ puts( "[CHANNEL]" ); - printf( " Name = %s\n", Conf_Channel[i].name ); - printf( " Modes = %s\n", Conf_Channel[i].modes ); - printf( " Key = %s\n", Conf_Channel[i].key ); - printf( " MaxUsers = %lu\n", Conf_Channel[i].maxusers ); - - topic = (char*)array_start(&Conf_Channel[i].topic); - printf( " Topic = %s\n\n", topic ? topic : ""); + printf(" Name = %s\n", predef_chan->name); + printf(" Modes = %s\n", predef_chan->modes); + printf(" Key = %s\n", predef_chan->key); + printf(" MaxUsers = %lu\n", predef_chan->maxusers); + printf(" Topic = %s\n", predef_chan->topic); + printf(" KeyFile = %s\n\n", predef_chan->keyfile); } return (config_valid ? 0 : 1); @@ -382,7 +387,7 @@ Conf_GetServer( CONN_ID Idx ) GLOBAL bool -Conf_EnableServer( char *Name, UINT16 Port ) +Conf_EnableServer( const char *Name, UINT16 Port ) { /* Enable specified server and adjust port */ @@ -395,7 +400,7 @@ Conf_EnableServer( char *Name, UINT16 Port ) /* Gotcha! Set port and enable server: */ Conf_Server[i].port = Port; Conf_Server[i].flags &= ~CONF_SFLAG_DISABLED; - return true; + return (Conf_Server[i].port && Conf_Server[i].host[0]); } } return false; @@ -421,7 +426,7 @@ Conf_EnablePassiveServer(const char *Name) GLOBAL bool -Conf_DisableServer( char *Name ) +Conf_DisableServer( const char *Name ) { /* Enable specified server and adjust port */ @@ -442,7 +447,7 @@ Conf_DisableServer( char *Name ) GLOBAL bool -Conf_AddServer( char *Name, UINT16 Port, char *Host, char *MyPwd, char *PeerPwd ) +Conf_AddServer( const char *Name, UINT16 Port, const char *Host, const char *MyPwd, const char *PeerPwd ) { /* Add new server to configuration */ @@ -476,7 +481,7 @@ Conf_AddServer( char *Name, UINT16 Port, char *Host, char *MyPwd, char *PeerPwd * Check if the given nick name is an service */ GLOBAL bool -Conf_IsService(int ConfServer, char *Nick) +Conf_IsService(int ConfServer, const char *Nick) { return MatchCaseInsensitive(Conf_Server[ConfServer].svs_mask, Nick); } /* Conf_IsService */ @@ -537,6 +542,16 @@ Set_Defaults( bool InitServers ) } /* Set_Defaults */ +static bool +no_listenports(void) +{ + size_t cnt = array_bytes(&Conf_ListenPorts); +#ifdef SSL_SUPPORT + cnt += array_bytes(&Conf_SSLOptions.ListenPorts); +#endif + return cnt == 0; +} + static bool Read_Config( bool ngircd_starting ) { @@ -656,20 +671,11 @@ Read_Config( bool ngircd_starting ) else New_Server_Idx = i; continue; } - if( strcasecmp( section, "[CHANNEL]" ) == 0 ) { - if( Conf_Channel_Count + 1 > MAX_DEFCHANNELS ) { - Config_Error( LOG_ERR, "Too many pre-defined channels configured." ); - } else { - /* Initialize new channel structure */ - strcpy( Conf_Channel[Conf_Channel_Count].name, "" ); - strcpy( Conf_Channel[Conf_Channel_Count].modes, "" ); - strcpy( Conf_Channel[Conf_Channel_Count].key, "" ); - Conf_Channel[Conf_Channel_Count].maxusers = 0; - array_free(&Conf_Channel[Conf_Channel_Count].topic); - Conf_Channel_Count++; - } + if (strcasecmp(section, "[CHANNEL]") == 0) { + Conf_Channel_Count++; continue; } + Config_Error( LOG_ERR, "%s, line %d: Unknown section \"%s\"!", NGIRCd_ConfFile, line, section ); section[0] = 0x1; } @@ -702,12 +708,14 @@ Read_Config( bool ngircd_starting ) Conf_Server[New_Server_Idx] = New_Server; } - if (0 == array_length(&Conf_ListenPorts, sizeof(UINT16))) { - if (!array_copyb(&Conf_ListenPorts, (char*) &defaultport, sizeof defaultport)) { - Config_Error( LOG_ALERT, "Could not add default listening Port %u: %s", - (unsigned int) defaultport, strerror(errno)); - exit( 1 ); - } + /* not a single listening port? Add default. */ + if (no_listenports() && + !array_copyb(&Conf_ListenPorts, (char*) &defaultport, sizeof defaultport)) + { + Config_Error(LOG_ALERT, "Could not add default listening Port %u: %s", + (unsigned int) defaultport, strerror(errno)); + + exit(1); } if (!Conf_ListenAddress) @@ -1162,19 +1170,23 @@ Handle_SERVER( int Line, char *Var, char *Arg ) Config_Error_TooLong(Line, Var); return; } - + Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var ); } /* Handle_SERVER */ static bool -Handle_Channelname(size_t chancount, const char *name) +Handle_Channelname(struct Conf_Channel *new_chan, const char *name) { - size_t size = sizeof( Conf_Channel[chancount].name ); - char *dest = Conf_Channel[chancount].name; + size_t size = sizeof(new_chan->name); + char *dest = new_chan->name; - if (*name && *name != '#') { + if (!Channel_IsValidName(name)) { + /* + * maybe user forgot to add a '#'. + * This is only here for user convenience. + */ *dest = '#'; --size; ++dest; @@ -1184,51 +1196,64 @@ Handle_Channelname(size_t chancount, const char *name) static void -Handle_CHANNEL( int Line, char *Var, char *Arg ) +Handle_CHANNEL(int Line, char *Var, char *Arg) { size_t len; - size_t chancount = 0; + size_t chancount; + struct Conf_Channel *chan; assert( Line > 0 ); assert( Var != NULL ); assert( Arg != NULL ); - if (Conf_Channel_Count > 0) - chancount = Conf_Channel_Count - 1; + assert(Conf_Channel_Count > 0); - if( strcasecmp( Var, "Name" ) == 0 ) { - if (!Handle_Channelname(chancount, Arg)) - Config_Error_TooLong( Line, Var ); + 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); return; } - if( strcasecmp( Var, "Modes" ) == 0 ) { + if (strcasecmp(Var, "Name") == 0) { + if (!Handle_Channelname(chan, Arg)) + Config_Error_TooLong(Line, Var); + return; + } + if (strcasecmp(Var, "Modes") == 0) { /* Initial modes */ - len = strlcpy( Conf_Channel[chancount].modes, Arg, sizeof( Conf_Channel[chancount].modes )); - if (len >= sizeof( Conf_Channel[chancount].modes )) + len = strlcpy(chan->modes, Arg, sizeof(chan->modes)); + if (len >= sizeof(chan->modes)) Config_Error_TooLong( Line, Var ); return; } if( strcasecmp( Var, "Topic" ) == 0 ) { /* Initial topic */ - if (!array_copys( &Conf_Channel[chancount].topic, Arg)) + len = strlcpy(chan->topic, Arg, sizeof(chan->topic)); + if (len >= sizeof(chan->topic)) Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "Key" ) == 0 ) { /* Initial Channel Key (mode k) */ - len = strlcpy(Conf_Channel[chancount].key, Arg, sizeof(Conf_Channel[chancount].key)); - if (len >= sizeof( Conf_Channel[chancount].key )) + len = strlcpy(chan->key, Arg, sizeof(chan->key)); + if (len >= sizeof(chan->key)) Config_Error_TooLong(Line, Var); return; } - if( strcasecmp( Var, "MaxUsers" ) == 0 ) { /* maximum user limit, mode l */ - Conf_Channel[chancount].maxusers = (unsigned long) atol(Arg); - if (Conf_Channel[chancount].maxusers == 0) + chan->maxusers = (unsigned long) atol(Arg); + if (chan->maxusers == 0) Config_Error_NaN(Line, Var); return; } + if (strcasecmp(Var, "KeyFile") == 0) { + /* channel keys */ + len = strlcpy(chan->keyfile, Arg, sizeof(chan->keyfile)); + if (len >= sizeof(chan->keyfile)) + Config_Error_TooLong(Line, Var); + return; + } Config_Error( LOG_ERR, "%s, line %d (section \"Channel\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var );