ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/modules.c

Comparing ircd-hybrid-8/src/modules.c (file contents):
Revision 1228 by michael, Mon Sep 19 09:38:38 2011 UTC vs.
Revision 1574 by michael, Wed Oct 17 22:08:15 2012 UTC

#	Line 22 | Line 22
22		*  $Id$
23		*/
24
25	+	#include "ltdl.h"
26	+
27		#include "stdinc.h"
28		#include "list.h"
29		#include "modules.h"
30	<	#include "s_log.h"
30	>	#include "log.h"
31		#include "ircd.h"
32		#include "client.h"
33		#include "send.h"
34	<	#include "s_conf.h"
33	<	#include "handlers.h"
34	>	#include "conf.h"
35		#include "numeric.h"
36		#include "parse.h"
37		#include "ircd_defs.h"
#	Line 38 | Line 39
39		#include "memory.h"
40
41
42	<	dlink_list mod_list = { NULL, NULL, 0 };
42	>	dlink_list modules_list = { NULL, NULL, 0 };
43	>
44	>	static const char *unknown_ver = "<unknown>";
45
46		static const char *core_module_table[] =
47		{
#	Line 61 | Line 64 | static const char *core_module_table[] =
64		static dlink_list mod_paths = { NULL, NULL, 0 };
65		static dlink_list conf_modules = { NULL, NULL, 0 };
66
67	<	static void mo_modload(struct Client *, struct Client *, int, char *[]);
68	<	static void mo_modlist(struct Client *, struct Client *, int, char *[]);
69	<	static void mo_modreload(struct Client *, struct Client *, int, char *[]);
70	<	static void mo_modunload(struct Client *, struct Client *, int, char *[]);
71	<	static void mo_modrestart(struct Client *, struct Client *, int, char *[]);
69	<
70	<	struct Message modload_msgtab = {
71	<	"MODLOAD", 0, 0, 2, 0, MFLG_SLOW, 0,
72	<	{m_unregistered, m_not_oper, m_ignore, m_ignore, mo_modload, m_ignore}
73	<	};
67	>	int
68	>	modules_valid_suffix(const char *name)
69	>	{
70	>	return ((name = strrchr(name, '.'))) && !strcmp(name, ".la");
71	>	}
72
73	<	struct Message modunload_msgtab = {
74	<	"MODUNLOAD", 0, 0, 2, 0, MFLG_SLOW, 0,
75	<	{m_unregistered, m_not_oper, m_ignore, m_ignore, mo_modunload, m_ignore}
76	<	};
73	>	/* unload_one_module()
74	>	*
75	>	* inputs       - name of module to unload
76	>	*              - 1 to say modules unloaded, 0 to not
77	>	* output       - 0 if successful, -1 if error
78	>	* side effects - module is unloaded
79	>	*/
80	>	int
81	>	unload_one_module(const char *name, int warn)
82	>	{
83	>	struct module *modp = NULL;
84
85	<	struct Message modreload_msgtab = {
86	<	"MODRELOAD", 0, 0, 2, 0, MFLG_SLOW, 0,
82	<	{m_unregistered, m_not_oper, m_ignore, m_ignore, mo_modreload, m_ignore}
83	<	};
85	>	if ((modp = findmodule_byname(name)) == NULL)
86	>	return -1;
87
88	<	struct Message modlist_msgtab = {
89	<	"MODLIST", 0, 0, 0, 0, MFLG_SLOW, 0,
87	<	{m_unregistered, m_not_oper, m_ignore, m_ignore, mo_modlist, m_ignore}
88	<	};
88	>	if (modp->modexit)
89	>	modp->modexit();
90
91	<	struct Message modrestart_msgtab = {
92	<	"MODRESTART", 0, 0, 0, 0, MFLG_SLOW, 0,
93	<	{m_unregistered, m_not_oper, m_ignore, m_ignore, mo_modrestart, m_ignore}
94	<	};
91	>	assert(dlink_list_length(&modules_list) > 0);
92	>	dlinkDelete(&modp->node, &modules_list);
93	>	MyFree(modp->name);
94	>
95	>	lt_dlclose(modp->handle);
96	>
97	>	if (warn == 1)
98	>	{
99	>	ilog(LOG_TYPE_IRCD, "Module %s unloaded", name);
100	>	sendto_realops_flags(UMODE_ALL, L_ALL, "Module %s unloaded", name);
101	>	}
102	>
103	>	return 0;
104	>	}
105	>
106	>	/* load_a_module()
107	>	*
108	>	* inputs       - path name of module, int to notice, int of core
109	>	* output       - -1 if error 0 if success
110	>	* side effects - loads a module if successful
111	>	*/
112	>	int
113	>	load_a_module(const char *path, int warn)
114	>	{
115	>	lt_dlhandle tmpptr = NULL;
116	>	const char *mod_basename = NULL;
117	>	struct module *modp = NULL;
118	>
119	>	if (findmodule_byname((mod_basename = libio_basename(path))))
120	>	return 1;
121	>
122	>	if (!(tmpptr = lt_dlopen(path))) {
123	>	const char *err = ((err = lt_dlerror())) ? err : "<unknown>";
124	>
125	>	sendto_realops_flags(UMODE_ALL, L_ALL, "Error loading module %s: %s",
126	>	mod_basename, err);
127	>	ilog(LOG_TYPE_IRCD, "Error loading module %s: %s", mod_basename, err);
128	>	return -1;
129	>	}
130	>
131	>	if ((modp = lt_dlsym(tmpptr, "module_entry")) == NULL)
132	>	{
133	>	const char *err = ((err = lt_dlerror())) ? err : "<unknown>";
134	>
135	>	sendto_realops_flags(UMODE_ALL, L_ALL, "Error loading module %s: %s",
136	>	mod_basename, err);
137	>	ilog(LOG_TYPE_IRCD, "Error loading module %s: %s", mod_basename, err);
138	>	lt_dlclose(tmpptr);
139	>	return -1;
140	>	}
141	>
142	>	modp->handle = tmpptr;
143	>
144	>	if (EmptyString(modp->version))
145	>	modp->version = unknown_ver;
146	>
147	>	DupString(modp->name, mod_basename);
148	>	dlinkAdd(modp, &modp->node, &modules_list);
149
150	+	if (modp->modinit)
151	+	modp->modinit();
152	+
153	+	if (warn == 1)
154	+	{
155	+	sendto_realops_flags(UMODE_ALL, L_ALL,
156	+	"Module %s [version: %s handle: %p] loaded.",
157	+	modp->name, modp->version, tmpptr);
158	+	ilog(LOG_TYPE_IRCD, "Module %s [version: %s handle: %p] loaded.",
159	+	modp->name, modp->version, tmpptr);
160	+	}
161	+
162	+	return 0;
163	+	}
164
165		/*
166		* modules_init
#	Line 103 | Line 172 | struct Message modrestart_msgtab = {
172		void
173		modules_init(void)
174		{
175	<	dynlink_init();
176	<
177	<	mod_add_cmd(&modload_msgtab);
178	<	mod_add_cmd(&modunload_msgtab);
179	<	mod_add_cmd(&modreload_msgtab);
180	<	mod_add_cmd(&modlist_msgtab);
112	<	mod_add_cmd(&modrestart_msgtab);
175	>	if (lt_dlinit())
176	>	{
177	>	ilog(LOG_TYPE_IRCD, "Couldn't initialize the libltdl run time dynamic"
178	>	" link library. Exiting.");
179	>	exit(0);
180	>	}
181		}
182
183		/* mod_find_path()
#	Line 122 | Line 190 | static struct module_path *
190		mod_find_path(const char *path)
191		{
192		dlink_node *ptr;
125	–	struct module_path *mpath;
193
194		DLINK_FOREACH(ptr, mod_paths.head)
195		{
196	<	mpath = ptr->data;
196	>	struct module_path *mpath = ptr->data;
197
198		if (!strcmp(path, mpath->path))
199		return mpath;
#	Line 181 | Line 248 | add_conf_module(const char *name)
248		void
249		mod_clear_paths(void)
250		{
251	<	struct module_path *pathst;
185	<	dlink_node *ptr;
186	<	dlink_node *next_ptr;
251	>	dlink_node *ptr = NULL, *next_ptr = NULL;
252
253		DLINK_FOREACH_SAFE(ptr, next_ptr, mod_paths.head)
254		{
255	<	pathst = ptr->data;
256	<
192	<	dlinkDelete(&pathst->node, &mod_paths);
193	<	MyFree(pathst);
255	>	dlinkDelete(ptr, &mod_paths);
256	>	MyFree(ptr->data);
257		}
258
259		DLINK_FOREACH_SAFE(ptr, next_ptr, conf_modules.head)
260		{
261	<	pathst = ptr->data;
262	<
200	<	dlinkDelete(&pathst->node, &conf_modules);
201	<	MyFree(pathst);
261	>	dlinkDelete(ptr, &conf_modules);
262	>	MyFree(ptr->data);
263		}
264		}
265
#	Line 208 | Line 269 | mod_clear_paths(void)
269		* output       - NULL if not found or pointer to module
270		* side effects - NONE
271		*/
272	<	dlink_node *
272	>	struct module *
273		findmodule_byname(const char *name)
274		{
275	<	dlink_node *ptr;
215	<	struct module *modp;
275	>	dlink_node *ptr = NULL;
276
277	<	DLINK_FOREACH(ptr, mod_list.head)
277	>	DLINK_FOREACH(ptr, modules_list.head)
278		{
279	<	modp = ptr->data;
279	>	struct module *modp = ptr->data;
280
281		if (strcmp(modp->name, name) == 0)
282	<	return ptr;
282	>	return modp;
283		}
284
285		return NULL;
#	Line 238 | Line 298 | load_all_modules(int warn)
298		struct dirent *ldirent = NULL;
299		char module_fq_name[PATH_MAX + 1];
300
241	–	modules_init();
242	–
301		if ((system_module_dir = opendir(AUTOMODPATH)) == NULL)
302		{
303	<	ilog(L_WARN, "Could not load modules from %s: %s",
303	>	ilog(LOG_TYPE_IRCD, "Could not load modules from %s: %s",
304		AUTOMODPATH, strerror(errno));
305		return;
306		}
#	Line 253 | Line 311 | load_all_modules(int warn)
311		{
312		snprintf(module_fq_name, sizeof(module_fq_name), "%s/%s",
313		AUTOMODPATH, ldirent->d_name);
314	<	load_a_module(module_fq_name, warn, 0);
314	>	load_a_module(module_fq_name, warn);
315		}
316		}
317
#	Line 270 | Line 328 | void
328		load_conf_modules(void)
329		{
330		dlink_node *ptr = NULL;
273	–	struct module_path *mpath = NULL;
331
332		DLINK_FOREACH(ptr, conf_modules.head)
333		{
334	<	mpath = ptr->data;
334	>	struct module_path *mpath = ptr->data;
335
336		if (findmodule_byname(mpath->path) == NULL)
337	<	load_one_module(mpath->path, 0);
337	>	load_one_module(mpath->path);
338		}
339		}
340
#	Line 298 | Line 355 | load_core_modules(int warn)
355		snprintf(module_name, sizeof(module_name), "%s%s",
356		MODPATH, core_module_table[i]);
357
358	<	if (load_a_module(module_name, warn, 1) == -1)
358	>	if (load_a_module(module_name, warn) == -1)
359		{
360	<	ilog(L_CRIT, "Error loading core module %s: terminating ircd",
360	>	ilog(LOG_TYPE_IRCD, "Error loading core module %s: terminating ircd",
361		core_module_table[i]);
362		exit(EXIT_FAILURE);
363		}
#	Line 315 | Line 372 | load_core_modules(int warn)
372		* side effects - module is loaded if found.
373		*/
374		int
375	<	load_one_module(const char *path, int coremodule)
375	>	load_one_module(const char *path)
376		{
377		dlink_node *ptr = NULL;
378		char modpath[PATH_MAX + 1];
#	Line 332 | Line 389 | load_one_module(const char *path, int co
389
390		if (strstr(modpath, "../") == NULL &&
391		strstr(modpath, "/..") == NULL)
335	–	{
392		if (!stat(modpath, &statbuf))
393	<	{
394	<	if (S_ISREG(statbuf.st_mode))
339	<	{
340	<	/* Regular files only please */
341	<	return load_a_module(modpath, 1, coremodule);
342	<	}
343	<	}
344	<	}
393	>	if (S_ISREG(statbuf.st_mode))  /* Regular files only please */
394	>	return load_a_module(modpath, 1);
395		}
396
397		sendto_realops_flags(UMODE_ALL, L_ALL,
398		"Cannot locate module %s", path);
399	<	ilog(L_WARN, "Cannot locate module %s", path);
399	>	ilog(LOG_TYPE_IRCD, "Cannot locate module %s", path);
400		return -1;
401		}
352	–
353	–	/* load a module .. */
354	–	static void
355	–	mo_modload(struct Client *client_p, struct Client *source_p,
356	–	int parc, char *parv[])
357	–	{
358	–	const char *m_bn = NULL;
359	–
360	–	if (!HasOFlag(source_p, OPER_FLAG_MODULE))
361	–	{
362	–	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
363	–	me.name, source_p->name);
364	–	return;
365	–	}
366	–
367	–	m_bn = libio_basename(parv[1]);
368	–
369	–	if (findmodule_byname(m_bn) != NULL)
370	–	{
371	–	sendto_one(source_p, ":%s NOTICE %s :Module %s is already loaded",
372	–	me.name, source_p->name, m_bn);
373	–	return;
374	–	}
375	–
376	–	load_one_module(parv[1], 0);
377	–	}
378	–
379	–	/* unload a module .. */
380	–	static void
381	–	mo_modunload(struct Client *client_p, struct Client *source_p,
382	–	int parc, char *parv[])
383	–	{
384	–	const char *m_bn = NULL;
385	–	dlink_node *ptr;
386	–	struct module *modp;
387	–
388	–	if (!HasOFlag(source_p, OPER_FLAG_MODULE))
389	–	{
390	–	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
391	–	me.name, source_p->name);
392	–	return;
393	–	}
394	–
395	–	m_bn = libio_basename(parv[1]);
396	–
397	–	if ((ptr = findmodule_byname(m_bn)) == NULL)
398	–	{
399	–	sendto_one(source_p, ":%s NOTICE %s :Module %s is not loaded",
400	–	me.name, source_p->name, m_bn);
401	–	return;
402	–	}
403	–
404	–	modp = ptr->data;
405	–
406	–	if (modp->core == 1)
407	–	{
408	–	sendto_one(source_p,
409	–	":%s NOTICE %s :Module %s is a core module and may not be unloaded",
410	–	me.name, source_p->name, m_bn);
411	–	return;
412	–	}
413	–
414	–	/* XXX might want to simply un dlink it here */
415	–
416	–	if (unload_one_module(m_bn, 1) == -1)
417	–	{
418	–	sendto_one(source_p, ":%s NOTICE %s :Module %s is not loaded",
419	–	me.name, source_p->name, m_bn);
420	–	}
421	–	}
422	–
423	–	/* unload and load in one! */
424	–	static void
425	–	mo_modreload(struct Client *client_p, struct Client *source_p,
426	–	int parc, char *parv[])
427	–	{
428	–	const char *m_bn = NULL;
429	–	dlink_node *ptr;
430	–	struct module *modp;
431	–	int check_core;
432	–
433	–	if (!HasOFlag(source_p, OPER_FLAG_MODULE))
434	–	{
435	–	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
436	–	me.name, source_p->name);
437	–	return;
438	–	}
439	–
440	–	m_bn = libio_basename(parv[1]);
441	–
442	–	if ((ptr = findmodule_byname(m_bn)) == NULL)
443	–	{
444	–	sendto_one(source_p, ":%s NOTICE %s :Module %s is not loaded",
445	–	me.name, source_p->name, m_bn);
446	–	return;
447	–	}
448	–
449	–	modp = ptr->data;
450	–	check_core = modp->core;
451	–
452	–	if (unload_one_module(m_bn, 1) == -1)
453	–	{
454	–	sendto_one(source_p, ":%s NOTICE %s :Module %s is not loaded",
455	–	me.name, source_p->name, m_bn);
456	–	return;
457	–	}
458	–
459	–	if ((load_one_module(parv[1], check_core) == -1) && check_core)
460	–	{
461	–	sendto_realops_flags(UMODE_ALL, L_ALL, "Error reloading core "
462	–	"module: %s: terminating ircd", parv[1]);
463	–	ilog(L_CRIT, "Error loading core module %s: terminating ircd", parv[1]);
464	–	exit(0);
465	–	}
466	–	}
467	–
468	–	/* list modules .. */
469	–	static void
470	–	mo_modlist(struct Client *client_p, struct Client *source_p,
471	–	int parc, char *parv[])
472	–	{
473	–	const dlink_node *ptr = NULL;
474	–
475	–	if (!HasOFlag(source_p, OPER_FLAG_MODULE))
476	–	{
477	–	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
478	–	me.name, source_p->name);
479	–	return;
480	–	}
481	–
482	–	DLINK_FOREACH(ptr, mod_list.head)
483	–	{
484	–	const struct module *modp = ptr->data;
485	–
486	–	if (parc > 1 && !match(parv[1], modp->name))
487	–	continue;
488	–
489	–	sendto_one(source_p, form_str(RPL_MODLIST), me.name, parv[0],
490	–	modp->name, modp->handle,
491	–	modp->version, modp->core?"(core)":"");
492	–	}
493	–
494	–	sendto_one(source_p, form_str(RPL_ENDOFMODLIST),
495	–	me.name, source_p->name);
496	–	}
497	–
498	–	/* unload and reload all modules */
499	–	static void
500	–	mo_modrestart(struct Client *client_p, struct Client *source_p,
501	–	int parc, char *parv[])
502	–	{
503	–	unsigned int modnum = 0;
504	–	dlink_node *ptr = NULL, *ptr_next = NULL;
505	–
506	–	if (!HasOFlag(source_p, OPER_FLAG_MODULE))
507	–	{
508	–	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
509	–	me.name, source_p->name);
510	–	return;
511	–	}
512	–
513	–	sendto_one(source_p, ":%s NOTICE %s :Reloading all modules",
514	–	me.name, source_p->name);
515	–
516	–	modnum = dlink_list_length(&mod_list);
517	–
518	–	DLINK_FOREACH_SAFE(ptr, ptr_next, mod_list.head)
519	–	{
520	–	struct module *modp = ptr->data;
521	–	unload_one_module(modp->name, 0);
522	–	}
523	–
524	–	load_all_modules(0);
525	–	load_conf_modules();
526	–	load_core_modules(0);
527	–
528	–	sendto_realops_flags(UMODE_ALL, L_ALL,
529	–	"Module Restart: %u modules unloaded, %u modules loaded",
530	–	modnum, dlink_list_length(&mod_list));
531	–	ilog(L_WARN, "Module Restart: %u modules unloaded, %u modules loaded",
532	–	modnum, dlink_list_length(&mod_list));
533	–	}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)