X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/5366977b4f3c7a50d170bf7a1e29b14c74944db7..4562c604897f18f08e1bee993d455d9c1774f9ad:/modules/m_rehash.c diff --git a/modules/m_rehash.c b/modules/m_rehash.c index e979a587..8bddf18e 100644 --- a/modules/m_rehash.c +++ b/modules/m_rehash.c @@ -28,15 +28,14 @@ #include "client.h" #include "channel.h" #include "common.h" -#include "irc_string.h" +#include "match.h" #include "ircd.h" -#include "s_gline.h" #include "s_serv.h" #include "numeric.h" #include "res.h" #include "s_conf.h" #include "s_newconf.h" -#include "s_log.h" +#include "logger.h" #include "send.h" #include "msg.h" #include "parse.h" @@ -89,8 +88,7 @@ rehash_motd(struct Client *source_p) "%s is forcing re-reading of MOTD file", get_oper_name(source_p)); - free_cachefile(user_motd); - user_motd = cache_file(MPATH, "ircd.motd", 0); + cache_user_motd(); } static void @@ -104,50 +102,11 @@ rehash_omotd(struct Client *source_p) oper_motd = cache_file(OPATH, "opers.motd", 0); } -static void -rehash_glines(struct Client *source_p) -{ - struct ConfItem *aconf; - dlink_node *ptr, *next_ptr; - - sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing G-lines", - get_oper_name(source_p)); - - DLINK_FOREACH_SAFE(ptr, next_ptr, glines.head) - { - aconf = ptr->data; - - delete_one_address_conf(aconf->host, aconf); - dlinkDestroy(ptr, &glines); - } -} - -static void -rehash_pglines(struct Client *source_p) -{ - struct gline_pending *glp_ptr; - dlink_node *ptr; - dlink_node *next_ptr; - - sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing pending glines", - get_oper_name(source_p)); - - DLINK_FOREACH_SAFE(ptr, next_ptr, pending_glines.head) - { - glp_ptr = ptr->data; - - MyFree(glp_ptr->reason1); - MyFree(glp_ptr->reason2); - MyFree(glp_ptr); - dlinkDestroy(ptr, &pending_glines); - } -} - static void rehash_tklines(struct Client *source_p) { struct ConfItem *aconf; - dlink_node *ptr, *next_ptr; + rb_dlink_node *ptr, *next_ptr; int i; sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp klines", @@ -155,12 +114,12 @@ rehash_tklines(struct Client *source_p) for(i = 0; i < LAST_TEMP_TYPE; i++) { - DLINK_FOREACH_SAFE(ptr, next_ptr, temp_klines[i].head) + RB_DLINK_FOREACH_SAFE(ptr, next_ptr, temp_klines[i].head) { aconf = ptr->data; delete_one_address_conf(aconf->host, aconf); - dlinkDestroy(ptr, &temp_klines[i]); + rb_dlinkDestroy(ptr, &temp_klines[i]); } } } @@ -169,7 +128,7 @@ static void rehash_tdlines(struct Client *source_p) { struct ConfItem *aconf; - dlink_node *ptr, *next_ptr; + rb_dlink_node *ptr, *next_ptr; int i; sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp dlines", @@ -177,12 +136,12 @@ rehash_tdlines(struct Client *source_p) for(i = 0; i < LAST_TEMP_TYPE; i++) { - DLINK_FOREACH_SAFE(ptr, next_ptr, temp_dlines[i].head) + RB_DLINK_FOREACH_SAFE(ptr, next_ptr, temp_dlines[i].head) { aconf = ptr->data; delete_one_address_conf(aconf->host, aconf); - dlinkDestroy(ptr, &temp_dlines[i]); + rb_dlinkDestroy(ptr, &temp_dlines[i]); } } } @@ -191,13 +150,13 @@ static void rehash_txlines(struct Client *source_p) { struct ConfItem *aconf; - dlink_node *ptr; - dlink_node *next_ptr; + rb_dlink_node *ptr; + rb_dlink_node *next_ptr; sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp xlines", get_oper_name(source_p)); - DLINK_FOREACH_SAFE(ptr, next_ptr, xline_conf_list.head) + RB_DLINK_FOREACH_SAFE(ptr, next_ptr, xline_conf_list.head) { aconf = ptr->data; @@ -205,7 +164,7 @@ rehash_txlines(struct Client *source_p) continue; free_conf(aconf); - dlinkDestroy(ptr, &xline_conf_list); + rb_dlinkDestroy(ptr, &xline_conf_list); } } @@ -213,8 +172,8 @@ static void rehash_tresvs(struct Client *source_p) { struct ConfItem *aconf; - dlink_node *ptr; - dlink_node *next_ptr; + rb_dlink_node *ptr; + rb_dlink_node *next_ptr; int i; sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp resvs", @@ -228,11 +187,11 @@ rehash_tresvs(struct Client *source_p) continue; free_conf(aconf); - dlinkDestroy(ptr, &resvTable[i]); + rb_dlinkDestroy(ptr, &resvTable[i]); } HASH_WALK_END - DLINK_FOREACH_SAFE(ptr, next_ptr, resv_conf_list.head) + RB_DLINK_FOREACH_SAFE(ptr, next_ptr, resv_conf_list.head) { aconf = ptr->data; @@ -240,7 +199,7 @@ rehash_tresvs(struct Client *source_p) continue; free_conf(aconf); - dlinkDestroy(ptr, &resv_conf_list); + rb_dlinkDestroy(ptr, &resv_conf_list); } } @@ -259,7 +218,6 @@ rehash_help(struct Client *source_p) sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is forcing re-reading of HELP files", get_oper_name(source_p)); - clear_help_hash(); load_help(); } @@ -267,14 +225,14 @@ static void rehash_nickdelay(struct Client *source_p) { struct nd_entry *nd; - dlink_node *ptr; - dlink_node *safe_ptr; + rb_dlink_node *ptr; + rb_dlink_node *safe_ptr; sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing the nick delay table", get_oper_name(source_p)); - DLINK_FOREACH_SAFE(ptr, safe_ptr, nd_list.head) + RB_DLINK_FOREACH_SAFE(ptr, safe_ptr, nd_list.head) { nd = ptr->data; @@ -289,8 +247,6 @@ static struct hash_commands rehash_commands[] = {"DNS", rehash_dns }, {"MOTD", rehash_motd }, {"OMOTD", rehash_omotd }, - {"GLINES", rehash_glines }, - {"PGLINES", rehash_pglines }, {"TKLINES", rehash_tklines }, {"TDLINES", rehash_tdlines }, {"TXLINES", rehash_txlines }, @@ -329,8 +285,8 @@ do_rehash(struct Client *source_p, const char *type) for (x = 0; rehash_commands[x].cmd != NULL && rehash_commands[x].handler != NULL; x++) { - strlcat(cmdbuf, " ", sizeof(cmdbuf)); - strlcat(cmdbuf, rehash_commands[x].cmd, sizeof(cmdbuf)); + rb_strlcat(cmdbuf, " ", sizeof(cmdbuf)); + rb_strlcat(cmdbuf, rehash_commands[x].cmd, sizeof(cmdbuf)); } sendto_one_notice(source_p, ":rehash one of:%s", cmdbuf); } @@ -402,7 +358,7 @@ me_rehash(struct Client *client_p, struct Client *source_p, int parc, const char return 0; if (!find_shared_conf(source_p->username, source_p->host, - source_p->user->server, SHARED_REHASH)) + source_p->servptr->name, SHARED_REHASH)) return 0; do_rehash(source_p, parc > 1 ? parv[1] : NULL);