X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/307328bb13d557f8877d7b8cdc81c7a3c8d92108..9e29fe51e5a320919044d878d6f812f206097136:/src/s_conf.c diff --git a/src/s_conf.c b/src/s_conf.c index fa3580a..f45601f 100644 --- a/src/s_conf.c +++ b/src/s_conf.c @@ -21,12 +21,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: s_conf.c 3257 2007-03-13 16:09:28Z jilles $ + * $Id: s_conf.c 3550 2007-08-09 06:47:26Z nenolod $ */ #include "stdinc.h" #include "ircd_defs.h" -#include "tools.h" #include "s_conf.h" #include "s_newconf.h" #include "s_serv.h" @@ -35,7 +34,6 @@ #include "class.h" #include "client.h" #include "common.h" -#include "event.h" #include "hash.h" #include "irc_string.h" #include "sprintf_irc.h" @@ -44,12 +42,9 @@ #include "hostmask.h" #include "modules.h" #include "numeric.h" -#include "commio.h" #include "s_log.h" #include "send.h" #include "s_gline.h" -#include "memory.h" -#include "balloc.h" #include "patricia.h" #include "reject.h" #include "cache.h" @@ -64,11 +59,11 @@ extern char linebuf[]; #define INADDR_NONE ((unsigned int) 0xffffffff) #endif -static BlockHeap *confitem_heap = NULL; +static rb_bh *confitem_heap = NULL; -dlink_list temp_klines[LAST_TEMP_TYPE]; -dlink_list temp_dlines[LAST_TEMP_TYPE]; -dlink_list service_list; +rb_dlink_list temp_klines[LAST_TEMP_TYPE]; +rb_dlink_list temp_dlines[LAST_TEMP_TYPE]; +rb_dlink_list service_list; /* internally defined functions */ static void set_default_conf(void); @@ -88,22 +83,22 @@ static int attach_iline(struct Client *, struct ConfItem *); void init_s_conf(void) { - confitem_heap = BlockHeapCreate(sizeof(struct ConfItem), CONFITEM_HEAP_SIZE); + confitem_heap = rb_bh_create(sizeof(struct ConfItem), CONFITEM_HEAP_SIZE); - eventAddIsh("expire_temp_klines", expire_temp_kd, &temp_klines[TEMP_MIN], 60); - eventAddIsh("expire_temp_dlines", expire_temp_kd, &temp_dlines[TEMP_MIN], 60); + rb_event_addish("expire_temp_klines", expire_temp_kd, &temp_klines[TEMP_MIN], 60); + rb_event_addish("expire_temp_dlines", expire_temp_kd, &temp_dlines[TEMP_MIN], 60); - eventAddIsh("expire_temp_klines_hour", reorganise_temp_kd, + rb_event_addish("expire_temp_klines_hour", reorganise_temp_kd, &temp_klines[TEMP_HOUR], 3600); - eventAddIsh("expire_temp_dlines_hour", reorganise_temp_kd, + rb_event_addish("expire_temp_dlines_hour", reorganise_temp_kd, &temp_dlines[TEMP_HOUR], 3600); - eventAddIsh("expire_temp_klines_day", reorganise_temp_kd, + rb_event_addish("expire_temp_klines_day", reorganise_temp_kd, &temp_klines[TEMP_DAY], 86400); - eventAddIsh("expire_temp_dlines_day", reorganise_temp_kd, + rb_event_addish("expire_temp_dlines_day", reorganise_temp_kd, &temp_dlines[TEMP_DAY], 86400); - eventAddIsh("expire_temp_klines_week", reorganise_temp_kd, + rb_event_addish("expire_temp_klines_week", reorganise_temp_kd, &temp_klines[TEMP_WEEK], 604800); - eventAddIsh("expire_temp_dlines_week", reorganise_temp_kd, + rb_event_addish("expire_temp_dlines_week", reorganise_temp_kd, &temp_dlines[TEMP_WEEK], 604800); } @@ -119,7 +114,7 @@ make_conf() { struct ConfItem *aconf; - aconf = BlockHeapAlloc(confitem_heap); + aconf = rb_bh_alloc(confitem_heap); aconf->status = CONF_ILLEGAL; return (aconf); } @@ -144,14 +139,14 @@ free_conf(struct ConfItem *aconf) if(aconf->spasswd) memset(aconf->spasswd, 0, strlen(aconf->spasswd)); - MyFree(aconf->passwd); - MyFree(aconf->spasswd); - MyFree(aconf->name); - MyFree(aconf->className); - MyFree(aconf->user); - MyFree(aconf->host); + rb_free(aconf->passwd); + rb_free(aconf->spasswd); + rb_free(aconf->name); + rb_free(aconf->className); + rb_free(aconf->user); + rb_free(aconf->host); - BlockHeapFree(confitem_heap, aconf); + rb_bh_free(confitem_heap, aconf); } /* @@ -173,8 +168,6 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern { int i; - ClearAccess(source_p); - if((i = verify_access(source_p, username))) { ilog(L_FUSER, "Access denied: %s[%s]", @@ -239,7 +232,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern "I-line is full for %s!%s%s@%s (%s).", source_p->name, IsGotId(source_p) ? "" : "~", source_p->username, source_p->host, - source_p->sockhost); + show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : "255.255.255.255"); ilog(L_FUSER, "Too many connections from %s!%s%s@%s.", source_p->name, IsGotId(source_p) ? "" : "~", @@ -281,13 +274,12 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern source_p->name, IsGotId(source_p) ? "" : "~", source_p->username, source_p->sockhost, source_p->localClient->listener->name, port); - add_reject(client_p); + add_reject(client_p, NULL, NULL); exit_client(client_p, source_p, &me, "You are not authorised to use this server"); break; } case BANNED_CLIENT: - add_reject(client_p); exit_client(client_p, client_p, &me, "*** Banned "); ServerStats->is_ref++; break; @@ -337,16 +329,11 @@ verify_access(struct Client *client_p, const char *username) { if(aconf->flags & CONF_FLAGS_REDIR) { - sendto_one(client_p, form_str(RPL_REDIR), - me.name, client_p->name, + sendto_one_numeric(client_p, RPL_REDIR, form_str(RPL_REDIR), aconf->name ? aconf->name : "", aconf->port); return (NOT_AUTHORISED); } - - if(IsConfDoIdentd(aconf)) - SetNeedId(client_p); - /* Thanks for spoof idea amm */ if(IsConfDoSpoofIp(aconf)) { @@ -389,6 +376,7 @@ verify_access(struct Client *client_p, const char *username) form_str(ERR_YOUREBANNEDCREEP), me.name, client_p->name, aconf->passwd); } + add_reject(client_p, aconf->user, aconf->host); return (BANNED_CLIENT); } else if(aconf->status & CONF_GLINE) @@ -400,6 +388,7 @@ verify_access(struct Client *client_p, const char *username) form_str(ERR_YOUREBANNEDCREEP), me.name, client_p->name, aconf->passwd); + add_reject(client_p, aconf->user, aconf->host); return (BANNED_CLIENT); } @@ -483,7 +472,7 @@ static int attach_iline(struct Client *client_p, struct ConfItem *aconf) { struct Client *target_p; - dlink_node *ptr; + rb_dlink_node *ptr; int local_count = 0; int global_count = 0; int ident_count = 0; @@ -497,7 +486,7 @@ attach_iline(struct Client *client_p, struct ConfItem *aconf) /* find_hostname() returns the head of the list to search */ - DLINK_FOREACH(ptr, find_hostname(client_p->host)) + RB_DLINK_FOREACH(ptr, find_hostname(client_p->host)) { target_p = ptr->data; @@ -605,7 +594,6 @@ attach_conf(struct Client *client_p, struct ConfItem *aconf) else { sendto_one_notice(client_p, ":*** I: line is full, but you have an >I: line!"); - SetExemptLimits(client_p); } } @@ -729,8 +717,8 @@ set_default_conf(void) /* ServerInfo.name is not rehashable */ /* ServerInfo.name = ServerInfo.name; */ ServerInfo.description = NULL; - DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT); - DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT); + ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT); + ServerInfo.network_desc = rb_strdup(NETWORK_DESC_DEFAULT); memset(&ServerInfo.ip, 0, sizeof(ServerInfo.ip)); ServerInfo.specific_ipv4_vhost = 0; @@ -738,7 +726,6 @@ set_default_conf(void) memset(&ServerInfo.ip6, 0, sizeof(ServerInfo.ip6)); ServerInfo.specific_ipv6_vhost = 0; #endif - ServerInfo.use_ts6 = YES; /* Don't reset hub, as that will break lazylinks */ /* ServerInfo.hub = NO; */ @@ -746,9 +733,9 @@ set_default_conf(void) AdminInfo.email = NULL; AdminInfo.description = NULL; - DupString(ConfigFileEntry.default_operstring, "is an IRC operator"); - DupString(ConfigFileEntry.default_adminstring, "is a Server Administrator"); - DupString(ConfigFileEntry.servicestring, "is a Network Service"); + ConfigFileEntry.default_operstring = rb_strdup("is an IRC operator"); + ConfigFileEntry.default_adminstring = rb_strdup("is a Server Administrator"); + ConfigFileEntry.servicestring = rb_strdup("is a Network Service"); ConfigFileEntry.default_umodes = UMODE_INVISIBLE; ConfigFileEntry.failed_oper_notice = YES; @@ -800,10 +787,9 @@ set_default_conf(void) ConfigFileEntry.gline_min_cidr6 = 48; ConfigFileEntry.hide_spoof_ips = YES; ConfigFileEntry.hide_error_messages = 1; - ConfigFileEntry.idletime = 0; ConfigFileEntry.dots_in_ident = 0; ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT; - DupString(ConfigFileEntry.servlink_path, SLPATH); + ConfigFileEntry.servlink_path = rb_strdup(SLPATH); ConfigFileEntry.egdpool_path = NULL; ConfigFileEntry.use_whois_actually = YES; ConfigFileEntry.burst_away = NO; @@ -851,8 +837,9 @@ set_default_conf(void) ConfigFileEntry.reject_after_count = 5; ConfigFileEntry.reject_ban_time = 300; ConfigFileEntry.reject_duration = 120; + ConfigFileEntry.max_unknown_ip = 2; - ServerInfo.max_clients = MAXCONNECTIONS; + ServerInfo.max_clients = rb_get_maxconnections() - MAX_BUFFER; } #undef YES @@ -888,20 +875,18 @@ validate_conf(void) ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT; if(ConfigFileEntry.servlink_path == NULL) - DupString(ConfigFileEntry.servlink_path, SLPATH); + ConfigFileEntry.servlink_path = rb_strdup(SLPATH); if(ServerInfo.network_name == NULL) - DupString(ServerInfo.network_name, NETWORK_NAME_DEFAULT); + ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT); if(ServerInfo.network_desc == NULL) - DupString(ServerInfo.network_desc, NETWORK_DESC_DEFAULT); + ServerInfo.network_desc = rb_strdup(NETWORK_DESC_DEFAULT); if((ConfigFileEntry.client_flood < CLIENT_FLOOD_MIN) || (ConfigFileEntry.client_flood > CLIENT_FLOOD_MAX)) ConfigFileEntry.client_flood = CLIENT_FLOOD_MAX; - GlobalSetOptions.idletime = (ConfigFileEntry.idletime * 60); - if(!split_users || !split_servers || (!ConfigChannel.no_create_on_split && !ConfigChannel.no_join_on_split)) { @@ -950,24 +935,24 @@ conf_connect_allowed(struct sockaddr *addr, int aftype) void add_temp_kline(struct ConfItem *aconf) { - if(aconf->hold >= CurrentTime + (10080 * 60)) + if(aconf->hold >= rb_current_time() + (10080 * 60)) { - dlinkAddAlloc(aconf, &temp_klines[TEMP_WEEK]); + rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_WEEK]); aconf->port = TEMP_WEEK; } - else if(aconf->hold >= CurrentTime + (1440 * 60)) + else if(aconf->hold >= rb_current_time() + (1440 * 60)) { - dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]); + rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]); aconf->port = TEMP_DAY; } - else if(aconf->hold >= CurrentTime + (60 * 60)) + else if(aconf->hold >= rb_current_time() + (60 * 60)) { - dlinkAddAlloc(aconf, &temp_klines[TEMP_HOUR]); + rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_HOUR]); aconf->port = TEMP_HOUR; } else { - dlinkAddAlloc(aconf, &temp_klines[TEMP_MIN]); + rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_MIN]); aconf->port = TEMP_MIN; } @@ -984,24 +969,24 @@ add_temp_kline(struct ConfItem *aconf) void add_temp_dline(struct ConfItem *aconf) { - if(aconf->hold >= CurrentTime + (10080 * 60)) + if(aconf->hold >= rb_current_time() + (10080 * 60)) { - dlinkAddAlloc(aconf, &temp_dlines[TEMP_WEEK]); + rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_WEEK]); aconf->port = TEMP_WEEK; } - else if(aconf->hold >= CurrentTime + (1440 * 60)) + else if(aconf->hold >= rb_current_time() + (1440 * 60)) { - dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]); + rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]); aconf->port = TEMP_DAY; } - else if(aconf->hold >= CurrentTime + (60 * 60)) + else if(aconf->hold >= rb_current_time() + (60 * 60)) { - dlinkAddAlloc(aconf, &temp_dlines[TEMP_HOUR]); + rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_HOUR]); aconf->port = TEMP_HOUR; } else { - dlinkAddAlloc(aconf, &temp_dlines[TEMP_MIN]); + rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_MIN]); aconf->port = TEMP_MIN; } @@ -1019,15 +1004,15 @@ add_temp_dline(struct ConfItem *aconf) static void expire_temp_kd(void *list) { - dlink_node *ptr; - dlink_node *next_ptr; + rb_dlink_node *ptr; + rb_dlink_node *next_ptr; struct ConfItem *aconf; - DLINK_FOREACH_SAFE(ptr, next_ptr, ((dlink_list *) list)->head) + RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head) { aconf = ptr->data; - if(aconf->hold <= CurrentTime) + if(aconf->hold <= rb_current_time()) { /* Alert opers that a TKline expired - Hwy */ if(ConfigFileEntry.tkline_expire_notices) @@ -1037,7 +1022,7 @@ expire_temp_kd(void *list) user : "*", (aconf->host) ? aconf->host : "*"); delete_one_address_conf(aconf->host, aconf); - dlinkDestroy(ptr, list); + rb_dlinkDestroy(ptr, list); } } } @@ -1046,30 +1031,30 @@ static void reorganise_temp_kd(void *list) { struct ConfItem *aconf; - dlink_node *ptr, *next_ptr; + rb_dlink_node *ptr, *next_ptr; - DLINK_FOREACH_SAFE(ptr, next_ptr, ((dlink_list *) list)->head) + RB_DLINK_FOREACH_SAFE(ptr, next_ptr, ((rb_dlink_list *) list)->head) { aconf = ptr->data; - if(aconf->hold < (CurrentTime + (60 * 60))) + if(aconf->hold < (rb_current_time() + (60 * 60))) { - dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? + rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? &temp_klines[TEMP_MIN] : &temp_dlines[TEMP_MIN]); aconf->port = TEMP_MIN; } else if(aconf->port > TEMP_HOUR) { - if(aconf->hold < (CurrentTime + (1440 * 60))) + if(aconf->hold < (rb_current_time() + (1440 * 60))) { - dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? + rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? &temp_klines[TEMP_HOUR] : &temp_dlines[TEMP_HOUR]); aconf->port = TEMP_HOUR; } else if(aconf->port > TEMP_DAY && - (aconf->hold < (CurrentTime + (10080 * 60)))) + (aconf->hold < (rb_current_time() + (10080 * 60)))) { - dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? + rb_dlinkMoveNode(ptr, list, (aconf->status == CONF_KILL) ? &temp_klines[TEMP_DAY] : &temp_dlines[TEMP_DAY]); aconf->port = TEMP_DAY; } @@ -1092,13 +1077,13 @@ get_oper_name(struct Client *client_p) if(MyOper(client_p)) { - ircsnprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", + rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name, client_p->username, client_p->host, client_p->localClient->opername); return buffer; } - ircsnprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", + rb_snprintf(buffer, sizeof(buffer), "%s!%s@%s{%s}", client_p->name, client_p->username, client_p->host, client_p->servptr->name); return buffer; @@ -1200,6 +1185,19 @@ read_conf_files(int cold) fclose(conf_fbfile_in); } +/* + * free an alias{} entry. + */ +static void +free_alias_cb(struct DictionaryElement *ptr, void *unused) +{ + struct alias_entry *aptr = ptr->data; + + rb_free(aptr->name); + rb_free(aptr->target); + rb_free(aptr); +} + /* * clear_out_old_conf * @@ -1211,15 +1209,14 @@ static void clear_out_old_conf(void) { struct Class *cltmp; - dlink_node *ptr; - dlink_node *next_ptr; - int i; + rb_dlink_node *ptr; + rb_dlink_node *next_ptr; /* * don't delete the class table, rather mark all entries * for deletion. The table is cleaned up by check_class. - avalon */ - DLINK_FOREACH(ptr, class_list.head) + RB_DLINK_FOREACH(ptr, class_list.head) { cltmp = ptr->data; MaxUsers(cltmp) = -1; @@ -1236,19 +1233,19 @@ clear_out_old_conf(void) #endif /* clean out ServerInfo */ - MyFree(ServerInfo.description); + rb_free(ServerInfo.description); ServerInfo.description = NULL; - MyFree(ServerInfo.network_name); + rb_free(ServerInfo.network_name); ServerInfo.network_name = NULL; - MyFree(ServerInfo.network_desc); + rb_free(ServerInfo.network_desc); ServerInfo.network_desc = NULL; /* clean out AdminInfo */ - MyFree(AdminInfo.name); + rb_free(AdminInfo.name); AdminInfo.name = NULL; - MyFree(AdminInfo.email); + rb_free(AdminInfo.email); AdminInfo.email = NULL; - MyFree(AdminInfo.description); + rb_free(AdminInfo.description); AdminInfo.description = NULL; /* operator{} and class{} blocks are freed above */ @@ -1260,29 +1257,18 @@ clear_out_old_conf(void) */ /* clean out general */ - MyFree(ConfigFileEntry.servlink_path); + rb_free(ConfigFileEntry.servlink_path); ConfigFileEntry.servlink_path = NULL; - DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head) + RB_DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head) { - MyFree(ptr->data); - dlinkDestroy(ptr, &service_list); + rb_free(ptr->data); + rb_dlinkDestroy(ptr, &service_list); } /* remove any aliases... -- nenolod */ - for (i = 0; i < MAX_MSG_HASH; i++) - { - DLINK_FOREACH_SAFE(ptr, next_ptr, alias_hash_table[i].head) - { - struct alias_entry *aptr = ptr->data; - - MyFree(aptr->name); - MyFree(aptr->target); - MyFree(aptr); - - dlinkDestroy(ptr, &alias_hash_table[i]); - } - } + irc_dictionary_destroy(alias_dict, free_alias_cb, NULL); + alias_dict = NULL; destroy_blacklists(); @@ -1388,21 +1374,21 @@ write_confitem(KlineType type, struct Client *source_p, char *user, if(type == KLINE_TYPE) { - ircsnprintf(buffer, sizeof(buffer), + rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", user, host, reason, oper_reason, current_date, - get_oper_name(source_p), CurrentTime); + get_oper_name(source_p), rb_current_time()); } else if(type == DLINE_TYPE) { - ircsnprintf(buffer, sizeof(buffer), + rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",%ld\n", host, - reason, oper_reason, current_date, get_oper_name(source_p), CurrentTime); + reason, oper_reason, current_date, get_oper_name(source_p), rb_current_time()); } else if(type == RESV_TYPE) { - ircsnprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n", - host, reason, get_oper_name(source_p), CurrentTime); + rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n", + host, reason, get_oper_name(source_p), rb_current_time()); } if(fputs(buffer, out) == -1) @@ -1458,7 +1444,7 @@ conf_add_class_to_conf(struct ConfItem *aconf) { if(aconf->className == NULL) { - DupString(aconf->className, "default"); + aconf->className = rb_strdup("default"); ClassPtr(aconf) = default_class; return; } @@ -1474,16 +1460,16 @@ conf_add_class_to_conf(struct ConfItem *aconf) aconf->className, aconf->user, aconf->host); } - MyFree(aconf->className); - DupString(aconf->className, "default"); + rb_free(aconf->className); + aconf->className = rb_strdup("default"); return; } if(ConfMaxUsers(aconf) < 0) { ClassPtr(aconf) = default_class; - MyFree(aconf->className); - DupString(aconf->className, "default"); + rb_free(aconf->className); + aconf->className = rb_strdup("default"); return; } }