From 96d8022ac9d07f38ff0579dab121dc306cb5973f Mon Sep 17 00:00:00 2001 From: "imen.bhiri" Date: Thu, 12 May 2016 16:06:04 +0100 Subject: [PATCH] add alias for xmpp and softwaremodules object --- dm/dmcwmp.c | 2 ++ dm/dmtree/common/softwaremodules.c | 4 ++-- dm/dmtree/common/xmpp.c | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dm/dmcwmp.c b/dm/dmcwmp.c index d67018d..2d8dee7 100644 --- a/dm/dmcwmp.c +++ b/dm/dmcwmp.c @@ -45,6 +45,7 @@ #include "softwaremodules.h" #include "routing.h" #include "nat.h" +#include "xmpp.h" static char *get_parameter_notification (struct dmctx *ctx, char *param); static int remove_parameter_notification(char *param); @@ -124,6 +125,7 @@ struct prefix_method prefix_methods[] = { { DMROOT"IPPingDiagnostics.", 1, NULL, 0, &entry_method_root_IPPingDiagnostics }, { DMROOT"X_INTENO_SE_SyslogCfg.", 1, NULL, 0, &entry_method_root_syslog }, { DMROOT"SoftwareModules.", 1, NULL, 0, &entry_method_root_software_modules }, + { DMROOT"XMPP.", 1, NULL, 0, &entry_method_root_xmpp }, #ifdef DATAMODEL_TR181 { DMROOT"Wifi.", 1, NULL, 0, &entry_method_root_Wifi }, { DMROOT"Ethernet.", 1, NULL, 0, &entry_method_root_Ethernet }, diff --git a/dm/dmtree/common/softwaremodules.c b/dm/dmtree/common/softwaremodules.c index aabb753..db94fd5 100644 --- a/dm/dmtree/common/softwaremodules.c +++ b/dm/dmtree/common/softwaremodules.c @@ -222,13 +222,13 @@ char *get_softwaremodules_version(char *uuid) inline int entry_softwaremodules_deploymentunit(struct dmctx *ctx) { - char *idu = NULL; + char *idu = NULL, *idu_last = NULL; char *permission = "1"; struct uci_section *s = NULL; uci_foreach_sections("dmmap", "deploymentunit", s) { init_args_du_entry(ctx, s); - idu = update_instance(s, idu, "duinstance"); + idu = handle_update_instance(1, ctx, &idu_last, update_instance_alias, 3, s, "duinstance", "duinstance_alias"); SUBENTRY(entry_softwaremodules_deploymentunit_instance, ctx, idu); } return 0; diff --git a/dm/dmtree/common/xmpp.c b/dm/dmtree/common/xmpp.c index 19d6dcc..b7cc97c 100644 --- a/dm/dmtree/common/xmpp.c +++ b/dm/dmtree/common/xmpp.c @@ -203,8 +203,7 @@ inline int entry_xmpp_connection(struct dmctx *ctx) uci_foreach_sections("cwmp", "xmpp_connection", s) { init_args_connection_entry(ctx, s); - iconnection = update_instance(s, iconnection, "connection_instance"); - //iconnection = handle_update_instance(1, ctx, &iconnection_last, update_instance_alias, 3, s, "connection_instance", "connection_instance_alias"); + iconnection = handle_update_instance(1, ctx, &iconnection_last, update_instance_alias, 3, s, "connection_instance", "connection_instance_alias"); SUBENTRY(entry_xmpp_connection_instance, ctx, iconnection); } }