[svn-commits] oej: trunk r46513 - in /trunk: funcs/ include/asterisk/ main/

[svn-commits at lists.digium.com]

Author: oej
Date: Mon Oct 30 15:48:41 2006
New Revision: 46513

URL: http://svn.digium.com/view/asterisk?rev=46513&view=rev
Log:
Adding dialplan function IFMODULE, so you can create dialplans that handle
various PBX installations and checks if a module is loaded before using
it.
	example IFMODULE(chan_sip3.so)

issue #6671 in the bug tracker, finally gone. Thanks to mithraen for keeping
it updated.

Added:
    trunk/funcs/func_module.c   (with props)
Modified:
    trunk/include/asterisk/module.h
    trunk/main/loader.c

Added: trunk/funcs/func_module.c
URL: http://svn.digium.com/view/asterisk/trunk/funcs/func_module.c?rev=46513&view=auto
==============================================================================
--- trunk/funcs/func_module.c (added)
+++ trunk/funcs/func_module.c Mon Oct 30 15:48:41 2006
@@ -1,0 +1,77 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 1999 - 2006, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ *
+ * \brief Simple module check function
+ * \author Olle E. Johansson, Edvina.net
+ */
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "asterisk/module.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/logger.h"
+#include "asterisk/utils.h"
+#include "asterisk/app.h"
+#include "asterisk/module.h"
+
+static int ifmodule_read(struct ast_channel *chan, char *cmd, char *data,
+		    char *buf, size_t len)
+{
+	char *ret = "0";
+
+	*buf = '\0';
+
+	if (data)
+		if (ast_module_check(data))
+			ret = "1";
+
+	ast_copy_string(buf, ret, len);
+
+	return 0;
+}
+
+static struct ast_custom_function ifmodule_function = {
+	.name = "IFMODULE",
+	.synopsis = "Checks if an Asterisk module is loaded in memory",
+	.syntax = "IFMODULE(<modulename.so>)",
+	.read = ifmodule_read,
+	.desc = "Checks if a module is loaded. Use the full module name\n"
+		"as shown by the list in \"show modules\". \n"
+		"Returns \"1\" if module exists in memory, otherwise \"0\".\n",
+};
+
+
+static int unload_module(void)
+{
+	return ast_custom_function_unregister(&ifmodule_function);
+}
+
+static int load_module(void)
+{
+	return ast_custom_function_register(&ifmodule_function);
+}
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Checks if Asterisk module is loaded in memory");

Propchange: trunk/funcs/func_module.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/funcs/func_module.c
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: trunk/funcs/func_module.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: trunk/include/asterisk/module.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/module.h?rev=46513&r1=46512&r2=46513&view=diff
==============================================================================
--- trunk/include/asterisk/module.h (original)
+++ trunk/include/asterisk/module.h Mon Oct 30 15:48:41 2006
@@ -113,6 +113,13 @@
 int ast_update_module_list(int (*modentry)(const char *module, const char *description, int usecnt, const char *like),
 			   const char *like);
 
+/*!
+ * \brief Check if module with the name given is loaded
+ * \param name Module name, like "chan_sip.so"
+ * \return 0 if false, 1 if true 
+ */
+int ast_module_check(char *name);
+
 /*! 
  * \brief Add a procedure to be run when modules have been updated.
  * \param updater The function to run when modules have been updated.

Modified: trunk/main/loader.c
URL: http://svn.digium.com/view/asterisk/trunk/main/loader.c?rev=46513&r1=46512&r2=46513&view=diff
==============================================================================
--- trunk/main/loader.c (original)
+++ trunk/main/loader.c Mon Oct 30 15:48:41 2006
@@ -871,6 +871,26 @@
 	return total_mod_loaded;
 }
 
+int ast_module_check(char *name)
+{
+	struct ast_module *cur;
+	int unlock = -1;
+	int res = 0;
+
+	if (ast_strlen_zero(name))
+		return 0;       /* FALSE */
+
+	if (ast_mutex_trylock(&module_list.lock))
+		unlock = 0;
+	AST_LIST_TRAVERSE(&module_list, cur, entry)
+	if (!res && !strcasecmp(name, cur->resource))
+		res = 1;
+	if (unlock)
+		AST_LIST_UNLOCK(&module_list);
+	return res;
+}
+
+
 int ast_loader_register(int (*v)(void))
 {
 	struct loadupdate *tmp;