From 10a11f0cb8597467b49fac4524fa10dabac0b061 Mon Sep 17 00:00:00 2001 From: Amin Ben Ramdhane Date: Mon, 7 Dec 2020 22:47:29 +0100 Subject: [PATCH] BulkData & XMPP & TWAMP: align with latest bbf changes --- bulkdata/src/datamodel.c | 6 +++--- twamp/src/datamodel.c | 2 +- xmpp/src/datamodel.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bulkdata/src/datamodel.c b/bulkdata/src/datamodel.c index 9ce63d307..45acf5fc2 100644 --- a/bulkdata/src/datamodel.c +++ b/bulkdata/src/datamodel.c @@ -140,7 +140,7 @@ static int addObjBulkDataProfile(char *refparam, struct dmctx *ctx, void *data, dmuci_add_section_bbfdm("dmmap_bulkdata", "profile", &dmmap_bulkdata); dmuci_set_value_by_section(dmmap_bulkdata, "section_name", section_name(profile)); - *instance = update_instance(last_inst, 4, dmmap_bulkdata, "profile_instance", "dmmap_bulkdata", "profile"); + *instance = update_instance(last_inst, 2, dmmap_bulkdata, "profile_instance"); return 0; } @@ -237,7 +237,7 @@ static int addObjBulkDataProfileParameter(char *refparam, struct dmctx *ctx, voi dmuci_set_value_by_section(dmmap_bulkdata, "section_name", section_name(profile_parameter)); dmuci_set_value_by_section(dmmap_bulkdata, "profile_id", prev_profile_id); - *instance = update_instance(last_inst, 6, dmmap_bulkdata, "parameter_instance", "dmmap_bulkdata", "profile_parameter", check_browse_section, (void *)&browse_args); + *instance = update_instance(last_inst, 5, dmmap_bulkdata, "parameter_instance", NULL, check_browse_section, (void *)&browse_args); return 0; } @@ -291,7 +291,7 @@ static int addObjBulkDataProfileHTTPRequestURIParameter(char *refparam, struct d dmuci_set_value_by_section(dmmap_bulkdata, "section_name", section_name(profile_http_request_uri_parameter)); dmuci_set_value_by_section(dmmap_bulkdata, "profile_id", prev_profile_id); - *instance = update_instance(last_inst, 6, dmmap_bulkdata, "requesturiparameter_instance", "dmmap_bulkdata", "profile_http_request_uri_parameter", check_browse_section, (void *)&browse_args); + *instance = update_instance(last_inst, 5, dmmap_bulkdata, "requesturiparameter_instance", NULL, check_browse_section, (void *)&browse_args); return 0; } diff --git a/twamp/src/datamodel.c b/twamp/src/datamodel.c index d800a4909..8120482fc 100644 --- a/twamp/src/datamodel.c +++ b/twamp/src/datamodel.c @@ -29,7 +29,7 @@ static char *get_last_instance_with_option(char *package, char *section, char *o char *inst = NULL; uci_foreach_option_eq(package, section, option, val, s) { - inst = update_instance(inst, 4, s, opt_inst, package, section); + inst = update_instance(inst, 2, s, opt_inst); } return inst; } diff --git a/xmpp/src/datamodel.c b/xmpp/src/datamodel.c index b2424b26f..9d027e697 100644 --- a/xmpp/src/datamodel.c +++ b/xmpp/src/datamodel.c @@ -49,7 +49,7 @@ static int add_xmpp_connection(char *refparam, struct dmctx *ctx, void *data, ch dmuci_add_section_bbfdm("dmmap_xmpp", "connection", &dmmap_xmpp); dmuci_set_value_by_section(dmmap_xmpp, "section_name", section_name(xmpp_con)); - *instance = update_instance(last_inst, 4, dmmap_xmpp, "con_inst", "dmmap_xmpp", "connection"); + *instance = update_instance(last_inst, 2, dmmap_xmpp, "con_inst"); return 0; }