res_pjsip: Allow configuration of endpoint identifier query order

[asterisk/asterisk.git] / res / res_sorcery_realtime.c

diff --git a/res/res_sorcery_realtime.c b/res/res_sorcery_realtime.c
index bc4c7f9..52b097f 100644 (file)
--- a/res/res_sorcery_realtime.c
+++ b/res/res_sorcery_realtime.c
@@ -79,7 +79,7 @@ static int sorcery_realtime_create(const struct ast_sorcery *sorcery, void *data
        id->next = fields;
        fields = id;
 
-       return ast_store_realtime_fields(family, fields) ? -1 : 0;
+       return (ast_store_realtime_fields(family, fields) <= 0) ? -1 : 0;
 }
 
 /*! \brief Internal helper function which returns a filtered objectset. 
@@ -177,7 +177,7 @@ static void sorcery_realtime_retrieve_multiple(const struct ast_sorcery *sorcery
        const char *family = data;
        RAII_VAR(struct ast_config *, rows, NULL, ast_config_destroy);
        RAII_VAR(struct ast_variable *, all, NULL, ast_variables_destroy);
-       char *row = NULL;
+       struct ast_category *row = NULL;
 
        if (!fields) {
                char field[strlen(UUID_FIELD) + 6], value[2];
@@ -197,9 +197,8 @@ static void sorcery_realtime_retrieve_multiple(const struct ast_sorcery *sorcery
                return;
        }
 
-       while ((row = ast_category_browse(rows, row))) {
-               struct ast_category *cat = ast_category_get(rows, row);
-               struct ast_variable *objectset = ast_category_detach_variables(cat);
+       while ((row = ast_category_browse_filtered(rows, NULL, row, NULL))) {
+               struct ast_variable *objectset = ast_category_detach_variables(row);
                RAII_VAR(struct ast_variable *, id, NULL, ast_variables_destroy);
                RAII_VAR(void *, object, NULL, ao2_cleanup);
 
@@ -283,6 +282,7 @@ static int unload_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Sorcery Realtime Object Wizard",
+       .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
        .load_pri = AST_MODPRI_REALTIME_DRIVER,