mirror/icwmp
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/icwmp.git synced 2026-03-11 03:28:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add enable flag to disable/enable data model paths.

Browse source
This commit is contained in:
Anis Ellouze 2015-08-31 11:24:11 +01:00 • committed by MOHAMED Kallel
parent 394a1dbaf3
commit bb93b813e3
3 changed files with 61 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
dm/dmcwmp.c
View file

@ -65,22 +65,34 @@ struct notification notifications[] = {
[2] = {"2", "active"}
};
const struct prefix_method prefix_methods[] = {
{ DMROOT, 1, &entry_method_root },
{ DMROOT"DeviceInfo.", 1, &entry_method_root_DeviceInfo },
{ DMROOT"ManagementServer.", 1, &entry_method_root_ManagementServer },
{ DMROOT"X_INTENO_SE_PowerManagement.", 0, &entry_method_root_X_INTENO_SE_PowerManagement },
{ DMROOT"LANDevice.", 0, &entry_method_root_LANDevice },
{ DMROOT"WANDevice.", 1, &entry_method_root_WANDevice },
{ DMROOT"X_INTENO_SE_IGMP.", 0, &entry_method_root_X_INTENO_SE_IGMP },
{ DMROOT"X_INTENO_SE_Wifi.", 0, &entry_method_root_SE_Wifi },
{ DMROOT"X_INTENO_SE_ICE.", 0, &entry_method_root_X_INTENO_SE_Ice },
{ DMROOT"UPnP.", 0, &entry_method_root_upnp },
{ DMROOT"Time.", 0, &entry_method_root_Time },
{ DMROOT"X_INTENO_SE_IpAccCfg.", 0, &entry_method_root_X_INTENO_SE_IpAccCfg },
//{ DMROOT"Layer2Bridging.", &entry_method_root_Layer2Bridging },
struct prefix_method prefix_methods[] = {
{ DMROOT, 1, NULL, 1, &entry_method_root },
{ DMROOT"DeviceInfo.", 1, NULL, 1, &entry_method_root_DeviceInfo },
{ DMROOT"ManagementServer.", 1, NULL, 1, &entry_method_root_ManagementServer },
{ DMROOT"X_INTENO_SE_PowerManagement.", 1, NULL, 0, &entry_method_root_X_INTENO_SE_PowerManagement },
{ DMROOT"LANDevice.", 1, NULL, 0, &entry_method_root_LANDevice },
{ DMROOT"WANDevice.", 1, NULL, 1, &entry_method_root_WANDevice },
{ DMROOT"X_INTENO_SE_IGMP.", 1, NULL, 0, &entry_method_root_X_INTENO_SE_IGMP },
{ DMROOT"X_INTENO_SE_Wifi.", 1, NULL, 0, &entry_method_root_SE_Wifi },
{ DMROOT"X_INTENO_SE_ICE.", 1, NULL, 0, &entry_method_root_X_INTENO_SE_Ice },
{ DMROOT"UPnP.", 1, NULL, 0, &entry_method_root_upnp },
{ DMROOT"Time.", 1, NULL, 0, &entry_method_root_Time },
{ DMROOT"X_INTENO_SE_IpAccCfg.", 1, NULL, 0, &entry_method_root_X_INTENO_SE_IpAccCfg },
//{ DMROOT"Layer2Bridging.", 1, NULL, &entry_method_root_Layer2Bridging },
//TODO set_enable for service voice and other file if exist
};
int dm_entry_set_prefix_methods_enable(void)
{
int i = 0;
for (i = 0; i < ARRAY_SIZE(prefix_methods); i++) {
if (prefix_methods[i].set_enable) {
prefix_methods[i].enable = prefix_methods[i].set_enable();
}
}
return 0;
}
char *update_instance(struct uci_section *s, char *last_inst, char *inst_opt)
{
char *instance;
@ -111,7 +123,7 @@ char *max_instance(char *package, char *stype, char *option, char *inst_opt, cha
tmp_instance = dmstrdup(tmp);
}
if (tmp_instance == NULL)
return "1";
return "0";
dmfree(tmp_instance);
return tmp;
}
@ -257,7 +269,7 @@ static int remove_parameter_notification(char *param)
if (list_notif) {
uci_foreach_element(list_notif, e) {
pch = e->name;
if (strstr(pch, param) == 0) {
if (strstr(pch, param)) {
dmuci_del_list_value("cwmp", "@notifications[0]", notifications[i].type, pch);
}
}
@ -384,9 +396,10 @@ int dm_entry_get_value(struct dmctx *ctx)
}
for (i = 0; i < ARRAY_SIZE(prefix_methods); i++) {
int ret = prefix_methods[i].method(ctx);
if (ctx->stop)
return ret;
if (!prefix_methods[i].enable) continue;
int ret = prefix_methods[i].method(ctx);
if (ctx->stop)
return ret;
}
return ctx->faultcode;
@ -487,9 +500,10 @@ int dm_entry_get_name(struct dmctx *ctx)
}
for (i = 0; i < ARRAY_SIZE(prefix_methods); i++) {
int ret = prefix_methods[i].method(ctx);
if (ctx->stop == 1)
return ret;
if (!prefix_methods[i].enable) continue;
int ret = prefix_methods[i].method(ctx);
if (ctx->stop == 1)
return ret;
}
return ctx->faultcode;
}
@ -601,9 +615,10 @@ int dm_entry_get_notification(struct dmctx *ctx)
ctx->method_param=&get_notification_inparam_isparam_check_param;
}
for (i = 0; i < ARRAY_SIZE(prefix_methods); i++) {
int ret = prefix_methods[i].method(ctx);
if (ctx->stop == 1)
return ret;
if (!prefix_methods[i].enable) continue;
int ret = prefix_methods[i].method(ctx);
if (ctx->stop == 1)
return ret;
}
return ctx->faultcode;
}
@ -688,6 +703,7 @@ int dm_entry_inform(struct dmctx *ctx)
ctx->method_obj = &inform_check_obj;
ctx->method_param = &inform_check_param;
for (i = 0; i < ARRAY_SIZE(prefix_methods); i++) {
if (!prefix_methods[i].enable) continue;
if (prefix_methods[i].forced_inform)
prefix_methods[i].method(ctx);
}
@ -722,9 +738,10 @@ int dm_entry_add_object(struct dmctx *ctx)
ctx->method_obj=&add_object_obj;
ctx->method_param=&add_object_param;
for (i = 0; i < ARRAY_SIZE(prefix_methods); i++) {
int ret = prefix_methods[i].method(ctx);
if (ctx->stop)
return ret;
if (!prefix_methods[i].enable) continue;
int ret = prefix_methods[i].method(ctx);
if (ctx->stop)
return ret;
}
return FAULT_9005;
}
@ -767,9 +784,10 @@ int dm_entry_delete_object(struct dmctx *ctx)
ctx->method_obj=&delete_object_obj;
ctx->method_param=&delete_object_param;
for (i = 0; i < ARRAY_SIZE(prefix_methods); i++) {
int ret = prefix_methods[i].method(ctx);
if (ctx->stop)
return ret;
if (!prefix_methods[i].enable) continue;
int ret = prefix_methods[i].method(ctx);
if (ctx->stop)
return ret;
}
return FAULT_9005;
}
@ -806,9 +824,10 @@ int dm_entry_set_value(struct dmctx *ctx)
ctx->method_param=&set_value_check_param;
}
for (i = 0; i < ARRAY_SIZE(prefix_methods); i++) {
int ret = prefix_methods[i].method(ctx);
if (ctx->stop)
return ret;
if (!prefix_methods[i].enable) continue;
int ret = prefix_methods[i].method(ctx);
if (ctx->stop)
return ret;
}
return FAULT_9005;
}
@ -865,9 +884,10 @@ int dm_entry_set_notification(struct dmctx *ctx)
ctx->method_param=&set_notification_check_param;
}
for (i = 0; i < ARRAY_SIZE(prefix_methods); i++) {
int ret = prefix_methods[i].method(ctx);
if (ctx->stop)
return ret;
if (!prefix_methods[i].enable) continue;
int ret = prefix_methods[i].method(ctx);
if (ctx->stop)
return ret;
}
return FAULT_9005;
}

3
dm/dmcwmp.h
View file

@ -121,6 +121,8 @@ struct dmctx
struct prefix_method {
const char *prefix_name;
bool enable;
bool (*set_enable)(void);
bool forced_inform;
int (*method)(struct dmctx *ctx);
};
@ -191,6 +193,7 @@ int dm_entry_add_object(struct dmctx *ctx);
int dm_entry_delete_object(struct dmctx *ctx);
int dm_entry_set_value(struct dmctx *ctx);
int dm_entry_set_notification(struct dmctx *ctx);
int dm_entry_set_prefix_methods_enable(void);
#ifndef TRACE
#define TRACE_TYPE 0

1
dm/dmentry.c
View file

@ -20,6 +20,7 @@ LIST_HEAD(head_package_change);
int dm_global_init(void)
{
dm_entry_set_prefix_methods_enable();
memset(&dmubus_ctx, 0, sizeof(struct dmubus_ctx));
INIT_LIST_HEAD(&dmubus_ctx.obj_head);
uci_ctx = uci_alloc_context();