core: Remove 'Data Retrieval API'

This API was not actively maintained, was not added to new modules
(such as res_pjsip), and there exist better alternatives to acquire the
same information, such as the ARI.

Change-Id: I4b2185a83aeb74798b4ad43ff8f89f971096aa83

3 files changed, 0 insertions, 608 deletions

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 71ca9dc9f..d98c418c3 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -69,7 +69,6 @@
 #include "asterisk/dial.h"
 #include "asterisk/causes.h"
 #include "asterisk/paths.h"
-#include "asterisk/data.h"
 #include "asterisk/test.h"
 #include "asterisk/stasis.h"
 #include "asterisk/stasis_channels.h"
@@ -8005,186 +8004,6 @@ static int load_config(int reload)
 	return sla_load_config(reload);
 }
 
-#define MEETME_DATA_EXPORT(MEMBER)					\
-	MEMBER(ast_conference, confno, AST_DATA_STRING)			\
-	MEMBER(ast_conference, dahdiconf, AST_DATA_INTEGER)		\
-	MEMBER(ast_conference, users, AST_DATA_INTEGER)			\
-	MEMBER(ast_conference, markedusers, AST_DATA_INTEGER)		\
-	MEMBER(ast_conference, maxusers, AST_DATA_INTEGER)		\
-	MEMBER(ast_conference, isdynamic, AST_DATA_BOOLEAN)		\
-	MEMBER(ast_conference, locked, AST_DATA_BOOLEAN)		\
-	MEMBER(ast_conference, recordingfilename, AST_DATA_STRING)	\
-	MEMBER(ast_conference, recordingformat, AST_DATA_STRING)	\
-	MEMBER(ast_conference, pin, AST_DATA_PASSWORD)			\
-	MEMBER(ast_conference, pinadmin, AST_DATA_PASSWORD)		\
-	MEMBER(ast_conference, start, AST_DATA_TIMESTAMP)		\
-	MEMBER(ast_conference, endtime, AST_DATA_TIMESTAMP)
-
-AST_DATA_STRUCTURE(ast_conference, MEETME_DATA_EXPORT);
-
-#define MEETME_USER_DATA_EXPORT(MEMBER)					\
-	MEMBER(ast_conf_user, user_no, AST_DATA_INTEGER)		\
-	MEMBER(ast_conf_user, talking, AST_DATA_BOOLEAN)		\
-	MEMBER(ast_conf_user, dahdichannel, AST_DATA_BOOLEAN)		\
-	MEMBER(ast_conf_user, jointime, AST_DATA_TIMESTAMP)		\
-	MEMBER(ast_conf_user, kicktime, AST_DATA_TIMESTAMP)		\
-	MEMBER(ast_conf_user, timelimit, AST_DATA_MILLISECONDS)		\
-	MEMBER(ast_conf_user, play_warning, AST_DATA_MILLISECONDS)	\
-	MEMBER(ast_conf_user, warning_freq, AST_DATA_MILLISECONDS)
-
-AST_DATA_STRUCTURE(ast_conf_user, MEETME_USER_DATA_EXPORT);
-
-static int user_add_provider_cb(void *obj, void *arg, int flags)
-{
-	struct ast_data *data_meetme_user;
-	struct ast_data *data_meetme_user_channel;
-	struct ast_data *data_meetme_user_volume;
-
-	struct ast_conf_user *user = obj;
-	struct ast_data *data_meetme_users = arg;
-
-	data_meetme_user = ast_data_add_node(data_meetme_users, "user");
-	if (!data_meetme_user) {
-		return 0;
-	}
-	/* user structure */
-	ast_data_add_structure(ast_conf_user, data_meetme_user, user);
-
-	/* user's channel */
-	data_meetme_user_channel = ast_data_add_node(data_meetme_user, "channel");
-	if (!data_meetme_user_channel) {
-		return 0;
-	}
-
-	ast_channel_data_add_structure(data_meetme_user_channel, user->chan, 1);
-
-	/* volume structure */
-	data_meetme_user_volume = ast_data_add_node(data_meetme_user, "listen-volume");
-	if (!data_meetme_user_volume) {
-		return 0;
-	}
-	ast_data_add_int(data_meetme_user_volume, "desired", user->listen.desired);
-	ast_data_add_int(data_meetme_user_volume, "actual", user->listen.actual);
-
-	data_meetme_user_volume = ast_data_add_node(data_meetme_user, "talk-volume");
-	if (!data_meetme_user_volume) {
-		return 0;
-	}
-	ast_data_add_int(data_meetme_user_volume, "desired", user->talk.desired);
-	ast_data_add_int(data_meetme_user_volume, "actual", user->talk.actual);
-
-	return 0;
-}
-
-/*!
- * \internal
- * \brief Implements the meetme data provider.
- */
-static int meetme_data_provider_get(const struct ast_data_search *search,
-	struct ast_data *data_root)
-{
-	struct ast_conference *cnf;
-	struct ast_data *data_meetme, *data_meetme_users;
-
-	AST_LIST_LOCK(&confs);
-	AST_LIST_TRAVERSE(&confs, cnf, list) {
-		data_meetme = ast_data_add_node(data_root, "meetme");
-		if (!data_meetme) {
-			continue;
-		}
-
-		ast_data_add_structure(ast_conference, data_meetme, cnf);
-
-		if (ao2_container_count(cnf->usercontainer)) {
-			data_meetme_users = ast_data_add_node(data_meetme, "users");
-			if (!data_meetme_users) {
-				ast_data_remove_node(data_root, data_meetme);
-				continue;
-			}
-
-			ao2_callback(cnf->usercontainer, OBJ_NODATA, user_add_provider_cb, data_meetme_users); 
-		}
-
-		if (!ast_data_search_match(search, data_meetme)) {
-			ast_data_remove_node(data_root, data_meetme);
-		}
-	}
-	AST_LIST_UNLOCK(&confs);
-
-	return 0;
-}
-
-static const struct ast_data_handler meetme_data_provider = {
-	.version = AST_DATA_HANDLER_VERSION,
-	.get = meetme_data_provider_get
-};
-
-static const struct ast_data_entry meetme_data_providers[] = {
-	AST_DATA_ENTRY("asterisk/application/meetme/list", &meetme_data_provider),
-};
-
-#ifdef TEST_FRAMEWORK
-AST_TEST_DEFINE(test_meetme_data_provider)
-{
-	struct ast_channel *chan;
-	struct ast_conference *cnf;
-	struct ast_data *node;
-	struct ast_data_query query = {
-		.path = "/asterisk/application/meetme/list",
-		.search = "list/meetme/confno=9898"
-	};
-
-	switch (cmd) {
-	case TEST_INIT:
-		info->name = "meetme_get_data_test";
-		info->category = "/main/data/app_meetme/list/";
-		info->summary = "Meetme data provider unit test";
-		info->description =
-			"Tests whether the Meetme data provider implementation works as expected.";
-		return AST_TEST_NOT_RUN;
-	case TEST_EXECUTE:
-		break;
-	}
-
-	chan = ast_channel_alloc(0, AST_STATE_DOWN, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, "MeetMeTest");
-	if (!chan) {
-		ast_test_status_update(test, "Channel allocation failed\n");
-		return AST_TEST_FAIL;
-	}
-
-	ast_channel_unlock(chan);
-
-	cnf = build_conf("9898", "", "1234", 1, 1, 1, chan, test);
-	if (!cnf) {
-		ast_test_status_update(test, "Build of test conference 9898 failed\n");
-		ast_hangup(chan);
-		return AST_TEST_FAIL;
-	}
-
-	node = ast_data_get(&query);
-	if (!node) {
-		ast_test_status_update(test, "Data query for test conference 9898 failed\n");
-		dispose_conf(cnf);
-		ast_hangup(chan);
-		return AST_TEST_FAIL;
-	}
-
-	if (strcmp(ast_data_retrieve_string(node, "meetme/confno"), "9898")) {
-		ast_test_status_update(test, "Query returned the wrong conference\n");
-		dispose_conf(cnf);
-		ast_hangup(chan);
-		ast_data_free(node);
-		return AST_TEST_FAIL;
-	}
-
-	ast_data_free(node);
-	dispose_conf(cnf);
-	ast_hangup(chan);
-
-	return AST_TEST_PASS;
-}
-#endif
-
 static int unload_module(void)
 {
 	int res = 0;
@@ -8201,11 +8020,6 @@ static int unload_module(void)
 	res |= ast_unregister_application(slastation_app);
 	res |= ast_unregister_application(slatrunk_app);
 
-#ifdef TEST_FRAMEWORK
-	AST_TEST_UNREGISTER(test_meetme_data_provider);
-#endif
-	ast_data_unregister(NULL);
-
 	ast_devstate_prov_del("Meetme");
 	ast_devstate_prov_del("SLA");
 	
@@ -8249,11 +8063,6 @@ static int load_module(void)
 	res |= ast_register_application_xml(slastation_app, sla_station_exec);
 	res |= ast_register_application_xml(slatrunk_app, sla_trunk_exec);
 
-#ifdef TEST_FRAMEWORK
-	AST_TEST_REGISTER(test_meetme_data_provider);
-#endif
-	ast_data_register_multiple(meetme_data_providers, ARRAY_LEN(meetme_data_providers));
-
 	res |= ast_devstate_prov_add("Meetme", meetmestate);
 	res |= ast_devstate_prov_add("SLA", sla_state);
 
diff --git a/apps/app_queue.c b/apps/app_queue.c
index b306af1ae..3f8e136f2 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -99,7 +99,6 @@
 #include "asterisk/taskprocessor.h"
 #include "asterisk/aoc.h"
 #include "asterisk/callerid.h"
-#include "asterisk/data.h"
 #include "asterisk/term.h"
 #include "asterisk/dial.h"
 #include "asterisk/stasis_channels.h"
@@ -10896,275 +10895,6 @@ static struct ast_cli_entry cli_queue[] = {
 	AST_CLI_DEFINE(handle_queue_reset, "Reset statistics for a queue"),
 };
 
-/* struct call_queue astdata mapping. */
-#define DATA_EXPORT_CALL_QUEUE(MEMBER)					\
-	MEMBER(call_queue, name, AST_DATA_STRING)			\
-	MEMBER(call_queue, moh, AST_DATA_STRING)			\
-	MEMBER(call_queue, announce, AST_DATA_STRING)			\
-	MEMBER(call_queue, context, AST_DATA_STRING)			\
-	MEMBER(call_queue, membermacro, AST_DATA_STRING)		\
-	MEMBER(call_queue, membergosub, AST_DATA_STRING)		\
-	MEMBER(call_queue, defaultrule, AST_DATA_STRING)		\
-	MEMBER(call_queue, sound_next, AST_DATA_STRING)			\
-	MEMBER(call_queue, sound_thereare, AST_DATA_STRING)		\
-	MEMBER(call_queue, sound_calls, AST_DATA_STRING)		\
-	MEMBER(call_queue, queue_quantity1, AST_DATA_STRING)		\
-	MEMBER(call_queue, queue_quantity2, AST_DATA_STRING)		\
-	MEMBER(call_queue, sound_holdtime, AST_DATA_STRING)		\
-	MEMBER(call_queue, sound_minutes, AST_DATA_STRING)		\
-	MEMBER(call_queue, sound_minute, AST_DATA_STRING)		\
-	MEMBER(call_queue, sound_seconds, AST_DATA_STRING)		\
-	MEMBER(call_queue, sound_thanks, AST_DATA_STRING)		\
-	MEMBER(call_queue, sound_callerannounce, AST_DATA_STRING)	\
-	MEMBER(call_queue, sound_reporthold, AST_DATA_STRING)		\
-	MEMBER(call_queue, dead, AST_DATA_BOOLEAN)			\
-	MEMBER(call_queue, ringinuse, AST_DATA_BOOLEAN)			\
-	MEMBER(call_queue, announce_to_first_user, AST_DATA_BOOLEAN)	\
-	MEMBER(call_queue, setinterfacevar, AST_DATA_BOOLEAN)		\
-	MEMBER(call_queue, setqueuevar, AST_DATA_BOOLEAN)		\
-	MEMBER(call_queue, setqueueentryvar, AST_DATA_BOOLEAN)		\
-	MEMBER(call_queue, reportholdtime, AST_DATA_BOOLEAN)		\
-	MEMBER(call_queue, wrapped, AST_DATA_BOOLEAN)			\
-	MEMBER(call_queue, timeoutrestart, AST_DATA_BOOLEAN)		\
-	MEMBER(call_queue, announceholdtime, AST_DATA_INTEGER)		\
-	MEMBER(call_queue, realtime, AST_DATA_BOOLEAN)			\
-	MEMBER(call_queue, found, AST_DATA_BOOLEAN)			\
-	MEMBER(call_queue, announcepositionlimit, AST_DATA_INTEGER)	\
-	MEMBER(call_queue, announcefrequency, AST_DATA_SECONDS)		\
-	MEMBER(call_queue, minannouncefrequency, AST_DATA_SECONDS)	\
-	MEMBER(call_queue, periodicannouncefrequency, AST_DATA_SECONDS)	\
-	MEMBER(call_queue, numperiodicannounce, AST_DATA_INTEGER)	\
-	MEMBER(call_queue, randomperiodicannounce, AST_DATA_INTEGER)	\
-	MEMBER(call_queue, roundingseconds, AST_DATA_SECONDS)		\
-	MEMBER(call_queue, holdtime, AST_DATA_SECONDS)			\
-	MEMBER(call_queue, talktime, AST_DATA_SECONDS)			\
-	MEMBER(call_queue, callscompleted, AST_DATA_INTEGER)		\
-	MEMBER(call_queue, callsabandoned, AST_DATA_INTEGER)		\
-	MEMBER(call_queue, servicelevel, AST_DATA_INTEGER)		\
-	MEMBER(call_queue, callscompletedinsl, AST_DATA_INTEGER)	\
-	MEMBER(call_queue, monfmt, AST_DATA_STRING)			\
-	MEMBER(call_queue, montype, AST_DATA_INTEGER)			\
-	MEMBER(call_queue, count, AST_DATA_INTEGER)			\
-	MEMBER(call_queue, maxlen, AST_DATA_INTEGER)			\
-	MEMBER(call_queue, wrapuptime, AST_DATA_SECONDS)		\
-	MEMBER(call_queue, retry, AST_DATA_SECONDS)			\
-	MEMBER(call_queue, timeout, AST_DATA_SECONDS)			\
-	MEMBER(call_queue, weight, AST_DATA_INTEGER)			\
-	MEMBER(call_queue, autopause, AST_DATA_INTEGER)			\
-	MEMBER(call_queue, timeoutpriority, AST_DATA_INTEGER)		\
-	MEMBER(call_queue, rrpos, AST_DATA_INTEGER)			\
-	MEMBER(call_queue, memberdelay, AST_DATA_INTEGER)		\
-	MEMBER(call_queue, autofill, AST_DATA_INTEGER)			\
-	MEMBER(call_queue, members, AST_DATA_CONTAINER)
-
-AST_DATA_STRUCTURE(call_queue, DATA_EXPORT_CALL_QUEUE);
-
-/* struct member astdata mapping. */
-#define DATA_EXPORT_MEMBER(MEMBER)					\
-	MEMBER(member, interface, AST_DATA_STRING)			\
-	MEMBER(member, state_interface, AST_DATA_STRING)		\
-	MEMBER(member, membername, AST_DATA_STRING)			\
-	MEMBER(member, penalty, AST_DATA_INTEGER)			\
-	MEMBER(member, calls, AST_DATA_INTEGER)				\
-	MEMBER(member, dynamic, AST_DATA_INTEGER)			\
-	MEMBER(member, realtime, AST_DATA_INTEGER)			\
-	MEMBER(member, status, AST_DATA_INTEGER)			\
-	MEMBER(member, paused, AST_DATA_BOOLEAN)			\
-	MEMBER(member, rt_uniqueid, AST_DATA_STRING)
-
-AST_DATA_STRUCTURE(member, DATA_EXPORT_MEMBER);
-
-#define DATA_EXPORT_QUEUE_ENT(MEMBER)						\
-	MEMBER(queue_ent, moh, AST_DATA_STRING)					\
-	MEMBER(queue_ent, announce, AST_DATA_STRING)				\
-	MEMBER(queue_ent, context, AST_DATA_STRING)				\
-	MEMBER(queue_ent, digits, AST_DATA_STRING)				\
-	MEMBER(queue_ent, valid_digits, AST_DATA_INTEGER)			\
-	MEMBER(queue_ent, pos, AST_DATA_INTEGER)				\
-	MEMBER(queue_ent, prio, AST_DATA_INTEGER)				\
-	MEMBER(queue_ent, last_pos_said, AST_DATA_INTEGER)			\
-	MEMBER(queue_ent, last_periodic_announce_time, AST_DATA_INTEGER)	\
-	MEMBER(queue_ent, last_periodic_announce_sound, AST_DATA_INTEGER)	\
-	MEMBER(queue_ent, last_pos, AST_DATA_INTEGER)				\
-	MEMBER(queue_ent, opos, AST_DATA_INTEGER)				\
-	MEMBER(queue_ent, handled, AST_DATA_INTEGER)				\
-	MEMBER(queue_ent, pending, AST_DATA_INTEGER)				\
-	MEMBER(queue_ent, max_penalty, AST_DATA_INTEGER)			\
-	MEMBER(queue_ent, min_penalty, AST_DATA_INTEGER)			\
-	MEMBER(queue_ent, raise_penalty, AST_DATA_INTEGER)			\
-	MEMBER(queue_ent, linpos, AST_DATA_INTEGER)				\
-	MEMBER(queue_ent, linwrapped, AST_DATA_INTEGER)				\
-	MEMBER(queue_ent, start, AST_DATA_INTEGER)				\
-	MEMBER(queue_ent, expire, AST_DATA_INTEGER)				\
-	MEMBER(queue_ent, cancel_answered_elsewhere, AST_DATA_INTEGER)
-
-AST_DATA_STRUCTURE(queue_ent, DATA_EXPORT_QUEUE_ENT);
-
-/*!
- * \internal
- * \brief Add a queue to the data_root node.
- * \param[in] search The search tree.
- * \param[in] data_root The main result node.
- * \param[in] queue The queue to add.
- */
-static void queues_data_provider_get_helper(const struct ast_data_search *search,
-	struct ast_data *data_root, struct call_queue *queue)
-{
-	struct ao2_iterator im;
-	struct member *member;
-	struct queue_ent *qe;
-	struct ast_data *data_queue, *data_members = NULL, *enum_node;
-	struct ast_data *data_member, *data_callers = NULL, *data_caller, *data_caller_channel;
-
-	data_queue = ast_data_add_node(data_root, "queue");
-	if (!data_queue) {
-		return;
-	}
-
-	ast_data_add_structure(call_queue, data_queue, queue);
-
-	ast_data_add_str(data_queue, "strategy", int2strat(queue->strategy));
-	ast_data_add_int(data_queue, "membercount", ao2_container_count(queue->members));
-
-	/* announce position */
-	enum_node = ast_data_add_node(data_queue, "announceposition");
-	if (!enum_node) {
-		return;
-	}
-	switch (queue->announceposition) {
-	case ANNOUNCEPOSITION_LIMIT:
-		ast_data_add_str(enum_node, "text", "limit");
-		break;
-	case ANNOUNCEPOSITION_MORE_THAN:
-		ast_data_add_str(enum_node, "text", "more");
-		break;
-	case ANNOUNCEPOSITION_YES:
-		ast_data_add_str(enum_node, "text", "yes");
-		break;
-	case ANNOUNCEPOSITION_NO:
-		ast_data_add_str(enum_node, "text", "no");
-		break;
-	default:
-		ast_data_add_str(enum_node, "text", "unknown");
-		break;
-	}
-	ast_data_add_int(enum_node, "value", queue->announceposition);
-
-	/* add queue members */
-	im = ao2_iterator_init(queue->members, 0);
-	while ((member = ao2_iterator_next(&im))) {
-		if (!data_members) {
-			data_members = ast_data_add_node(data_queue, "members");
-			if (!data_members) {
-				ao2_ref(member, -1);
-				continue;
-			}
-		}
-
-		data_member = ast_data_add_node(data_members, "member");
-		if (!data_member) {
-			ao2_ref(member, -1);
-			continue;
-		}
-
-		ast_data_add_structure(member, data_member, member);
-
-		ao2_ref(member, -1);
-	}
-	ao2_iterator_destroy(&im);
-
-	/* include the callers inside the result. */
-	if (queue->head) {
-		for (qe = queue->head; qe; qe = qe->next) {
-			if (!data_callers) {
-				data_callers = ast_data_add_node(data_queue, "callers");
-				if (!data_callers) {
-					continue;
-				}
-			}
-
-			data_caller = ast_data_add_node(data_callers, "caller");
-			if (!data_caller) {
-				continue;
-			}
-
-			ast_data_add_structure(queue_ent, data_caller, qe);
-
-			/* add the caller channel. */
-			data_caller_channel = ast_data_add_node(data_caller, "channel");
-			if (!data_caller_channel) {
-				continue;
-			}
-
-			ast_channel_data_add_structure(data_caller_channel, qe->chan, 1);
-		}
-	}
-
-	/* if this queue doesn't match remove the added queue. */
-	if (!ast_data_search_match(search, data_queue)) {
-		ast_data_remove_node(data_root, data_queue);
-	}
-}
-
-/*!
- * \internal
- * \brief Callback used to generate the queues tree.
- * \param[in] search The search pattern tree.
- * \retval NULL on error.
- * \retval non-NULL The generated tree.
- */
-static int queues_data_provider_get(const struct ast_data_search *search,
-	struct ast_data *data_root)
-{
-	struct ao2_iterator i;
-	struct call_queue *queue, *queue_realtime = NULL;
-	struct ast_config *cfg;
-
-	/* load realtime queues. */
-	cfg = ast_load_realtime_multientry("queues", "name LIKE", "%", SENTINEL);
-	if (cfg) {
-		char *category = NULL;
-		while ((category = ast_category_browse(cfg, category))) {
-			const char *queuename = ast_variable_retrieve(cfg, category, "name");
-			if ((queue = find_load_queue_rt_friendly(queuename))) {
-				queue_unref(queue);
-			}
-		}
-		ast_config_destroy(cfg);
-	}
-
-	/* static queues. */
-	i = ao2_iterator_init(queues, 0);
-	while ((queue = ao2_iterator_next(&i))) {
-		ao2_lock(queue);
-		if (queue->realtime) {
-			queue_realtime = find_load_queue_rt_friendly(queue->name);
-			if (!queue_realtime) {
-				ao2_unlock(queue);
-				queue_unref(queue);
-				continue;
-			}
-			queue_unref(queue_realtime);
-		}
-
-		queues_data_provider_get_helper(search, data_root, queue);
-		ao2_unlock(queue);
-		queue_unref(queue);
-	}
-	ao2_iterator_destroy(&i);
-
-	return 0;
-}
-
-static const struct ast_data_handler queues_data_provider = {
-	.version = AST_DATA_HANDLER_VERSION,
-	.get = queues_data_provider_get
-};
-
-static const struct ast_data_entry queue_data_providers[] = {
-	AST_DATA_ENTRY("asterisk/application/queue/list", &queues_data_provider),
-};
-
 static struct stasis_message_router *agent_router;
 static struct stasis_forward *topic_forwarder;
 
@@ -11222,8 +10952,6 @@ static int unload_module(void)
 	ast_custom_function_unregister(&queuewaitingcount_function);
 	ast_custom_function_unregister(&queuememberpenalty_function);
 
-	ast_data_unregister(NULL);
-
 	device_state_sub = stasis_unsubscribe_and_join(device_state_sub);
 
 	ast_extension_state_del(0, extension_state_cb);
@@ -11302,8 +11030,6 @@ static int load_module(void)
 		reload_queue_members();
 	}
 
-	ast_data_register_multiple(queue_data_providers, ARRAY_LEN(queue_data_providers));
-
 	err |= ast_cli_register_multiple(cli_queue, ARRAY_LEN(cli_queue));
 	err |= ast_register_application_xml(app, queue_exec);
 	err |= ast_register_application_xml(app_aqm, aqm_exec);
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 783cab69e..e5fa91605 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -12914,147 +12914,6 @@ static struct ast_cli_entry cli_voicemail[] = {
 	AST_CLI_DEFINE(handle_voicemail_reload, "Reload voicemail configuration"),
 };
 
-#ifdef IMAP_STORAGE
-	#define DATA_EXPORT_VM_USERS(USER)					\
-		USER(ast_vm_user, context, AST_DATA_STRING)			\
-		USER(ast_vm_user, mailbox, AST_DATA_STRING)			\
-		USER(ast_vm_user, password, AST_DATA_PASSWORD)			\
-		USER(ast_vm_user, fullname, AST_DATA_STRING)			\
-		USER(ast_vm_user, email, AST_DATA_STRING)			\
-		USER(ast_vm_user, emailsubject, AST_DATA_STRING)		\
-		USER(ast_vm_user, emailbody, AST_DATA_STRING)			\
-		USER(ast_vm_user, pager, AST_DATA_STRING)			\
-		USER(ast_vm_user, serveremail, AST_DATA_STRING)			\
-		USER(ast_vm_user, fromstring, AST_DATA_STRING)			\
-		USER(ast_vm_user, language, AST_DATA_STRING)			\
-		USER(ast_vm_user, zonetag, AST_DATA_STRING)			\
-		USER(ast_vm_user, callback, AST_DATA_STRING)			\
-		USER(ast_vm_user, dialout, AST_DATA_STRING)			\
-		USER(ast_vm_user, uniqueid, AST_DATA_STRING)			\
-		USER(ast_vm_user, exit, AST_DATA_STRING)			\
-		USER(ast_vm_user, attachfmt, AST_DATA_STRING)			\
-		USER(ast_vm_user, flags, AST_DATA_UNSIGNED_INTEGER)		\
-		USER(ast_vm_user, saydurationm, AST_DATA_INTEGER)		\
-		USER(ast_vm_user, maxmsg, AST_DATA_INTEGER)			\
-		USER(ast_vm_user, maxdeletedmsg, AST_DATA_INTEGER)		\
-		USER(ast_vm_user, maxsecs, AST_DATA_INTEGER)			\
-		USER(ast_vm_user, imapuser, AST_DATA_STRING)			\
-		USER(ast_vm_user, imappassword, AST_DATA_STRING)		\
-		USER(ast_vm_user, imapvmshareid, AST_DATA_STRING)		\
-		USER(ast_vm_user, volgain, AST_DATA_DOUBLE)
-#else
-	#define DATA_EXPORT_VM_USERS(USER)					\
-		USER(ast_vm_user, context, AST_DATA_STRING)			\
-		USER(ast_vm_user, mailbox, AST_DATA_STRING)			\
-		USER(ast_vm_user, password, AST_DATA_PASSWORD)			\
-		USER(ast_vm_user, fullname, AST_DATA_STRING)			\
-		USER(ast_vm_user, email, AST_DATA_STRING)			\
-		USER(ast_vm_user, emailsubject, AST_DATA_STRING)		\
-		USER(ast_vm_user, emailbody, AST_DATA_STRING)			\
-		USER(ast_vm_user, pager, AST_DATA_STRING)			\
-		USER(ast_vm_user, serveremail, AST_DATA_STRING)			\
-		USER(ast_vm_user, fromstring, AST_DATA_STRING)			\
-		USER(ast_vm_user, language, AST_DATA_STRING)			\
-		USER(ast_vm_user, zonetag, AST_DATA_STRING)			\
-		USER(ast_vm_user, callback, AST_DATA_STRING)			\
-		USER(ast_vm_user, dialout, AST_DATA_STRING)			\
-		USER(ast_vm_user, uniqueid, AST_DATA_STRING)			\
-		USER(ast_vm_user, exit, AST_DATA_STRING)			\
-		USER(ast_vm_user, attachfmt, AST_DATA_STRING)			\
-		USER(ast_vm_user, flags, AST_DATA_UNSIGNED_INTEGER)		\
-		USER(ast_vm_user, saydurationm, AST_DATA_INTEGER)		\
-		USER(ast_vm_user, maxmsg, AST_DATA_INTEGER)			\
-		USER(ast_vm_user, maxdeletedmsg, AST_DATA_INTEGER)		\
-		USER(ast_vm_user, maxsecs, AST_DATA_INTEGER)			\
-		USER(ast_vm_user, volgain, AST_DATA_DOUBLE)
-#endif
-
-AST_DATA_STRUCTURE(ast_vm_user, DATA_EXPORT_VM_USERS);
-
-#define DATA_EXPORT_VM_ZONES(ZONE)			\
-	ZONE(vm_zone, name, AST_DATA_STRING)		\
-	ZONE(vm_zone, timezone, AST_DATA_STRING)	\
-	ZONE(vm_zone, msg_format, AST_DATA_STRING)
-
-AST_DATA_STRUCTURE(vm_zone, DATA_EXPORT_VM_ZONES);
-
-/*!
- * \internal
- * \brief Add voicemail user to the data_root.
- * \param[in] search The search tree.
- * \param[in] data_root The main result node.
- * \param[in] user The voicemail user.
- */
-static int vm_users_data_provider_get_helper(const struct ast_data_search *search,
-    struct ast_data *data_root, struct ast_vm_user *user)
-{
-	struct ast_data *data_user, *data_zone;
-	struct ast_data *data_state;
-	struct vm_zone *zone = NULL;
-	int urgentmsg = 0, newmsg = 0, oldmsg = 0;
-	char ext_context[256] = "";
-
-	data_user = ast_data_add_node(data_root, "user");
-	if (!data_user) {
-		return -1;
-	}
-
-	ast_data_add_structure(ast_vm_user, data_user, user);
-
-	AST_LIST_LOCK(&zones);
-	AST_LIST_TRAVERSE(&zones, zone, list) {
-		if (!strcmp(zone->name, user->zonetag)) {
-			break;
-		}
-	}
-	AST_LIST_UNLOCK(&zones);
-
-	/* state */
-	data_state = ast_data_add_node(data_user, "state");
-	if (!data_state) {
-		return -1;
-	}
-	snprintf(ext_context, sizeof(ext_context), "%s@%s", user->mailbox, user->context);
-	inboxcount2(ext_context, &urgentmsg, &newmsg, &oldmsg);
-	ast_data_add_int(data_state, "urgentmsg", urgentmsg);
-	ast_data_add_int(data_state, "newmsg", newmsg);
-	ast_data_add_int(data_state, "oldmsg", oldmsg);
-
-	if (zone) {
-		data_zone = ast_data_add_node(data_user, "zone");
-		ast_data_add_structure(vm_zone, data_zone, zone);
-	}
-
-	if (!ast_data_search_match(search, data_user)) {
-		ast_data_remove_node(data_root, data_user);
-	}
-
-	return 0;
-}
-
-static int vm_users_data_provider_get(const struct ast_data_search *search,
-	struct ast_data *data_root)
-{
-	struct ast_vm_user *user;
-
-	AST_LIST_LOCK(&users);
-	AST_LIST_TRAVERSE(&users, user, list) {
-		vm_users_data_provider_get_helper(search, data_root, user);
-	}
-	AST_LIST_UNLOCK(&users);
-
-	return 0;
-}
-
-static const struct ast_data_handler vm_users_data_provider = {
-	.version = AST_DATA_HANDLER_VERSION,
-	.get = vm_users_data_provider_get
-};
-
-static const struct ast_data_entry vm_data_providers[] = {
-	AST_DATA_ENTRY("asterisk/application/voicemail/list", &vm_users_data_provider)
-};
-
 static void poll_subscribed_mailbox(struct mwi_sub *mwi_sub)
 {
 	int new = 0, old = 0, urgent = 0;
@@ -14997,7 +14856,6 @@ static int unload_module(void)
 	res |= ast_custom_function_unregister(&vm_info_acf);
 	res |= ast_manager_unregister("VoicemailUsersList");
 	res |= ast_manager_unregister("VoicemailRefresh");
-	res |= ast_data_unregister(NULL);
 #ifdef TEST_FRAMEWORK
 	res |= AST_TEST_UNREGISTER(test_voicemail_vmsayname);
 	res |= AST_TEST_UNREGISTER(test_voicemail_msgcount);
@@ -15107,7 +14965,6 @@ static int load_module(void)
 	}
 
 	ast_cli_register_multiple(cli_voicemail, ARRAY_LEN(cli_voicemail));
-	ast_data_register_multiple(vm_data_providers, ARRAY_LEN(vm_data_providers));
 
 #ifdef TEST_FRAMEWORK
 	ast_install_vm_test_functions(vm_test_create_user, vm_test_destroy_user);