X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/5366977b4f3c7a50d170bf7a1e29b14c74944db7..8e69bb4e903f428b14e2950cce9be39dc8ddd12c:/src/s_conf.c diff --git a/src/s_conf.c b/src/s_conf.c index ea0dc8d..4694d4b 100644 --- a/src/s_conf.c +++ b/src/s_conf.c @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * USA * - * $Id: s_conf.c 3161 2007-01-25 07:23:01Z nenolod $ + * $Id: s_conf.c 3550 2007-08-09 06:47:26Z nenolod $ */ #include "stdinc.h" @@ -66,9 +66,9 @@ extern char linebuf[]; static BlockHeap *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); @@ -173,8 +173,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]", @@ -188,10 +186,15 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern break; case TOO_MANY_LOCAL: + /* Note that these notices are sent to opers on other + * servers also, so even if local opers are allowed to + * see the IP, we still cannot send it. + */ sendto_realops_snomask(SNO_FULL, L_NETWIDE, "Too many local connections for %s!%s%s@%s", source_p->name, IsGotId(source_p) ? "" : "~", - source_p->username, source_p->sockhost); + source_p->username, + show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : source_p->host); ilog(L_FUSER, "Too many local connections from %s!%s%s@%s", source_p->name, IsGotId(source_p) ? "" : "~", @@ -205,7 +208,8 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern sendto_realops_snomask(SNO_FULL, L_NETWIDE, "Too many global connections for %s!%s%s@%s", source_p->name, IsGotId(source_p) ? "" : "~", - source_p->username, source_p->sockhost); + source_p->username, + show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : source_p->host); ilog(L_FUSER, "Too many global connections from %s!%s%s@%s", source_p->name, IsGotId(source_p) ? "" : "~", source_p->username, source_p->sockhost); @@ -218,7 +222,8 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern sendto_realops_snomask(SNO_FULL, L_NETWIDE, "Too many user connections for %s!%s%s@%s", source_p->name, IsGotId(source_p) ? "" : "~", - source_p->username, source_p->sockhost); + source_p->username, + show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : source_p->host); ilog(L_FUSER, "Too many user connections from %s!%s%s@%s", source_p->name, IsGotId(source_p) ? "" : "~", source_p->username, source_p->sockhost); @@ -232,7 +237,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) ? "" : "~", @@ -274,13 +279,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; @@ -330,16 +334,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)) { @@ -382,6 +381,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) @@ -393,6 +393,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); } @@ -476,7 +477,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; @@ -490,7 +491,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; @@ -598,7 +599,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); } } @@ -731,7 +731,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; */ @@ -793,7 +792,6 @@ 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); @@ -823,7 +821,6 @@ set_default_conf(void) ConfigChannel.max_bans = 25; ConfigChannel.max_bans_large = 500; ConfigChannel.burst_topicwho = NO; - ConfigChannel.invite_ops_only = YES; ConfigChannel.kick_on_split_riding = NO; ConfigChannel.default_split_user_count = 15000; @@ -845,7 +842,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 = rb_get_maxconnections() - MAX_BUFFER; } #undef YES @@ -893,8 +892,6 @@ validate_conf(void) (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)) { @@ -945,22 +942,22 @@ add_temp_kline(struct ConfItem *aconf) { if(aconf->hold >= CurrentTime + (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)) { - dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]); + rb_dlinkAddAlloc(aconf, &temp_klines[TEMP_DAY]); aconf->port = TEMP_DAY; } else if(aconf->hold >= CurrentTime + (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; } @@ -979,22 +976,22 @@ add_temp_dline(struct ConfItem *aconf) { if(aconf->hold >= CurrentTime + (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)) { - dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]); + rb_dlinkAddAlloc(aconf, &temp_dlines[TEMP_DAY]); aconf->port = TEMP_DAY; } else if(aconf->hold >= CurrentTime + (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; } @@ -1012,11 +1009,11 @@ 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; @@ -1030,7 +1027,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); } } } @@ -1039,15 +1036,15 @@ 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))) { - 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; } @@ -1055,14 +1052,14 @@ reorganise_temp_kd(void *list) { if(aconf->hold < (CurrentTime + (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)))) { - 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; } @@ -1085,13 +1082,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; @@ -1193,6 +1190,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; + + MyFree(aptr->name); + MyFree(aptr->target); + MyFree(aptr); +} + /* * clear_out_old_conf * @@ -1204,15 +1214,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; @@ -1256,26 +1265,15 @@ clear_out_old_conf(void) MyFree(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_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(); @@ -1381,20 +1379,20 @@ 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); } 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); } else if(type == RESV_TYPE) { - ircsnprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n", + rb_snprintf(buffer, sizeof(buffer), "\"%s\",\"%s\",\"%s\",%ld\n", host, reason, get_oper_name(source_p), CurrentTime); }