From 4777b9166ff2243dd7d4d56513de9b026b39a379 Mon Sep 17 00:00:00 2001 From: Amin Ben Ramdhane Date: Sun, 15 Sep 2019 11:52:54 +0100 Subject: [PATCH] change cwmp -> bbfdm --- bin/Makefile.am | 6 +-- dmcwmp.c => dmbbf.c | 33 ++++++++------- dmcwmp.h => dmbbf.h | 4 +- dmcommon.c | 2 +- dmcommon.h | 2 +- dmentry.c | 2 +- dmentry.h | 2 +- dmjson.h | 2 +- dmoperate.c | 28 ++++++------- dmtree/tr064/upnp_common.c | 2 +- dmtree/tr064/upnp_configuration.c | 2 +- dmtree/tr064/upnp_configuration.h | 2 +- dmtree/tr064/upnp_device.c | 2 +- dmtree/tr064/upnp_deviceinfo.c | 2 +- dmtree/tr064/upnp_deviceinfo.h | 2 +- dmtree/tr064/upnp_monitoring.c | 2 +- dmtree/tr064/upnp_monitoring.h | 2 +- dmtree/tr104/voice_services.c | 2 +- dmtree/tr143/diagnostics.c | 2 +- dmtree/tr181/atm.c | 2 +- dmtree/tr181/bridging.c | 2 +- dmtree/tr181/datamodelversion.c | 10 +++++ dmtree/tr181/datamodelversion.h | 15 ++++++- dmtree/tr181/device.c | 4 +- dmtree/tr181/deviceinfo.c | 2 +- dmtree/tr181/deviceinfo.h | 2 +- dmtree/tr181/dhcpv4.c | 58 +++++++++++++-------------- dmtree/tr181/dhcpv6.c | 26 ++++++------ dmtree/tr181/dns.c | 2 +- dmtree/tr181/dsl.c | 2 +- dmtree/tr181/ethernet.c | 2 +- dmtree/tr181/firewall.c | 2 +- dmtree/tr181/hosts.c | 2 +- dmtree/tr181/interfacestack.c | 2 +- dmtree/tr181/ip.c | 2 +- dmtree/tr181/managementserver.c | 2 +- dmtree/tr181/managementserver.h | 2 +- dmtree/tr181/nat.c | 2 +- dmtree/tr181/ppp.c | 2 +- dmtree/tr181/ptm.c | 2 +- dmtree/tr181/qos.c | 3 +- dmtree/tr181/routing.c | 2 +- dmtree/tr181/softwaremodules.c | 2 +- dmtree/tr181/times.c | 2 +- dmtree/tr181/times.h | 2 +- dmtree/tr181/upnp.c | 2 +- dmtree/tr181/usb.c | 2 +- dmtree/tr181/userinterface.c | 2 +- dmtree/tr181/users.c | 2 +- dmtree/tr181/users.h | 3 +- dmtree/tr181/wifi.c | 2 +- dmtree/tr181/x_iopsys_eu_buttons.c | 2 +- dmtree/tr181/x_iopsys_eu_dropbear.c | 2 +- dmtree/tr181/x_iopsys_eu_ice.c | 2 +- dmtree/tr181/x_iopsys_eu_igmp.c | 2 +- dmtree/tr181/x_iopsys_eu_ipacccfg.c | 2 +- dmtree/tr181/x_iopsys_eu_logincfg.c | 2 +- dmtree/tr181/x_iopsys_eu_owsd.c | 2 +- dmtree/tr181/x_iopsys_eu_power_mgmt.c | 2 +- dmtree/tr181/x_iopsys_eu_syslog.c | 2 +- dmtree/tr181/x_iopsys_eu_wifilife.c | 2 +- dmtree/tr181/xmpp.c | 2 +- json/convertor_json_to_c.py | 2 +- tools/generator_c.py | 2 +- 64 files changed, 156 insertions(+), 140 deletions(-) rename dmcwmp.c => dmbbf.c (99%) rename dmcwmp.h => dmbbf.h (99%) diff --git a/bin/Makefile.am b/bin/Makefile.am index 143ec793..40932b2a 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,11 +1,10 @@ -CWMP_VERSION = 3.0.0 LIB_BBFDM_VERSION = 3:0:0 lib_LTLIBRARIES = libbbfdm.la libbbfdm_la_SOURCES = \ ../md5.c \ - ../dmcwmp.c \ + ../dmbbf.c \ ../dmentry.c \ ../dmmem.c \ ../dmubus.c \ @@ -100,9 +99,6 @@ libbbfdm_la_LIBADD = \ $(LIBTRACE_LIBS) \ $(LBLOBMSG_LIBS) -libbbfdm_la_CFLAGS+=-DCWMP_VERSION=\"$(CWMP_VERSION)\" -libbbfdm_la_LDFLAGS+=-DCWMP_VERSION=\"$(CWMP_VERSION)\" - libbbfdm_la_CFLAGS+=-I../ libbbfdm_la_CFLAGS+=-I../dmtree/ libbbfdm_la_CFLAGS+=-I../dmtree/tr181 diff --git a/dmcwmp.c b/dmbbf.c similarity index 99% rename from dmcwmp.c rename to dmbbf.c index c4bf0d57..445496d3 100644 --- a/dmcwmp.c +++ b/dmbbf.c @@ -13,7 +13,7 @@ #include #include #include "dmuci.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmmem.h" #include "device.h" #include "times.h" @@ -40,7 +40,6 @@ #include "routing.h" #include "nat.h" #include "xmpp.h" -#include "dmcwmp.h" #include "dmjson.h" #ifdef BBF_TR104 #include "voice_services.h" @@ -1915,9 +1914,9 @@ static int get_linker_value_check_param(DMPARAM_ARGS) * UPNP entries * ******************/ -int upnp_map_cwmp_fault(int cwmp_fault) +int upnp_map_bbf_fault(int bbf_fault) { - switch (cwmp_fault) { + switch (bbf_fault) { case FAULT_9005: return FAULT_UPNP_703; case FAULT_9003: @@ -1927,9 +1926,9 @@ int upnp_map_cwmp_fault(int cwmp_fault) case FAULT_9008: return FAULT_UPNP_706; } - if (cwmp_fault > __FAULT_UPNP_MAX) + if (bbf_fault > __FAULT_UPNP_MAX) return FAULT_UPNP_701; - return cwmp_fault; + return bbf_fault; } int plugin_upnp_structured_obj_match(DMOBJECT_ARGS) @@ -2221,7 +2220,7 @@ int dm_entry_upnp_get_instances(struct dmctx *dmctx) if (dmctx->findparam) return 0; else - return (upnp_map_cwmp_fault(err)); + return (upnp_map_bbf_fault(err)); } static int mparam_upnp_get_instances(DMPARAM_ARGS) @@ -2275,7 +2274,7 @@ int dm_entry_upnp_get_supported_parameters(struct dmctx *dmctx) if (dmctx->findparam) return 0; else - return (upnp_map_cwmp_fault(err)); + return (upnp_map_bbf_fault(err)); } static int mparam_upnp_get_supportedparams(DMPARAM_ARGS) @@ -2367,7 +2366,7 @@ int dm_entry_upnp_get_selected_values(struct dmctx *dmctx) if (dmctx->findparam) return 0; else - return (upnp_map_cwmp_fault(err)); + return (upnp_map_bbf_fault(err)); } static int mparam_upnp_structured_get_value_in_param(DMPARAM_ARGS) @@ -2434,7 +2433,7 @@ int dm_entry_upnp_get_values(struct dmctx *dmctx) if (findparam_check && dmctx->findparam) return 0; else - return (upnp_map_cwmp_fault(err)); + return (upnp_map_bbf_fault(err)); } static int upnp_get_value_obj(DMOBJECT_ARGS) @@ -2506,7 +2505,7 @@ int dm_entry_upnp_set_values(struct dmctx *dmctx) dmctx->method_param = mparam_upnp_set_value; err = dm_browse(dmctx, &node, root, NULL, NULL); if (dmctx->stop) - return (upnp_map_cwmp_fault(err)); + return (upnp_map_bbf_fault(err)); else return FAULT_UPNP_703; } @@ -2581,7 +2580,7 @@ int dm_entry_upnp_delete_instance(struct dmctx *dmctx) dmctx->method_param = upnp_delete_instance_param; err = dm_browse(dmctx, &node, root, NULL, NULL); if (dmctx->stop) - return (upnp_map_cwmp_fault(err)); + return (upnp_map_bbf_fault(err)); else return FAULT_UPNP_703; } @@ -2640,7 +2639,7 @@ int dm_entry_upnp_add_instance(struct dmctx *dmctx) dmctx->method_param = mparam_upnp_add_instance; err = dm_browse(dmctx, &node, root, NULL, NULL); if (dmctx->stop) - return (upnp_map_cwmp_fault(err)); + return (upnp_map_bbf_fault(err)); else return FAULT_UPNP_703; } @@ -2715,7 +2714,7 @@ int dm_entry_upnp_get_attributes(struct dmctx *dmctx) if (dmctx->findparam) return 0; else - return (upnp_map_cwmp_fault(err)); + return (upnp_map_bbf_fault(err)); } static int mparam_upnp_get_attributes(DMPARAM_ARGS) @@ -2827,7 +2826,7 @@ int dm_entry_upnp_set_attributes(struct dmctx *dmctx) if (dmctx->findparam) return 0; else - return (upnp_map_cwmp_fault(err)); + return (upnp_map_bbf_fault(err)); } static int mparam_upnp_set_attributes(DMPARAM_ARGS) @@ -2921,7 +2920,7 @@ int dm_entry_upnp_get_acl_data(struct dmctx *dmctx) if (dmctx->findparam) return 0; else - return (upnp_map_cwmp_fault(err)); + return (upnp_map_bbf_fault(err)); } static int mparam_upnp_get_acldata(DMPARAM_ARGS) @@ -3016,7 +3015,7 @@ int dm_entry_upnp_get_instance_numbers(struct dmctx *dmctx) if (dmctx->findparam) return 0; else - return (upnp_map_cwmp_fault(err)); + return (upnp_map_bbf_fault(err)); } static int mparam_upnp_get_instance_numbers(DMPARAM_ARGS) diff --git a/dmcwmp.h b/dmbbf.h similarity index 99% rename from dmcwmp.h rename to dmbbf.h index db818b4e..c141e109 100644 --- a/dmcwmp.h +++ b/dmbbf.h @@ -11,8 +11,8 @@ * */ -#ifndef __DMCWMP_H__ -#define __DMCWMP_H__ +#ifndef __DMBBF_H__ +#define __DMBBF_H__ #include #include #include diff --git a/dmcommon.c b/dmcommon.c index f05dce61..02bfec55 100644 --- a/dmcommon.c +++ b/dmcommon.c @@ -29,7 +29,7 @@ #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmcommon.h b/dmcommon.h index 819fba09..dc40129e 100644 --- a/dmcommon.h +++ b/dmcommon.h @@ -15,7 +15,7 @@ #include #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #define NVRAM_FILE "/proc/nvram/WpaKey" #define MAX_DHCP_LEASES 256 #define MAX_PROC_ROUTING 256 diff --git a/dmentry.c b/dmentry.c index 266c6de2..638170a1 100644 --- a/dmentry.c +++ b/dmentry.c @@ -11,7 +11,7 @@ * */ -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmubus.h" #include "dmuci.h" #include "dmentry.h" diff --git a/dmentry.h b/dmentry.h index 9b3f80f4..68f4a4dc 100644 --- a/dmentry.h +++ b/dmentry.h @@ -14,7 +14,7 @@ #ifndef __DMENTRY_H__ #define __DMENTRY_H__ -#include "dmcwmp.h" +#include "dmbbf.h" extern struct list_head head_package_change; extern unsigned char dmcli_timetrack; extern unsigned char dmcli_evaluatetest; diff --git a/dmjson.h b/dmjson.h index 11850379..511a4908 100644 --- a/dmjson.h +++ b/dmjson.h @@ -15,7 +15,7 @@ #include #include #include -#include "dmcwmp.h" +#include "dmbbf.h" struct dmjson_arg { char *key; diff --git a/dmoperate.c b/dmoperate.c index c09c1907..77e2c348 100644 --- a/dmoperate.c +++ b/dmoperate.c @@ -26,7 +26,7 @@ #include #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmubus.h" #include "dmuci.h" #include "dmjson.h" @@ -55,7 +55,7 @@ bool is_str_eq(const char *s1, const char *s2) return false; } -static void cwmp_init(struct dmctx *dm_ctx, char *path) +static void bbf_init(struct dmctx *dm_ctx, char *path) { char *uci_amd = NULL, *uci_instance = NULL; int amd = AMD_2, instance = INSTANCE_MODE_ALIAS; @@ -80,12 +80,12 @@ static void cwmp_init(struct dmctx *dm_ctx, char *path) dm_ctx_init_sub(dm_ctx, DM_CWMP, amd, instance); } -static void cwmp_cleanup(struct dmctx *dm_ctx) +static void bbf_cleanup(struct dmctx *dm_ctx) { dm_ctx_clean_sub(dm_ctx); } -static bool cwmp_get(int operation, char *path, struct dmctx *dm_ctx) +static bool bbf_get(int operation, char *path, struct dmctx *dm_ctx) { int fault = 0; @@ -109,13 +109,13 @@ static bool cwmp_get(int operation, char *path, struct dmctx *dm_ctx) return true; } -static bool cwmp_set_value(char *path, char *value) +static bool bbf_set_value(char *path, char *value) { int fault = 0, res; struct dmctx dm_ctx = {0}; struct dmctx *p_dmctx = &dm_ctx; - cwmp_init(&dm_ctx, path); + bbf_init(&dm_ctx, path); fault = dm_entry_param_method(&dm_ctx, CMD_SET_VALUE, path, value, NULL); @@ -132,24 +132,24 @@ static bool cwmp_set_value(char *path, char *value) else res = SUCCESS; - cwmp_cleanup(&dm_ctx); + bbf_cleanup(&dm_ctx); return res; } -static char *cwmp_get_value_by_id(char *id) +static char *bbf_get_value_by_id(char *id) { struct dmctx dm_ctx = {0}; struct dm_parameter *n; char *value = NULL; - cwmp_init(&dm_ctx, id); - if(cwmp_get(CMD_GET_VALUE, id, &dm_ctx)) { + bbf_init(&dm_ctx, id); + if(bbf_get(CMD_GET_VALUE, id, &dm_ctx)) { list_for_each_entry(n, &dm_ctx.list_parameter, list) { value = dmstrdup(n->data); break; } } - cwmp_cleanup(&dm_ctx); + bbf_cleanup(&dm_ctx); return value; } @@ -167,7 +167,7 @@ static char *get_param_val_from_op_cmd(char *op_cmd, const char *param) strcat(node, param); // Get parameter value - val = cwmp_get_value_by_id(node); + val = bbf_get_value_by_id(node); return val; } @@ -256,14 +256,14 @@ static opr_ret_t ap_security_reset(struct dmctx *dmctx, char *path, char *input) strncpy(reset_params[2].value, wpakey, MAXNAMLEN); for (i = 0; i < len; i++) { - cwmp_set_value(reset_params[i].node, reset_params[i].value); + bbf_set_value(reset_params[i].node, reset_params[i].value); } return SUCCESS; } static opr_ret_t dhcp_client_renew(struct dmctx *dmctx, char *path, char *input) { - if(SUCCESS == cwmp_set_value(path, "true")) + if(SUCCESS == bbf_set_value(path, "true")) return SUCCESS; else return FAIL; diff --git a/dmtree/tr064/upnp_common.c b/dmtree/tr064/upnp_common.c index 78193017..c6d0a59b 100755 --- a/dmtree/tr064/upnp_common.c +++ b/dmtree/tr064/upnp_common.c @@ -10,7 +10,7 @@ */ #include "upnp_common.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmjson.h" diff --git a/dmtree/tr064/upnp_configuration.c b/dmtree/tr064/upnp_configuration.c index a5b73d2d..90f4925a 100755 --- a/dmtree/tr064/upnp_configuration.c +++ b/dmtree/tr064/upnp_configuration.c @@ -9,7 +9,7 @@ * */ -#include "dmcwmp.h" +#include "dmbbf.h" #include "upnp_configuration.h" #include "upnp_common.h" #include "dmuci.h" diff --git a/dmtree/tr064/upnp_configuration.h b/dmtree/tr064/upnp_configuration.h index 73c2c2c1..61d6620b 100755 --- a/dmtree/tr064/upnp_configuration.h +++ b/dmtree/tr064/upnp_configuration.h @@ -11,7 +11,7 @@ #ifndef UPNP_CONFIGURATION_H #define UPNP_CONFIGURATION_H -#include "dmcwmp.h" +#include "dmbbf.h" struct upnp_configuration_args{ struct uci_section *upnpConfiguration_sec; diff --git a/dmtree/tr064/upnp_device.c b/dmtree/tr064/upnp_device.c index 77d56cea..50f1e6ef 100644 --- a/dmtree/tr064/upnp_device.c +++ b/dmtree/tr064/upnp_device.c @@ -10,7 +10,7 @@ */ #include "dmuci.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "upnp_device.h" #include "deviceinfo.h" #include "managementserver.h" diff --git a/dmtree/tr064/upnp_deviceinfo.c b/dmtree/tr064/upnp_deviceinfo.c index 9e20e360..564e790d 100755 --- a/dmtree/tr064/upnp_deviceinfo.c +++ b/dmtree/tr064/upnp_deviceinfo.c @@ -10,7 +10,7 @@ */ #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "upnp_deviceinfo.h" #include #include "dmuci.h" diff --git a/dmtree/tr064/upnp_deviceinfo.h b/dmtree/tr064/upnp_deviceinfo.h index 4837c908..63fd15d4 100755 --- a/dmtree/tr064/upnp_deviceinfo.h +++ b/dmtree/tr064/upnp_deviceinfo.h @@ -11,7 +11,7 @@ #ifndef UPNP_DEVICEINFO_H #define UPNP_DEVICEINFO_H -#include "dmcwmp.h" +#include "dmbbf.h" struct upnp_dvinf_args { diff --git a/dmtree/tr064/upnp_monitoring.c b/dmtree/tr064/upnp_monitoring.c index a3d4c5c7..eba457ba 100755 --- a/dmtree/tr064/upnp_monitoring.c +++ b/dmtree/tr064/upnp_monitoring.c @@ -9,7 +9,7 @@ * */ -#include "dmcwmp.h" +#include "dmbbf.h" #include "upnp_monitoring.h" #include "upnp_common.h" #include "dmubus.h" diff --git a/dmtree/tr064/upnp_monitoring.h b/dmtree/tr064/upnp_monitoring.h index 070bc49d..4c7ae14c 100755 --- a/dmtree/tr064/upnp_monitoring.h +++ b/dmtree/tr064/upnp_monitoring.h @@ -11,7 +11,7 @@ #ifndef UPNP_MONITORING_H #define UPNP_MONITORING_H -#include "dmcwmp.h" +#include "dmbbf.h" struct upnp_ip_usage_args{ char *systemName; char *status; diff --git a/dmtree/tr104/voice_services.c b/dmtree/tr104/voice_services.c index e15bbe36..54d40725 100644 --- a/dmtree/tr104/voice_services.c +++ b/dmtree/tr104/voice_services.c @@ -13,7 +13,7 @@ #include #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr143/diagnostics.c b/dmtree/tr143/diagnostics.c index 5e524809..e489eb0a 100644 --- a/dmtree/tr143/diagnostics.c +++ b/dmtree/tr143/diagnostics.c @@ -14,7 +14,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "dmjson.h" #include "dmentry.h" diff --git a/dmtree/tr181/atm.c b/dmtree/tr181/atm.c index d6e50cb6..c7824d78 100644 --- a/dmtree/tr181/atm.c +++ b/dmtree/tr181/atm.c @@ -11,7 +11,7 @@ #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr181/bridging.c b/dmtree/tr181/bridging.c index d5e343af..1cc9fddb 100644 --- a/dmtree/tr181/bridging.c +++ b/dmtree/tr181/bridging.c @@ -12,7 +12,7 @@ #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr181/datamodelversion.c b/dmtree/tr181/datamodelversion.c index 63c4c1ea..3b17bc1f 100644 --- a/dmtree/tr181/datamodelversion.c +++ b/dmtree/tr181/datamodelversion.c @@ -1,3 +1,13 @@ +/* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. +* +* Copyright (C) 2019 iopsys Software Solutions AB +* Author: Omar Kallel +*/ + #include "datamodelversion.h" int get_Device_RootDataModelVersion(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value) diff --git a/dmtree/tr181/datamodelversion.h b/dmtree/tr181/datamodelversion.h index 4b80f943..55f828e5 100644 --- a/dmtree/tr181/datamodelversion.h +++ b/dmtree/tr181/datamodelversion.h @@ -1,6 +1,19 @@ +/* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 2 of the License, or +* (at your option) any later version. +* +* Copyright (C) 2019 iopsys Software Solutions AB +* Author: Omar Kallel +*/ + #ifndef __DATAMODELVERSION_H #define __DATAMODELVERSION_H -#include "dmcwmp.h" + +#include "dmbbf.h" #include "dmcommon.h" + int get_Device_RootDataModelVersion(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); + #endif diff --git a/dmtree/tr181/device.c b/dmtree/tr181/device.c index 1d7bba89..5a8a5392 100644 --- a/dmtree/tr181/device.c +++ b/dmtree/tr181/device.c @@ -11,7 +11,7 @@ */ #include "dmuci.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "device.h" #include "deviceinfo.h" #include "managementserver.h" @@ -54,7 +54,7 @@ #include "voice_services.h" #endif -/* *** CWMP *** */ +/* *** BBFDM *** */ DMOBJ tEntry181Obj[] = { /* OBJ, permission, addobj, delobj, checkobj, browseinstobj, forced_inform, notification, nextobj, leaf, linker, bbfdm_type*/ {(char *)&dmroot, &DMREAD, NULL, NULL, NULL, NULL, &DMFINFRM, &DMNONE, tRoot_181_Obj, tRoot_181_Params, NULL, BBFDM_BOTH}, diff --git a/dmtree/tr181/deviceinfo.c b/dmtree/tr181/deviceinfo.c index 305056bc..024faea7 100644 --- a/dmtree/tr181/deviceinfo.c +++ b/dmtree/tr181/deviceinfo.c @@ -16,7 +16,7 @@ #include #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr181/deviceinfo.h b/dmtree/tr181/deviceinfo.h index 8cc1e16d..ee1a5a29 100644 --- a/dmtree/tr181/deviceinfo.h +++ b/dmtree/tr181/deviceinfo.h @@ -12,7 +12,7 @@ #ifndef __DEVICE_INFO_H #define __DEVICE_INFO_H -#include "dmcwmp.h" +#include "dmbbf.h" #define UPTIME "/proc/uptime" #define DEFAULT_CONFIG_DIR "/etc/config/" diff --git a/dmtree/tr181/dhcpv4.c b/dmtree/tr181/dhcpv4.c index 86a6366c..1ad51c7d 100644 --- a/dmtree/tr181/dhcpv4.c +++ b/dmtree/tr181/dhcpv4.c @@ -16,7 +16,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "dhcpv4.h" #include "dmjson.h" @@ -434,7 +434,7 @@ int addObjDHCPv4Client(char *refparam, struct dmctx *ctx, void *data, char **ins char *wan_eth, *value, *wanname, *instancepara, *v; check_create_dmmap_package("dmmap_dhcp_client"); - instancepara = get_last_instance_bbfdm("dmmap_dhcp_client", "interface", "cwmp_dhcpv4client_instance"); + instancepara = get_last_instance_bbfdm("dmmap_dhcp_client", "interface", "bbf_dhcpv4client_instance"); dmuci_get_option_value_string("ports", "WAN", "ifname", &wan_eth); dmasprintf(&wanname, "%s.1", wan_eth); dmuci_add_section("network", "interface", &s, &value); @@ -443,7 +443,7 @@ int addObjDHCPv4Client(char *refparam, struct dmctx *ctx, void *data, char **ins dmuci_set_value_by_section(s, "type", "anywan"); dmuci_add_section_bbfdm("dmmap_dhcp_client", "interface", &dmmap_sect, &v); dmuci_set_value_by_section(dmmap_sect, "section_name", section_name(s)); - *instance = update_instance_bbfdm(dmmap_sect, instancepara, "cwmp_dhcpv4client_instance"); + *instance = update_instance_bbfdm(dmmap_sect, instancepara, "bbf_dhcpv4client_instance"); return 0; } @@ -506,7 +506,7 @@ int delObjDHCPv4Client(char *refparam, struct dmctx *ctx, void *data, char *inst get_dmmap_section_of_config_section("dmmap_dhcp_client", "interface", section_name(s), &dmmap_section); if(strlen(ipv4addr) == 0){ if(dmmap_section != NULL) - dmuci_get_value_by_section_string(dmmap_section, "cwmp_dhcpv4client_instance", &v); + dmuci_get_value_by_section_string(dmmap_section, "bbf_dhcpv4client_instance", &v); else dmasprintf(&v, "%d", 0); @@ -533,12 +533,12 @@ int addObjDHCPv4ClientSentOption(char *refparam, struct dmctx *ctx, void *data, char *value, *instancepara, *v; check_create_dmmap_package("dmmap_dhcp_client"); - instancepara= get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_dhcp_client", "send_option", "cwmp_dhcpv4_sentopt_instance", "section_name", section_name(dhcp_client_args->dhcp_client_conf)); + instancepara= get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_dhcp_client", "send_option", "bbf_dhcpv4_sentopt_instance", "section_name", section_name(dhcp_client_args->dhcp_client_conf)); dmuci_add_section_bbfdm("dmmap_dhcp_client", "send_option", &dmmap_sect, &value); if(dhcp_client_args->dhcp_client_conf != NULL) DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(dhcp_client_args->dhcp_client_conf)); DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_tag", "0"); - *instance = update_instance_bbfdm(dmmap_sect, instancepara, "cwmp_dhcpv4_sentopt_instance"); + *instance = update_instance_bbfdm(dmmap_sect, instancepara, "bbf_dhcpv4_sentopt_instance"); return 0; } @@ -577,12 +577,12 @@ int addObjDHCPv4ClientReqOption(char *refparam, struct dmctx *ctx, void *data, c char *value, *instancepara, *v; check_create_dmmap_package("dmmap_dhcp_client"); - instancepara= get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_dhcp_client", "req_option", "cwmp_dhcpv4_sentopt_instance", "section_name", section_name(dhcp_client_args->dhcp_client_conf)); + instancepara= get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_dhcp_client", "req_option", "bbf_dhcpv4_sentopt_instance", "section_name", section_name(dhcp_client_args->dhcp_client_conf)); dmuci_add_section_bbfdm("dmmap_dhcp_client", "req_option", &dmmap_sect, &value); if(dhcp_client_args->dhcp_client_conf != NULL) DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(dhcp_client_args->dhcp_client_conf)); DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_tag", "0"); - *instance = update_instance_bbfdm(dmmap_sect, instancepara, "cwmp_dhcpv4_sentopt_instance"); + *instance = update_instance_bbfdm(dmmap_sect, instancepara, "bbf_dhcpv4_sentopt_instance"); return 0; } @@ -620,12 +620,12 @@ int addObjDHCPv4ServerPoolOption(char *refparam, struct dmctx *ctx, void *data, char *value, *instancepara, *v; check_create_dmmap_package("dmmap_dhcp"); - instancepara= get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_dhcp", "servpool_option", "cwmp_dhcpv4_servpool_option_instance", "section_name", section_name(dhcp_arg->dhcp_sec)); + instancepara= get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_dhcp", "servpool_option", "bbf_dhcpv4_servpool_option_instance", "section_name", section_name(dhcp_arg->dhcp_sec)); dmuci_add_section_bbfdm("dmmap_dhcp", "servpool_option", &dmmap_sect, &value); if(dhcp_arg->dhcp_sec != NULL) DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(dhcp_arg->dhcp_sec)); DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_tag", "0"); - *instance = update_instance_bbfdm(dmmap_sect, instancepara, "cwmp_dhcpv4_servpool_option_instance"); + *instance = update_instance_bbfdm(dmmap_sect, instancepara, "bbf_dhcpv4_servpool_option_instance"); return 0; } @@ -663,12 +663,12 @@ int addObjDHCPv4RelayForwarding(char *refparam, struct dmctx *ctx, void *data, c char *wan_eth, *value, *bridgerelay, *instancepara, *v; check_create_dmmap_package("dmmap_dhcp_relay"); - instancepara = get_last_instance_bbfdm("dmmap_dhcp_relay", "interface", "cwmp_dhcpv4relay_instance"); + instancepara = get_last_instance_bbfdm("dmmap_dhcp_relay", "interface", "bbf_dhcpv4relay_instance"); dmuci_add_section("network", "interface", &s, &value); dmuci_set_value_by_section(s, "proto", "relay"); dmuci_add_section_bbfdm("dmmap_dhcp_relay", "interface", &dmmap_sect, &v); dmuci_set_value_by_section(dmmap_sect, "section_name", section_name(s)); - *instance = update_instance_bbfdm(dmmap_sect, instancepara, "cwmp_dhcpv4relay_instance"); + *instance = update_instance_bbfdm(dmmap_sect, instancepara, "bbf_dhcpv4relay_instance"); return 0; } @@ -685,8 +685,8 @@ int delObjDHCPv4RelayForwarding(char *refparam, struct dmctx *ctx, void *data, c case DEL_INST: if(is_section_unnamed(section_name(dhcp_relay_args->dhcp_client_conf))){ LIST_HEAD(dup_list); - delete_sections_save_next_sections("dmmap_dhcp_relay", "interface", "cwmp_dhcpv4relay_instance", section_name(dhcp_relay_args->dhcp_client_conf), atoi(instance), &dup_list); - update_dmmap_sections(&dup_list, "cwmp_dhcpv4relay_instance", "dmmap_dhcp_relay", "interface"); + delete_sections_save_next_sections("dmmap_dhcp_relay", "interface", "bbf_dhcpv4relay_instance", section_name(dhcp_relay_args->dhcp_client_conf), atoi(instance), &dup_list); + update_dmmap_sections(&dup_list, "bbf_dhcpv4relay_instance", "dmmap_dhcp_relay", "interface"); dmuci_delete_by_section_unnamed(dhcp_relay_args->dhcp_client_conf, NULL, NULL); } else { get_dmmap_section_of_config_section("dmmap_dhcp_relay", "interface", section_name(dhcp_relay_args->dhcp_client_conf), &dmmap_section); @@ -1644,7 +1644,7 @@ int get_DHCPv4Client_Alias(char *refparam, struct dmctx *ctx, void *data, char * { struct dhcp_client_args *dhcp_client_args = (struct dhcp_client_args*)data; - dmuci_get_value_by_section_string(dhcp_client_args->dhcp_client_dm, "cwmp_dhcpv4client_alias", value); + dmuci_get_value_by_section_string(dhcp_client_args->dhcp_client_dm, "bbf_dhcpv4client_alias", value); return 0; } @@ -1657,7 +1657,7 @@ int set_DHCPv4Client_Alias(char *refparam, struct dmctx *ctx, void *data, char * case VALUECHECK: break; case VALUESET: - dmuci_set_value_by_section(dhcp_client_args->dhcp_client_dm, "cwmp_dhcpv4client_alias", value); + dmuci_set_value_by_section(dhcp_client_args->dhcp_client_dm, "bbf_dhcpv4client_alias", value); break; } return 0; @@ -2034,7 +2034,7 @@ int get_DHCPv4ClientSentOption_Alias(char *refparam, struct dmctx *ctx, void *da { struct dhcp_client_option_args* dhcp_client_opt_args= (struct dhcp_client_option_args*)data; - dmuci_get_value_by_section_string(dhcp_client_opt_args->opt_sect, "cwmp_dhcpv4_sentopt_alias", value); + dmuci_get_value_by_section_string(dhcp_client_opt_args->opt_sect, "bbf_dhcpv4_sentopt_alias", value); return 0; } @@ -2047,7 +2047,7 @@ int set_DHCPv4ClientSentOption_Alias(char *refparam, struct dmctx *ctx, void *da case VALUECHECK: break; case VALUESET: - DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "cwmp_dhcpv4_sentopt_alias", value); + DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "bbf_dhcpv4_sentopt_alias", value); break; } return 0; @@ -2200,7 +2200,7 @@ int get_DHCPv4ClientReqOption_Alias(char *refparam, struct dmctx *ctx, void *dat { struct dhcp_client_option_args* dhcp_client_opt_args= (struct dhcp_client_option_args*)data; - dmuci_get_value_by_section_string(dhcp_client_opt_args->opt_sect, "cwmp_dhcpv4_reqtopt_alias", value); + dmuci_get_value_by_section_string(dhcp_client_opt_args->opt_sect, "bbf_dhcpv4_reqtopt_alias", value); return 0; } @@ -2213,7 +2213,7 @@ int set_DHCPv4ClientReqOption_Alias(char *refparam, struct dmctx *ctx, void *dat case VALUECHECK: break; case VALUESET: - DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "cwmp_dhcpv4_reqtopt_alias", value); + DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "bbf_dhcpv4_reqtopt_alias", value); break; } return 0; @@ -2386,7 +2386,7 @@ int get_DHCPv4ServerPoolOption_Alias(char *refparam, struct dmctx *ctx, void *da { struct dhcp_client_option_args* dhcp_client_opt_args= (struct dhcp_client_option_args*)data; - dmuci_get_value_by_section_string(dhcp_client_opt_args->opt_sect, "cwmp_dhcpv4_servpool_option_alias", value); + dmuci_get_value_by_section_string(dhcp_client_opt_args->opt_sect, "bbf_dhcpv4_servpool_option_alias", value); return 0; } @@ -2397,7 +2397,7 @@ int set_DHCPv4ServerPoolOption_Alias(char *refparam, struct dmctx *ctx, void *da case VALUECHECK: break; case VALUESET: - DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "cwmp_dhcpv4_servpool_option_alias", value); + DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "bbf_dhcpv4_servpool_option_alias", value); break; } return 0; @@ -2534,7 +2534,7 @@ int get_DHCPv4RelayForwarding_Alias(char *refparam, struct dmctx *ctx, void *dat struct uci_section *dmmap_section; char *v; - dmuci_get_value_by_section_string(dhcp_client_args->dhcp_client_dm, "cwmp_dhcpv4relay_alias", value); + dmuci_get_value_by_section_string(dhcp_client_args->dhcp_client_dm, "bbf_dhcpv4relay_alias", value); return 0; } @@ -2547,7 +2547,7 @@ int set_DHCPv4RelayForwarding_Alias(char *refparam, struct dmctx *ctx, void *dat case VALUECHECK: break; case VALUESET: - dmuci_set_value_by_section(dhcp_client_args->dhcp_client_dm, "cwmp_dhcpv4relay_alias", value); + dmuci_set_value_by_section(dhcp_client_args->dhcp_client_dm, "bbf_dhcpv4relay_alias", value); break; } return 0; @@ -3162,7 +3162,7 @@ int browseDHCPv4ClientInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_ dhcp_client_arg.dhcp_client_conf = p->config_section; dhcp_client_arg.dhcp_client_dm= p->dmmap_section; - instance= handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, (void *)p->dmmap_section, "cwmp_dhcpv4client_instance", "cwmp_dhcpv4client_alias"); + instance= handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, (void *)p->dmmap_section, "bbf_dhcpv4client_instance", "bbf_dhcpv4client_alias"); if (DM_LINK_INST_OBJ(dmctx, parent_node, &dhcp_client_arg, instance) == DM_STOP) break; } @@ -3214,7 +3214,7 @@ int browseDHCPv4ClientSentOptionInst(struct dmctx *dmctx, DMNODE *parent_node, v dhcp_client_opt_args.value= dmstrdup(v2); dhcp_client_opt_args.opt_sect= dmmap_sect; - instance= handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, dmmap_sect, "cwmp_dhcpv4_sentopt_instance", "cwmp_dhcpv4_sentopt_alias"); + instance= handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, dmmap_sect, "bbf_dhcpv4_sentopt_instance", "bbf_dhcpv4_sentopt_alias"); if (DM_LINK_INST_OBJ(dmctx, parent_node, &dhcp_client_opt_args, instance) == DM_STOP) break; } @@ -3250,7 +3250,7 @@ int browseDHCPv4ClientReqOptionInst(struct dmctx *dmctx, DMNODE *parent_node, vo dhcp_client_opt_args.value= dmstrdup(""); dhcp_client_opt_args.opt_sect= dmmap_sect; - instance= handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, dmmap_sect, "cwmp_dhcpv4_reqtopt_instance", "cwmp_dhcpv4_reqtopt_alias"); + instance= handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, dmmap_sect, "bbf_dhcpv4_reqtopt_instance", "bbf_dhcpv4_reqtopt_alias"); if (DM_LINK_INST_OBJ(dmctx, parent_node, &dhcp_client_opt_args, instance) == DM_STOP) break; } @@ -3298,7 +3298,7 @@ int browseDHCPv4ServerPoolOptionInst(struct dmctx *dmctx, DMNODE *parent_node, v dhcp_client_opt_args.option_tag= strdup(v1); dhcp_client_opt_args.value= strdup(v2); dhcp_client_opt_args.opt_sect= dmmap_sect; - instance= handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, dmmap_sect, "cwmp_dhcpv4_servpool_option_instance", "cwmp_dhcpv4_servpool_option_alias"); + instance= handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, dmmap_sect, "bbf_dhcpv4_servpool_option_instance", "bbf_dhcpv4_servpool_option_alias"); if (DM_LINK_INST_OBJ(dmctx, parent_node, &dhcp_client_opt_args, instance) == DM_STOP) break; } @@ -3435,7 +3435,7 @@ int browseDHCPv4RelayForwardingInst(struct dmctx *dmctx, DMNODE *parent_node, vo dhcp_relay_arg.dhcp_client_conf = p->config_section; dhcp_relay_arg.dhcp_client_dm= p->dmmap_section; - instance= handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, (void *)p->dmmap_section, "cwmp_dhcpv4relay_instance", "cwmp_dhcpv4relay_alias"); + instance= handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, (void *)p->dmmap_section, "bbf_dhcpv4relay_instance", "bbf_dhcpv4relay_alias"); if (DM_LINK_INST_OBJ(dmctx, parent_node, &dhcp_relay_arg, instance) == DM_STOP) break; diff --git a/dmtree/tr181/dhcpv6.c b/dmtree/tr181/dhcpv6.c index 8478d9ba..e8dd40df 100644 --- a/dmtree/tr181/dhcpv6.c +++ b/dmtree/tr181/dhcpv6.c @@ -13,7 +13,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "dmentry.h" #include "dhcpv4.h" @@ -298,7 +298,7 @@ int browseDHCPv6ClientInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_ dhcpv6_client_arg.dhcp_client_dm= p->dmmap_section; dhcpv6_client_arg.ip= strdup(ipv6addr?ipv6addr:""); - instance = handle_update_instance(1, dmctx, &instnbr, update_instance_alias, 3, p->dmmap_section, "cwmp_dhcpv6client_instance", "cwmp_dhcpv6client_alias"); + instance = handle_update_instance(1, dmctx, &instnbr, update_instance_alias, 3, p->dmmap_section, "bbf_dhcpv6client_instance", "bbf_dhcpv6client_alias"); if (DM_LINK_INST_OBJ(dmctx, parent_node, &dhcpv6_client_arg, instance) == DM_STOP) break; } @@ -425,7 +425,7 @@ int browseDHCPv6ServerPoolOptionInst(struct dmctx *dmctx, DMNODE *parent_node, v dhcp_client_opt_args.option_tag= strdup(v1); dhcp_client_opt_args.value= strdup(v2); dhcp_client_opt_args.opt_sect= dmmap_sect; - instance= handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, dmmap_sect, "cwmp_dhcpv6_servpool_option_instance", "cwmp_dhcpv6_servpool_option_alias"); + instance= handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, dmmap_sect, "bbf_dhcpv6_servpool_option_instance", "bbf_dhcpv6_servpool_option_alias"); if (DM_LINK_INST_OBJ(dmctx, parent_node, &dhcp_client_opt_args, instance) == DM_STOP) break; } @@ -489,14 +489,14 @@ int addObjDHCPv6Client(char *refparam, struct dmctx *ctx, void *data, char **ins char *wan_eth, *value, *wanname, *instancepara, *v; check_create_dmmap_package("dmmap_dhcpv6"); - instancepara = get_last_instance_bbfdm("dmmap_dhcpv6", "interface", "cwmp_dhcpv6client_instance"); + instancepara = get_last_instance_bbfdm("dmmap_dhcpv6", "interface", "bbf_dhcpv6client_instance"); dmuci_add_section("network", "interface", &s, &value); dmuci_set_value_by_section(s, "proto", "dhcpv6"); dmuci_set_value_by_section(s, "ifname", "@wan"); dmuci_set_value_by_section(s, "type", "anywan"); dmuci_add_section_bbfdm("dmmap_dhcpv6", "interface", &dmmap_sect, &v); dmuci_set_value_by_section(dmmap_sect, "section_name", section_name(s)); - *instance = update_instance_bbfdm(dmmap_sect, instancepara, "cwmp_dhcpv6client_instance"); + *instance = update_instance_bbfdm(dmmap_sect, instancepara, "bbf_dhcpv6client_instance"); return 0; } @@ -512,8 +512,8 @@ int delObjDHCPv6Client(char *refparam, struct dmctx *ctx, void *data, char *inst case DEL_INST: if(dhcpv6_client_args->dhcp_client_conf != NULL && is_section_unnamed(section_name(dhcpv6_client_args->dhcp_client_conf))){ LIST_HEAD(dup_list); - delete_sections_save_next_sections("dmmap_dhcpv6", "interface", "cwmp_dhcpv6client_instance", section_name(dhcpv6_client_args->dhcp_client_conf), atoi(instance), &dup_list); - update_dmmap_sections(&dup_list, "cwmp_dhcpv6client_instance", "dmmap_dhcpv6", "interface"); + delete_sections_save_next_sections("dmmap_dhcpv6", "interface", "bbf_dhcpv6client_instance", section_name(dhcpv6_client_args->dhcp_client_conf), atoi(instance), &dup_list); + update_dmmap_sections(&dup_list, "bbf_dhcpv6client_instance", "dmmap_dhcpv6", "interface"); dmuci_delete_by_section_unnamed(dhcpv6_client_args->dhcp_client_conf, NULL, NULL); } else { get_dmmap_section_of_config_section("dmmap_dhcpv6", "interface", section_name(dhcpv6_client_args->dhcp_client_conf), &dmmap_section); @@ -645,12 +645,12 @@ int addObjDHCPv6ServerPoolOption(char *refparam, struct dmctx *ctx, void *data, char *value, *instancepara, *v; check_create_dmmap_package("dmmap_dhcpv6"); - instancepara= get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_dhcpv6", "servpool_option", "cwmp_dhcpv6_servpool_option_instance", "section_name", section_name(dhcp_arg->dhcp_sec)); + instancepara= get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_dhcpv6", "servpool_option", "bbf_dhcpv6_servpool_option_instance", "section_name", section_name(dhcp_arg->dhcp_sec)); dmuci_add_section_bbfdm("dmmap_dhcpv6", "servpool_option", &dmmap_sect, &value); if(dhcp_arg->dhcp_sec != NULL) DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(dhcp_arg->dhcp_sec)); DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_tag", "0"); - *instance = update_instance_bbfdm(dmmap_sect, instancepara, "cwmp_dhcpv6_servpool_option_instance"); + *instance = update_instance_bbfdm(dmmap_sect, instancepara, "bbf_dhcpv6_servpool_option_instance"); return 0; } @@ -742,7 +742,7 @@ int get_DHCPv6Client_Alias(char *refparam, struct dmctx *ctx, void *data, char * { struct dhcpv6_client_args *dhcpv6_client_args = (struct dhcpv6_client_args*)data; - dmuci_get_value_by_section_string(dhcpv6_client_args->dhcp_client_dm, "cwmp_dhcpv6client_alias", value); + dmuci_get_value_by_section_string(dhcpv6_client_args->dhcp_client_dm, "bbf_dhcpv6client_alias", value); return 0; } @@ -754,7 +754,7 @@ int set_DHCPv6Client_Alias(char *refparam, struct dmctx *ctx, void *data, char * case VALUECHECK: break; case VALUESET: - dmuci_set_value_by_section(dhcpv6_client_args->dhcp_client_dm, "cwmp_dhcpv6client_alias", value); + dmuci_set_value_by_section(dhcpv6_client_args->dhcp_client_dm, "bbf_dhcpv6client_alias", value); break; } return 0; @@ -1957,7 +1957,7 @@ int get_DHCPv6ServerPoolOption_Alias(char *refparam, struct dmctx *ctx, void *da { struct dhcpv6_client_option_args* dhcp_client_opt_args= (struct dhcpv6_client_option_args*)data; - dmuci_get_value_by_section_string(dhcp_client_opt_args->opt_sect, "cwmp_dhcpv6_servpool_option_alias", value); + dmuci_get_value_by_section_string(dhcp_client_opt_args->opt_sect, "bbf_dhcpv6_servpool_option_alias", value); return 0; } @@ -1970,7 +1970,7 @@ int set_DHCPv6ServerPoolOption_Alias(char *refparam, struct dmctx *ctx, void *da case VALUECHECK: break; case VALUESET: - DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "cwmp_dhcpv6_servpool_option_alias", value); + DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "bbf_dhcpv6_servpool_option_alias", value); break; } return 0; diff --git a/dmtree/tr181/dns.c b/dmtree/tr181/dns.c index 22f7b0bc..7a05b36e 100644 --- a/dmtree/tr181/dns.c +++ b/dmtree/tr181/dns.c @@ -10,7 +10,7 @@ #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "dmjson.h" #include "dmentry.h" diff --git a/dmtree/tr181/dsl.c b/dmtree/tr181/dsl.c index e46e276b..33c88f5f 100644 --- a/dmtree/tr181/dsl.c +++ b/dmtree/tr181/dsl.c @@ -13,7 +13,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "dmjson.h" #include "dmentry.h" diff --git a/dmtree/tr181/ethernet.c b/dmtree/tr181/ethernet.c index 50361cac..47612b8b 100644 --- a/dmtree/tr181/ethernet.c +++ b/dmtree/tr181/ethernet.c @@ -15,7 +15,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "ethernet.h" #include "dmjson.h" diff --git a/dmtree/tr181/firewall.c b/dmtree/tr181/firewall.c index f73802cf..4e692cac 100644 --- a/dmtree/tr181/firewall.c +++ b/dmtree/tr181/firewall.c @@ -9,7 +9,7 @@ * Author: Omar Kallel */ -#include "dmcwmp.h" +#include "dmbbf.h" #include "firewall.h" #include "dmcommon.h" #include "dmentry.h" diff --git a/dmtree/tr181/hosts.c b/dmtree/tr181/hosts.c index 358f3364..5e6d32b1 100644 --- a/dmtree/tr181/hosts.c +++ b/dmtree/tr181/hosts.c @@ -14,7 +14,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "hosts.h" #include "dmjson.h" diff --git a/dmtree/tr181/interfacestack.c b/dmtree/tr181/interfacestack.c index 2af71f74..0361de88 100644 --- a/dmtree/tr181/interfacestack.c +++ b/dmtree/tr181/interfacestack.c @@ -8,7 +8,7 @@ * Author: Amin Ben Ramdhane */ -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "dmubus.h" #include "dmjson.h" diff --git a/dmtree/tr181/ip.c b/dmtree/tr181/ip.c index 6835f0d4..7231cba1 100644 --- a/dmtree/tr181/ip.c +++ b/dmtree/tr181/ip.c @@ -15,7 +15,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "ip.h" #include "dmjson.h" diff --git a/dmtree/tr181/managementserver.c b/dmtree/tr181/managementserver.c index 7eb5cbb4..d0a1db97 100644 --- a/dmtree/tr181/managementserver.c +++ b/dmtree/tr181/managementserver.c @@ -15,7 +15,7 @@ #include #include #include "dmmem.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr181/managementserver.h b/dmtree/tr181/managementserver.h index 73900f58..0b845372 100644 --- a/dmtree/tr181/managementserver.h +++ b/dmtree/tr181/managementserver.h @@ -11,7 +11,7 @@ #ifndef __MANAGEMENT_SERVER_H #define __MANAGEMENT_SERVER_H -#include "dmcwmp.h" +#include "dmbbf.h" extern DMLEAF tManagementServerParams[]; int get_management_server_url(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value); diff --git a/dmtree/tr181/nat.c b/dmtree/tr181/nat.c index ab0b003d..f7589b6f 100644 --- a/dmtree/tr181/nat.c +++ b/dmtree/tr181/nat.c @@ -15,7 +15,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "dmentry.h" #include "nat.h" diff --git a/dmtree/tr181/ppp.c b/dmtree/tr181/ppp.c index cb593d62..a198ace2 100644 --- a/dmtree/tr181/ppp.c +++ b/dmtree/tr181/ppp.c @@ -14,7 +14,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmjson.h" #include "dmcommon.h" #include "dmentry.h" diff --git a/dmtree/tr181/ptm.c b/dmtree/tr181/ptm.c index ff758f2c..56a638cd 100644 --- a/dmtree/tr181/ptm.c +++ b/dmtree/tr181/ptm.c @@ -11,7 +11,7 @@ #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr181/qos.c b/dmtree/tr181/qos.c index 855dfb37..53540930 100644 --- a/dmtree/tr181/qos.c +++ b/dmtree/tr181/qos.c @@ -8,9 +8,8 @@ * Author: Omar Kallel */ -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" -#include "dmcwmp.h" #include "dmentry.h" #include "dmuci.h" #include "qos.h" diff --git a/dmtree/tr181/routing.c b/dmtree/tr181/routing.c index c829ef32..7780d6eb 100644 --- a/dmtree/tr181/routing.c +++ b/dmtree/tr181/routing.c @@ -14,7 +14,7 @@ #include #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr181/softwaremodules.c b/dmtree/tr181/softwaremodules.c index 665a180b..1c656937 100644 --- a/dmtree/tr181/softwaremodules.c +++ b/dmtree/tr181/softwaremodules.c @@ -12,7 +12,7 @@ #include #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr181/times.c b/dmtree/tr181/times.c index 45a692fb..a7a0a449 100644 --- a/dmtree/tr181/times.c +++ b/dmtree/tr181/times.c @@ -12,7 +12,7 @@ #include #include #include "dmuci.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmubus.h" #include "dmcommon.h" #include "dmentry.h" diff --git a/dmtree/tr181/times.h b/dmtree/tr181/times.h index f29eb656..56b50837 100644 --- a/dmtree/tr181/times.h +++ b/dmtree/tr181/times.h @@ -11,7 +11,7 @@ #ifndef __TIMES_H #define __TIMES_H -#include "dmcwmp.h" +#include "dmbbf.h" extern DMLEAF tTimeParams[]; diff --git a/dmtree/tr181/upnp.c b/dmtree/tr181/upnp.c index 1ace60a3..cae1fd14 100644 --- a/dmtree/tr181/upnp.c +++ b/dmtree/tr181/upnp.c @@ -14,7 +14,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "upnp.h" diff --git a/dmtree/tr181/usb.c b/dmtree/tr181/usb.c index f75f19d5..0dede806 100644 --- a/dmtree/tr181/usb.c +++ b/dmtree/tr181/usb.c @@ -8,7 +8,7 @@ * Author: Omar Kallel */ -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "usb.h" #include diff --git a/dmtree/tr181/userinterface.c b/dmtree/tr181/userinterface.c index ec3edbb7..760a9ca3 100644 --- a/dmtree/tr181/userinterface.c +++ b/dmtree/tr181/userinterface.c @@ -15,7 +15,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmjson.h" #include "dmcommon.h" #include "userinterface.h" diff --git a/dmtree/tr181/users.c b/dmtree/tr181/users.c index 488b3258..c4f44bb7 100644 --- a/dmtree/tr181/users.c +++ b/dmtree/tr181/users.c @@ -9,7 +9,7 @@ * Author: Omar Kallel */ -#include "dmcwmp.h" +#include "dmbbf.h" #include "users.h" #include "dmcommon.h" diff --git a/dmtree/tr181/users.h b/dmtree/tr181/users.h index 2ea935e0..08898d32 100644 --- a/dmtree/tr181/users.h +++ b/dmtree/tr181/users.h @@ -12,8 +12,7 @@ #ifndef _USERS_H #define _USERS_H -#include "dmcwmp.h" - +#include "dmbbf.h" extern DMOBJ tUsersObj[]; extern DMLEAF tUsersParams[]; diff --git a/dmtree/tr181/wifi.c b/dmtree/tr181/wifi.c index cfabd4c4..20ce9937 100644 --- a/dmtree/tr181/wifi.c +++ b/dmtree/tr181/wifi.c @@ -15,7 +15,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "wifi.h" #include "dmjson.h" diff --git a/dmtree/tr181/x_iopsys_eu_buttons.c b/dmtree/tr181/x_iopsys_eu_buttons.c index 8fcc95e2..6ccfe9f5 100644 --- a/dmtree/tr181/x_iopsys_eu_buttons.c +++ b/dmtree/tr181/x_iopsys_eu_buttons.c @@ -12,7 +12,7 @@ #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr181/x_iopsys_eu_dropbear.c b/dmtree/tr181/x_iopsys_eu_dropbear.c index ccf0e0ad..41c83c9f 100644 --- a/dmtree/tr181/x_iopsys_eu_dropbear.c +++ b/dmtree/tr181/x_iopsys_eu_dropbear.c @@ -11,7 +11,7 @@ #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr181/x_iopsys_eu_ice.c b/dmtree/tr181/x_iopsys_eu_ice.c index 894e0c6f..e19391bf 100644 --- a/dmtree/tr181/x_iopsys_eu_ice.c +++ b/dmtree/tr181/x_iopsys_eu_ice.c @@ -14,7 +14,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "x_iopsys_eu_ice.h" diff --git a/dmtree/tr181/x_iopsys_eu_igmp.c b/dmtree/tr181/x_iopsys_eu_igmp.c index 84482d2e..d6de7e53 100644 --- a/dmtree/tr181/x_iopsys_eu_igmp.c +++ b/dmtree/tr181/x_iopsys_eu_igmp.c @@ -14,7 +14,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "x_iopsys_eu_igmp.h" diff --git a/dmtree/tr181/x_iopsys_eu_ipacccfg.c b/dmtree/tr181/x_iopsys_eu_ipacccfg.c index b6cc57a0..6b3a09dc 100644 --- a/dmtree/tr181/x_iopsys_eu_ipacccfg.c +++ b/dmtree/tr181/x_iopsys_eu_ipacccfg.c @@ -12,7 +12,7 @@ #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr181/x_iopsys_eu_logincfg.c b/dmtree/tr181/x_iopsys_eu_logincfg.c index 7dab5fcd..6695f6f1 100644 --- a/dmtree/tr181/x_iopsys_eu_logincfg.c +++ b/dmtree/tr181/x_iopsys_eu_logincfg.c @@ -10,7 +10,7 @@ */ #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr181/x_iopsys_eu_owsd.c b/dmtree/tr181/x_iopsys_eu_owsd.c index dee65a5e..b985a03a 100644 --- a/dmtree/tr181/x_iopsys_eu_owsd.c +++ b/dmtree/tr181/x_iopsys_eu_owsd.c @@ -12,7 +12,7 @@ #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr181/x_iopsys_eu_power_mgmt.c b/dmtree/tr181/x_iopsys_eu_power_mgmt.c index a6d6e1b3..660eea76 100644 --- a/dmtree/tr181/x_iopsys_eu_power_mgmt.c +++ b/dmtree/tr181/x_iopsys_eu_power_mgmt.c @@ -12,7 +12,7 @@ */ #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmcommon.h" #include "x_iopsys_eu_power_mgmt.h" diff --git a/dmtree/tr181/x_iopsys_eu_syslog.c b/dmtree/tr181/x_iopsys_eu_syslog.c index 3f2fbd5d..91715691 100644 --- a/dmtree/tr181/x_iopsys_eu_syslog.c +++ b/dmtree/tr181/x_iopsys_eu_syslog.c @@ -14,7 +14,7 @@ #include #include "dmuci.h" #include "dmubus.h" -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmcommon.h" #include "x_iopsys_eu_syslog.h" diff --git a/dmtree/tr181/x_iopsys_eu_wifilife.c b/dmtree/tr181/x_iopsys_eu_wifilife.c index 9f686a92..ed73269a 100644 --- a/dmtree/tr181/x_iopsys_eu_wifilife.c +++ b/dmtree/tr181/x_iopsys_eu_wifilife.c @@ -10,7 +10,7 @@ #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/dmtree/tr181/xmpp.c b/dmtree/tr181/xmpp.c index dfb0f7e4..21228bdc 100644 --- a/dmtree/tr181/xmpp.c +++ b/dmtree/tr181/xmpp.c @@ -12,7 +12,7 @@ #include #include -#include "dmcwmp.h" +#include "dmbbf.h" #include "dmuci.h" #include "dmubus.h" #include "dmcommon.h" diff --git a/json/convertor_json_to_c.py b/json/convertor_json_to_c.py index f8d477d0..921f7490 100755 --- a/json/convertor_json_to_c.py +++ b/json/convertor_json_to_c.py @@ -179,7 +179,7 @@ def cprinttopfile (fp, filename): print >> fp, "* Author: Amin Ben Ramdhane " print >> fp, "*/" print >> fp, "" - print >> fp, "#include \"dmcwmp.h\"" + print >> fp, "#include \"dmbbf.h\"" print >> fp, "#include \"dmcommon.h\"" print >> fp, "#include \"dmuci.h\"" print >> fp, "#include \"dmubus.h\"" diff --git a/tools/generator_c.py b/tools/generator_c.py index 49147b79..c447688f 100755 --- a/tools/generator_c.py +++ b/tools/generator_c.py @@ -132,7 +132,7 @@ def cprinttopfile (fp, filename): print >> fp, "* Author: Amin Ben Ramdhane " print >> fp, "*/" print >> fp, "" - print >> fp, "#include \"dmcwmp.h\"" + print >> fp, "#include \"dmbbf.h\"" print >> fp, "#include \"dmcommon.h\"" print >> fp, "#include \"%s.h\"" % filename.lower() print >> fp, ""