[svn-commits] file: branch file/res_sorcery_astdb r383439 - /team/file/res_sorcery_astdb/res/

SVN commits to the Digium repositories svn-commits at lists.digium.com
Wed Mar 20 12:29:08 CDT 2013


Author: file
Date: Wed Mar 20 12:29:05 2013
New Revision: 383439

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383439
Log:
Add the beginnings of res_sorcery_astdb.c

This stores sorcery objects in astdb using a JSON representation of them.
Right now only the primary CRUD operations are implemented, next up is
implementing the fields/multiple/regex retrieve functions.

Added:
    team/file/res_sorcery_astdb/res/res_sorcery_astdb.c   (with props)

Added: team/file/res_sorcery_astdb/res/res_sorcery_astdb.c
URL: http://svnview.digium.com/svn/asterisk/team/file/res_sorcery_astdb/res/res_sorcery_astdb.c?view=auto&rev=383439
==============================================================================
--- team/file/res_sorcery_astdb/res/res_sorcery_astdb.c (added)
+++ team/file/res_sorcery_astdb/res/res_sorcery_astdb.c Wed Mar 20 12:29:05 2013
@@ -1,0 +1,224 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2013, Digium, Inc.
+ *
+ * Joshua Colp <jcolp at digium.com>
+ *
+ * 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 Sorcery Astdb Object Wizard
+ *
+ * \author Joshua Colp <jcolp at digium.com>
+ */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include <regex.h>
+
+#include "asterisk/module.h"
+#include "asterisk/sorcery.h"
+#include "asterisk/astdb.h"
+#include "asterisk/json.h"
+
+/* This define is taken from db.c, but should be made available elsewhere */
+#define MAX_DB_FIELD 256
+
+static void *sorcery_astdb_open(const char *data);
+static int sorcery_astdb_create(const struct ast_sorcery *sorcery, void *data, void *object);
+static void *sorcery_astdb_retrieve_id(const struct ast_sorcery *sorcery, void *data, const char *type, const char *id);
+static void *sorcery_astdb_retrieve_fields(const struct ast_sorcery *sorcery, void *data, const char *type, const struct ast_variable *fields);
+static void sorcery_astdb_retrieve_multiple(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects,
+					     const struct ast_variable *fields);
+static void sorcery_astdb_retrieve_regex(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects, const char *regex);
+static int sorcery_astdb_update(const struct ast_sorcery *sorcery, void *data, void *object);
+static int sorcery_astdb_delete(const struct ast_sorcery *sorcery, void *data, void *object);
+static void sorcery_astdb_close(void *data);
+
+static struct ast_sorcery_wizard astdb_object_wizard = {
+	.name = "astdb",
+	.open = sorcery_astdb_open,
+	.create = sorcery_astdb_create,
+	.retrieve_id = sorcery_astdb_retrieve_id,
+	.retrieve_fields = sorcery_astdb_retrieve_fields,
+	.retrieve_multiple = sorcery_astdb_retrieve_multiple,
+	.retrieve_regex = sorcery_astdb_retrieve_regex,
+	.update = sorcery_astdb_update,
+	.delete = sorcery_astdb_delete,
+	.close = sorcery_astdb_close,
+};
+
+/*! \brief Helper function which converts from a sorcery object set to a json object */
+static struct ast_json *sorcery_objectset_to_json(const struct ast_variable *objectset)
+{
+	struct ast_json *json = ast_json_object_create();
+	const struct ast_variable *field;
+
+	for (field = objectset; field; field = field->next) {
+		struct ast_json *value = ast_json_string_create(field->value);
+
+		if (!value) {
+			ast_json_unref(json);
+			return NULL;
+		} else if (ast_json_object_set(json, field->name, value)) {
+			ast_json_unref(value);
+			ast_json_unref(json);
+			return NULL;
+		}
+	}
+
+	return json;
+}
+
+/*! \brief Helper function which converts a json object to a sorcery object set */
+static struct ast_variable *sorcery_json_to_objectset(struct ast_json *json)
+{
+	struct ast_json_iter *field;
+	struct ast_variable *objset = NULL;
+
+	for (field = ast_json_object_iter(json); field; field = ast_json_object_iter_next(json, field)) {
+		struct ast_json *value = ast_json_object_iter_value(field);
+		struct ast_variable *variable = ast_variable_new(ast_json_object_iter_key(field), ast_json_string_get(value), "");
+
+		if (!variable) {
+			ast_variables_destroy(objset);
+			return NULL;
+		}
+
+		variable->next = objset;
+		objset = variable;
+	}
+
+	return objset;
+}
+
+static int sorcery_astdb_create(const struct ast_sorcery *sorcery, void *data, void *object)
+{
+	RAII_VAR(struct ast_variable *, objset, ast_sorcery_objectset_create(sorcery, object), ast_variables_destroy);
+	RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
+	RAII_VAR(char *, value, NULL, ast_free_ptr);
+	const char *prefix = data;
+	char family[strlen(prefix) + strlen(ast_sorcery_object_get_type(object)) + 2];
+
+	if (!objset || !(json = sorcery_objectset_to_json(objset)) || !(value = ast_json_dump_string(json))) {
+		return -1;
+	}
+
+	snprintf(family, sizeof(family), "%s/%s", prefix, ast_sorcery_object_get_type(object));
+
+	return ast_db_put(family, ast_sorcery_object_get_id(object), value);
+}
+
+static void *sorcery_astdb_retrieve_fields(const struct ast_sorcery *sorcery, void *data, const char *type, const struct ast_variable *fields)
+{
+	return NULL;
+}
+
+static void *sorcery_astdb_retrieve_id(const struct ast_sorcery *sorcery, void *data, const char *type, const char *id)
+{
+	const char *prefix = data;
+	char family[strlen(prefix) + strlen(type) + 2], value[MAX_DB_FIELD];
+	RAII_VAR(struct ast_json *, json, NULL, ast_json_unref);
+	struct ast_json_error error;
+	RAII_VAR(struct ast_variable *, objset, NULL, ast_variables_destroy);
+	void *object = NULL;
+
+	snprintf(family, sizeof(family), "%s/%s", prefix, type);
+
+	if (ast_db_get(family, id, value, sizeof(value)) || !(json = ast_json_load_string(value, &error)) ||
+		!(objset = sorcery_json_to_objectset(json)) || !(object = ast_sorcery_alloc(sorcery, type, id)) ||
+		ast_sorcery_objectset_apply(sorcery, object, objset)) {
+		ao2_cleanup(object);
+		return NULL;
+	}
+
+	return object;
+}
+
+static void sorcery_astdb_retrieve_multiple(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects, const struct ast_variable *fields)
+{
+}
+
+static void sorcery_astdb_retrieve_regex(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects, const char *regex)
+{
+}
+
+static int sorcery_astdb_update(const struct ast_sorcery *sorcery, void *data, void *object)
+{
+	const char *prefix = data;
+	char family[strlen(prefix) + strlen(ast_sorcery_object_get_type(object)) + 2];
+	char value[MAX_DB_FIELD];
+
+	snprintf(family, sizeof(family), "%s/%s", prefix, ast_sorcery_object_get_type(object));
+
+	if (ast_db_get(family, ast_sorcery_object_get_id(object), value, sizeof(value))) {
+		return -1;
+	}
+
+	/* The only difference between update and create is that for update the object must already exist */
+	return sorcery_astdb_create(sorcery, data, object);
+}
+
+static int sorcery_astdb_delete(const struct ast_sorcery *sorcery, void *data, void *object)
+{
+	const char *prefix = data;
+	char family[strlen(prefix) + strlen(ast_sorcery_object_get_type(object)) + 2];
+
+	snprintf(family, sizeof(family), "%s/%s", prefix, ast_sorcery_object_get_type(object));
+
+	return ast_db_del(family, ast_sorcery_object_get_id(object));
+}
+
+static void *sorcery_astdb_open(const char *data)
+{
+	/* We require a prefix for family string generation, or else stuff could mix together */
+	if (ast_strlen_zero(data)) {
+		return NULL;
+	}
+
+	return ast_strdup(data);
+}
+
+static void sorcery_astdb_close(void *data)
+{
+	ast_free(data);
+}
+
+static int load_module(void)
+{
+	if (ast_sorcery_wizard_register(&astdb_object_wizard)) {
+		return AST_MODULE_LOAD_DECLINE;
+	}
+
+	return AST_MODULE_LOAD_SUCCESS;
+}
+
+static int unload_module(void)
+{
+	ast_sorcery_wizard_unregister(&astdb_object_wizard);
+	return 0;
+}
+
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Sorcery Astdb Object Wizard",
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_REALTIME_DRIVER,
+);

Propchange: team/file/res_sorcery_astdb/res/res_sorcery_astdb.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/file/res_sorcery_astdb/res/res_sorcery_astdb.c
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/file/res_sorcery_astdb/res/res_sorcery_astdb.c
------------------------------------------------------------------------------
    svn:mime-type = text/plain




More information about the svn-commits mailing list