mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-12-15 02:18:06 +00:00
Code Issues Releases Wiki Activity

Evaluate initial channel modes

Browse Source 
Allow setting arbitrary channel modes in the config file.

Closes #55.
This commit is contained in:
michi
2020-02-19 09:26:21 +00:00
committed by Alexander Barton
parent a77353361b
commit decf98d5ef
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ngircd/channel.c
View File

@@ -36,6 +36,8 @@
#include "log.h" #include "log.h"
#include "messages.h" #include "messages.h"
#include "match.h" #include "match.h"
#include "parse.h"
#include "irc-mode.h"
#define REMOVE_PART 0 #define REMOVE_PART 0
#define REMOVE_QUIT 1 #define REMOVE_QUIT 1
@@ -93,8 +95,10 @@ GLOBAL void
Channel_InitPredefined( void ) Channel_InitPredefined( void )
{ {
CHANNEL *new_chan; CHANNEL *new_chan;
REQUEST Req;
const struct Conf_Channel *conf_chan; const struct Conf_Channel *conf_chan;
const char *c; char *c;
char modes[COMMAND_LEN], name[CHANNEL_NAME_LEN];
size_t i, channel_count = array_length(&Conf_Channels, sizeof(*conf_chan)); size_t i, channel_count = array_length(&Conf_Channels, sizeof(*conf_chan));
conf_chan = array_start(&Conf_Channels); conf_chan = array_start(&Conf_Channels);
@@ -134,9 +138,22 @@ Channel_InitPredefined( void )
if (conf_chan->topic[0]) if (conf_chan->topic[0])
Channel_SetTopic(new_chan, NULL, conf_chan->topic); Channel_SetTopic(new_chan, NULL, conf_chan->topic);
c = conf_chan->modes; /* Evaluate modes string with a fake request */
while (*c) if(conf_chan->modes[0]) {
Channel_ModeAdd(new_chan, *c++); strlcpy(modes, conf_chan->modes, sizeof(modes));
strlcpy(name, conf_chan->name, sizeof(name));
Log(LOG_DEBUG, "Evaluate \"MODE %s %s\".", name, modes);
Req.argc = 0;
Req.argv[Req.argc++] = name;
Req.prefix = Client_ID(Client_ThisServer());
Req.command = "MODE";
c = strtok(modes, " ");
while (c && Req.argc<15) {
Req.argv[Req.argc++] = c;
c = strtok(0, " ");
}
IRC_MODE(Client_ThisServer(), &Req);
}
Channel_SetKey(new_chan, conf_chan->key); Channel_SetKey(new_chan, conf_chan->key);
Channel_SetMaxUsers(new_chan, conf_chan->maxusers); Channel_SetMaxUsers(new_chan, conf_chan->maxusers);

2
src/ngircd/conf.h
View File

@@ -83,7 +83,7 @@ struct SSLOptions {
/** Pre-defined channels */ /** Pre-defined channels */
struct Conf_Channel { struct Conf_Channel {
char name[CHANNEL_NAME_LEN]; /**< Name of the channel */ char name[CHANNEL_NAME_LEN]; /**< Name of the channel */
char modes[CHANNEL_MODE_LEN]; /**< Initial channel modes */ char modes[COMMAND_LEN]; /**< Initial channel modes to evaluate */
char key[CLIENT_PASS_LEN]; /**< Channel key ("password", mode "k" ) */ char key[CLIENT_PASS_LEN]; /**< Channel key ("password", mode "k" ) */
char topic[COMMAND_LEN]; /**< Initial topic */ char topic[COMMAND_LEN]; /**< Initial topic */
char keyfile[512]; /**< Path and name of channel key file */ char keyfile[512]; /**< Path and name of channel key file */