X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/55abcbb20aeabcf2e878a9c65c9697210dd10079..742ddc8fac87a5dd713110df6f2a76f56d34b00b:/modules/m_rehash.c

diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index 004bca66..ac7e2241 100644
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -20,19 +20,15 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_rehash.c 3161 2007-01-25 07:23:01Z nenolod $
  */
 
 #include "stdinc.h"
 #include "client.h"
 #include "channel.h"
-#include "common.h"
 #include "match.h"
 #include "ircd.h"
 #include "s_serv.h"
 #include "numeric.h"
-#include "res.h"
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "logger.h"
@@ -44,17 +40,23 @@
 #include "reject.h"
 #include "hash.h"
 #include "cache.h"
+#include "rb_radixtree.h"
+#include "sslproc.h"
+
+static const char rehash_desc[] =
+	"Provides the REHASH command to reload configuration and other files";
 
-static int mo_rehash(struct Client *, struct Client *, int, const char **);
-static int me_rehash(struct Client *, struct Client *, int, const char **);
+static void mo_rehash(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void 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}}
 };
 
 mapi_clist_av1 rehash_clist[] = { &rehash_msgtab, NULL };
-DECLARE_MODULE_AV1(rehash, NULL, NULL, rehash_clist, NULL, NULL, "$Revision: 3161 $");
+
+DECLARE_MODULE_AV2(rehash, NULL, NULL, rehash_clist, NULL, NULL, NULL, NULL, rehash_desc);
 
 struct hash_commands
 {
@@ -70,7 +72,7 @@ rehash_bans_loc(struct Client *source_p)
 	if (!MyConnect(source_p))
 		remote_rehash_oper_p = source_p;
 
-	rehash_bans(0);
+	rehash_bans();
 }
 
 static void
@@ -81,8 +83,23 @@ rehash_dns(struct Client *source_p)
 	if (!MyConnect(source_p))
 		remote_rehash_oper_p = source_p;
 
-	/* reread /etc/resolv.conf and reopen res socket */
-	restart_resolver();
+	reload_nameservers();
+}
+
+static void
+rehash_ssld(struct Client *source_p)
+{
+	if (!IsOperAdmin(source_p))
+	{
+		sendto_one(source_p, form_str(ERR_NOPRIVS),
+			   me.name, source_p->name, "admin");
+		return;
+	}
+
+	sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s is restarting ssld",
+				get_oper_name(source_p));
+
+	restart_ssld();
 }
 
 static void
@@ -107,7 +124,7 @@ rehash_omotd(struct Client *source_p)
 		remote_rehash_oper_p = source_p;
 
 	free_cachefile(oper_motd);
-	oper_motd = cache_file(OPATH, "opers.motd", 0);
+	oper_motd = cache_file(ircd_paths[IRCD_PATH_IRCD_OMOTD], "opers.motd", 0);
 }
 
 static void
@@ -186,26 +203,23 @@ static void
 rehash_tresvs(struct Client *source_p)
 {
 	struct ConfItem *aconf;
+	rb_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)
+	RB_RADIXTREE_FOREACH(aconf, &iter, resv_tree)
 	{
-		aconf = ptr->data;
-
 		if(!aconf->hold || aconf->lifetime)
 			continue;
 
+		rb_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)
 	{
@@ -278,6 +292,7 @@ static struct hash_commands rehash_commands[] =
 {
 	{"BANS",	rehash_bans_loc		},
 	{"DNS", 	rehash_dns		},
+	{"SSLD", 	rehash_ssld		},
 	{"MOTD", 	rehash_motd		},
 	{"OMOTD", 	rehash_omotd		},
 	{"TKLINES", 	rehash_tklines		},
@@ -335,7 +350,7 @@ do_rehash(struct Client *source_p, const char *type)
 			remote_rehash_oper_p = source_p;
 		ilog(L_MAIN, "REHASH From %s[%s]", get_oper_name(source_p),
 		     source_p->sockhost);
-		rehash(0);
+		rehash(false);
 		remote_rehash_oper_p = NULL;
 	}
 }
@@ -346,8 +361,8 @@ do_rehash(struct Client *source_p, const char *type)
  * parv[1] = rehash type or destination
  * parv[2] = destination
  */
-static int
-mo_rehash(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+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;
 
@@ -355,7 +370,7 @@ mo_rehash(struct Client *client_p, struct Client *source_p, int parc, const char
 	{
 		sendto_one(source_p, form_str(ERR_NOPRIVS),
 			   me.name, source_p->name, "rehash");
-		return 0;
+		return;
 	}
 
 	if (parc > 2)
@@ -373,33 +388,29 @@ mo_rehash(struct Client *client_p, struct Client *source_p, int parc, const char
 		{
 			sendto_one(source_p, form_str(ERR_NOPRIVS),
 				me.name, source_p->name, "remoteban");
-			return 0;
+			return;
 		}
 		sendto_match_servs(source_p, target_server,
 				CAP_ENCAP, NOCAPS,
 				"ENCAP %s REHASH %s",
 				target_server, type != NULL ? type : "");
 		if (match(target_server, me.name) == 0)
-			return 0;
+			return;
 	}
 
 	do_rehash(source_p, type);
-
-	return 0;
 }
 
-static int
-me_rehash(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+me_rehash(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 
 	if (!IsPerson(source_p))
-		return 0;
+		return;
 
 	if (!find_shared_conf(source_p->username, source_p->host,
 				source_p->servptr->name, SHARED_REHASH))
-		return 0;
+		return;
 
 	do_rehash(source_p, parc > 1 ? parv[1] : NULL);
-
-	return 0;
 }