mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-25 22:18:07 +00:00 
			
		
		
		
	The function call ast_db_deltree returns the number of row deleted, or a negative number if it failed. DBdeltree was treating any non-zero return as an error, causing a spurious verbose error message to be displayed. This patch handles the return code of ast_db_deltree correctly. (closes issue ASTERISK-21070) Reported by: ianc patches: dbdeltree.diff uploaded by ianc (License #5955) ........ Merged revisions 381364 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 381365 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381366 65c4cc65-6c06-0410-ace0-fbb531ad65f3
		
			
				
	
	
		
			172 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			172 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Asterisk -- An open source telephony toolkit.
 | |
|  *
 | |
|  * Copyright (C) 1999 - 2005, Digium, Inc.
 | |
|  * Copyright (C) 2003, Jefferson Noxon
 | |
|  *
 | |
|  * Mark Spencer <markster@digium.com>
 | |
|  * Jefferson Noxon <jeff@debian.org>
 | |
|  *
 | |
|  * 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 Database access functions
 | |
|  *
 | |
|  * \author Mark Spencer <markster@digium.com>
 | |
|  * \author Jefferson Noxon <jeff@debian.org>
 | |
|  *
 | |
|  * \ingroup applications
 | |
|  */
 | |
| 
 | |
| /*** MODULEINFO
 | |
| 	<support_level>core</support_level>
 | |
|  ***/
 | |
| 
 | |
| #include "asterisk.h"
 | |
| 
 | |
| ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 | |
| 
 | |
| #include "asterisk/file.h"
 | |
| #include "asterisk/channel.h"
 | |
| #include "asterisk/pbx.h"
 | |
| #include "asterisk/module.h"
 | |
| #include "asterisk/astdb.h"
 | |
| #include "asterisk/lock.h"
 | |
| 
 | |
| /*** DOCUMENTATION
 | |
| 	<application name="DBdel" language="en_US">
 | |
| 		<synopsis>
 | |
| 			Delete a key from the asterisk database.
 | |
| 		</synopsis>
 | |
| 		<syntax argsep="/">
 | |
| 			<parameter name="family" required="true" />
 | |
| 			<parameter name="key" required="true" />
 | |
| 		</syntax>
 | |
| 		<description>
 | |
| 			<para>This application will delete a <replaceable>key</replaceable> from the Asterisk
 | |
| 			database.</para>
 | |
| 			<note><para>This application has been DEPRECATED in favor of the DB_DELETE function.</para></note>
 | |
| 		</description>
 | |
| 		<see-also>
 | |
| 			<ref type="function">DB_DELETE</ref>
 | |
| 			<ref type="application">DBdeltree</ref>
 | |
| 			<ref type="function">DB</ref>
 | |
| 		</see-also>
 | |
| 	</application>
 | |
| 	<application name="DBdeltree" language="en_US">
 | |
| 		<synopsis>
 | |
| 			Delete a family or keytree from the asterisk database.
 | |
| 		</synopsis>
 | |
| 		<syntax argsep="/">
 | |
| 			<parameter name="family" required="true" />
 | |
| 			<parameter name="keytree" />
 | |
| 		</syntax>
 | |
| 		<description>
 | |
| 			<para>This application will delete a <replaceable>family</replaceable> or <replaceable>keytree</replaceable>
 | |
| 			from the Asterisk database.</para>
 | |
| 		</description>
 | |
| 		<see-also>
 | |
| 			<ref type="function">DB_DELETE</ref>
 | |
| 			<ref type="application">DBdel</ref>
 | |
| 			<ref type="function">DB</ref>
 | |
| 		</see-also>
 | |
| 	</application>
 | |
|  ***/
 | |
| 
 | |
| static const char d_app[] = "DBdel";
 | |
| static const char dt_app[] = "DBdeltree";
 | |
| 
 | |
| static int deltree_exec(struct ast_channel *chan, const char *data)
 | |
| {
 | |
| 	char *argv, *family, *keytree;
 | |
| 
 | |
| 	argv = ast_strdupa(data);
 | |
| 
 | |
| 	if (strchr(argv, '/')) {
 | |
| 		family = strsep(&argv, "/");
 | |
| 		keytree = strsep(&argv, "\0");
 | |
| 		if (!family || !keytree) {
 | |
| 			ast_debug(1, "Ignoring; Syntax error in argument\n");
 | |
| 			return 0;
 | |
| 		}
 | |
| 		if (ast_strlen_zero(keytree))
 | |
| 			keytree = 0;
 | |
| 	} else {
 | |
| 		family = argv;
 | |
| 		keytree = 0;
 | |
| 	}
 | |
| 
 | |
| 	if (keytree) {
 | |
| 		ast_verb(3, "DBdeltree: family=%s, keytree=%s\n", family, keytree);
 | |
| 	} else {
 | |
| 		ast_verb(3, "DBdeltree: family=%s\n", family);
 | |
| 	}
 | |
| 
 | |
| 	if (ast_db_deltree(family, keytree) < 0) {
 | |
| 		ast_verb(3, "DBdeltree: Error deleting key from database.\n");
 | |
| 	}
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| static int del_exec(struct ast_channel *chan, const char *data)
 | |
| {
 | |
| 	char *argv, *family, *key;
 | |
| 	static int deprecation_warning = 0;
 | |
| 
 | |
| 	if (!deprecation_warning) {
 | |
| 		deprecation_warning = 1;
 | |
| 		ast_log(LOG_WARNING, "The DBdel application has been deprecated in favor of the DB_DELETE dialplan function!\n");
 | |
| 	}
 | |
| 
 | |
| 	argv = ast_strdupa(data);
 | |
| 
 | |
| 	if (strchr(argv, '/')) {
 | |
| 		family = strsep(&argv, "/");
 | |
| 		key = strsep(&argv, "\0");
 | |
| 		if (!family || !key) {
 | |
| 			ast_debug(1, "Ignoring; Syntax error in argument\n");
 | |
| 			return 0;
 | |
| 		}
 | |
| 		ast_verb(3, "DBdel: family=%s, key=%s\n", family, key);
 | |
| 		if (ast_db_del(family, key))
 | |
| 			ast_verb(3, "DBdel: Error deleting key from database.\n");
 | |
| 	} else {
 | |
| 		ast_debug(1, "Ignoring, no parameters\n");
 | |
| 	}
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| static int unload_module(void)
 | |
| {
 | |
| 	int retval;
 | |
| 
 | |
| 	retval = ast_unregister_application(dt_app);
 | |
| 	retval |= ast_unregister_application(d_app);
 | |
| 
 | |
| 	return retval;
 | |
| }
 | |
| 
 | |
| static int load_module(void)
 | |
| {
 | |
| 	int retval;
 | |
| 
 | |
| 	retval = ast_register_application_xml(d_app, del_exec);
 | |
| 	retval |= ast_register_application_xml(dt_app, deltree_exec);
 | |
| 
 | |
| 	return retval;
 | |
| }
 | |
| 
 | |
| AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Database Access Functions");
 |