#include "parse.h"
#include "res.h"
#include "s_bsd.h"
+#include "s_conf.h"
#include "s_debug.h"
#include "s_misc.h"
#include "send.h"
#include "support.h"
#include "sys.h"
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <arpa/inet.h>
#define MAX_STRINGS 80 /* Maximum number of feature params. */
extern struct DenyConf* denyConfList;
extern struct CRuleConf* cruleConfList;
extern struct ServerConf* serverConfList;
+ extern struct qline *GlobalQuarantineList;
+
int yylex(void);
/* Now all the globals we need :/... */
int stringno;
char *name, *pass, *host;
char *stringlist[MAX_STRINGS];
- struct ConnectionClass *class;
+ struct ConnectionClass *c_class;
struct ConfItem *aconf;
struct DenyConf *dconf;
struct ServerConf *sconf;
+ struct qline *qconf = NULL;
+
+static void parse_error(char *pattern,...) {
+ va_list vl;
+ struct VarData vd;
+ va_start(vl,pattern);
+ vd.vd_format = pattern;
+ vd.vd_args = vl;
+ sendto_opmask_butone(0, SNO_OLDSNO, "Config: %v", &vd);
+ va_end(vl);
+}
%}
%token <text> QSTRING
%token CONTACT
%token CONNECT
%token CLASS
+%token CHANNEL
%token PINGFREQ
%token CONNECTFREQ
%token MAXLINKS
%token ALL
%token IP
%token FEATURES
+%token QUARANTINE
/* and now a lot of priviledges... */
-%token TPRIV_CHAN_LIMIT, TPRIV_MODE_LCHAN, TPRIV_DEOP_LCHAN, TPRIV_WALK_LCHAN
-%token TPRIV_KILL, TPRIV_LOCAL_KILL, TPRIV_REHASH, TPRIV_RESTART, TPRIV_DIE
-%token TPRIV_GLINE, TPRIV_LOCAL_GLINE, TPRIV_JUPE, TPRIV_LOCAL_JUPE
-%token TPRIV_LOCAL_OPMODE, TPRIV_OPMODE, TPRIV_SET, TPRIV_WHOX, TPRIV_BADCHAN
+%token TPRIV_CHAN_LIMIT TPRIV_MODE_LCHAN TPRIV_DEOP_LCHAN TPRIV_WALK_LCHAN
+%token TPRIV_KILL TPRIV_LOCAL_KILL TPRIV_REHASH TPRIV_RESTART TPRIV_DIE
+%token TPRIV_GLINE TPRIV_LOCAL_GLINE TPRIV_JUPE TPRIV_LOCAL_JUPE
+%token TPRIV_LOCAL_OPMODE TPRIV_OPMODE TPRIV_SET TPRIV_WHOX TPRIV_BADCHAN
%token TPRIV_LOCAL_BADCHAN
-%token TPRIV_SEE_CHAN, TPRIV_SHOW_INVIS, TPRIV_SHOW_ALL_INVIS, TPRIV_PROPAGATE
-%token TPRIV_UNLIMIT_QUERY, TPRIV_DISPLAY, TPRIV_SEE_OPERS, TPRIV_WIDE_GLINE
+%token TPRIV_SEE_CHAN TPRIV_SHOW_INVIS TPRIV_SHOW_ALL_INVIS TPRIV_PROPAGATE
+%token TPRIV_UNLIMIT_QUERY TPRIV_DISPLAY TPRIV_SEE_OPERS TPRIV_WIDE_GLINE
/* and some types... */
%type <num> sizespec
-%type <num> timespec, timefactor, factoredtimes, factoredtime
-%type <num> expr, yesorno, privtype
+%type <num> timespec timefactor factoredtimes factoredtime
+%type <num> expr yesorno privtype
%left '+' '-'
%left '*' '/'
blocks: blocks block | block;
block: adminblock | generalblock | classblock | connectblock |
serverblock | operblock | portblock | jupeblock | clientblock |
- killblock | cruleblock | motdblock | featuresblock;
+ killblock | cruleblock | motdblock | featuresblock | quarantineblock;
/* The timespec, sizespec and expr was ripped straight from
* ircd-hybrid-7. */
| DECADES { $$ = 60 * 60 * 24 * 365 * 10; };
-sizespec: expr
- = {
+sizespec: expr {
$$ = $1;
}
- | expr BYTES
- = {
+ | expr BYTES {
$$ = $1;
}
- | expr KBYTES
- = {
+ | expr KBYTES {
$$ = $1 * 1024;
}
- | expr MBYTES
- = {
+ | expr MBYTES {
$$ = $1 * 1024 * 1024;
}
- | expr GBYTES
- = {
+ | expr GBYTES {
$$ = $1 * 1024 * 1024 * 1024;
}
- | expr TBYTES
- = {
+ | expr TBYTES {
$$ = $1 * 1024 * 1024 * 1024;
}
;
/* this is an arithmatic expression */
expr: NUMBER
- = {
+ {
$$ = $1;
}
- | expr '+' expr
- = {
+ | expr '+' expr {
$$ = $1 + $3;
}
- | expr '-' expr
- = {
+ | expr '-' expr {
$$ = $1 - $3;
}
- | expr '*' expr
- = {
+ | expr '*' expr {
$$ = $1 * $3;
}
- | expr '/' expr
- = {
+ | expr '/' expr {
$$ = $1 / $3;
}
/* leave this out until we find why it makes BSD yacc dump core -larne
= {
$$ = -$2;
} */
- | '(' expr ')'
- = {
+ | '(' expr ')' {
$$ = $2;
}
;
{
if (localConf.numeric == 0)
localConf.numeric = yylval.num;
+ else
+ parse_error("Redefinition of server numeric %i (%i)",yylval.num,
+ localConf.numeric);
};
generalname: NAME '=' QSTRING ';'
{
if (localConf.name == NULL)
DupString(localConf.name, yylval.text);
+ else
+ parse_error("Redefinition of server name %s (%s)",yylval.text,
+ localConf.name);
};
generaldesc: DESCRIPTION '=' QSTRING ';'
{
MyFree(localConf.description);
DupString(localConf.description, yylval.text);
+ ircd_strncpy(cli_info(&me), yylval.text, REALLEN);
};
generalvhost: VHOST '=' QSTRING ';'
admincontact: CONTACT '=' QSTRING ';'
{
if (localConf.contact != NULL)
- free(localConf.contact);
+ MyFree(localConf.contact);
DupString(localConf.contact, yylval.text);
};
classblock: CLASS {
- name = NULL;
- tping = 90;
- tconn = 0;
- maxlinks = 0;
- sendq = 0;
+ name = NULL;
+ tping = 90;
+ tconn = 0;
+ maxlinks = 0;
+ sendq = 0;
} '{' classitems '}'
{
- if (name != NULL)
- {
- add_class(name, tping, tconn, maxlinks, sendq);
- }
+ if (name != NULL)
+ {
+ add_class(name, tping, tconn, maxlinks, sendq);
+ }
+ else {
+ parse_error("Missing name in class block");
+ }
} ';';
classitems: classitem classitems | classitem;
classitem: classname | classpingfreq | classconnfreq | classmaxlinks |
classsendq;
classname: NAME '=' QSTRING ';'
{
- MyFree(name);
- DupString(name, yylval.text);
+ MyFree(name);
+ DupString(name, yylval.text);
};
classpingfreq: PINGFREQ '=' timespec ';'
{
- tping = yylval.num;
+ tping = yylval.num;
};
classconnfreq: CONNECTFREQ '=' timespec ';'
{
- tconn = yylval.num;
+ tconn = yylval.num;
};
classmaxlinks: MAXLINKS '=' expr ';'
{
- maxlinks = yylval.num;
+ maxlinks = yylval.num;
};
classsendq: SENDQ '=' sizespec ';'
{
- sendq = yylval.num;
+ sendq = yylval.num;
};
connectblock: CONNECT
{
name = pass = host = NULL;
- class = NULL;
+ c_class = NULL;
port = 0;
} '{' connectitems '}'
{
- if (name != NULL && pass != NULL && host != NULL && class != NULL &&
+ if (name != NULL && pass != NULL && host != NULL && c_class != NULL &&
/*ccount < MAXCONFLINKS &&*/ !strchr(host, '*') &&
!strchr(host, '?'))
{
- aconf = MyMalloc(sizeof(*aconf));
- aconf->status = CONF_SERVER;
- aconf->name = name;
- aconf->passwd = pass;
- aconf->conn_class = class;
- aconf->port = port;
- aconf->status = CONF_SERVER;
- aconf->host = host;
- aconf->next = GlobalConfList;
- GlobalConfList = aconf;
- printf("Server added: %s\n", name);
- /* ccount++; -- XXX fixme --- A1kmm */
+ aconf = make_conf();
+ aconf->status = CONF_SERVER;
+ aconf->name = name;
+ aconf->passwd = pass;
+ aconf->conn_class = c_class;
+ aconf->port = port;
+ aconf->status = CONF_SERVER;
+ aconf->host = host;
+ aconf->next = GlobalConfList;
+ aconf->ipnum.s_addr = INADDR_NONE;
+ lookup_confhost(aconf);
+ GlobalConfList = aconf;
}
else
{
- MyFree(name);
- MyFree(pass);
- MyFree(host);
- name = pass = host = NULL;
+ MyFree(name);
+ MyFree(pass);
+ MyFree(host);
+ name = pass = host = NULL;
+ parse_error("Bad connect block");
}
}';';
connectitems: connectitem connectitems | connectitem;
};
connectclass: CLASS '=' QSTRING ';'
{
- class = find_class(yylval.text);
+ c_class = find_class(yylval.text);
};
connecthost: HOST '=' QSTRING ';'
{
serverblock: SERVER
{
- aconf = MyMalloc(sizeof(*aconf));
+ aconf = (struct ConfItem*) MyMalloc(sizeof(*aconf));
memset(aconf, 0, sizeof(*aconf));
} '{' serveritems '}'
{
MyFree(aconf->name);
MyFree(aconf);
aconf = NULL;
+ parse_error("Bad server block");
}
else
{
{
if (!(aconf->status & CONF_HUB && aconf->status & CONF_UWORLD))
aconf->status |= CONF_LEAF;
+ else
+ parse_error("Server is both leaf and a hub");
}
| LEAF '=' NO ';'
{
operblock: OPER
{
- aconf = MyMalloc(sizeof(*aconf));
+ aconf = (struct ConfItem*) MyMalloc(sizeof(*aconf));
memset(aconf, 0, sizeof(*aconf));
aconf->status = CONF_OPERATOR;
- set_initial_oper_privs(aconf, (FLAGS_OPER | FLAGS_LOCOP));
} '{' operitems '}' ';'
{
if (aconf->name != NULL && aconf->passwd != NULL && aconf->host != NULL)
{
- log_write(LS_CONFIG, L_ERROR, 0, "added an oper block for host %s", aconf->host);
aconf->next = GlobalConfList;
GlobalConfList = aconf;
}
* permission values here. But for now, I am just going with local
* opers... */
aconf->status = CONF_LOCOP;
- /* XXX blow away existing priviledges. */
- set_initial_oper_privs(aconf, FLAGS_LOCOP);
} | LOCAL '=' NO ';'
{
- /* XXX blow away existing priviledges. */
- set_initial_oper_privs(aconf, (FLAGS_OPER|FLAGS_LOCOP));
aconf->status = CONF_OPERATOR;
};
if (!strchr(yylval.text, '@'))
{
int uh_len;
- char *b = MyMalloc((uh_len = strlen(yylval.text)+3));
+ char *b = (char*) MyMalloc((uh_len = strlen(yylval.text)+3));
ircd_snprintf(0, b, uh_len, "*@%s", yylval.text);
aconf->host = b;
}
operpriv: privtype '=' yesorno ';'
{
if ($3 == 1)
+ {
+ PrivSet(&aconf->privs_dirty, $1);
PrivSet(&aconf->privs, $1);
+ }
else
+ {
+ PrivSet(&aconf->privs_dirty, $1);
PrivClr(&aconf->privs, $1);
+ }
};
privtype: TPRIV_CHAN_LIMIT { $$ = PRIV_CHAN_LIMIT; } |
{
MyFree(host);
MyFree(pass);
+ parse_error("Bad port block");
}
};
portitems: portitem portitems | portitem;
clientblock: CLIENT
{
- aconf = MyMalloc(sizeof(*aconf));
+ aconf = (struct ConfItem*) MyMalloc(sizeof(*aconf));
memset(aconf, 0, sizeof(*aconf));
aconf->status = CONF_CLIENT;
} '{' clientitems '}'
MyFree(aconf->passwd);
MyFree(aconf);
aconf = NULL;
+ parse_error("Bad client block");
}
} ';';
clientitems: clientitem clientitems | clientitem;
killblock: KILL
{
- dconf = MyMalloc(sizeof(*dconf));
+ dconf = (struct DenyConf*) MyMalloc(sizeof(*dconf));
memset(dconf, 0, sizeof(*dconf));
} '{' killitems '}'
{
MyFree(dconf->message);
MyFree(dconf);
dconf = NULL;
+ parse_error("Bad kill block");
}
} ';';
killitems: killitem killitems | killitem;
struct CRuleNode *node;
if (host != NULL && pass != NULL && (node=crule_parse(pass)) != NULL)
{
- struct CRuleConf *p = MyMalloc(sizeof(*p));
+ struct CRuleConf *p = (struct CRuleConf*) MyMalloc(sizeof(*p));
p->hostmask = host;
p->rule = pass;
p->type = tconn;
{
MyFree(host);
MyFree(pass);
+ parse_error("Bad CRule block");
}
} ';';
if (stringno < MAX_STRINGS)
stringlist[stringno++] = $1;
};
+
+quarantineblock: QUARANTINE '{'
+{
+ if (qconf != NULL)
+ qconf = (struct qline*) MyMalloc(sizeof(*qconf));
+ else
+ {
+ if (qconf->chname != NULL)
+ MyFree(qconf->chname);
+ if (qconf->reason != NULL)
+ MyFree(qconf->reason);
+ }
+ memset(qconf, 0, sizeof(*qconf));
+} quarantineitems '}' ';'
+{
+ if (qconf->chname == NULL || qconf->reason == NULL)
+ {
+ log_write(LS_CONFIG, L_ERROR, 0, "quarantine blocks need a channel name "
+ "and a reason.");
+ return 0;
+ }
+ qconf->next = GlobalQuarantineList;
+ GlobalQuarantineList = qconf;
+ qconf = NULL;
+};
+
+quarantineitems: CHANNEL NAME '=' QSTRING ';'
+{
+ DupString(qconf->chname, yylval.text);
+} | REASON '=' QSTRING ';'
+{
+ DupString(qconf->reason, yylval.text);
+};