*
* $Id$
*/
-#include "s_conf.h"
+#include "config.h"
+#include "s_conf.h"
#include "IPcheck.h"
#include "class.h"
#include "client.h"
#include "crule.h"
+#include "ircd_features.h"
#include "fileio.h"
#include "gline.h"
#include "hash.h"
#include "list.h"
#include "listener.h"
#include "match.h"
+#include "motd.h"
#include "numeric.h"
#include "numnicks.h"
#include "opercmds.h"
#include "s_debug.h"
#include "s_misc.h"
#include "send.h"
-#include "sprintf_irc.h"
#include "struct.h"
#include "support.h"
#include "sys.h"
#define INADDR_NONE 0xffffffff
#endif
-struct ConfItem* GlobalConfList = 0;
+struct ConfItem *GlobalConfList = 0;
int GlobalConfCount = 0;
-struct MotdItem* motd = NULL;
-struct MotdItem* rmotd = NULL;
-struct TRecord* tdata = NULL;
-struct tm motd_tm;
+struct s_map *GlobalServiceMapList = 0;
+struct qline *GlobalQuarantineList = 0;
+void yyparse(void);
+int conf_fd, lineno;
-/*
- * is the K line field an interval or a comment? - Mmmm
- */
-static int is_comment(const char *comment)
-{
- unsigned int i;
- unsigned int len = strlen(comment);
- for (i = 0; i < len; ++i) {
- if (!IsKTimeChar(comment[i]))
- return 1;
- }
- return 0;
-}
-
-/*
- * check against a set of time intervals
- */
-static int check_time_interval(char *interval, char *reply, size_t reply_size)
-{
- struct tm* tptr;
- char* p;
- int perm_min_hours;
- int perm_min_minutes;
- int perm_max_hours;
- int perm_max_minutes;
- int nowm;
- int perm_min;
- int perm_max;
-
- tptr = localtime(&CurrentTime);
- nowm = tptr->tm_hour * 60 + tptr->tm_min;
-
- while (interval) {
- p = strchr(interval, ',');
- if (p)
- *p = '\0';
- if (sscanf(interval, "%2d%2d-%2d%2d", &perm_min_hours, &perm_min_minutes,
- &perm_max_hours, &perm_max_minutes) != 4)
- {
- if (p)
- *p = ',';
- return 0;
- }
- if (p)
- *(p++) = ',';
- perm_min = 60 * perm_min_hours + perm_min_minutes;
- perm_max = 60 * perm_max_hours + perm_max_minutes;
- /*
- * The following check allows intervals over midnight ...
- */
- if ((perm_min < perm_max)
- ? (perm_min <= nowm && nowm <= perm_max)
- : (perm_min <= nowm || nowm <= perm_max))
- {
- ircd_snprintf(0, reply, reply_size, ":You are not allowed to connect "
- "from %d:%02d to %d:%02d.", perm_min_hours,
- perm_min_minutes, perm_max_hours, perm_max_minutes);
- return (ERR_YOUREBANNEDCREEP);
- }
- if ((perm_min < perm_max)
- ? (perm_min <= nowm + 5 && nowm + 5 <= perm_max)
- : (perm_min <= nowm + 5 || nowm + 5 <= perm_max))
- {
- ircd_snprintf(0, reply, reply_size, ":%d minute%s and you will be "
- "denied for further access", perm_min - nowm,
- (perm_min - nowm) > 1 ? "s" : "");
- return (ERR_YOUWILLBEBANNED);
- }
- interval = p;
- }
- return 0;
-}
+struct LocalConf localConf;
+struct CRuleConf* cruleConfList;
+/* struct ServerConf* serverConfList; */
+struct DenyConf* denyConfList;
/*
* output the reason for being k lined from a file - Mmmm
- * sptr is server
- * parv is the sender prefix
+ * sptr is client being dumped
* filename is the file that is to be output to the K lined client
*/
-static void killcomment(struct Client *sptr, char *parv, char *filename)
+static void killcomment(struct Client* sptr, const char* filename)
{
- FBFILE* file = NULL;
+ FBFILE* file = 0;
char line[80];
- char* tmp = NULL;
struct stat sb;
struct tm* tm;
if (NULL == (file = fbopen(filename, "r"))) {
send_reply(sptr, ERR_NOMOTD);
send_reply(sptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP,
- ":Connection from your host is refused on this server.");
+ ":Connection from your host is refused on this server.");
return;
}
fbstat(&sb, file);
tm = localtime((time_t*) &sb.st_mtime); /* NetBSD needs cast */
while (fbgets(line, sizeof(line) - 1, file)) {
- if ((tmp = strchr(line, '\n')))
- *tmp = '\0';
- if ((tmp = strchr(line, '\r')))
- *tmp = '\0';
+ char* end = line + strlen(line);
+ while (end > line) {
+ --end;
+ if ('\n' == *end || '\r' == *end)
+ *end = '\0';
+ else
+ break;
+ }
send_reply(sptr, RPL_MOTD, line);
}
send_reply(sptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP,
- ":Connection from your host is refused on this server.");
+ ":Connection from your host is refused on this server.");
fbclose(file);
}
#ifdef DEBUGMODE
++GlobalConfCount;
#endif
+ memset(aconf, 0, sizeof(struct ConfItem));
aconf->status = CONF_ILLEGAL;
- aconf->clients = 0;
aconf->ipnum.s_addr = INADDR_NONE;
- aconf->host = 0;
- aconf->passwd = 0;
- aconf->name = 0;
- aconf->port = 0;
- aconf->hold = 0;
- aconf->dns_pending = 0;
- aconf->confClass = 0;
- aconf->next = 0;
return aconf;
}
;
bconf->next = aconf->next;
}
- aconf->next = NULL;
+ aconf->next = 0;
}
void free_conf(struct ConfItem *aconf)
#endif
}
+/*
+ * detach_conf - Disassociate configuration from the client.
+ */
+static void detach_conf(struct Client* cptr, struct ConfItem* aconf)
+{
+ struct SLink** lp;
+ struct SLink* tmp;
+
+ assert(0 != aconf);
+ assert(0 != cptr);
+ assert(0 < aconf->clients);
+
+ lp = &(cli_confs(cptr));
+
+ while (*lp) {
+ if ((*lp)->value.aconf == aconf) {
+ if (aconf->conn_class && (aconf->status & CONF_CLIENT_MASK) && ConfLinks(aconf) > 0)
+ --ConfLinks(aconf);
+
+ assert(0 < aconf->clients);
+ if (0 == --aconf->clients && IsIllegal(aconf))
+ free_conf(aconf);
+ tmp = *lp;
+ *lp = tmp->next;
+ free_link(tmp);
+ return;
+ }
+ lp = &((*lp)->next);
+ }
+}
+
/*
* conf_dns_callback - called when resolver query finishes
* if the query resulted in a successful search, hp will contain
* a non-null pointer, otherwise hp will be null.
* if successful save hp in the conf item it was called with
*/
-static void conf_dns_callback(void* vptr, struct DNSReply* reply)
+static void conf_dns_callback(void* vptr, struct hostent* hp)
{
struct ConfItem* aconf = (struct ConfItem*) vptr;
+ assert(aconf);
aconf->dns_pending = 0;
- if (reply)
- memcpy(&aconf->ipnum, reply->hp->h_addr, sizeof(struct in_addr));
+ if (hp) {
+ memcpy(&aconf->ipnum, hp->h_addr, sizeof(struct in_addr));
+ MyFree(hp);
+ }
}
/*
* if the conf entry is currently doing a ns lookup do nothing, otherwise
* if the lookup returns a null pointer, set the conf dns_pending flag
*/
-static struct DNSReply* conf_dns_lookup(struct ConfItem* aconf)
+static void conf_dns_lookup(struct ConfItem* aconf)
{
- struct DNSReply* dns_reply = 0;
if (!aconf->dns_pending) {
char buf[HOSTLEN + 1];
struct DNSQuery query;
host_from_uh(buf, aconf->host, HOSTLEN);
buf[HOSTLEN] = '\0';
- if (0 == (dns_reply = gethost_byname(buf, &query)))
- aconf->dns_pending = 1;
+ gethost_byname(buf, &query);
+ aconf->dns_pending = 1;
}
- return dns_reply;
}
* Do (start) DNS lookups of all hostnames in the conf line and convert
* an IP addresses in a.b.c.d number for to IP#s.
*/
-static void lookup_confhost(struct ConfItem *aconf)
+void
+lookup_confhost(struct ConfItem *aconf)
{
- struct DNSReply* reply;
-
if (EmptyString(aconf->host) || EmptyString(aconf->name)) {
Debug((DEBUG_ERROR, "Host/server name error: (%s) (%s)",
aconf->host, aconf->name));
aconf->host, aconf->name));
}
}
- else if ((reply = conf_dns_lookup(aconf)))
- memcpy(&aconf->ipnum, reply->hp->h_addr, sizeof(struct in_addr));
+ else
+ conf_dns_lookup(aconf);
}
/*
* Evaluate connection rules... If no rules found, allow the
* connect. Otherwise stop with the first true rule (ie: rules
* are ored together. Oper connects are effected only by D
- * lines (CRULEALL) not d lines (CRULEAUTO).
+ * lines (CRULE_ALL) not d lines (CRULE_AUTO).
*/
-const char* conf_eval_crule(struct ConfItem* conf)
+const char* conf_eval_crule(const char* name, int mask)
{
- struct ConfItem* rule;
- assert(0 != conf);
+ struct CRuleConf* p = cruleConfList;
+ assert(0 != name);
- for (rule = GlobalConfList; rule; rule = rule->next) {
- if ((CONF_CRULEALL == rule->status) && (0 == match(rule->host, conf->name))) {
- if (crule_eval(rule->passwd))
- return rule->name;
+ for ( ; p; p = p->next) {
+ if (0 != (p->type & mask) && 0 == match(p->hostmask, name)) {
+ if (crule_eval(p->node))
+ return p->rule;
}
}
return 0;
}
-
-/*
- * field breakup for ircd.conf file.
- */
-static char* getfield(char* newline, char fs)
-{
- static char* gfline = NULL;
- char* end;
- char* field;
-
- if (newline)
- gfline = newline;
-
- if (gfline == NULL)
- return NULL;
-
- end = field = gfline;
-
- if (fs != ':') {
- if (*end == fs)
- ++end;
- else
- fs = ':';
- }
- do {
- while (*end != fs) {
- if (!*end) {
- end = NULL;
- break;
- }
- ++end;
- }
- } while (end && fs != ':' && *++end != ':' && *end != '\n') ;
-
- if (end == NULL) {
- gfline = NULL;
- if ((end = strchr(field, '\n')) == NULL)
- end = field + strlen(field);
- }
- else
- gfline = end + 1;
-
- *end = '\0';
-
- return field;
-}
-
/*
* Remove all conf entries from the client except those which match
* the status field mask.
*/
-void det_confs_butmask(struct Client *cptr, int mask)
-{
- struct SLink *tmp, *tmp2;
-
- for (tmp = cptr->confs; tmp; tmp = tmp2) {
- tmp2 = tmp->next;
- if ((tmp->value.aconf->status & mask) == 0)
- detach_conf(cptr, tmp->value.aconf);
- }
-}
-
-/*
- * validate_hostent - make sure hostnames are valid in a hostent struct
- * XXX - this is terrible, what's worse is it used to be in the inner
- * loop of scanning all the I:lines --Bleep
- */
-static int validate_hostent(struct hostent* hp)
+void det_confs_butmask(struct Client* cptr, int mask)
{
- char fullname[HOSTLEN + 1];
- int i = 0;
- int error = 0;
- const char* hname;
-
- for (hname = hp->h_name; hname; hname = hp->h_aliases[i++]) {
- unsigned int fullnamelen = 0;
- unsigned int label_count = 0;
+ struct SLink* link;
+ struct SLink* next;
+ assert(0 != cptr);
- ircd_strncpy(fullname, hname, HOSTLEN);
- fullname[HOSTLEN] = '\0';
- /*
- * Disallow a hostname label to contain anything but a [-a-zA-Z0-9].
- * It may not start or end on a '.'.
- * A label may not end on a '-', the maximum length of a label is
- * 63 characters.
- * On top of that (which seems to be the RFC) we demand that the
- * top domain does not contain any digits.
- */
- error = (*hname == '.') ? 1 : 0; /* May not start with a '.' */
- if (!error) {
- char *p;
- for (p = fullname; *p; ++p, ++fullnamelen) {
- if (*p == '.') {
- /* Label may not end on '-' and May not end on a '.' */
- if (p[-1] == '-' || p[1] == 0) {
- error = 1;
- break;
- }
- label_count = 0;
- error = 0; /* Was not top domain */
- continue;
- }
- if (++label_count > 63) {
- /* Label not longer then 63 */
- error = 1;
- break;
- }
- if (*p >= '0' && *p <= '9') {
- /* In case this is top domain */
- error = 1;
- continue;
- }
- if (!(*p >= 'a' && *p <= 'z')
- && !(*p >= 'A' && *p <= 'Z') && *p != '-') {
- error = 1;
- break;
- }
- }
- }
- if (error)
- break;
+ for (link = cli_confs(cptr); link; link = next) {
+ next = link->next;
+ if ((link->value.aconf->status & mask) == 0)
+ detach_conf(cptr, link->value.aconf);
}
- return (0 == error);
}
/*
* check_limit_and_attach - check client limits and attach I:line
+ *
+ * Made it accept 1 charactor, and 2 charactor limits (0->99 now),
+ * and dislallow more than 255 people here as well as in ipcheck.
+ * removed the old "ONE" scheme too.
+ * -- Isomer 2000-06-22
*/
static enum AuthorizationCheckResult
check_limit_and_attach(struct Client* cptr, struct ConfItem* aconf)
{
+ int number = 255;
+
if (aconf->passwd) {
- /* Special case: exactly one digit */
- if (IsDigit(*aconf->passwd) && !aconf->passwd[1]) {
- /*
- * Refuse connections when there are already <digit>
- * clients connected with the same IP number
- */
- unsigned short nr = *aconf->passwd - '0';
- if (ip_registry_count(cptr->ip.s_addr) > nr)
- return ACR_TOO_MANY_FROM_IP; /* Already got nr with that ip# */
- }
-#ifdef USEONE
- else if (0 == strcmp(aconf->passwd, "ONE")) {
- int i;
- for (i = HighestFd; i > -1; --i) {
- if (LocalClientArray[i] && MyUser(LocalClientArray[i]) &&
- LocalClientArray[i]->ip.s_addr == cptr->ip.s_addr)
- return ACR_TOO_MANY_FROM_IP; /* Already got one with that ip# */
- }
- }
-#endif
+ if (IsDigit(*aconf->passwd) && !aconf->passwd[1])
+ number = *aconf->passwd-'0';
+ else if (IsDigit(*aconf->passwd) && IsDigit(aconf->passwd[1]) &&
+ !aconf->passwd[2])
+ number = (*aconf->passwd-'0')*10+(aconf->passwd[1]-'0');
}
+ if (IPcheck_nr(cptr) > number)
+ return ACR_TOO_MANY_FROM_IP;
return attach_conf(cptr, aconf);
}
static char fullname[HOSTLEN + 1];
struct hostent* hp = 0;
- if (cptr->dns_reply) {
- hp = cptr->dns_reply->hp;
- if (!validate_hostent(hp))
- hp = 0;
- }
+ assert(0 != cptr);
+
+ if (cli_dns_reply(cptr))
+ hp = cli_dns_reply(cptr);
+
for (aconf = GlobalConfList; aconf; aconf = aconf->next) {
if (aconf->status != CONF_CLIENT)
continue;
- if (aconf->port && aconf->port != cptr->listener->port)
+ if (aconf->port && aconf->port != cli_listener(cptr)->port)
continue;
if (!aconf->host || !aconf->name)
continue;
ircd_strncpy(fullname, hname, HOSTLEN);
fullname[HOSTLEN] = '\0';
- Debug((DEBUG_DNS, "a_il: %s->%s", cptr->sockhost, fullname));
+ Debug((DEBUG_DNS, "a_il: %s->%s", cli_sockhost(cptr), fullname));
if (strchr(aconf->name, '@')) {
- strcpy(uhost, cptr->username);
+ strcpy(uhost, cli_username(cptr));
strcat(uhost, "@");
}
else
uhost[sizeof(uhost) - 1] = 0;
if (0 == match(aconf->name, uhost)) {
if (strchr(uhost, '@'))
- cptr->flags |= FLAGS_DOID;
+ SetFlag(cptr, FLAG_DOID);
return check_limit_and_attach(cptr, aconf);
}
}
}
if (strchr(aconf->host, '@')) {
- ircd_strncpy(uhost, cptr->username, sizeof(uhost) - 2);
+ ircd_strncpy(uhost, cli_username(cptr), sizeof(uhost) - 2);
uhost[sizeof(uhost) - 2] = 0;
strcat(uhost, "@");
}
else
*uhost = '\0';
- strncat(uhost, cptr->sock_ip, sizeof(uhost) - 1 - strlen(uhost));
+ strncat(uhost, cli_sock_ip(cptr), sizeof(uhost) - 1 - strlen(uhost));
uhost[sizeof(uhost) - 1] = 0;
if (match(aconf->host, uhost))
continue;
if (strchr(uhost, '@'))
- cptr->flags |= FLAGS_DOID;
+ SetFlag(cptr, FLAG_DOID);
return check_limit_and_attach(cptr, aconf);
}
return ACR_NO_AUTHORIZATION;
}
-/*
- * detach_conf - Disassociate configuration from the client.
- */
-int detach_conf(struct Client *cptr, struct ConfItem *aconf)
-{
- struct SLink** lp;
- struct SLink* tmp;
-
- assert(0 != aconf);
- assert(0 != cptr);
- assert(0 < aconf->clients);
-
- lp = &(cptr->confs);
-
- while (*lp) {
- if ((*lp)->value.aconf == aconf) {
- if (aconf->confClass && (aconf->status & CONF_CLIENT_MASK) &&
- ConfLinks(aconf) > 0)
- --ConfLinks(aconf);
- if (0 == --aconf->clients && IsIllegal(aconf))
- free_conf(aconf);
- tmp = *lp;
- *lp = tmp->next;
- free_link(tmp);
- return 0;
- }
- else
- lp = &((*lp)->next);
- }
- return -1;
-}
-
static int is_attached(struct ConfItem *aconf, struct Client *cptr)
{
struct SLink *lp;
- for (lp = cptr->confs; lp; lp = lp->next)
+ for (lp = cli_confs(cptr); lp; lp = lp->next) {
if (lp->value.aconf == aconf)
- break;
-
- return (lp) ? 1 : 0;
+ return 1;
+ }
+ return 0;
}
/*
ConfLinks(aconf) >= ConfMaxLinks(aconf) && ConfMaxLinks(aconf) > 0)
return ACR_TOO_MANY_IN_CLASS; /* Use this for printing error message */
lp = make_link();
- lp->next = cptr->confs;
+ lp->next = cli_confs(cptr);
lp->value.aconf = aconf;
- cptr->confs = lp;
+ cli_confs(cptr) = lp;
++aconf->clients;
if (aconf->status & CONF_CLIENT_MASK)
ConfLinks(aconf)++;
return ACR_OK;
}
-struct ConfItem *find_admin(void)
+const struct LocalConf* conf_get_local(void)
{
- struct ConfItem *aconf;
-
- for (aconf = GlobalConfList; aconf; aconf = aconf->next) {
- if (aconf->status & CONF_ADMIN)
- break;
- }
- return aconf;
-}
-
-struct ConfItem* find_me(void)
-{
- struct ConfItem* aconf;
- for (aconf = GlobalConfList; aconf; aconf = aconf->next) {
- if (aconf->status & CONF_ME)
- break;
- }
- return aconf;
+ return &localConf;
}
/*
if (match(tmp->host, userhost))
continue;
if (tmp->status & (CONF_OPERATOR | CONF_LOCOP)) {
- if (tmp->clients < MaxLinks(tmp->confClass))
+ if (tmp->clients < MaxLinks(tmp->conn_class))
return tmp;
else
continue;
struct ConfItem* find_conf_byhost(struct SLink* lp, const char* host,
int statmask)
{
- struct ConfItem* tmp;
+ struct ConfItem* tmp = NULL;
assert(0 != host);
if (HOSTLEN < strlen(host))
*
* - looks for a match on all given fields.
*/
+#if 0
static struct ConfItem *find_conf_entry(struct ConfItem *aconf,
unsigned int mask)
{
(EmptyString(aconf->passwd) && !EmptyString(bconf->passwd)))
continue;
if (!EmptyString(bconf->passwd) && (!IsDigit(*bconf->passwd) || bconf->passwd[1])
-#ifdef USEONE
- && 0 != ircd_strcmp(bconf->passwd, "ONE")
-#endif
&& 0 != ircd_strcmp(bconf->passwd, aconf->passwd))
continue;
return bconf;
}
+/*
+ * If conf line is a class definition, create a class entry
+ * for it and make the conf_line illegal and delete it.
+ */
+void conf_add_class(const char* const* fields, int count)
+{
+ if (count < 6)
+ return;
+ add_class(atoi(fields[1]), atoi(fields[2]), atoi(fields[3]),
+ atoi(fields[4]), atoi(fields[5]));
+}
+
+void conf_add_listener(const char* const* fields, int count)
+{
+ int is_server = 0;
+ int is_hidden = 0;
+
+ /*
+ * need a port
+ */
+ if (count < 5 || EmptyString(fields[4]))
+ return;
+
+ if (!EmptyString(fields[3])) {
+ const char* x = fields[3];
+ if ('S' == ToUpper(*x))
+ is_server = 1;
+ ++x;
+ if ('H' == ToUpper(*x))
+ is_hidden = 1;
+ }
+ /* port vhost mask */
+ add_listener(atoi(fields[4]), fields[2], fields[1], is_server, is_hidden);
+}
+
+void conf_add_local(const char* const* fields, int count)
+{
+ if (count < 6 || EmptyString(fields[1]) || EmptyString(fields[5])) {
+ log_write(LS_CONFIG, L_CRIT, 0, "Your M: line must have 6 fields!");
+ return;
+ }
+ /*
+ * these two can only be set the first time
+ */
+ if (0 == localConf.name) {
+ if (string_is_hostname(fields[1]))
+ DupString(localConf.name, fields[1]);
+ }
+ if (0 == localConf.numeric) {
+ localConf.numeric = atoi(fields[5]);
+ if (0 == localConf.numeric)
+ log_write(LS_CONFIG, L_WARNING, 0,
+ "Your M: line must have a Numeric value greater than 0");
+ }
+ /*
+ * these two can be changed while the server is running
+ */
+ if (string_is_address(fields[2])) {
+ if (INADDR_NONE == (localConf.vhost_address.s_addr = inet_addr(fields[2])))
+ localConf.vhost_address.s_addr = INADDR_ANY;
+ }
+ MyFree(localConf.description);
+ DupString(localConf.description, fields[3]);
+ /*
+ * XXX - shouldn't be setting these directly here
+ */
+ ircd_strncpy(cli_info(&me), fields[3], REALLEN);
+ set_virtual_host(localConf.vhost_address);
+}
+
+void conf_add_admin(const char* const* fields, int count)
+{
+ /*
+ * if you have one, it MUST have 3 lines
+ */
+ if (count < 4) {
+ log_write(LS_CONFIG, L_CRIT, 0, "Your A: line must have 4 fields!");
+ return;
+ }
+ MyFree(localConf.location1);
+ DupString(localConf.location1, fields[1]);
+
+ MyFree(localConf.location2);
+ DupString(localConf.location2, fields[2]);
+
+ MyFree(localConf.contact);
+ DupString(localConf.contact, fields[3]);
+}
+
+/*
+ * conf_add_crule - Create expression tree from connect rule and add it
+ * to the crule list
+ */
+void conf_add_crule(const char* const* fields, int count, int type)
+{
+ struct CRuleNode* node;
+ assert(0 != fields);
+
+ if (count < 4 || EmptyString(fields[1]) || EmptyString(fields[3]))
+ return;
+
+ if ((node = crule_parse(fields[3]))) {
+ struct CRuleConf* p = (struct CRuleConf*) MyMalloc(sizeof(struct CRuleConf));
+ assert(0 != p);
+
+ DupString(p->hostmask, fields[1]);
+ collapse(p->hostmask);
+
+ DupString(p->rule, fields[3]);
+
+ p->type = type;
+ p->node = node;
+ p->next = cruleConfList;
+ cruleConfList = p;
+ }
+}
+#endif
+
+void conf_erase_crule_list(void)
+{
+ struct CRuleConf* next;
+ struct CRuleConf* p = cruleConfList;
+
+ for ( ; p; p = next) {
+ next = p->next;
+ crule_free(&p->node);
+ MyFree(p->hostmask);
+ MyFree(p->rule);
+ MyFree(p);
+ }
+ cruleConfList = 0;
+}
+
+const struct CRuleConf* conf_get_crule_list(void)
+{
+ return cruleConfList;
+}
+
+#if 0
+void conf_add_server(const char* const* fields, int count)
+{
+ struct ServerConf* server;
+ struct in_addr addr;
+ assert(0 != fields);
+ /*
+ * missing host, password, or alias?
+ */
+ if (count < 6 || EmptyString(fields[1]) || EmptyString(fields[2]) || EmptyString(fields[3]))
+ return;
+ /*
+ * check the host
+ */
+ if (string_is_hostname(fields[1]))
+ addr.s_addr = INADDR_NONE;
+ else if (INADDR_NONE == (addr.s_addr = inet_addr(fields[1])))
+ return;
+
+ server = (struct ServerConf*) MyMalloc(sizeof(struct ServerConf));
+ assert(0 != server);
+ DupString(server->hostname, fields[1]);
+ DupString(server->passwd, fields[2]);
+ DupString(server->alias, fields[3]);
+ server->address.s_addr = addr.s_addr;
+ server->port = atoi(fields[4]);
+ server->dns_pending = 0;
+ server->connected = 0;
+ server->hold = 0;
+ server->conn_class = find_class(atoi(fields[5]));
+
+ server->next = serverConfList;
+ serverConfList = server;
+
+ /* if (INADDR_NONE == server->address.s_addr) */
+ /* lookup_confhost(server); */
+}
+
+void conf_add_deny(const char* const* fields, int count, int ip_kill)
+{
+ struct DenyConf* conf;
+
+ if (count < 4 || EmptyString(fields[1]) || EmptyString(fields[3]))
+ return;
+
+ conf = (struct DenyConf*) MyMalloc(sizeof(struct DenyConf));
+ assert(0 != conf);
+ memset(conf, 0, sizeof(struct DenyConf));
+
+ if (fields[1][0] == '$' && fields[1][1] == 'R')
+ conf->flags |= DENY_FLAGS_REALNAME;
+
+ DupString(conf->hostmask, fields[1]);
+ collapse(conf->hostmask);
+
+ if (!EmptyString(fields[2])) {
+ const char* p = fields[2];
+ if ('!' == *p) {
+ conf->flags |= DENY_FLAGS_FILE;
+ ++p;
+ }
+ DupString(conf->message, p);
+ }
+ DupString(conf->usermask, fields[3]);
+ collapse(conf->usermask);
+
+ if (ip_kill) {
+ /*
+ * Here we use the same kludge as in listener.c to parse
+ * a.b.c.d, or a.b.c.*, or a.b.c.d/e.
+ */
+ int c_class;
+ char ipname[16];
+ int ad[4] = { 0 };
+ int bits2 = 0;
+ c_class = sscanf(conf->hostmask, "%d.%d.%d.%d/%d",
+ &ad[0], &ad[1], &ad[2], &ad[3], &bits2);
+ if (c_class != 5) {
+ conf->bits = c_class * 8;
+ }
+ else {
+ conf->bits = bits2;
+ }
+ ircd_snprintf(0, ipname, sizeof(ipname), "%d.%d.%d.%d", ad[0], ad[1],
+ ad[2], ad[3]);
+
+ /*
+ * This ensures endian correctness
+ */
+ conf->address = inet_addr(ipname);
+ Debug((DEBUG_DEBUG, "IPkill: %s = %08x/%i (%08x)", ipname,
+ conf->address, conf->bits, NETMASK(conf->bits)));
+ conf->flags |= DENY_FLAGS_IP;
+ }
+ conf->next = denyConfList;
+ denyConfList = conf;
+}
+#endif
+
+
+void conf_erase_deny_list(void)
+{
+ struct DenyConf* next;
+ struct DenyConf* p = denyConfList;
+ for ( ; p; p = next) {
+ next = p->next;
+ MyFree(p->hostmask);
+ MyFree(p->usermask);
+ MyFree(p->message);
+ MyFree(p);
+ }
+ denyConfList = 0;
+}
+
+const struct DenyConf* conf_get_deny_list(void)
+{
+ return denyConfList;
+}
+
+#if 0
+void conf_add_quarantine(const char *chname, const char *reason)
+{
+ struct qline *qline;
+
+ qline = (struct qline *) MyMalloc(sizeof(struct qline));
+ DupString(qline->chname, chname);
+ DupString(qline->reason, reason);
+ qline->next = GlobalQuarantineList;
+ GlobalQuarantineList = qline;
+}
+#endif
+
+const char*
+find_quarantine(const char *chname)
+{
+ struct qline *qline;
+
+ for (qline = GlobalQuarantineList; qline; qline = qline->next)
+ if (!ircd_strcmp(qline->chname, chname))
+ return qline->reason;
+ return NULL;
+}
+
+void clear_quarantines(void)
+{
+ struct qline *qline;
+ while ((qline = GlobalQuarantineList))
+ {
+ GlobalQuarantineList = qline->next;
+ MyFree(qline->reason);
+ MyFree(qline->chname);
+ MyFree(qline);
+ }
+}
+
+
+/*
+ * read_configuration_file
+ *
+ * Read configuration file.
+ *
+ * returns 0, if file cannot be opened
+ * 1, if file read
+ */
+
+#define MAXCONFLINKS 150
+
+static int conf_error;
+static int conf_already_read;
+extern FILE *yyin;
+void init_lexer(void);
+
+int read_configuration_file(void)
+{
+ conf_error = 0;
+ feature_unmark(); /* unmark all features for resetting later */
+ /* Now just open an fd. The buffering isn't really needed... */
+ init_lexer();
+ yyparse();
+ fclose(yyin);
+ yyin = NULL;
+ feature_mark(); /* reset unmarked features */
+ conf_already_read = 1;
+ return 1;
+}
+
+void
+yyerror(const char *msg)
+{
+ sendto_opmask_butone(0, SNO_ALL, "Config file parse error line %d: %s",
+ lineno, msg);
+ log_write(LS_CONFIG, L_ERROR, 0, "Config file parse error line %d: %s",
+ lineno, msg);
+ if (!conf_already_read)
+ fprintf(stderr, "Config file parse error line %d: %s\n", lineno, msg);
+ conf_error = 1;
+}
+
/*
* rehash
*
{
struct ConfItem** tmp = &GlobalConfList;
struct ConfItem* tmp2;
- struct ConfClass* cltmp;
struct Client* acptr;
- struct MotdItem* temp;
int i;
int ret = 0;
int found_g = 0;
if (1 == sig)
sendto_opmask_butone(0, SNO_OLDSNO,
- "Got signal SIGHUP, reloading ircd conf. file");
+ "Got signal SIGHUP, reloading ircd conf. file");
while ((tmp2 = *tmp)) {
if (tmp2->clients) {
* that it will be deleted when the last client
* exits...
*/
- if (!(tmp2->status & CONF_CLIENT)) {
+ if (CONF_CLIENT == (tmp2->status & CONF_CLIENT))
+ tmp = &tmp2->next;
+ else {
*tmp = tmp2->next;
tmp2->next = 0;
}
- else
- tmp = &tmp2->next;
tmp2->status |= CONF_ILLEGAL;
}
else {
*tmp = tmp2->next;
- /* free expression trees of connect rules */
- if ((tmp2->status & (CONF_CRULEALL | CONF_CRULEAUTO)) &&
- (tmp2->passwd != NULL))
- crule_free(&(tmp2->passwd));
free_conf(tmp2);
}
}
-
- /*
- * We don't delete the class table, rather mark all entries
- * for deletion. The table is cleaned up by check_class(). - avalon
- */
- for (cltmp = NextClass(FirstClass()); cltmp; cltmp = NextClass(cltmp))
- MarkDelete(cltmp);
+ conf_erase_crule_list();
+ conf_erase_deny_list();
+ motd_clear();
/*
* delete the juped nicks list
clearNickJupes();
if (sig != 2)
- flush_resolver_cache();
+ restart_resolver();
+ class_mark_delete();
mark_listeners_closing();
- if (!conf_init()) /* This calls check_class(), */
- check_class(); /* unless it fails */
+ read_configuration_file();
+
+ log_reopen(); /* reopen log files */
- /*
- * make sure that the server listener is re-added so it doesn't get
- * closed
- */
close_listeners();
+ class_delete_marked(); /* unless it fails */
/*
* Flush out deleted I and P lines although still in use.
*/
for (tmp = &GlobalConfList; (tmp2 = *tmp);) {
- if (!(tmp2->status & CONF_ILLEGAL))
- tmp = &tmp2->next;
- else
- {
+ if (CONF_ILLEGAL == (tmp2->status & CONF_ILLEGAL)) {
*tmp = tmp2->next;
tmp2->next = NULL;
if (!tmp2->clients)
free_conf(tmp2);
}
+ else
+ tmp = &tmp2->next;
}
+
for (i = 0; i <= HighestFd; i++) {
if ((acptr = LocalClientArray[i])) {
assert(!IsMe(acptr));
if (IsServer(acptr)) {
det_confs_butmask(acptr,
~(CONF_HUB | CONF_LEAF | CONF_UWORLD | CONF_ILLEGAL));
- attach_confs_byname(acptr, acptr->name,
+ attach_confs_byname(acptr, cli_name(acptr),
CONF_HUB | CONF_LEAF | CONF_UWORLD);
}
+ /* Because admin's are getting so uppity about people managing to
+ * get past K/G's etc, we'll "fix" the bug by actually explaining
+ * whats going on.
+ */
if ((found_g = find_kill(acptr))) {
sendto_opmask_butone(0, found_g == -2 ? SNO_GLINE : SNO_OPERKILL,
- found_g == -2 ? "G-line active for %s" :
- "K-line active for %s",
- get_client_name(acptr, HIDE_IP));
+ found_g == -2 ? "G-line active for %s%s" :
+ "K-line active for %s%s",
+ IsUnknown(acptr) ? "Unregistered Client ":"",
+ get_client_name(acptr, HIDE_IP));
if (exit_client(cptr, acptr, &me, found_g == -2 ? "G-lined" :
"K-lined") == CPTR_KILLED)
ret = CPTR_KILLED;
}
}
}
- /*
- * free old motd structs
- */
- while (motd) {
- temp = motd->next;
- MyFree(motd);
- motd = temp;
- }
- while (rmotd) {
- temp = rmotd->next;
- MyFree(rmotd);
- rmotd = temp;
- }
- /* reload motd files */
- read_tlines();
- rmotd = read_motd(RPATH);
- motd = read_motd(MPATH);
+
return ret;
}
/*
- * conf_init
+ * init_conf
*
* Read configuration file.
*
* 1, if file read
*/
-#define MAXCONFLINKS 150
-
-
-int conf_init(void)
+int init_conf(void)
{
- static char quotes[9][2] = {
- {'b', '\b'},
- {'f', '\f'},
- {'n', '\n'},
- {'r', '\r'},
- {'t', '\t'},
- {'v', '\v'},
- {'\\', '\\'},
- {0, 0}
- };
- char *tmp, *s;
- FBFILE *file;
- int i;
- char line[512];
- int ccount = 0;
- struct ConfItem *aconf = 0;
-
- Debug((DEBUG_DEBUG, "conf_init: ircd.conf = %s", configfile));
- if (0 == (file = fbopen(configfile, "r"))) {
- return 0;
- }
- while (fbgets(line, sizeof(line) - 1, file)) {
- if ((tmp = strchr(line, '\n')))
- *tmp = '\0';
- /*
- * Do quoting of characters and # detection.
- */
- for (tmp = line; *tmp; tmp++) {
- if (*tmp == '\\') {
- for (i = 0; quotes[i][0]; i++) {
- if (quotes[i][0] == *(tmp + 1)) {
- *tmp = quotes[i][1];
- break;
- }
- }
- if (!quotes[i][0])
- *tmp = *(tmp + 1);
- if (!*(tmp + 1))
- break;
- else {
- for (s = tmp; (*s = *(s + 1)); s++)
- ;
- }
- }
- else if (*tmp == '#')
- *tmp = '\0';
- }
- if (!*line || line[0] == '#' || line[0] == '\n' ||
- line[0] == ' ' || line[0] == '\t')
- continue;
- /* Could we test if it's conf line at all? -Vesa */
- if (line[1] != ':') {
- Debug((DEBUG_ERROR, "Bad config line: %s", line));
- continue;
- }
- if (aconf)
- free_conf(aconf);
- aconf = make_conf();
-
- tmp = getfield(line, ':');
- if (!tmp)
- continue;
- switch (*tmp) {
- case 'A': /* Name, e-mail address of administrator */
- case 'a': /* of this server. */
- aconf->status = CONF_ADMIN;
- break;
- case 'C': /* Server where I should try to connect */
- case 'c': /* in case of lp failures */
- ++ccount;
- aconf->status = CONF_SERVER;
- break;
- /* Connect rule */
- case 'D':
- aconf->status = CONF_CRULEALL;
- break;
- /* Connect rule - autos only */
- case 'd':
- aconf->status = CONF_CRULEAUTO;
- break;
- case 'H': /* Hub server line */
- case 'h':
- aconf->status = CONF_HUB;
- break;
- case 'I': /* Just plain normal irc client trying */
- case 'i': /* to connect me */
- aconf->status = CONF_CLIENT;
- break;
- case 'K': /* Kill user line on irc.conf */
- aconf->status = CONF_KILL;
- break;
- case 'k': /* Kill user line based on IP in ircd.conf */
- aconf->status = CONF_IPKILL;
- break;
- /* Operator. Line should contain at least */
- /* password and host where connection is */
- case 'L': /* guaranteed leaf server */
- case 'l':
- aconf->status = CONF_LEAF;
- break;
- /* Me. Host field is name used for this host */
- /* and port number is the number of the port */
- case 'M':
- case 'm':
- aconf->status = CONF_ME;
- break;
- case 'O':
- aconf->status = CONF_OPERATOR;
- break;
- /* Local Operator, (limited privs --SRB) */
- case 'o':
- aconf->status = CONF_LOCOP;
- break;
- case 'P': /* listen port line */
- case 'p':
- aconf->status = CONF_LISTEN_PORT;
- break;
- case 'T': /* print out different motd's */
- case 't': /* based on hostmask */
- aconf->status = CONF_TLINES;
- break;
- case 'U': /* Underworld server, allowed to hack modes */
- case 'u': /* *Every* server on the net must define the same !!! */
- aconf->status = CONF_UWORLD;
- break;
- case 'Y':
- case 'y':
- aconf->status = CONF_CLASS;
- break;
- default:
- Debug((DEBUG_ERROR, "Error in config file: %s", line));
- break;
- }
- if (IsIllegal(aconf))
- continue;
-
- for (;;) { /* Fake loop, that I can use break here --msa */
- if ((tmp = getfield(NULL, ':')) == NULL)
- break;
- DupString(aconf->host, tmp);
- if ((tmp = getfield(NULL, (aconf->status == CONF_KILL
- || aconf->status == CONF_IPKILL) ? '"' : ':')) == NULL)
- break;
- DupString(aconf->passwd, tmp);
- if ((tmp = getfield(NULL, ':')) == NULL)
- break;
- DupString(aconf->name, tmp);
- if ((tmp = getfield(NULL, ':')) == NULL)
- break;
- aconf->port = atoi(tmp);
- tmp = getfield(NULL, ':');
- if (aconf->status & CONF_ME) {
- if (!tmp) {
- Debug((DEBUG_FATAL, "Your M: line must have the Numeric, "
- "assigned to you by routing-com, behind the port number!\n"));
- ircd_log(L_WARNING, "Your M: line must have the Numeric, "
- "assigned to you by routing-com, behind the port number!\n");
- exit(-1);
- }
- SetYXXServerName(&me, atoi(tmp)); /* Our Numeric Nick */
- }
- else if (tmp)
- aconf->confClass = find_class(atoi(tmp));
- break;
- }
+ if (read_configuration_file()) {
/*
- * If conf line is a class definition, create a class entry
- * for it and make the conf_line illegal and delete it.
+ * make sure we're sane to start if the config
+ * file read didn't get everything we need.
+ * XXX - should any of these abort the server?
+ * TODO: add warning messages
*/
- if (aconf->status & CONF_CLASS) {
- add_class(atoi(aconf->host), atoi(aconf->passwd),
- atoi(aconf->name), aconf->port, tmp ? atoi(tmp) : 0);
- continue;
- }
- /*
- * Associate each conf line with a class by using a pointer
- * to the correct class record. -avalon
- */
- if (aconf->status & CONF_CLIENT_MASK) {
- if (aconf->confClass == 0)
- aconf->confClass = find_class(0);
- }
- if (aconf->status & CONF_LISTEN_PORT) {
- int is_server = 0;
- int is_hidden = 0;
- if (!EmptyString(aconf->name)) {
- const char* x = aconf->name;
- if ('S' == ToUpper(*x))
- is_server = 1;
- ++x;
- if ('H' == ToUpper(*x))
- is_hidden = 1;
- }
- add_listener(aconf->port, aconf->passwd, aconf->host,
- is_server, is_hidden);
- continue;
- }
- if (aconf->status & CONF_CLIENT) {
- struct ConfItem *bconf;
-
- if ((bconf = find_conf_entry(aconf, aconf->status))) {
- delist_conf(bconf);
- bconf->status &= ~CONF_ILLEGAL;
- if (aconf->status == CONF_CLIENT) {
- /*
- * copy the password field in case it changed
- */
- MyFree(bconf->passwd);
- bconf->passwd = aconf->passwd;
- aconf->passwd = 0;
-
- ConfLinks(bconf) -= bconf->clients;
- bconf->confClass = aconf->confClass;
- if (bconf->confClass)
- ConfLinks(bconf) += bconf->clients;
- }
- free_conf(aconf);
- aconf = bconf;
- }
- }
- if (aconf->status & CONF_SERVER) {
- if (ccount > MAXCONFLINKS || !aconf->host || strchr(aconf->host, '*') ||
- strchr(aconf->host, '?') || !aconf->name)
- continue;
- }
- if (aconf->status & (CONF_LOCOP | CONF_OPERATOR)) {
- if (!strchr(aconf->host, '@')) {
- char* newhost;
- int len = 3; /* *@\0 = 3 */
-
- len += strlen(aconf->host);
- newhost = (char*) MyMalloc(len);
- assert(0 != newhost);
- ircd_snprintf(0, newhost, len, "*@%s", aconf->host);
- MyFree(aconf->host);
- aconf->host = newhost;
- }
- }
- if (aconf->status & CONF_SERVER) {
- if (EmptyString(aconf->passwd))
- continue;
- lookup_confhost(aconf);
- }
-
- /* Create expression tree from connect rule...
- * If there's a parsing error, nuke the conf structure */
- if (aconf->status & (CONF_CRULEALL | CONF_CRULEAUTO)) {
- MyFree(aconf->passwd);
- if ((aconf->passwd = (char *)crule_parse(aconf->name)) == NULL) {
- free_conf(aconf);
- aconf = NULL;
- continue;
- }
- }
+ if (0 == localConf.name || 0 == localConf.numeric)
+ return 0;
+ if (conf_error)
+ return 0;
- /*
- * Own port and name cannot be changed after the startup.
- * (or could be allowed, but only if all links are closed first).
- * Configuration info does not override the name and port
- * if previously defined. Note, that "info"-field can be
- * changed by "/rehash".
- */
- if (aconf->status == CONF_ME) {
- ircd_strncpy(me.info, aconf->name, REALLEN);
- }
+ if (0 == localConf.location1)
+ DupString(localConf.location1, "");
+ if (0 == localConf.location2)
+ DupString(localConf.location2, "");
+ if (0 == localConf.contact)
+ DupString(localConf.contact, "");
- /*
- * Juped nicks are listed in the 'password' field of U:lines,
- * the list is comma separated and might be empty and/or contain
- * empty elements... the only limit is that it MUST be shorter
- * than 512 chars, or they will be cutted out :)
- */
- if ((aconf->status == CONF_UWORLD) && (aconf->passwd) && (*aconf->passwd))
- addNickJupes(aconf->passwd);
-
- if (aconf->status & CONF_ADMIN) {
- if (!aconf->host || !aconf->passwd || !aconf->name) {
- Debug((DEBUG_FATAL, "Your A: line must have 4 fields!\n"));
- ircd_log(L_WARNING, "Your A: line must have 4 fields!\n");
- exit(-1);
- }
- }
- collapse(aconf->host);
- collapse(aconf->name);
- Debug((DEBUG_NOTICE,
- "Read Init: (%d) (%s) (%s) (%s) (%u) (%p)",
- aconf->status, aconf->host, aconf->passwd,
- aconf->name, aconf->port, aconf->confClass));
- aconf->next = GlobalConfList;
- GlobalConfList = aconf;
- aconf = NULL;
+ return 1;
}
- if (aconf)
- free_conf(aconf);
- fbclose(file);
- check_class();
- nextping = nextconnect = CurrentTime;
- return 1;
+ return 0;
}
-/* read_tlines
- * Read info from T:lines into TRecords which include the file
- * timestamp, the hostmask, and the contents of the motd file
- * -Ghostwolf 7sep97
+/*
+ * find_kill
+ * input:
+ * client pointer
+ * returns:
+ * 0: Client may continue to try and connect
+ * -1: Client was K/k:'d - sideeffect: reason was sent.
+ * -2: Client was G/g:'d - sideeffect: reason was sent.
+ * sideeffects:
+ * Client may have been sent a reason why they are denied, as above.
*/
-void read_tlines()
-{
- struct ConfItem *tmp;
- struct TRecord *temp;
- struct TRecord *last = NULL; /* Init. to avoid compiler warning */
- struct MotdItem *amotd;
-
- /* Free the old trecords and the associated motd contents first */
- while (tdata)
- {
- last = tdata->next;
- while (tdata->tmotd)
- {
- amotd = tdata->tmotd->next;
- MyFree(tdata->tmotd);
- tdata->tmotd = amotd;
- }
- MyFree(tdata);
- tdata = last;
- }
-
- for (tmp = GlobalConfList; tmp; tmp = tmp->next) {
- if (tmp->status == CONF_TLINES && tmp->host && tmp->passwd) {
- temp = (struct TRecord*) MyMalloc(sizeof(struct TRecord));
- assert(0 != temp);
-
- temp->hostmask = tmp->host;
- temp->tmotd = read_motd(tmp->passwd);
- temp->tmotd_tm = motd_tm;
- temp->next = NULL;
- if (!tdata)
- tdata = temp;
- else
- last->next = temp;
- last = temp;
- }
- }
-}
-
int find_kill(struct Client *cptr)
{
- char reply[256];
const char* host;
const char* name;
- struct ConfItem* tmp;
+ const char* realname;
+ struct DenyConf* deny;
struct Gline* agline = NULL;
assert(0 != cptr);
- if (!cptr->user)
+ if (!cli_user(cptr))
return 0;
- host = cptr->sockhost;
- name = cptr->user->username;
+ host = cli_sockhost(cptr);
+ name = cli_user(cptr)->username;
+ realname = cli_info(cptr);
-#if 0
- /*
- * whee :)
- * XXX - if this ever happens, we're already screwed
+ assert(strlen(host) <= HOSTLEN);
+ assert((name ? strlen(name) : 0) <= HOSTLEN);
+ assert((realname ? strlen(realname) : 0) <= REALLEN);
+
+ /* 2000-07-14: Rewrote this loop for massive speed increases.
+ * -- Isomer
*/
- if (strlen(host) > HOSTLEN ||
- (name ? strlen(name) : 0) > HOSTLEN)
- return (0);
-#endif
+ for (deny = denyConfList; deny; deny = deny->next) {
+ if (0 != match(deny->usermask, name))
+ continue;
- reply[0] = '\0';
+ if (EmptyString(deny->hostmask))
+ break;
- for (tmp = GlobalConfList; tmp; tmp = tmp->next) {
- /* Added a check against the user's IP address as well.
- * If the line is either CONF_KILL or CONF_IPKILL, check it; if and only
- * if it's CONF_IPKILL, check the IP address as well (the && below will
- * short circuit and the match won't even get run) -Kev
- */
- if ((tmp->status & CONF_KLINE) && tmp->host && tmp->name &&
- (match(tmp->host, host) == 0 ||
- ((tmp->status == CONF_IPKILL) &&
- match(tmp->host, ircd_ntoa((const char*) &cptr->ip)) == 0)) &&
- (!name || match(tmp->name, name) == 0) &&
- (!tmp->port || (tmp->port == cptr->listener->port)))
- {
- /*
- * Can short-circuit evaluation - not taking chances
- * because check_time_interval destroys tmp->passwd
- * - Mmmm
- */
- if (EmptyString(tmp->passwd))
- break;
- else if (is_comment(tmp->passwd))
- break;
- else if (check_time_interval(tmp->passwd, reply, sizeof(reply)))
+ if (deny->flags & DENY_FLAGS_REALNAME) { /* K: by real name */
+ if (0 == match(deny->hostmask, realname))
+ break;
+ } else if (deny->flags & DENY_FLAGS_IP) { /* k: by IP */
+ Debug((DEBUG_DEBUG, "ip: %08x network: %08x/%i mask: %08x",
+ cli_ip(cptr).s_addr, deny->address, deny->bits, NETMASK(deny->bits)));
+ if ((cli_ip(cptr).s_addr & NETMASK(deny->bits)) == deny->address)
break;
}
+ else if (0 == match(deny->hostmask, host))
+ break;
}
- if (reply[0])
- send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, reply);
- else if (tmp) {
- if (EmptyString(tmp->passwd))
+ if (deny) {
+ if (EmptyString(deny->message))
send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP,
- ":Connection from your host is refused on this server.");
+ ":Connection from your host is refused on this server.");
else {
- if (*tmp->passwd == '"') {
- send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%*s.",
- strlen(tmp->passwd + 1) - 1, tmp->passwd + 1);
- }
- else if (*tmp->passwd == '!')
- killcomment(cptr, cptr->name, &tmp->passwd[1]);
+ if (deny->flags & DENY_FLAGS_FILE)
+ killcomment(cptr, deny->message);
else
-#ifdef COMMENT_IS_FILE
- killcomment(cptr, cptr->name, tmp->passwd);
-#else
- send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.",
- tmp->passwd);
-#endif
+ send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", deny->message);
}
}
-
- /* find active glines */
- /* added a check against the user's IP address to find_gline() -Kev */
- else if ((agline = gline_lookup(cptr)) && GlineIsActive(agline))
- send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.",
- GlineReason(agline));
+ else if ((agline = gline_lookup(cptr, 0)) && GlineIsActive(agline)) {
+ /*
+ * find active glines
+ * added a check against the user's IP address to find_gline() -Kev
+ */
+ send_reply(cptr, SND_EXPLICIT | ERR_YOUREBANNEDCREEP, ":%s.", GlineReason(agline));
+ }
else
- agline = NULL; /* if a gline was found, it was inactive */
-
- return (tmp ? -1 : (agline ? -2 : 0));
-}
+ agline = 0; /* if a gline was found, it was inactive */
-struct MotdItem* read_motd(const char* motdfile)
-{
- FBFILE* file = NULL;
- struct MotdItem* temp;
- struct MotdItem* newmotd;
- struct MotdItem* last;
- struct stat sb;
- char line[80];
- char* tmp;
-
- if (NULL == (file = fbopen(motdfile, "r"))) {
- Debug((DEBUG_ERROR, "Couldn't open \"%s\": %s", motdfile, strerror(errno)));
- return NULL;
- }
- if (-1 == fbstat(&sb, file)) {
- fbclose(file);
- return NULL;
- }
- newmotd = last = NULL;
- motd_tm = *localtime((time_t *) & sb.st_mtime); /* NetBSD needs cast */
- while (fbgets(line, sizeof(line) - 1, file)) {
- if ((tmp = (char *)strchr(line, '\n')))
- *tmp = '\0';
- if ((tmp = (char *)strchr(line, '\r')))
- *tmp = '\0';
- temp = (struct MotdItem*) MyMalloc(sizeof(struct MotdItem));
- assert(0 != temp);
- strcpy(temp->line, line);
- temp->next = NULL;
- if (!newmotd)
- newmotd = temp;
- else
- last->next = temp;
- last = temp;
- }
- fbclose(file);
- return newmotd;
+ if (deny)
+ return -1;
+ if (agline)
+ return -2;
+
+ return 0;
}
-
/*
* Ordinary client access check. Look for conf lines which have the same
* status as the flags passed.
if ((acr = attach_iline(cptr))) {
Debug((DEBUG_DNS, "ch_cl: access denied: %s[%s]",
- cptr->name, cptr->sockhost));
+ cli_name(cptr), cli_sockhost(cptr)));
return acr;
}
return ACR_OK;
struct SLink* lp;
Debug((DEBUG_DNS, "sv_cl: check access for %s[%s]",
- cptr->name, cptr->sockhost));
+ cli_name(cptr), cli_sockhost(cptr)));
- if (IsUnknown(cptr) && !attach_confs_byname(cptr, cptr->name, CONF_SERVER)) {
- Debug((DEBUG_DNS, "No C/N lines for %s", cptr->sockhost));
+ if (IsUnknown(cptr) && !attach_confs_byname(cptr, cli_name(cptr), CONF_SERVER)) {
+ Debug((DEBUG_DNS, "No C/N lines for %s", cli_sockhost(cptr)));
return -1;
}
- lp = cptr->confs;
+ lp = cli_confs(cptr);
/*
* We initiated this connection so the client should have a C and N
* line already attached after passing through the connect_server()
* function earlier.
*/
if (IsConnecting(cptr) || IsHandshake(cptr)) {
- c_conf = find_conf_byname(lp, cptr->name, CONF_SERVER);
+ c_conf = find_conf_byname(lp, cli_name(cptr), CONF_SERVER);
if (!c_conf) {
sendto_opmask_butone(0, SNO_OLDSNO, "Connect Error: lost C:line for %s",
- cptr->name);
+ cli_name(cptr));
det_confs_butmask(cptr, 0);
return -1;
}
ClearAccess(cptr);
if (!c_conf) {
- if (cptr->dns_reply) {
+ if (cli_dns_reply(cptr)) {
int i;
- struct hostent* hp = cptr->dns_reply->hp;
+ struct hostent* hp = cli_dns_reply(cptr);
const char* name = hp->h_name;
/*
* If we are missing a C or N line from above, search for
*/
for (i = 0; name; name = hp->h_aliases[i++]) {
if ((c_conf = find_conf_byhost(lp, name, CONF_SERVER))) {
- ircd_strncpy(cptr->sockhost, name, HOSTLEN);
+ ircd_strncpy(cli_sockhost(cptr), name, HOSTLEN);
break;
}
}
* of the host the server runs on. This also checks the case where
* there is a server connecting from 'localhost'.
*/
- c_conf = find_conf_byhost(lp, cptr->sockhost, CONF_SERVER);
+ c_conf = find_conf_byhost(lp, cli_sockhost(cptr), CONF_SERVER);
}
}
/*
* happen when using DNS in the way the irc server does. -avalon
*/
if (!c_conf)
- c_conf = find_conf_byip(lp, (const char*) &cptr->ip, CONF_SERVER);
+ c_conf = find_conf_byip(lp, (const char*) &(cli_ip(cptr)), CONF_SERVER);
/*
* detach all conf lines that got attached by attach_confs()
*/
*/
if (!c_conf) {
Debug((DEBUG_DNS, "sv_cl: access denied: %s[%s@%s]",
- cptr->name, cptr->username, cptr->sockhost));
+ cli_name(cptr), cli_username(cptr), cli_sockhost(cptr)));
return -1;
}
- ircd_strncpy(cptr->name, c_conf->name, HOSTLEN);
+ ircd_strncpy(cli_name(cptr), c_conf->name, HOSTLEN);
/*
* attach the C and N lines to the client structure for later use.
*/
attach_conf(cptr, c_conf);
- attach_confs_byname(cptr, cptr->name, CONF_HUB | CONF_LEAF | CONF_UWORLD);
+ attach_confs_byname(cptr, cli_name(cptr), CONF_HUB | CONF_LEAF | CONF_UWORLD);
if (INADDR_NONE == c_conf->ipnum.s_addr)
- c_conf->ipnum.s_addr = cptr->ip.s_addr;
+ c_conf->ipnum.s_addr = cli_ip(cptr).s_addr;
- Debug((DEBUG_DNS, "sv_cl: access ok: %s[%s]", cptr->name, cptr->sockhost));
+ Debug((DEBUG_DNS, "sv_cl: access ok: %s[%s]",
+ cli_name(cptr), cli_sockhost(cptr)));
return 0;
}
projects / ircu2.10.12-pk.git / blobdiff