#include "ircd.h"
#include "s_serv.h"
#include "numeric.h"
-#include "res.h"
#include "s_conf.h"
#include "s_newconf.h"
#include "logger.h"
#include "reject.h"
#include "hash.h"
#include "cache.h"
+#include "irc_radixtree.h"
+#include "sslproc.h"
-static int mo_rehash(struct Client *, struct Client *, int, const char **);
-static int me_rehash(struct Client *, struct Client *, int, const char **);
+static int mo_rehash(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static int me_rehash(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
struct Message rehash_msgtab = {
- "REHASH", 0, 0, 0, MFLG_SLOW,
+ "REHASH", 0, 0, 0, 0,
{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_rehash, 0}, {mo_rehash, 0}}
};
{
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is rehashing bans",
get_oper_name(source_p));
+ if (!MyConnect(source_p))
+ remote_rehash_oper_p = source_p;
rehash_bans(0);
}
static void
rehash_dns(struct Client *source_p)
{
- sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is rehashing DNS",
+ sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is rehashing DNS",
get_oper_name(source_p));
+ if (!MyConnect(source_p))
+ remote_rehash_oper_p = source_p;
/* reread /etc/resolv.conf and reopen res socket */
- restart_resolver();
+ restart_authd();
+}
+
+static void
+rehash_ssld(struct Client *source_p)
+{
+ sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is restarting ssld",
+ get_oper_name(source_p));
+
+ restart_ssld();
}
static void
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"%s is forcing re-reading of MOTD file",
get_oper_name(source_p));
+ if (!MyConnect(source_p))
+ remote_rehash_oper_p = source_p;
cache_user_motd();
}
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"%s is forcing re-reading of OPER MOTD file",
get_oper_name(source_p));
+ if (!MyConnect(source_p))
+ remote_rehash_oper_p = source_p;
free_cachefile(oper_motd);
oper_motd = cache_file(OPATH, "opers.motd", 0);
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp klines",
get_oper_name(source_p));
+ if (!MyConnect(source_p))
+ remote_rehash_oper_p = source_p;
for(i = 0; i < LAST_TEMP_TYPE; i++)
{
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp dlines",
get_oper_name(source_p));
+ if (!MyConnect(source_p))
+ remote_rehash_oper_p = source_p;
for(i = 0; i < LAST_TEMP_TYPE; i++)
{
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp xlines",
get_oper_name(source_p));
+ if (!MyConnect(source_p))
+ remote_rehash_oper_p = source_p;
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, xline_conf_list.head)
{
aconf = ptr->data;
- if(!aconf->hold)
+ if(!aconf->hold || aconf->lifetime)
continue;
free_conf(aconf);
rehash_tresvs(struct Client *source_p)
{
struct ConfItem *aconf;
+ struct irc_radixtree_iteration_state iter;
rb_dlink_node *ptr;
rb_dlink_node *next_ptr;
int i;
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing temp resvs",
get_oper_name(source_p));
+ if (!MyConnect(source_p))
+ remote_rehash_oper_p = source_p;
- HASH_WALK_SAFE(i, R_MAX, ptr, next_ptr, resvTable)
+ IRC_RADIXTREE_FOREACH(aconf, &iter, resv_tree)
{
- aconf = ptr->data;
-
- if(!aconf->hold)
+ if(!aconf->hold || aconf->lifetime)
continue;
+ irc_radixtree_delete(resv_tree, aconf->host);
free_conf(aconf);
- rb_dlinkDestroy(ptr, &resvTable[i]);
}
- HASH_WALK_END
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, resv_conf_list.head)
{
aconf = ptr->data;
- if(!aconf->hold)
+ if(!aconf->hold || aconf->lifetime)
continue;
free_conf(aconf);
{
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing reject cache",
get_oper_name(source_p));
+ if (!MyConnect(source_p))
+ remote_rehash_oper_p = source_p;
flush_reject();
}
{
sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is clearing throttles",
get_oper_name(source_p));
+ if (!MyConnect(source_p))
+ remote_rehash_oper_p = source_p;
flush_throttle();
}
rehash_help(struct Client *source_p)
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "%s is forcing re-reading of HELP files",
+ "%s is forcing re-reading of HELP files",
get_oper_name(source_p));
+ if (!MyConnect(source_p))
+ remote_rehash_oper_p = source_p;
load_help();
}
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"%s is clearing the nick delay table",
get_oper_name(source_p));
+ if (!MyConnect(source_p))
+ remote_rehash_oper_p = source_p;
RB_DLINK_FOREACH_SAFE(ptr, safe_ptr, nd_list.head)
{
nd = ptr->data;
-
+
free_nd_entry(nd);
}
}
{
{"BANS", rehash_bans_loc },
{"DNS", rehash_dns },
+ {"SSLD", rehash_ssld },
{"MOTD", rehash_motd },
{"OMOTD", rehash_omotd },
{"TKLINES", rehash_tklines },
{
sendto_one(source_p, form_str(RPL_REHASHING), me.name,
source_p->name, rehash_commands[x].cmd);
- rehash_commands[x].handler(source_p);
ilog(L_MAIN, "REHASH %s From %s[%s]", type,
get_oper_name(source_p), source_p->sockhost);
+ rehash_commands[x].handler(source_p);
+ remote_rehash_oper_p = NULL;
return;
}
}
ConfigFileEntry.configfile);
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"%s is rehashing server config file", get_oper_name(source_p));
+ if (!MyConnect(source_p))
+ remote_rehash_oper_p = source_p;
ilog(L_MAIN, "REHASH From %s[%s]", get_oper_name(source_p),
source_p->sockhost);
rehash(0);
+ remote_rehash_oper_p = NULL;
}
}
* parv[2] = destination
*/
static int
-mo_rehash(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+mo_rehash(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
const char *type = NULL, *target_server = NULL;
}
static int
-me_rehash(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+me_rehash(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
if (!IsPerson(source_p))
source_p->servptr->name, SHARED_REHASH))
return 0;
- remote_rehash_oper_p = source_p;
do_rehash(source_p, parc > 1 ? parv[1] : NULL);
- remote_rehash_oper_p = NULL;
return 0;
}