#define CF_TYPE(x) ((x) & CF_MTYPE)
+static int yy_defer_accept = 1;
+
struct TopConf *conf_cur_block;
static char *conf_cur_block_name;
static char *yy_blacklist_reason = NULL;
static int yy_blacklist_ipv4 = 1;
static int yy_blacklist_ipv6 = 0;
+static rb_dlink_list yy_blacklist_filters;
static char *yy_privset_extends = NULL;
static void
conf_set_serverinfo_nicklen(void *data)
{
- static int nicklen_set = 0;
-
- if (nicklen_set)
- return;
-
ConfigFileEntry.nicklen = (*(unsigned int *) data) + 1;
if (ConfigFileEntry.nicklen > NICKLEN)
{
conf_report_error("Warning -- ignoring serverinfo::nicklen -- provided nicklen (%u) is greater than allowed nicklen (%u)",
- ConfigFileEntry.nicklen, NICKLEN);
+ ConfigFileEntry.nicklen - 1, NICKLEN - 1);
ConfigFileEntry.nicklen = NICKLEN;
}
-
- nicklen_set = 1;
+ else if (ConfigFileEntry.nicklen < 9 + 1)
+ {
+ conf_report_error("Warning -- serverinfo::nicklen is too low (%u) -- forcing 9",
+ ConfigFileEntry.nicklen);
+ ConfigFileEntry.nicklen = 9 + 1;
+ }
}
static void
m_bn = rb_basename((char *) data);
- if(findmodule_byname(m_bn) != -1)
- return;
-
- load_one_module((char *) data, 0);
+ if(findmodule_byname(m_bn) == -1)
+ load_one_module((char *) data, 0);
rb_free(m_bn);
#else
return 0;
}
-
+static void
+conf_set_listen_defer_accept(void *data)
+{
+ yy_defer_accept = *(unsigned int *) data;
+}
static void
conf_set_listen_port_both(void *data, int ssl)
}
if(listener_address == NULL)
{
- add_listener(args->v.number, listener_address, AF_INET, ssl);
+ add_listener(args->v.number, listener_address, AF_INET, ssl, yy_defer_accept);
#ifdef RB_IPV6
- add_listener(args->v.number, listener_address, AF_INET6, ssl);
+ add_listener(args->v.number, listener_address, AF_INET6, ssl, yy_defer_accept);
#endif
}
else
#endif
family = AF_INET;
- add_listener(args->v.number, listener_address, family, ssl);
+ add_listener(args->v.number, listener_address, family, ssl, yy_defer_accept);
}
conf_add_class_to_conf(yy_tmp);
- if (find_exact_conf_by_address("*", CONF_CLIENT, "*"))
+ if ((found_conf = find_exact_conf_by_address("*", CONF_CLIENT, "*")) && found_conf->spasswd == NULL)
conf_report_error("Ignoring redundant auth block (after *@*)");
- else if (find_exact_conf_by_address(yy_tmp->host, CONF_CLIENT, yy_tmp->user))
+ else if ((found_conf = find_exact_conf_by_address(yy_tmp->host, CONF_CLIENT, yy_tmp->user)) &&
+ (!found_conf->spasswd || (yy_tmp->spasswd &&
+ 0 == irccmp(found_conf->spasswd, yy_tmp->spasswd))))
conf_report_error("Ignoring duplicate auth block for %s@%s",
yy_tmp->user, yy_tmp->host);
else
ConfigServerHide.links_delay = val;
}
-static int
-conf_begin_service(struct TopConf *tc)
-{
- struct Client *target_p;
- rb_dlink_node *ptr;
-
- RB_DLINK_FOREACH(ptr, global_serv_list.head)
- {
- target_p = ptr->data;
-
- target_p->flags &= ~FLAGS_SERVICE;
- }
-
- return 0;
-}
-
static void
conf_set_service_name(void *data)
{
- struct Client *target_p;
const char *s;
char *tmp;
int dots = 0;
tmp = rb_strdup(data);
rb_dlinkAddAlloc(tmp, &service_list);
-
- if((target_p = find_server(NULL, tmp)))
- target_p->flags |= FLAGS_SERVICE;
}
static int
yy_alias->target = rb_strdup(data);
}
+/* XXX for below */
+static void conf_set_blacklist_reason(void *data);
+
static void
conf_set_blacklist_host(void *data)
{
+ if (yy_blacklist_host)
+ {
+ conf_report_error("blacklist::host %s overlaps existing host %s",
+ (char *)data, yy_blacklist_host);
+
+ /* Cleanup */
+ conf_set_blacklist_reason(NULL);
+ return;
+ }
+
+ yy_blacklist_ipv4 = 1;
+ yy_blacklist_ipv6 = 0;
yy_blacklist_host = rb_strdup(data);
}
}
}
+static void
+conf_set_blacklist_matches(void *data)
+{
+ conf_parm_t *args = data;
+
+ for (; args; args = args->next)
+ {
+ struct BlacklistFilter *filter;
+ char *str = args->v.string;
+ char *p;
+ int type = BLACKLIST_FILTER_LAST;
+
+ if (CF_TYPE(args->type) != CF_QSTRING)
+ {
+ conf_report_error("blacklist::matches -- must be quoted string");
+ continue;
+ }
+
+ if (str == NULL)
+ {
+ conf_report_error("blacklist::matches -- invalid entry");
+ continue;
+ }
+
+ if (strlen(str) > HOSTIPLEN)
+ {
+ conf_report_error("blacklist::matches has an entry too long: %s",
+ str);
+ continue;
+ }
+
+ for (p = str; *p != '\0'; p++)
+ {
+ /* Check for validity */
+ if (*p == '.')
+ type = BLACKLIST_FILTER_ALL;
+ else if (!isalnum(*p))
+ {
+ conf_report_error("blacklist::matches has invalid IP match entry %s",
+ str);
+ type = 0;
+ break;
+ }
+ }
+
+ if (type == BLACKLIST_FILTER_ALL)
+ {
+ /* Basic IP sanity check */
+ struct rb_sockaddr_storage tmp;
+ if (rb_inet_pton(AF_INET, str, &tmp) <= 0)
+ {
+ conf_report_error("blacklist::matches has invalid IP match entry %s",
+ str);
+ continue;
+ }
+ }
+ else if (type == BLACKLIST_FILTER_LAST)
+ {
+ /* Verify it's the correct length */
+ if (strlen(str) > 3)
+ {
+ conf_report_error("blacklist::matches has invalid octet match entry %s",
+ str);
+ continue;
+ }
+ }
+ else
+ {
+ continue; /* Invalid entry */
+ }
+
+ filter = rb_malloc(sizeof(struct BlacklistFilter));
+ filter->type = type;
+ rb_strlcpy(filter->filterstr, str, sizeof(filter->filterstr));
+
+ rb_dlinkAdd(filter, &filter->node, &yy_blacklist_filters);
+ }
+}
+
static void
conf_set_blacklist_reason(void *data)
{
yy_blacklist_reason = rb_strdup(data);
+ rb_dlink_node *ptr, *nptr;
if (yy_blacklist_host && yy_blacklist_reason)
{
}
}
- new_blacklist(yy_blacklist_host, yy_blacklist_reason, yy_blacklist_ipv4, yy_blacklist_ipv6);
+ new_blacklist(yy_blacklist_host, yy_blacklist_reason, yy_blacklist_ipv4, yy_blacklist_ipv6,
+ &yy_blacklist_filters);
+ }
cleanup_bl:
- rb_free(yy_blacklist_host);
- rb_free(yy_blacklist_reason);
- yy_blacklist_host = NULL;
- yy_blacklist_reason = NULL;
- yy_blacklist_ipv4 = 1;
- yy_blacklist_ipv6 = 0;
+ if (data == NULL)
+ {
+ RB_DLINK_FOREACH_SAFE(ptr, nptr, yy_blacklist_filters.head)
+ {
+ rb_dlinkDelete(ptr, &yy_blacklist_filters);
+ rb_free(ptr);
+ }
}
+ else
+ {
+ yy_blacklist_filters = (rb_dlink_list){ NULL, NULL, 0 };
+ }
+
+ rb_free(yy_blacklist_host);
+ rb_free(yy_blacklist_reason);
+ yy_blacklist_host = NULL;
+ yy_blacklist_reason = NULL;
+ yy_blacklist_ipv4 = 1;
+ yy_blacklist_ipv6 = 0;
}
/* public functions */
if((tc = find_top_conf(topconf)) == NULL)
return -1;
- if((cf = find_conf_item(tc, name)) != NULL)
+ if(find_conf_item(tc, name) != NULL)
return -1;
cf = rb_malloc(sizeof(struct ConfEntry));
{ "caller_id_wait", CF_TIME, NULL, 0, &ConfigFileEntry.caller_id_wait },
{ "client_exit", CF_YESNO, NULL, 0, &ConfigFileEntry.client_exit },
{ "collision_fnc", CF_YESNO, NULL, 0, &ConfigFileEntry.collision_fnc },
+ { "resv_fnc", CF_YESNO, NULL, 0, &ConfigFileEntry.resv_fnc },
{ "connect_timeout", CF_TIME, NULL, 0, &ConfigFileEntry.connect_timeout },
{ "default_floodcount", CF_INT, NULL, 0, &ConfigFileEntry.default_floodcount },
{ "default_ident_timeout", CF_INT, NULL, 0, &ConfigFileEntry.default_ident_timeout },
{ "client_flood_burst_max", CF_INT, NULL, 0, &ConfigFileEntry.client_flood_burst_max },
{ "client_flood_message_num", CF_INT, NULL, 0, &ConfigFileEntry.client_flood_message_num },
{ "client_flood_message_time", CF_INT, NULL, 0, &ConfigFileEntry.client_flood_message_time },
+ { "max_ratelimit_tokens", CF_INT, NULL, 0, &ConfigFileEntry.max_ratelimit_tokens },
+ { "away_interval", CF_INT, NULL, 0, &ConfigFileEntry.away_interval },
{ "\0", 0, NULL, 0, NULL }
};
add_top_conf("privset", NULL, NULL, conf_privset_table);
add_top_conf("listen", conf_begin_listen, conf_end_listen, NULL);
+ add_conf_item("listen", "defer_accept", CF_YESNO, conf_set_listen_defer_accept);
add_conf_item("listen", "port", CF_INT | CF_FLIST, conf_set_listen_port);
add_conf_item("listen", "sslport", CF_INT | CF_FLIST, conf_set_listen_sslport);
add_conf_item("listen", "ip", CF_QSTRING, conf_set_listen_address);
add_top_conf("channel", NULL, NULL, conf_channel_table);
add_top_conf("serverhide", NULL, NULL, conf_serverhide_table);
- add_top_conf("service", conf_begin_service, NULL, NULL);
+ add_top_conf("service", NULL, NULL, NULL);
add_conf_item("service", "name", CF_QSTRING, conf_set_service_name);
add_top_conf("alias", conf_begin_alias, conf_end_alias, NULL);
add_top_conf("blacklist", NULL, NULL, NULL);
add_conf_item("blacklist", "host", CF_QSTRING, conf_set_blacklist_host);
add_conf_item("blacklist", "type", CF_STRING | CF_FLIST, conf_set_blacklist_type);
+ add_conf_item("blacklist", "matches", CF_QSTRING | CF_FLIST, conf_set_blacklist_matches);
add_conf_item("blacklist", "reject_reason", CF_QSTRING, conf_set_blacklist_reason);
}
projects / solanum.git / blobdiff