/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 by 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
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <stdio.h>
#include <strings.h>
#include "defines.h"
#include "conn-func.h"
-#include "client.h"
#include "exp.h"
#include "channel.h"
#include "imp.h"
#include "irc-write.h"
-#include "resolve.h"
#include "conf.h"
#include "hash.h"
#include "lists.h"
#include "log.h"
#include "messages.h"
+#include "match.h"
#include "exp.h"
static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const char *Reason, bool InformServer ));
static CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
static CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
-static bool Delete_Channel PARAMS(( CHANNEL *Chan ));
+static void Delete_Channel PARAMS(( CHANNEL *Chan ));
+static void Free_Channel PARAMS(( CHANNEL *Chan ));
+static void Set_KeyFile PARAMS((CHANNEL *Chan, const char *KeyFile));
GLOBAL void
new_chan = Channel_Search(conf_chan->name);
if (new_chan) {
- Log(LOG_INFO, "Can't create pre-defined channel \"%s\": name already in use.",
- conf_chan->name);
+ Log(LOG_INFO,
+ "Can't create pre-defined channel \"%s\": name already in use.",
+ conf_chan->name);
+ Set_KeyFile(new_chan, conf_chan->keyfile);
continue;
}
conf_chan->name);
continue;
}
+ Log(LOG_INFO, "Created pre-defined channel \"%s\"",
+ conf_chan->name);
Channel_ModeAdd(new_chan, 'P');
Channel_SetKey(new_chan, conf_chan->key);
Channel_SetMaxUsers(new_chan, conf_chan->maxusers);
- Log(LOG_INFO, "Created pre-defined channel \"%s\"",
- conf_chan->name);
+ Set_KeyFile(new_chan, conf_chan->keyfile);
}
if (channel_count)
array_free(&Conf_Channels);
} /* Channel_InitPredefined */
+static void
+Free_Channel(CHANNEL *chan)
+{
+ array_free(&chan->topic);
+ array_free(&chan->keyfile);
+ Lists_Free(&chan->list_bans);
+ Lists_Free(&chan->list_invites);
+
+ free(chan);
+}
+
+
GLOBAL void
Channel_Exit( void )
{
/* free struct Channel */
c = My_Channels;
- while( c )
- {
+ while (c) {
c_next = c->next;
- array_free(&c->topic);
- free( c );
+ Free_Channel(c);
c = c_next;
}
/* Free Channel allocation table */
cl2chan = My_Cl2Chan;
- while( c )
- {
+ while (cl2chan) {
cl2chan_next = cl2chan->next;
- free( cl2chan );
+ free(cl2chan);
cl2chan = cl2chan_next;
}
} /* Channel_Exit */
* Add_Client().
*/
GLOBAL bool
-Channel_Join( CLIENT *Client, char *Name )
+Channel_Join( CLIENT *Client, const char *Name )
{
CHANNEL *chan;
GLOBAL void
-Channel_Quit( CLIENT *Client, char *Reason )
+Channel_Quit( CLIENT *Client, const char *Reason )
{
CHANNEL *c, *next_c;
GLOBAL void
-Channel_SetModes( CHANNEL *Chan, char *Modes )
+Channel_SetModes( CHANNEL *Chan, const char *Modes )
{
assert( Chan != NULL );
assert( Modes != NULL );
cl2chan->next = My_Cl2Chan;
My_Cl2Chan = cl2chan;
- Log( LOG_DEBUG, "User \"%s\" joined channel \"%s\".", Client_Mask( Client ), Chan->name );
+ LogDebug("User \"%s\" joined channel \"%s\".", Client_Mask(Client), Chan->name);
return cl2chan;
} /* Add_Client */
* Log a message to the local &SERVER channel, if it exists.
*/
GLOBAL void
-Channel_LogServer(char *msg)
+Channel_LogServer(const char *msg)
{
CHANNEL *sc;
CLIENT *c;
} /* Channel_LogServer */
+GLOBAL bool
+Channel_CheckKey(CHANNEL *Chan, CLIENT *Client, const char *Key)
+{
+ char *file_name, line[COMMAND_LEN], *nick, *pass;
+ FILE *fd;
+
+ assert(Chan != NULL);
+ assert(Client != NULL);
+ assert(Key != NULL);
+
+ if (!strchr(Chan->modes, 'k'))
+ return true;
+ if (strcmp(Chan->key, Key) == 0)
+ return true;
+ if (*Key == '\0')
+ return false;
+
+ file_name = array_start(&Chan->keyfile);
+ if (!file_name)
+ return false;
+ fd = fopen(file_name, "r");
+ if (!fd) {
+ Log(LOG_ERR, "Can't open channel key file \"%s\" for %s: %s",
+ file_name, Chan->name, strerror(errno));
+ return false;
+ }
+
+ while (fgets(line, (int)sizeof(line), fd) != NULL) {
+ ngt_TrimStr(line);
+ if (! (nick = strchr(line, ':')))
+ continue;
+ *nick++ = '\0';
+ if (!Match(line, Client_User(Client)))
+ continue;
+ if (! (pass = strchr(nick, ':')))
+ continue;
+ *pass++ = '\0';
+ if (!Match(nick, Client_ID(Client)))
+ continue;
+ if (strcmp(Key, pass) != 0)
+ continue;
+
+ fclose(fd);
+ return true;
+ }
+ fclose(fd);
+ return false;
+} /* Channel_CheckKey */
+
+
static CL2CHAN *
Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
{
} /* Get_Next_Cl2Chan */
-static bool
-Delete_Channel( CHANNEL *Chan )
+/**
+ * Remove a channel and free all of its data structures.
+ */
+static void
+Delete_Channel(CHANNEL *Chan)
{
- /* delete channel structure */
-
CHANNEL *chan, *last_chan;
last_chan = NULL;
chan = My_Channels;
- while( chan )
- {
- if( chan == Chan ) break;
+ while (chan) {
+ if (chan == Chan)
+ break;
last_chan = chan;
chan = chan->next;
}
- if( ! chan ) return false;
- Log( LOG_DEBUG, "Freed channel structure for \"%s\".", Chan->name );
-
- array_free(&chan->topic);
- Lists_Free(&chan->list_bans);
- Lists_Free(&chan->list_invites);
+ assert(chan != NULL);
+ if (!chan)
+ return;
/* maintain channel list */
- if( last_chan ) last_chan->next = chan->next;
- else My_Channels = chan->next;
- free( chan );
+ if (last_chan)
+ last_chan->next = chan->next;
+ else
+ My_Channels = chan->next;
- return true;
+ LogDebug("Freed channel structure for \"%s\".", Chan->name);
+ Free_Channel(Chan);
} /* Delete_Channel */
+
+static void
+Set_KeyFile(CHANNEL *Chan, const char *KeyFile)
+{
+ size_t len;
+
+ assert(Chan != NULL);
+ assert(KeyFile != NULL);
+
+ len = strlen(KeyFile);
+ if (len < array_bytes(&Chan->keyfile)) {
+ Log(LOG_INFO, "Channel key file of %s removed.", Chan->name);
+ array_free(&Chan->keyfile);
+ }
+
+ if (len < 1)
+ return;
+
+ if (!array_copyb(&Chan->keyfile, KeyFile, len+1))
+ Log(LOG_WARNING,
+ "Could not set new channel key file \"%s\" for %s: %s",
+ KeyFile, Chan->name, strerror(errno));
+ else
+ Log(LOG_INFO|LOG_snotice,
+ "New local channel key file \"%s\" for %s activated.",
+ KeyFile, Chan->name);
+} /* Set_KeyFile */
+
+
/* -eof- */
projects / ngircd-alex.git / blobdiff