mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

change icwmp,icwmpd -> bbfdm

Browse source
This commit is contained in:
Amin Ben Ramdhane 2019-09-03 15:24:55 +01:00
parent 9f59685ea4
commit 8655b0a37d
36 changed files with 521 additions and 522 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -18,7 +18,7 @@ development environment
Make sure you have all the packages installed from packages-arch-tr069 git
repository.
$ ln -sf `pwd`/scripts/defaults /usr/share/icwmp/defaults
$ ln -sf `pwd`/scripts/defaults /usr/share/bbfdm/defaults
run icwmpd

118
dmcommon.c
View file

@ -607,13 +607,13 @@ void update_section_option_list(char *config, char *section, char *option, char
}
if (config == DMMAP)
{
uci_path_foreach_option_eq(icwmpd, config, section, option_2, val_2, s) {
uci_path_foreach_option_eq(bbfdm, config, section, option_2, val_2, s) {
dmuci_get_value_by_section_string(s, option, &baseifname);
if (!strstr(name, baseifname))
{
//delete section if baseifname does not belong to ifname
if (prev_s) {
DMUCI_DELETE_BY_SECTION(icwmpd, prev_s, NULL, NULL);
DMUCI_DELETE_BY_SECTION(bbfdm, prev_s, NULL, NULL);
}
prev_s = s;
} else if (strstr(name, baseifname) && (strcmp(baseifname,val) ==0)) {
@ -622,12 +622,12 @@ void update_section_option_list(char *config, char *section, char *option, char
}
}
if (prev_s) {
DMUCI_DELETE_BY_SECTION(icwmpd, prev_s, NULL, NULL);
DMUCI_DELETE_BY_SECTION(bbfdm, prev_s, NULL, NULL);
}
if (add_sec) {
DMUCI_ADD_SECTION(icwmpd, config, section, &s, &add_value);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, option, val);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, option_2, val_2);
DMUCI_ADD_SECTION(bbfdm, config, section, &s, &add_value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, option, val);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, option_2, val_2);
}
}
else
@ -657,26 +657,26 @@ void update_section_option_list(char *config, char *section, char *option, char
}
}
void update_section_list_icwmpd(char *config, char *section, char *option, int number, char *filter, char *option1, char *val1, char *option2, char *val2)
void update_section_list_bbfdm(char *config, char *section, char *option, int number, char *filter, char *option1, char *val1, char *option2, char *val2)
{
char *add_value;
struct uci_section *s = NULL;
int i = 0;
if (option) {
uci_path_foreach_option_eq(icwmpd, config, section, option, filter, s) {
uci_path_foreach_option_eq(bbfdm, config, section, option, filter, s) {
return;
}
} else {
uci_path_foreach_sections(icwmpd, config, section, s) {
uci_path_foreach_sections(bbfdm, config, section, s) {
return;
}
}
while (i < number) {
DMUCI_ADD_SECTION(icwmpd, config, section, &s, &add_value);
if (option)DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, option, filter);
if (option1)DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, option1, val1);
if (option2)DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, option2, val2);
DMUCI_ADD_SECTION(bbfdm, config, section, &s, &add_value);
if (option)DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, option, filter);
if (option1)DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, option1, val1);
if (option2)DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, option2, val2);
i++;
}
}
@ -690,19 +690,19 @@ void update_section_list(char *config, char *section, char *option, int number,
if (config == DMMAP)
{
if (option) {
uci_path_foreach_option_eq(icwmpd, config, section, option, filter, s) {
uci_path_foreach_option_eq(bbfdm, config, section, option, filter, s) {
return;
}
} else {
uci_path_foreach_sections(icwmpd, config, section, s) {
uci_path_foreach_sections(bbfdm, config, section, s) {
return;
}
}
while (i < number) {
DMUCI_ADD_SECTION(icwmpd, config, section, &s, &add_value);
if (option)DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, option, filter);
if (option1)DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, option1, val1);
if (option2)DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, option2, val2);
DMUCI_ADD_SECTION(bbfdm, config, section, &s, &add_value);
if (option)DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, option, filter);
if (option1)DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, option1, val1);
if (option2)DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, option2, val2);
i++;
}
}
@ -1013,7 +1013,7 @@ struct uci_section *get_dup_section_in_dmmap(char *dmmap_package, char *section_
{
struct uci_section *s;
uci_path_foreach_option_eq(icwmpd, dmmap_package, section_type, "section_name", orig_section_name, s)
uci_path_foreach_option_eq(bbfdm, dmmap_package, section_type, "section_name", orig_section_name, s)
{
return s;
}
@ -1026,7 +1026,7 @@ struct uci_section *get_dup_section_in_dmmap_eq(char *dmmap_package, char* secti
struct uci_section *s;
char *v;
uci_path_foreach_option_eq(icwmpd, dmmap_package, section_type, "section_name", sect_name, s) {
uci_path_foreach_option_eq(bbfdm, dmmap_package, section_type, "section_name", sect_name, s) {
dmuci_get_value_by_section_string(s, opt_name, &v);
if(strcmp(v, opt_value)== 0)
return s;
@ -1040,7 +1040,7 @@ void synchronize_specific_config_sections_with_dmmap(char *package, char *sectio
FILE *fp;
char *v, *dmmap_file_path;
dmasprintf(&dmmap_file_path, "/etc/icwmpd/%s", dmmap_package);
dmasprintf(&dmmap_file_path, "/etc/bbfdm/%s", dmmap_package);
if (access(dmmap_file_path, F_OK)) {
/*
*File does not exist
@ -1053,8 +1053,8 @@ void synchronize_specific_config_sections_with_dmmap(char *package, char *sectio
* create/update corresponding dmmap section that have same config_section link and using param_value_array
*/
if ((dmmap_sect = get_dup_section_in_dmmap(dmmap_package, section_type, section_name(s))) == NULL) {
dmuci_add_section_icwmpd(dmmap_package, section_type, &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section_name", section_name(s));
dmuci_add_section_bbfdm(dmmap_package, section_type, &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(s));
}
/*
@ -1066,10 +1066,10 @@ void synchronize_specific_config_sections_with_dmmap(char *package, char *sectio
/*
* Delete unused dmmap sections
*/
uci_path_foreach_sections_safe(icwmpd, dmmap_package, section_type, stmp, s) {
uci_path_foreach_sections_safe(bbfdm, dmmap_package, section_type, stmp, s) {
dmuci_get_value_by_section_string(s, "section_name", &v);
if(get_origin_section_from_config(package, section_type, v) == NULL){
dmuci_delete_by_section_unnamed_icwmpd(s, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(s, NULL, NULL);
}
}
}
@ -1080,7 +1080,7 @@ void synchronize_specific_config_sections_with_dmmap_eq(char *package, char *sec
FILE *fp;
char *v, *dmmap_file_path;
dmasprintf(&dmmap_file_path, "/etc/icwmpd/%s", dmmap_package);
dmasprintf(&dmmap_file_path, "/etc/bbfdm/%s", dmmap_package);
if (access(dmmap_file_path, F_OK)) {
/*
*File does not exist
@ -1093,8 +1093,8 @@ void synchronize_specific_config_sections_with_dmmap_eq(char *package, char *sec
* create/update corresponding dmmap section that have same config_section link and using param_value_array
*/
if ((dmmap_sect = get_dup_section_in_dmmap(dmmap_package, section_type, section_name(s))) == NULL) {
dmuci_add_section_icwmpd(dmmap_package, section_type, &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section_name", section_name(s));
dmuci_add_section_bbfdm(dmmap_package, section_type, &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(s));
}
/*
@ -1106,7 +1106,7 @@ void synchronize_specific_config_sections_with_dmmap_eq(char *package, char *sec
/*
* Delete unused dmmap sections
*/
uci_path_foreach_sections_safe(icwmpd, dmmap_package, section_type, stmp, s) {
uci_path_foreach_sections_safe(bbfdm, dmmap_package, section_type, stmp, s) {
dmuci_get_value_by_section_string(s, "section_name", &v);
if(get_origin_section_from_config(package, section_type, v) == NULL){
dmuci_delete_by_section(s, NULL, NULL);
@ -1120,7 +1120,7 @@ void synchronize_specific_config_sections_with_dmmap_eq_no_delete(char *package,
FILE *fp;
char *v, *dmmap_file_path;
dmasprintf(&dmmap_file_path, "/etc/icwmpd/%s", dmmap_package);
dmasprintf(&dmmap_file_path, "/etc/bbfdm/%s", dmmap_package);
if (access(dmmap_file_path, F_OK)) {
/*
*File does not exist
@ -1133,14 +1133,14 @@ void synchronize_specific_config_sections_with_dmmap_eq_no_delete(char *package,
* create/update corresponding dmmap section that have same config_section link and using param_value_array
*/
if ((dmmap_sect = get_dup_section_in_dmmap(dmmap_package, section_type, section_name(s))) == NULL) {
dmuci_add_section_icwmpd(dmmap_package, section_type, &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section_name", section_name(s));
dmuci_add_section_bbfdm(dmmap_package, section_type, &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(s));
}
}
dmmap_sect= NULL;
s= NULL;
uci_path_foreach_sections(icwmpd, dmmap_package, section_type, dmmap_sect) {
uci_path_foreach_sections(bbfdm, dmmap_package, section_type, dmmap_sect) {
dmuci_get_value_by_section_string(dmmap_sect, "section_name", &v);
get_config_section_of_dmmap_section("network", "interface", v, &s);
add_sectons_list_paramameter(dup_list, s, dmmap_sect, NULL);
@ -1153,7 +1153,7 @@ void synchronize_specific_config_sections_with_dmmap_cont(char *package, char *s
FILE *fp;
char *v, *dmmap_file_path;
dmasprintf(&dmmap_file_path, "/etc/icwmpd/%s", dmmap_package);
dmasprintf(&dmmap_file_path, "/etc/bbfdm/%s", dmmap_package);
if (access(dmmap_file_path, F_OK)) {
/*
*File does not exist
@ -1166,8 +1166,8 @@ void synchronize_specific_config_sections_with_dmmap_cont(char *package, char *s
* create/update corresponding dmmap section that have same config_section link and using param_value_array
*/
if ((dmmap_sect = get_dup_section_in_dmmap(dmmap_package, section_type, section_name(s))) == NULL) {
dmuci_add_section_icwmpd(dmmap_package, section_type, &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section_name", section_name(s));
dmuci_add_section_bbfdm(dmmap_package, section_type, &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(s));
}
/*
@ -1179,7 +1179,7 @@ void synchronize_specific_config_sections_with_dmmap_cont(char *package, char *s
/*
* Delete unused dmmap sections
*/
uci_path_foreach_sections_safe(icwmpd, dmmap_package, section_type, stmp, s) {
uci_path_foreach_sections_safe(bbfdm, dmmap_package, section_type, stmp, s) {
dmuci_get_value_by_section_string(s, "section_name", &v);
if(get_origin_section_from_config(package, section_type, v) == NULL){
@ -1195,7 +1195,7 @@ bool synchronize_multi_config_sections_with_dmmap_eq(char *package, char *sectio
char *v, *dmmap_file_path, *pack, *sect;
bool found = false;
dmasprintf(&dmmap_file_path, "/etc/icwmpd/%s", dmmap_package);
dmasprintf(&dmmap_file_path, "/etc/bbfdm/%s", dmmap_package);
if (access(dmmap_file_path, F_OK)) {
/*
*File does not exist
@ -1210,10 +1210,10 @@ bool synchronize_multi_config_sections_with_dmmap_eq(char *package, char *sectio
* create/update corresponding dmmap section that have same config_section link and using param_value_array
*/
if ((dmmap_sect = get_dup_section_in_dmmap(dmmap_package, dmmap_section, section_name(s))) == NULL) {
dmuci_add_section_icwmpd(dmmap_package, dmmap_section, &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section_name", section_name(s));
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "package", package);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section", section_type);
dmuci_add_section_bbfdm(dmmap_package, dmmap_section, &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(s));
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "package", package);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section", section_type);
}
/*
@ -1225,7 +1225,7 @@ bool synchronize_multi_config_sections_with_dmmap_eq(char *package, char *sectio
/*
* Delete unused dmmap sections
*/
uci_path_foreach_sections_safe(icwmpd, dmmap_package, dmmap_section, stmp, s) {
uci_path_foreach_sections_safe(bbfdm, dmmap_package, dmmap_section, stmp, s) {
dmuci_get_value_by_section_string(s, "section_name", &v);
dmuci_get_value_by_section_string(s, "package", &pack);
dmuci_get_value_by_section_string(s, "section", &sect);
@ -1246,7 +1246,7 @@ bool synchronize_multi_config_sections_with_dmmap_eq_diff(char *package, char *s
char *v, *dmmap_file_path, *pack, *sect, *optval;
bool found= false;
dmasprintf(&dmmap_file_path, "/etc/icwmpd/%s", dmmap_package);
dmasprintf(&dmmap_file_path, "/etc/bbfdm/%s", dmmap_package);
if (access(dmmap_file_path, F_OK)) {
/*
*File does not exist
@ -1263,10 +1263,10 @@ bool synchronize_multi_config_sections_with_dmmap_eq_diff(char *package, char *s
* create/update corresponding dmmap section that have same config_section link and using param_value_array
*/
if ((dmmap_sect = get_dup_section_in_dmmap(dmmap_package, dmmap_section, section_name(s))) == NULL) {
dmuci_add_section_icwmpd(dmmap_package, dmmap_section, &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section_name", section_name(s));
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "package", package);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section", section_type);
dmuci_add_section_bbfdm(dmmap_package, dmmap_section, &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(s));
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "package", package);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section", section_type);
}
/*
@ -1279,7 +1279,7 @@ bool synchronize_multi_config_sections_with_dmmap_eq_diff(char *package, char *s
/*
* Delete unused dmmap sections
*/
uci_path_foreach_sections_safe(icwmpd, dmmap_package, dmmap_section, stmp, s) {
uci_path_foreach_sections_safe(bbfdm, dmmap_package, dmmap_section, stmp, s) {
dmuci_get_value_by_section_string(s, "section_name", &v);
dmuci_get_value_by_section_string(s, "package", &pack);
dmuci_get_value_by_section_string(s, "section", &sect);
@ -1297,7 +1297,7 @@ void get_dmmap_section_of_config_section(char* dmmap_package, char* section_type
{
struct uci_section* s;
uci_path_foreach_option_eq(icwmpd, dmmap_package, section_type, "section_name", section_name, s){
uci_path_foreach_option_eq(bbfdm, dmmap_package, section_type, "section_name", section_name, s){
*dmmap_section= s;
return;
}
@ -1308,7 +1308,7 @@ void get_dmmap_section_of_config_section_eq(char* dmmap_package, char* section_t
{
struct uci_section* s;
uci_path_foreach_option_eq(icwmpd, dmmap_package, section_type, opt, value, s){
uci_path_foreach_option_eq(bbfdm, dmmap_package, section_type, opt, value, s){
*dmmap_section= s;
return;
}
@ -1333,7 +1333,7 @@ void check_create_dmmap_package(char *dmmap_package)
FILE *fp;
char *dmmap_file_path;
dmasprintf(&dmmap_file_path, "/etc/icwmpd/%s", dmmap_package);
dmasprintf(&dmmap_file_path, "/etc/bbfdm/%s", dmmap_package);
if (access(dmmap_file_path, F_OK)) {
/*
*File does not exist
@ -1378,7 +1378,7 @@ void delete_sections_save_next_sections(char* dmmap_package, char *section_type,
asprintf(&lsectname, "%s", section_name);
uci_path_foreach_sections(icwmpd, dmmap_package, section_type, s) {
uci_path_foreach_sections(bbfdm, dmmap_package, section_type, s) {
dmuci_get_value_by_section_string(s, instancename, &v);
inst= atoi(v);
if(inst>instance){
@ -1395,11 +1395,11 @@ void delete_sections_save_next_sections(char* dmmap_package, char *section_type,
if(lsectname != NULL) free(lsectname);
uci_path_foreach_sections_safe(icwmpd, dmmap_package, section_type, stmp, s) {
uci_path_foreach_sections_safe(bbfdm, dmmap_package, section_type, stmp, s) {
dmuci_get_value_by_section_string(s, instancename, &v);
inst= atoi(v);
if(inst>=instance)
dmuci_delete_by_section_unnamed_icwmpd(s, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(s, NULL, NULL);
}
}
@ -1410,7 +1410,7 @@ void update_dmmap_sections(struct list_head *dup_list, char *instancename, char*
struct dmmap_sect *p;
list_for_each_entry(p, dup_list, list) {
dmuci_add_section_icwmpd(dmmap_package, section_type, &dm_sect, &v);
dmuci_add_section_bbfdm(dmmap_package, section_type, &dm_sect, &v);
dmuci_set_value_by_section(dm_sect, "section_name", p->section_name);
dmuci_set_value_by_section(dm_sect, instancename, p->instance);
}
@ -1420,7 +1420,7 @@ struct uci_section *is_dmmap_section_exist(char* package, char* section)
{
struct uci_section *s;
uci_path_foreach_sections(icwmpd, package, section, s) {
uci_path_foreach_sections(bbfdm, package, section, s) {
return s;
}
return NULL;
@ -1430,7 +1430,7 @@ struct uci_section *is_dmmap_section_exist_eq(char* package, char* section, char
{
struct uci_section *s;
uci_path_foreach_option_eq(icwmpd, package, section, opt, value, s) {
uci_path_foreach_option_eq(bbfdm, package, section, opt, value, s) {
return s;
}
return NULL;

16
dmcommon.h
View file

@ -57,22 +57,22 @@ do { \
if (mpp) close (mpp); \
} while (0)
#define IPPING_PATH "/usr/share/icwmp/functions/ipping_launch"
#define IPPING_PATH "/usr/share/bbfdm/functions/ipping_launch"
#define IPPING_STOP DMCMD("/bin/sh", 2, IPPING_PATH, "stop");
#define DOWNLOAD_DIAGNOSTIC_PATH "/usr/share/icwmp/functions/download_launch"
#define DOWNLOAD_DIAGNOSTIC_PATH "/usr/share/bbfdm/functions/download_launch"
#define DOWNLOAD_DUMP_FILE "/tmp/download_dump"
#define DOWNLOAD_DIAGNOSTIC_STOP DMCMD("/bin/sh", 2, DOWNLOAD_DIAGNOSTIC_PATH, "stop");
#define UPLOAD_DIAGNOSTIC_PATH "/usr/share/icwmp/functions/upload_launch"
#define UPLOAD_DIAGNOSTIC_PATH "/usr/share/bbfdm/functions/upload_launch"
#define UPLOAD_DUMP_FILE "/tmp/upload_dump"
#define UPLOAD_DIAGNOSTIC_STOP DMCMD("/bin/sh", 2, UPLOAD_DIAGNOSTIC_PATH, "stop");
#define NSLOOKUP_PATH "/usr/share/icwmp/functions/nslookup_launch"
#define NSLOOKUP_PATH "/usr/share/bbfdm/functions/nslookup_launch"
#define NSLOOKUP_LOG_FILE "/tmp/nslookup.log"
#define NSLOOKUP_STOP DMCMD("/bin/sh", 2, NSLOOKUP_PATH, "stop");
#define TRACEROUTE_PATH "/usr/share/icwmp/functions/traceroute_launch"
#define TRACEROUTE_PATH "/usr/share/bbfdm/functions/traceroute_launch"
#define TRACEROUTE_STOP DMCMD("/bin/sh", 2, TRACEROUTE_PATH, "stop");
#define UDPECHO_PATH "/usr/share/icwmp/functions/udpecho_launch"
#define UDPECHO_PATH "/usr/share/bbfdm/functions/udpecho_launch"
#define UDPECHO_STOP DMCMD("/bin/sh", 2, UDPECHO_PATH, "stop");
#define SERVERSELECTION_PATH "/usr/share/icwmp/functions/serverselection_launch"
#define SERVERSELECTION_PATH "/usr/share/bbfdm/functions/serverselection_launch"
#define SERVERSELECTION_STOP DMCMD("/bin/sh", 2, SERVERSELECTION_PATH, "stop");
enum notification_enum {
@ -157,7 +157,7 @@ int ipcalc_rev_end(char *ip_str, char *mask_str, char *start_str, char *ipend_st
int network_get_ipaddr(char **value, char *iface);
void remove_vid_interfaces_from_ifname(char *vid, char *ifname, char *new_ifname);
void update_section_option_list(char *config, char *section, char *option, char *option_2,char *val, char *val_2, char *name);
void update_section_list_icwmpd(char *config, char *section, char *option, int number, char *filter, char *option1, char *val1, char *option2, char *val2);
void update_section_list_bbfdm(char *config, char *section, char *option, int number, char *filter, char *option1, char *val1, char *option2, char *val2);
void update_section_list(char *config, char *section, char *option, int number, char *filter, char *option1, char *val1, char *option2, char *val2);
char *get_nvram_wpakey();
int reset_wlan(struct uci_section *s);

48
dmcwmp.c
View file

@ -445,11 +445,11 @@ char *update_instance(struct uci_section *s, char *last_inst, char *inst_opt)
argv[1] = inst_opt;
argv[2] = "";
instance = update_instance_alias_icwmpd(0, &last_inst, argv);
instance = update_instance_alias_bbfdm(0, &last_inst, argv);
return instance;
}
char *update_instance_icwmpd(struct uci_section *s, char *last_inst, char *inst_opt)
char *update_instance_bbfdm(struct uci_section *s, char *last_inst, char *inst_opt)
{
char *instance;
void *argv[3];
@ -457,11 +457,11 @@ char *update_instance_icwmpd(struct uci_section *s, char *last_inst, char *inst_
argv[0]= s;
argv[1]= inst_opt;
argv[2]= "";
instance = update_instance_alias_icwmpd(0, &last_inst, argv);
instance = update_instance_alias_bbfdm(0, &last_inst, argv);
return instance;
}
char *update_instance_alias_icwmpd(int action, char **last_inst , void *argv[])
char *update_instance_alias_bbfdm(int action, char **last_inst , void *argv[])
{
char *instance;
char *alias;
@ -475,14 +475,14 @@ char *update_instance_alias_icwmpd(int action, char **last_inst , void *argv[])
sprintf(buf, "%d", 1);
else
sprintf(buf, "%d", atoi(*last_inst)+1);
instance = DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, inst_opt, buf);
instance = DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, inst_opt, buf);
}
*last_inst = instance;
if (action == INSTANCE_MODE_ALIAS) {
dmuci_get_value_by_section_string(s, alias_opt, &alias);
if (alias[0] == '\0') {
sprintf(buf, "cpe-%s", instance);
alias = DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, alias_opt, buf);
alias = DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, alias_opt, buf);
}
sprintf(buf, "[%s]", alias);
instance = dmstrdup(buf);
@ -539,18 +539,18 @@ char *update_instance_without_section(int action, char **last_inst, void *argv[]
return instance;
}
char *get_vlan_last_instance_icwmpd(char *package, char *section, char *opt_inst, char *vlan_method)
char *get_vlan_last_instance_bbfdm(char *package, char *section, char *opt_inst, char *vlan_method)
{
struct uci_section *s, *confsect;
char *inst = NULL, *last_inst = NULL, *type, *sect_name;
uci_path_foreach_sections(icwmpd, package, section, s) {
uci_path_foreach_sections(bbfdm, package, section, s) {
dmuci_get_value_by_section_string(s, "section_name", &sect_name);
get_config_section_of_dmmap_section("network", "device", sect_name, &confsect);
dmuci_get_value_by_section_string(confsect, "type", &type);
if ((strcmp(vlan_method, "2") != 0 && strcmp(vlan_method, "1") != 0) || (strcmp(vlan_method, "1") == 0 && strcmp(type, "untagged") == 0) )
continue;
inst = update_instance_icwmpd(s, last_inst, opt_inst);
inst = update_instance_bbfdm(s, last_inst, opt_inst);
if(last_inst)
dmfree(last_inst);
last_inst = dmstrdup(inst);
@ -558,14 +558,14 @@ char *get_vlan_last_instance_icwmpd(char *package, char *section, char *opt_inst
return inst;
}
char *get_last_instance_icwmpd(char *package, char *section, char *opt_inst)
char *get_last_instance_bbfdm(char *package, char *section, char *opt_inst)
{
struct uci_section *s;
char *inst = NULL;
char *last_inst = NULL;
uci_path_foreach_sections(icwmpd, package, section, s) {
inst = update_instance_icwmpd(s, last_inst, opt_inst);
uci_path_foreach_sections(bbfdm, package, section, s) {
inst = update_instance_bbfdm(s, last_inst, opt_inst);
if(last_inst)
dmfree(last_inst);
last_inst = dmstrdup(inst);
@ -573,13 +573,13 @@ char *get_last_instance_icwmpd(char *package, char *section, char *opt_inst)
return inst;
}
char *get_last_instance_icwmpd_without_update(char *package, char *section, char *opt_inst)
char *get_last_instance_bbfdm_without_update(char *package, char *section, char *opt_inst)
{
struct uci_section *s;
char *inst = NULL;
char *last_inst = NULL;
uci_path_foreach_sections(icwmpd, package, section, s) {
uci_path_foreach_sections(bbfdm, package, section, s) {
dmuci_get_value_by_section_string(s, opt_inst, &inst);
if(last_inst)
dmfree(last_inst);
@ -595,8 +595,8 @@ char *get_last_instance(char *package, char *section, char *opt_inst)
char *last_inst = NULL;
if (package == DMMAP)
{
uci_path_foreach_sections(icwmpd, "dmmap", section, s) {
inst = update_instance_icwmpd(s, last_inst, opt_inst);
uci_path_foreach_sections(bbfdm, "dmmap", section, s) {
inst = update_instance_bbfdm(s, last_inst, opt_inst);
if(last_inst)
dmfree(last_inst);
last_inst = dmstrdup(inst);
@ -611,22 +611,22 @@ char *get_last_instance(char *package, char *section, char *opt_inst)
return inst;
}
char *get_last_instance_lev2_icwmpd_dmmap_opt(char* dmmap_package, char *section, char *opt_inst, char *opt_check, char *value_check)
char *get_last_instance_lev2_bbfdm_dmmap_opt(char* dmmap_package, char *section, char *opt_inst, char *opt_check, char *value_check)
{
struct uci_section *s;
char *instance = NULL, *section_name= NULL;
char *last_inst = NULL;
uci_path_foreach_option_eq(icwmpd, dmmap_package, section, opt_check, value_check, s) {
uci_path_foreach_option_eq(bbfdm, dmmap_package, section, opt_check, value_check, s) {
dmuci_get_value_by_section_string(s, "section_name", &section_name);
instance = update_instance_icwmpd(s, last_inst, opt_inst);
instance = update_instance_bbfdm(s, last_inst, opt_inst);
if(last_inst)
dmfree(last_inst);
last_inst = dmstrdup(instance);
}
return instance;
}
char *get_last_instance_lev2_icwmpd(char *package, char *section, char* dmmap_package, char *opt_inst, char *opt_check, char *value_check)
char *get_last_instance_lev2_bbfdm(char *package, char *section, char* dmmap_package, char *opt_inst, char *opt_check, char *value_check)
{
struct uci_section *s, *dmmap_section;
char *instance = NULL;
@ -636,10 +636,10 @@ char *get_last_instance_lev2_icwmpd(char *package, char *section, char* dmmap_pa
uci_foreach_option_cont(package, section, opt_check, value_check, s) {
get_dmmap_section_of_config_section(dmmap_package, section, section_name(s), &dmmap_section);
if(dmmap_section == NULL){
dmuci_add_section_icwmpd(dmmap_package, section, &dmmap_section, &v);
dmuci_add_section_bbfdm(dmmap_package, section, &dmmap_section, &v);
dmuci_set_value_by_section(dmmap_section, "section_name", section_name(s));
}
instance = update_instance_icwmpd(dmmap_section, last_inst, opt_inst);
instance = update_instance_bbfdm(dmmap_section, last_inst, opt_inst);
if(last_inst)
dmfree(last_inst);
last_inst = dmstrdup(instance);
@ -655,8 +655,8 @@ char *get_last_instance_lev2(char *package, char *section, char *opt_inst, char
if (package == DMMAP)
{
uci_path_foreach_option_cont(icwmpd, package, section, opt_check, value_check, s) {
instance = update_instance_icwmpd(s, last_inst, opt_inst);
uci_path_foreach_option_cont(bbfdm, package, section, opt_check, value_check, s) {
instance = update_instance_bbfdm(s, last_inst, opt_inst);
if(last_inst)
dmfree(last_inst);
last_inst = dmstrdup(instance);

14
dmcwmp.h
View file

@ -477,8 +477,8 @@ extern int bbfdatamodel_type;
extern unsigned int upnp_in_user_mask;
char *update_instance(struct uci_section *s, char *last_inst, char *inst_opt);
char *update_instance_icwmpd(struct uci_section *s, char *last_inst, char *inst_opt);
char *update_instance_alias_icwmpd(int action, char **last_inst , void *argv[]);
char *update_instance_bbfdm(struct uci_section *s, char *last_inst, char *inst_opt);
char *update_instance_alias_bbfdm(int action, char **last_inst , void *argv[]);
char *update_instance_alias(int action, char **last_inst , void *argv[]);
char *update_instance_without_section(int action, char **last_inst, void *argv[]);
int get_empty(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value);
@ -522,12 +522,12 @@ void dm_update_enabled_notify(struct dm_enabled_notify *p, char *new_value);
int dm_update_file_enabled_notify(char *param, char *new_value);
void dm_update_enabled_notify_byname(char *name, char *new_value);
char *get_last_instance(char *package, char *section, char *opt_inst);
char *get_last_instance_icwmpd_without_update(char *package, char *section, char *opt_inst);
char *get_last_instance_icwmpd(char *package, char *section, char *opt_inst);
char *get_vlan_last_instance_icwmpd(char *package, char *section, char *opt_inst, char *vlan_method);
char *get_last_instance_bbfdm_without_update(char *package, char *section, char *opt_inst);
char *get_last_instance_bbfdm(char *package, char *section, char *opt_inst);
char *get_vlan_last_instance_bbfdm(char *package, char *section, char *opt_inst, char *vlan_method);
char *get_last_instance_lev2(char *package, char *section, char *opt_inst, char *opt_check, char *value_check);
char *get_last_instance_lev2_icwmpd_dmmap_opt(char* dmmap_package, char *section, char *opt_inst, char *opt_check, char *value_check);
char *get_last_instance_lev2_icwmpd(char *package, char *section, char* dmmap_package, char *opt_inst, char *opt_check, char *value_check);
char *get_last_instance_lev2_bbfdm_dmmap_opt(char* dmmap_package, char *section, char *opt_inst, char *opt_check, char *value_check);
char *get_last_instance_lev2_bbfdm(char *package, char *section, char* dmmap_package, char *opt_inst, char *opt_check, char *value_check);
char *handle_update_instance(int instance_ranck, struct dmctx *ctx, char **last_inst, char * (*up_instance)(int action, char **last_inst, void *argv[]), int argc, ...);
int dm_add_end_session(struct dmctx *ctx, void(*function)(struct execute_end_session *), int action, void *data);
int apply_end_session();

4
dmentry.c
View file

@ -77,7 +77,7 @@ static int dm_ctx_init_custom(struct dmctx *ctx, unsigned int dm_type, unsigned
INIT_LIST_HEAD(&dmubus_ctx.obj_head);
uci_ctx = uci_alloc_context();
uci_varstate_ctx = uci_alloc_context();
DMUCI_INIT(icwmpd);
DMUCI_INIT(bbfdm);
}
INIT_LIST_HEAD(&ctx->list_parameter);
INIT_LIST_HEAD(&ctx->set_list_tmp);
@ -148,7 +148,7 @@ static int dm_ctx_clean_custom(struct dmctx *ctx, int custom)
uci_ctx = NULL;
if (uci_varstate_ctx) uci_free_context(uci_varstate_ctx);
uci_varstate_ctx = NULL;
DMUCI_EXIT(icwmpd);
DMUCI_EXIT(bbfdm);
dmubus_ctx_free(&dmubus_ctx);
dmcleanmem();
}

1
dmoperate.c
View file

@ -744,7 +744,6 @@ static opr_ret_t ip_diagnostics_serverselection(struct dmctx *dmctx, char *path,
serverselection.minimum_response_time = get_param_diagnostics("serverselectiondiagnostic", "MinimumResponseTime");
serverselection.maximum_response_time = get_param_diagnostics("serverselectiondiagnostic", "MaximumResponseTime");
char *param_fastest_host = dmstrdup("FastestHost");
char *param_average_response_time = dmstrdup("AverageResponseTime");
char *param_minimum_response_time = dmstrdup("MinimumResponseTime");

36
dmtree/tr104/voice_services.c
View file

@ -475,11 +475,11 @@ int add_profile_object(char *refparam, struct dmctx *ctx, void *data, char **ins
dmuci_set_value("voice_client", sname, "cbbs_maxretry", "5");
dmuci_set_value("voice_client", sname, "cbbs_retrytime", "300");
dmuci_set_value("voice_client", sname, "cbbs_waittime", "30");
instance = get_last_instance_icwmpd("dmmap_voice_client", "sip_service_provider", "profileinstance");
instance = get_last_instance_bbfdm("dmmap_voice_client", "sip_service_provider", "profileinstance");
dmuci_add_section_icwmpd("dmmap_voice_client", "sip_service_provider", &dmmap_voice_section, &v);
dmuci_add_section_bbfdm("dmmap_voice_client", "sip_service_provider", &dmmap_voice_section, &v);
dmuci_set_value_by_section(dmmap_voice_section, "section_name", sname);
*instancepara = update_instance_icwmpd(dmmap_voice_section, instance, "profileinstance");
*instancepara = update_instance_bbfdm(dmmap_voice_section, instance, "profileinstance");
return 0;
}
@ -492,7 +492,7 @@ int delete_associated_line_instances(char *sip_id, char* profile_key)
uci_foreach_option_eq("voice_client", "tel_line", "sip_account", sip_id, s) {
dmuci_set_value_by_section(s, "sip_account", "-");
}
uci_path_foreach_option_eq_safe(icwmpd, "dmmap_voice_client", "tel_line", "voice_profile_key", profile_key, stmp, s) {
uci_path_foreach_option_eq_safe(bbfdm, "dmmap_voice_client", "tel_line", "voice_profile_key", profile_key, stmp, s) {
dmuci_delete_by_section(s, NULL, NULL);
}
return 0;
@ -658,7 +658,7 @@ int add_line_object(char *refparam, struct dmctx *ctx, void *data, char **instan
if (i == 0)
return FAULT_9004;
add_line(s, section_name(sipargs->sip_section));
dmuci_add_section_icwmpd("dmmap_voice_client", "tel_line", &dmmap_voice_line_section, &v);
dmuci_add_section_bbfdm("dmmap_voice_client", "tel_line", &dmmap_voice_line_section, &v);
dmuci_set_value_by_section(dmmap_voice_line_section, "section_name", section_name(s));
get_dmmap_section_of_config_section("dmmap_voice_client", "sip_service_provider", section_name(sipargs->sip_section), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "profileinstance", &voice_profile_key);
@ -1762,7 +1762,7 @@ int set_line_tel_line(char *refparam, struct dmctx *ctx, void *data, char *insta
dmuci_delete_by_section(dmmap_section, NULL, NULL);
}
dmuci_set_value("voice_client", bname, "sip_account", sipaccount);
dmuci_add_section_icwmpd("dmmap_voice_client", "tel_line", &dmmap_tel_line_section, &v);
dmuci_add_section_bbfdm("dmmap_voice_client", "tel_line", &dmmap_tel_line_section, &v);
if(dmmap_section != NULL) {
dmuci_set_value_by_section(dmmap_tel_line_section, "section_name", bname);
dmuci_set_value_by_section(dmmap_tel_line_section, "voice_profile_key", voice_profile_key);
@ -2223,15 +2223,15 @@ void codec_update_id()
}
if(i == 0)
{
uci_path_foreach_sections(icwmpd, "dmmap", "codec_id", s) {
uci_path_foreach_sections(bbfdm, "dmmap", "codec_id", s) {
if (found != 0) {
DMUCI_DELETE_BY_SECTION(icwmpd, ss, NULL, NULL);
DMUCI_DELETE_BY_SECTION(bbfdm, ss, NULL, NULL);
}
ss = s;
found++;
}
if (ss != NULL) {
DMUCI_DELETE_BY_SECTION(icwmpd, ss, NULL, NULL);
DMUCI_DELETE_BY_SECTION(bbfdm, ss, NULL, NULL);
}
}
}
@ -2349,7 +2349,7 @@ int set_line_codec_list_alias(char *refparam, struct dmctx *ctx, void *data, cha
}
///////////////////////////////////////
void set_voice_profile_key_of_line(struct uci_section *dmmap_line_section, char* prev_instance){
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_line_section, "voice_profile_key", prev_instance);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_line_section, "voice_profile_key", prev_instance);
}
int browseVoiceServiceInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance)
@ -2358,8 +2358,8 @@ int browseVoiceServiceInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_
char *vs = NULL, *vs_last = NULL;
update_section_list(DMMAP,"voice_service", NULL, 1, NULL, NULL, NULL, NULL, NULL);
uci_path_foreach_sections(icwmpd, "dmmap", "voice_service", s) {
vs = handle_update_instance(1, dmctx, &vs_last, update_instance_alias_icwmpd, 3, s, "vsinstance", "vsalias");
uci_path_foreach_sections(bbfdm, "dmmap", "voice_service", s) {
vs = handle_update_instance(1, dmctx, &vs_last, update_instance_alias_bbfdm, 3, s, "vsinstance", "vsalias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)s, vs) == DM_STOP)
break;
}
@ -2375,9 +2375,9 @@ int browseCodecsInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data,
init_allowed_sip_codecs();
codec_update_id();
uci_path_foreach_sections(icwmpd, "dmmap", "codec_id", code_sec) {
uci_path_foreach_sections(bbfdm, "dmmap", "codec_id", code_sec) {
init_codec_args(&curr_codec_args, allowed_sip_codecs[i].allowed_cdc, allowed_sip_codecs[i].id, allowed_sip_codecs[i].enumid, code_sec);
id = handle_update_instance(2, dmctx, &id_last, update_instance_alias_icwmpd, 3, code_sec, "codecinstance", "codecalias");
id = handle_update_instance(2, dmctx, &id_last, update_instance_alias_bbfdm, 3, code_sec, "codecinstance", "codecalias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_codec_args, id) == DM_STOP) {
fini_codec_args(&curr_codec_args);
break;
@ -2399,7 +2399,7 @@ int browseProfileInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data,
wait_voice_service_up();
synchronize_specific_config_sections_with_dmmap("voice_client", "sip_service_provider", "dmmap_voice_client", &dup_list);
list_for_each_entry(p, &dup_list, list) {
profile_num = handle_update_instance(2, dmctx, &profile_num_last, update_instance_alias_icwmpd, 3, p->dmmap_section, "profileinstance", "profilealias");
profile_num = handle_update_instance(2, dmctx, &profile_num_last, update_instance_alias_bbfdm, 3, p->dmmap_section, "profileinstance", "profilealias");
init_sip_args(&curr_sip_args, p->config_section, profile_num_last);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_sip_args, profile_num) == DM_STOP)
break;
@ -2428,7 +2428,7 @@ int browseLineInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, ch
if ( line_id >= maxLine )
continue;
set_voice_profile_key_of_line(p->dmmap_section, prev_instance);
line_num = handle_update_instance(3, dmctx, &last_inst, update_instance_alias_icwmpd, 3, p->dmmap_section, "lineinstance", "linealias");
line_num = handle_update_instance(3, dmctx, &last_inst, update_instance_alias_bbfdm, 3, p->dmmap_section, "lineinstance", "linealias");
init_tel_args(&curr_tel_args, p->config_section, sipargs->sip_section, sipargs->profile_num); //check difference between sipargs->profile_num and profile_num
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_tel_args, line_num) == DM_STOP)
break;
@ -2448,9 +2448,9 @@ int browseLineCodecListInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev
init_allowed_sip_codecs();
codec_update_id();
codec_priority_update(telargs->sip_section);
uci_path_foreach_sections(icwmpd, "dmmap", "codec_id", code_sec) {
uci_path_foreach_sections(bbfdm, "dmmap", "codec_id", code_sec) {
init_line_code_args(&curr_line_codec_args, i, telargs->sip_section, code_sec);
id = handle_update_instance(4, dmctx, &id_last, update_instance_alias_icwmpd, 3, code_sec, "codecinstance", "codecalias");
id = handle_update_instance(4, dmctx, &id_last, update_instance_alias_bbfdm, 3, code_sec, "codecinstance", "codecalias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_line_codec_args, id) == DM_STOP)
break;
i++;

6
dmtree/tr181/atm.c
View file

@ -251,7 +251,7 @@ int add_atm_link(char *refparam, struct dmctx *ctx, void *data, char **instancep
struct uci_section *dmmap_atm = NULL;
check_create_dmmap_package("dmmap_dsl");
instance = get_last_instance_icwmpd("dmmap_dsl", "atm-device", "atmlinkinstance");
instance = get_last_instance_bbfdm("dmmap_dsl", "atm-device", "atmlinkinstance");
dmasprintf(&atm_device, "atm%d", instance ? atoi(instance) : 0);
dmasprintf(&instance_update, "%d", instance ? atoi(instance)+ 1 : 1);
dmuci_set_value("dsl", atm_device, "", "atm-device");
@ -262,9 +262,9 @@ int add_atm_link(char *refparam, struct dmctx *ctx, void *data, char **instancep
dmuci_set_value("dsl", atm_device, "link_type", "eoa");
dmuci_set_value("dsl", atm_device, "encapsulation", "llc");
dmuci_set_value("dsl", atm_device, "qos_class", "ubr");
dmuci_add_section_icwmpd("dmmap_dsl", "atm-device", &dmmap_atm, &v);
dmuci_add_section_bbfdm("dmmap_dsl", "atm-device", &dmmap_atm, &v);
dmuci_set_value_by_section(dmmap_atm, "section_name", atm_device);
*instancepara = update_instance_icwmpd(dmmap_atm, instance, "atmlinkinstance");
*instancepara = update_instance_bbfdm(dmmap_atm, instance, "atmlinkinstance");
return 0;
}

62
dmtree/tr181/bridging.c
View file

@ -228,7 +228,7 @@ int get_br_port_last_inst(char *br_key)
struct uci_section *s;
int instance;
uci_path_foreach_option_eq(icwmpd, "dmmap_bridge_port", "bridge_port", "bridge_key", br_key, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "bridge_key", br_key, s) {
dmuci_get_value_by_section_string(s, "bridge_port_instance", &tmp);
if (tmp[0] == '\0')
continue;
@ -242,7 +242,7 @@ int reset_br_port(char *br_key)
{
struct uci_section *s, *prev_s = NULL;
uci_path_foreach_option_eq(icwmpd, "dmmap_bridge_port", "bridge_port", "bridge_key", br_key, s){
uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "bridge_key", br_key, s){
if (prev_s)
dmuci_delete_by_section(prev_s, NULL, NULL);
prev_s = s;
@ -481,7 +481,7 @@ int get_br_port_number_of_entries(char *refparam, struct dmctx *ctx, void *data,
struct uci_section *s = NULL;
int cnt = 0;
uci_path_foreach_option_eq(icwmpd, "dmmap_bridge_port", "bridge_port", "bridge_key", instance, s)
uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "bridge_key", instance, s)
{
cnt++;
}
@ -494,7 +494,7 @@ int get_br_vlan_number_of_entries(char *refparam, struct dmctx *ctx, void *data,
struct uci_section *s = NULL;
int cnt = 0;
uci_path_foreach_option_eq(icwmpd, "dmmap_network", "device", "bridge_key", instance, s)
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "device", "bridge_key", instance, s)
{
cnt++;
}
@ -507,7 +507,7 @@ int get_br_vlan_port_number_of_entries(char *refparam, struct dmctx *ctx, void *
struct uci_section *s = NULL;
int cnt = 0;
uci_path_foreach_option_eq(icwmpd, "dmmap_network", "device", "bridge_key", instance, s)
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "device", "bridge_key", instance, s)
{
cnt++;
}
@ -1179,7 +1179,7 @@ int add_bridge(char *refparam, struct dmctx *ctx, void *data, char **instance)
char *p = bridge_name;
struct uci_section* dmmap_bridge= NULL;
last_inst = get_last_instance_lev2_icwmpd("network", "interface", "dmmap_network", "bridge_instance", "type", "bridge");
last_inst = get_last_instance_lev2_bbfdm("network", "interface", "dmmap_network", "bridge_instance", "type", "bridge");
sprintf(ib, "%d", last_inst ? atoi(last_inst)+1 : 1);
dmstrappendstr(p, "bridge_0_");
dmstrappendstr(p, ib);
@ -1188,9 +1188,9 @@ int add_bridge(char *refparam, struct dmctx *ctx, void *data, char **instance)
dmuci_set_value("network", bridge_name, "type", "bridge");
dmuci_set_value("network", bridge_name, "proto", "dhcp");
dmuci_add_section_icwmpd("dmmap_network", "interface", &dmmap_bridge, &v);
dmuci_add_section_bbfdm("dmmap_network", "interface", &dmmap_bridge, &v);
dmuci_set_value_by_section(dmmap_bridge, "section_name", bridge_name);
*instance = update_instance_icwmpd(dmmap_bridge, last_inst, "bridge_instance");
*instance = update_instance_bbfdm(dmmap_bridge, last_inst, "bridge_instance");
update_section_list(DMMAP,"bridge_port", "bridge_key", 1, ib, "mg_port", "true", "bridge_port_instance", "1");
return 0;
@ -1209,13 +1209,13 @@ int delete_bridge(char *refparam, struct dmctx *ctx, void *data, char *instance,
dmuci_set_value_by_section(dmmap_section, "bridge_instance", "");
dmuci_set_value_by_section(dmmap_section, "ip_int_instance", "");
dmuci_set_value_by_section(dmmap_section, "ipv4_instance", "");
uci_path_foreach_option_eq(icwmpd, "dmmap", "bridge_port", "bridge_key", ((struct bridging_args *)data)->br_key, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap", "bridge_port", "bridge_key", ((struct bridging_args *)data)->br_key, s) {
if (prev_s)
DMUCI_DELETE_BY_SECTION(icwmpd, prev_s, NULL, NULL);
DMUCI_DELETE_BY_SECTION(bbfdm, prev_s, NULL, NULL);
prev_s = s;
}
if (prev_s)
DMUCI_DELETE_BY_SECTION(icwmpd, prev_s, NULL, NULL);
DMUCI_DELETE_BY_SECTION(bbfdm, prev_s, NULL, NULL);
reset_br_port( ((struct bridging_args *)data)->br_key);
dmuci_set_value_by_section(((struct bridging_args *)data)->bridge_sec, "ifname", "");
break;
@ -1227,11 +1227,11 @@ int delete_bridge(char *refparam, struct dmctx *ctx, void *data, char *instance,
dmuci_set_value_by_section(dmmap_section, "bridge_instance", "");
dmuci_set_value_by_section(dmmap_section, "ip_int_instance", "");
dmuci_set_value_by_section(dmmap_section, "ipv4_instance", "");
uci_path_foreach_option_eq(icwmpd, "dmmap", "bridge_port", "bridge_key", bridgekey, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap", "bridge_port", "bridge_key", bridgekey, s) {
prev_s = s;
}
if (prev_s)
DMUCI_DELETE_BY_SECTION(icwmpd, prev_s, NULL, NULL);
DMUCI_DELETE_BY_SECTION(bbfdm, prev_s, NULL, NULL);
reset_br_port(bridgekey);
dmuci_set_value_by_section(bridge_s, "ifname", "");
}
@ -1246,7 +1246,7 @@ int add_br_vlan(char *refparam, struct dmctx *ctx, void *data, char **instance)
struct uci_section *vlan_s, *dmmap_bridge_vlan;
check_create_dmmap_package("dmmap_network");
last_instance = get_last_instance_lev2_icwmpd_dmmap_opt("dmmap_network", "device", "bridge_vlan_instance", "bridge_key", ((struct bridging_args *)data)->br_key);
last_instance = get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_network", "device", "bridge_vlan_instance", "bridge_key", ((struct bridging_args *)data)->br_key);
dmasprintf(&vlan_name, "vlan%d", last_instance ? atoi(last_instance)+ 1 : 1);
last_vid = get_last_vid();
dmasprintf(&name, "%s.%d", wan_baseifname, last_vid ? atoi(last_vid)+ 1 : 1001);
@ -1261,10 +1261,10 @@ int add_br_vlan(char *refparam, struct dmctx *ctx, void *data, char **instance)
dmfree(name);
dmfree(vid);
dmuci_add_section_icwmpd("dmmap_network", "device", &dmmap_bridge_vlan, &v);
dmuci_add_section_bbfdm("dmmap_network", "device", &dmmap_bridge_vlan, &v);
dmuci_set_value_by_section(dmmap_bridge_vlan, "section_name", vlan_name);
dmuci_set_value_by_section(dmmap_bridge_vlan, "bridge_key", ((struct bridging_args *)data)->br_key);
*instance = update_instance_icwmpd(dmmap_bridge_vlan, last_instance, "bridge_vlan_instance");
*instance = update_instance_bbfdm(dmmap_bridge_vlan, last_instance, "bridge_vlan_instance");
return 0;
}
@ -1319,7 +1319,7 @@ int add_br_port(char *refparam, struct dmctx *ctx, void *data, char **instance)
int m = get_br_port_last_inst(((struct bridging_args *)data)->br_key);
dmasprintf(instance, "%d", m+1);
DMUCI_ADD_SECTION(icwmpd, "dmmap_bridge_port", "bridge_port", &br_port_s, &value);
DMUCI_ADD_SECTION(bbfdm, "dmmap_bridge_port", "bridge_port", &br_port_s, &value);
dmuci_set_value_by_section(br_port_s, "bridge_key", ((struct bridging_args *)data)->br_key);
dmuci_set_value_by_section(br_port_s, "bridge_port_instance", *instance);
dmuci_set_value_by_section(br_port_s, "mg_port", "false");
@ -1337,7 +1337,7 @@ int delete_br_port(char *refparam, struct dmctx *ctx, void *data, char *instance
get_dmmap_section_of_config_section("dmmap_bridge_port", "bridge_port", section_name(((struct bridging_port_args *)data)->bridge_port_sec), &dmmap_section);
if(dmmap_section==NULL || dmmap_section==0){
dmmap_section= ((struct bridging_port_args *)data)->bridge_port_sec;
dmuci_delete_by_section_unnamed_icwmpd(dmmap_section, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dmmap_section, NULL, NULL);
}
else{
dmuci_get_value_by_section_string(((struct bridging_port_args *)data)->bridge_sec, "ifname", &ifname);
@ -1346,17 +1346,17 @@ int delete_br_port(char *refparam, struct dmctx *ctx, void *data, char *instance
dmuci_set_value_by_section(((struct bridging_port_args *)data)->bridge_sec, "ifname", new_ifname);
}
get_dmmap_section_of_config_section("dmmap_bridge_port", "bridge_port", section_name(((struct bridging_port_args *)data)->bridge_port_sec), &dmmap_section);
dmuci_delete_by_section_unnamed_icwmpd(dmmap_section, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dmmap_section, NULL, NULL);
}
break;
case DEL_ALL:
uci_path_foreach_option_eq(icwmpd, "dmmap_bridge_port", "bridge_port", "bridge_key", ((struct bridging_args *)data)->br_key, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "bridge_key", ((struct bridging_args *)data)->br_key, s) {
if (prev_s)
DMUCI_DELETE_BY_SECTION(icwmpd, prev_s, NULL, NULL);
DMUCI_DELETE_BY_SECTION(bbfdm, prev_s, NULL, NULL);
prev_s = s;
}
if (prev_s)
DMUCI_DELETE_BY_SECTION(icwmpd, prev_s, NULL, NULL);
DMUCI_DELETE_BY_SECTION(bbfdm, prev_s, NULL, NULL);
dmuci_set_value_by_section(((struct bridging_args *)data)->bridge_sec, "ifname", ""); // TO CHECK
break;
}
@ -1551,7 +1551,7 @@ int set_port_lower_layer(char *refparam, struct dmctx *ctx, void *data, char *in
//remove old br_port param to the new one
update_port_parameters(linker, br_key, br_pt_inst, mg_port);
if(((struct bridging_port_args *)data)->ifname[0] == '\0')
DMUCI_DELETE_BY_SECTION(icwmpd,((struct bridging_port_args *)data)->bridge_port_sec, NULL, NULL);// delete dmmap section after remove br_port_instance to adequate config
DMUCI_DELETE_BY_SECTION(bbfdm,((struct bridging_port_args *)data)->bridge_port_sec, NULL, NULL);// delete dmmap section after remove br_port_instance to adequate config
} else {
return FAULT_9005;
}
@ -1698,10 +1698,10 @@ int browseBridgeInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data,
static void set_bridge_port_parameters(struct uci_section *dmmap_section, char* bridge_key)
{
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_section, "bridge_key", bridge_key);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_section, "mg_port", "false");
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_section, "penable", "1");
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_section, "is_dmmap", "false");
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_section, "bridge_key", bridge_key);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_section, "mg_port", "false");
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_section, "penable", "1");
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_section, "is_dmmap", "false");
}
int browseBridgePortInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance){
@ -1714,12 +1714,12 @@ int browseBridgePortInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_da
dmasprintf(&file_config_name, "%s","/etc/config/dsl");
check_create_dmmap_package("dmmap_bridge_port");
update_section_list_icwmpd("dmmap_bridge_port","bridge_port", "bridge_key", 1, ((struct bridging_args *)prev_data)->br_key, "mg_port", "true", "bridge_port_instance", "1");
uci_path_foreach_option_eq(icwmpd, "dmmap_bridge_port", "bridge_port", "bridge_key", ((struct bridging_args *)prev_data)->br_key, new_port) {
update_section_list_bbfdm("dmmap_bridge_port","bridge_port", "bridge_key", 1, ((struct bridging_args *)prev_data)->br_key, "mg_port", "true", "bridge_port_instance", "1");
uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "bridge_key", ((struct bridging_args *)prev_data)->br_key, new_port) {
dmuci_get_value_by_section_string(new_port, "is_dmmap", &is_dmmap);
if(strcmp(is_dmmap, "false") !=0 ) {
init_bridging_port_args(&curr_bridging_port_args, new_port, ((struct bridging_args *)prev_data)->bridge_sec, false, "");
port = handle_update_instance(2, dmctx, &port_last, update_instance_alias_icwmpd, 5, new_port, "bridge_port_instance", "bridge_port_alias", &find_max, ((struct bridging_args *)prev_data)->br_key);
port = handle_update_instance(2, dmctx, &port_last, update_instance_alias_bbfdm, 5, new_port, "bridge_port_instance", "bridge_port_alias", &find_max, ((struct bridging_args *)prev_data)->br_key);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_bridging_port_args, port) == DM_STOP)
goto end;
}
@ -1775,7 +1775,7 @@ int browseBridgePortInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_da
list_for_each_entry(p, &dup_list, list) {
set_bridge_port_parameters(p->dmmap_section, ((struct bridging_args *)prev_data)->br_key);
init_bridging_port_args(&curr_bridging_port_args, p->config_section, ((struct bridging_args *)prev_data)->bridge_sec, false, (char*)p->additional_attribute);
port = handle_update_instance(2, dmctx, &port_last, update_instance_alias_icwmpd, 5, p->dmmap_section, "bridge_port_instance", "bridge_port_alias", &find_max, ((struct bridging_args *)prev_data)->br_key);
port = handle_update_instance(2, dmctx, &port_last, update_instance_alias_bbfdm, 5, p->dmmap_section, "bridge_port_instance", "bridge_port_alias", &find_max, ((struct bridging_args *)prev_data)->br_key);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_bridging_port_args, port) == DM_STOP)
goto end;
}

20
dmtree/tr181/deviceinfo.c
View file

@ -542,7 +542,7 @@ int set_vcf_alias(char *refparam, struct dmctx *ctx, void *data, char *instance,
int lookup_vcf_name(char *instance, char **value)
{
struct uci_section *s = NULL;
uci_path_foreach_option_eq(icwmpd, DMMAP, "vcf", "vcf_instance", instance, s) {
uci_path_foreach_option_eq(bbfdm, DMMAP, "vcf", "vcf_instance", instance, s) {
dmuci_get_value_by_section_string(s, "name", value);
}
return 0;
@ -745,22 +745,22 @@ int browseVcfInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, cha
}
closedir (dir);
}
uci_path_foreach_sections(icwmpd, DMMAP, "vcf", s) {
uci_path_foreach_sections(bbfdm, DMMAP, "vcf", s) {
dmuci_get_value_by_section_string(s, "name", &name);
if(del_sec) {
DMUCI_DELETE_BY_SECTION(icwmpd, del_sec, NULL, NULL);
DMUCI_DELETE_BY_SECTION(bbfdm, del_sec, NULL, NULL);
del_sec = NULL;
}
if (check_file_dir(name) == 0) {
del_sec = s;
continue;
}
vcf = handle_update_instance(1, dmctx, &vcf_last, update_instance_alias_icwmpd, 3, s, "vcf_instance", "vcf_alias");
vcf = handle_update_instance(1, dmctx, &vcf_last, update_instance_alias_bbfdm, 3, s, "vcf_instance", "vcf_alias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)s, vcf) == DM_STOP)
break;
}
if(del_sec)
DMUCI_DELETE_BY_SECTION(icwmpd, del_sec, NULL, NULL);
DMUCI_DELETE_BY_SECTION(bbfdm, del_sec, NULL, NULL);
return 0;
}
@ -775,7 +775,7 @@ int browseVlfInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, cha
break;
dmuci_get_value_by_section_string(sys_log_sec, "log_file", &log_file);
dmuci_get_value_by_section_string(sys_log_sec, "log_size", &log_size);
uci_path_foreach_sections(icwmpd, "dmmap", "vlf", dm_sec) {
uci_path_foreach_sections(bbfdm, "dmmap", "vlf", dm_sec) {
if(dm_sec)
break;
}
@ -783,12 +783,12 @@ int browseVlfInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, cha
update_section_list(DMMAP,"vlf", NULL, i++, NULL, "log_file", log_file, "log_size", log_size);
}
else{
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dm_sec, "log_file", log_file);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dm_sec, "log_size", log_size);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dm_sec, "log_file", log_file);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dm_sec, "log_size", log_size);
}
}
uci_path_foreach_sections(icwmpd, "dmmap", "vlf", dm_sec) {
instance = handle_update_instance(1, dmctx, &last_instance, update_instance_alias_icwmpd, 3, dm_sec, "vlf_instance", "vlf_alias");
uci_path_foreach_sections(bbfdm, "dmmap", "vlf", dm_sec) {
instance = handle_update_instance(1, dmctx, &last_instance, update_instance_alias_bbfdm, 3, dm_sec, "vlf_instance", "vlf_alias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)dm_sec, instance) == DM_STOP){
break;
}

162
dmtree/tr181/dhcpv4.c
View file

@ -261,7 +261,7 @@ inline int init_dhcp_client_args(struct client_args *args, json_object *client,
/*************************************************************/
struct uci_section* exist_other_section_same_order(struct uci_section *dmmap_sect, char * package, char* sect_type, char *order) {
struct uci_section *s;
uci_path_foreach_option_eq(icwmpd, package, sect_type, "order", order, s) {
uci_path_foreach_option_eq(bbfdm, package, sect_type, "order", order, s) {
if(strcmp(section_name(s), section_name(dmmap_sect)) != 0){
return s;
}
@ -276,7 +276,7 @@ int set_section_order(char *package, char *dmpackage, char* sect_type, struct uc
dmuci_get_value_by_section_string(dmmap_sect, "order", &v);
if((v!=NULL || strlen(v)>0) && strcmp(v, order) == 0)
return 0;
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "order", order);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "order", order);
if(conf==NULL){
dmuci_get_value_by_section_string(dmmap_sect, "section_name", &sect_name);
get_config_section_of_dmmap_section(package, sect_type, sect_name, &s);
@ -312,15 +312,15 @@ int add_dhcp_server(char *refparam, struct dmctx *ctx, void *data, char **instan
struct uci_section *s = NULL, *dmmap_dhcp= NULL;
check_create_dmmap_package("dmmap_dhcp");
instance = get_last_instance_icwmpd("dmmap_dhcp", "dhcp", "dhcp_instance");
instance = get_last_instance_bbfdm("dmmap_dhcp", "dhcp", "dhcp_instance");
dmuci_add_section("dhcp", "dhcp", &s, &value);
dmuci_set_value_by_section(s, "start", "100");
dmuci_set_value_by_section(s, "leasetime", "12h");
dmuci_set_value_by_section(s, "limit", "150");
dmuci_add_section_icwmpd("dmmap_dhcp", "dhcp", &dmmap_dhcp, &v);
dmuci_add_section_bbfdm("dmmap_dhcp", "dhcp", &dmmap_dhcp, &v);
dmuci_set_value_by_section(dmmap_dhcp, "section_name", section_name(s));
*instancepara = update_instance_icwmpd(dmmap_dhcp, instance, "dhcp_instance");
*instancepara = update_instance_bbfdm(dmmap_dhcp, instance, "dhcp_instance");
return 0;
}
@ -341,7 +341,7 @@ int delete_dhcp_server(char *refparam, struct dmctx *ctx, void *data, char *inst
} else {
get_dmmap_section_of_config_section("dmmap_dhcp", "dhcp", section_name(((struct dhcp_args *)data)->dhcp_sec), &dmmap_section);
if(dmmap_section != NULL)
dmuci_delete_by_section_unnamed_icwmpd(dmmap_section, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dmmap_section, NULL, NULL);
dmuci_delete_by_section(((struct dhcp_args *)data)->dhcp_sec, NULL, NULL);
}
@ -375,14 +375,14 @@ int add_dhcp_staticaddress(char *refparam, struct dmctx *ctx, void *data, char *
struct uci_section *s = NULL, *dmmap_dhcp_host= NULL;
check_create_dmmap_package("dmmap_dhcp");
instance = get_last_instance_lev2_icwmpd("dhcp", "host", "dmmap_dhcp", "ldhcpinstance", "dhcp", ((struct dhcp_args *)data)->interface);
instance = get_last_instance_lev2_bbfdm("dhcp", "host", "dmmap_dhcp", "ldhcpinstance", "dhcp", ((struct dhcp_args *)data)->interface);
dmuci_add_section("dhcp", "host", &s, &value);
dmuci_set_value_by_section(s, "dhcp", ((struct dhcp_args *)data)->interface);
dmuci_add_section_icwmpd("dmmap_dhcp", "host", &dmmap_dhcp_host, &v);
dmuci_add_section_bbfdm("dmmap_dhcp", "host", &dmmap_dhcp_host, &v);
dmuci_set_value_by_section(dmmap_dhcp_host, "section_name", section_name(s));
*instancepara = update_instance_icwmpd(dmmap_dhcp_host, instance, "ldhcpinstance");
*instancepara = update_instance_bbfdm(dmmap_dhcp_host, instance, "ldhcpinstance");
return 0;
}
@ -434,16 +434,16 @@ 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_icwmpd("dmmap_dhcp_client", "interface", "cwmp_dhcpv4client_instance");
instancepara = get_last_instance_bbfdm("dmmap_dhcp_client", "interface", "cwmp_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);
dmuci_set_value_by_section(s, "proto", "dhcp");
dmuci_set_value_by_section(s, "ifname", wanname);
dmuci_set_value_by_section(s, "type", "anywan");
dmuci_add_section_icwmpd("dmmap_dhcp_client", "interface", &dmmap_sect, &v);
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_icwmpd(dmmap_sect, instancepara, "cwmp_dhcpv4client_instance");
*instance = update_instance_bbfdm(dmmap_sect, instancepara, "cwmp_dhcpv4client_instance");
return 0;
}
@ -470,7 +470,7 @@ int delObjDHCPv4Client(char *refparam, struct dmctx *ctx, void *data, char *inst
dmuci_set_value_by_section(dhcp_client_args->dhcp_client_conf, "ipaddr", ipv4addr);
dmuci_set_value_by_section(dhcp_client_args->dhcp_client_conf, "netmask", mask4);
}
dmuci_delete_by_section_unnamed_icwmpd(dhcp_client_args->dhcp_client_dm, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dhcp_client_args->dhcp_client_dm, NULL, NULL);
break;
case DEL_ALL:
uci_foreach_sections("network", "interface", s) {
@ -518,8 +518,8 @@ int delObjDHCPv4Client(char *refparam, struct dmctx *ctx, void *data, char *inst
if(dmmap_section != NULL)
dmuci_delete_by_section(dmmap_section, NULL, NULL);
}
uci_path_foreach_sections_safe(icwmpd, "dmmap_dhcp_client", "interface", stmp, s) {
dmuci_delete_by_section_unnamed_icwmpd(s, NULL, NULL);
uci_path_foreach_sections_safe(bbfdm, "dmmap_dhcp_client", "interface", stmp, s) {
dmuci_delete_by_section_unnamed_bbfdm(s, NULL, NULL);
}
break;
}
@ -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_icwmpd_dmmap_opt("dmmap_dhcp_client", "send_option", "cwmp_dhcpv4_sentopt_instance", "section_name", section_name(dhcp_client_args->dhcp_client_conf));
dmuci_add_section_icwmpd("dmmap_dhcp_client", "send_option", &dmmap_sect, &value);
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));
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(icwmpd, dmmap_sect, "section_name", section_name(dhcp_client_args->dhcp_client_conf));
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "option_tag", "0");
*instance = update_instance_icwmpd(dmmap_sect, instancepara, "cwmp_dhcpv4_sentopt_instance");
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");
return 0;
}
@ -558,12 +558,12 @@ int delObjDHCPv4ClientSentOption(char *refparam, struct dmctx *ctx, void *data,
dmuci_set_value_by_section(((struct dhcp_client_option_args*) data)->client_sect, "sendopts", list);
}
}
dmuci_delete_by_section_unnamed_icwmpd(((struct dhcp_client_option_args*) data)->opt_sect, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(((struct dhcp_client_option_args*) data)->opt_sect, NULL, NULL);
break;
case DEL_ALL:
dmuci_set_value_by_section(((struct dhcp_client_args*) data)->dhcp_client_conf, "sendopts", "");
uci_path_foreach_sections_safe(icwmpd, "dmmap_dhcp_client", "send_option", stmp, s) {
dmuci_delete_by_section_unnamed_icwmpd(s, NULL, NULL);
uci_path_foreach_sections_safe(bbfdm, "dmmap_dhcp_client", "send_option", stmp, s) {
dmuci_delete_by_section_unnamed_bbfdm(s, NULL, NULL);
}
break;
}
@ -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_icwmpd_dmmap_opt("dmmap_dhcp_client", "req_option", "cwmp_dhcpv4_sentopt_instance", "section_name", section_name(dhcp_client_args->dhcp_client_conf));
dmuci_add_section_icwmpd("dmmap_dhcp_client", "req_option", &dmmap_sect, &value);
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));
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(icwmpd, dmmap_sect, "section_name", section_name(dhcp_client_args->dhcp_client_conf));
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "option_tag", "0");
*instance = update_instance_icwmpd(dmmap_sect, instancepara, "cwmp_dhcpv4_sentopt_instance");
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");
return 0;
}
@ -601,12 +601,12 @@ int delObjDHCPv4ClientReqOption(char *refparam, struct dmctx *ctx, void *data, c
dmuci_set_value_by_section(((struct dhcp_client_option_args*) data)->client_sect, "reqopts", list);
}
}
dmuci_delete_by_section_unnamed_icwmpd(((struct dhcp_client_option_args*) data)->opt_sect, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(((struct dhcp_client_option_args*) data)->opt_sect, NULL, NULL);
break;
case DEL_ALL:
dmuci_set_value_by_section(((struct dhcp_client_args*) data)->dhcp_client_conf, "reqopts", "");
uci_path_foreach_sections_safe(icwmpd, "dmmap_dhcp_client", "req_option", stmp, s) {
dmuci_delete_by_section_unnamed_icwmpd(s, NULL, NULL);
uci_path_foreach_sections_safe(bbfdm, "dmmap_dhcp_client", "req_option", stmp, s) {
dmuci_delete_by_section_unnamed_bbfdm(s, NULL, NULL);
}
break;
}
@ -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_icwmpd_dmmap_opt("dmmap_dhcp", "servpool_option", "cwmp_dhcpv4_servpool_option_instance", "section_name", section_name(dhcp_arg->dhcp_sec));
dmuci_add_section_icwmpd("dmmap_dhcp", "servpool_option", &dmmap_sect, &value);
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));
dmuci_add_section_bbfdm("dmmap_dhcp", "servpool_option", &dmmap_sect, &value);
if(dhcp_arg->dhcp_sec != NULL)
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section_name", section_name(dhcp_arg->dhcp_sec));
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "option_tag", "0");
*instance = update_instance_icwmpd(dmmap_sect, instancepara, "cwmp_dhcpv4_servpool_option_instance");
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");
return 0;
}
@ -645,12 +645,12 @@ int delObjDHCPv4ServerPoolOption(char *refparam, struct dmctx *ctx, void *data,
dmuci_del_list_value_by_section(((struct dhcp_client_option_args*) data)->client_sect, "dhcp_option", opt_value);
}
}
dmuci_delete_by_section_unnamed_icwmpd(((struct dhcp_client_option_args*) data)->opt_sect, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(((struct dhcp_client_option_args*) data)->opt_sect, NULL, NULL);
break;
case DEL_ALL:
dmuci_set_value_by_section(((struct dhcp_args*) data)->dhcp_sec, "dhcp_option", "");
uci_path_foreach_sections_safe(icwmpd, "dmmap_dhcp", "servpool_option", stmp, s) {
dmuci_delete_by_section_unnamed_icwmpd(s, NULL, NULL);
uci_path_foreach_sections_safe(bbfdm, "dmmap_dhcp", "servpool_option", stmp, s) {
dmuci_delete_by_section_unnamed_bbfdm(s, NULL, NULL);
}
break;
}
@ -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_icwmpd("dmmap_dhcp_relay", "interface", "cwmp_dhcpv4relay_instance");
instancepara = get_last_instance_bbfdm("dmmap_dhcp_relay", "interface", "cwmp_dhcpv4relay_instance");
dmuci_add_section("network", "interface", &s, &value);
dmuci_set_value_by_section(s, "proto", "relay");
dmuci_add_section_icwmpd("dmmap_dhcp_relay", "interface", &dmmap_sect, &v);
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_icwmpd(dmmap_sect, instancepara, "cwmp_dhcpv4relay_instance");
*instance = update_instance_bbfdm(dmmap_sect, instancepara, "cwmp_dhcpv4relay_instance");
return 0;
}
@ -690,7 +690,7 @@ int delObjDHCPv4RelayForwarding(char *refparam, struct dmctx *ctx, void *data, c
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);
dmuci_delete_by_section_unnamed_icwmpd(dmmap_section, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dmmap_section, NULL, NULL);
dmuci_delete_by_section(dhcp_relay_args->dhcp_client_conf, NULL, NULL);
}
break;
@ -745,7 +745,7 @@ int set_server_pool_alias(char *refparam, struct dmctx *ctx, void *data, char *i
case VALUESET:
get_dmmap_section_of_config_section("dmmap_dhcp", "dhcp", section_name(dhcp_arg->dhcp_sec), &dmmap_sect);
if (dmmap_sect)
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "dhcp_alias", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "dhcp_alias", value);
}
return 0;
}
@ -1585,7 +1585,7 @@ int get_DHCPv4_ClientNumberOfEntries(char *refparam, struct dmctx *ctx, void *da
uci_foreach_option_eq("network", "interface", "proto", "dhcp", s) {
nbre_confs++;
}
uci_path_foreach_sections(icwmpd, "dmmap_dhcp_client", "interface", dmmap_sect) {
uci_path_foreach_sections(bbfdm, "dmmap_dhcp_client", "interface", dmmap_sect) {
nbre_dmmaps++;
}
if(nbre_dmmaps ==0 || nbre_dmmaps < nbre_confs)
@ -1695,7 +1695,7 @@ int set_DHCPv4Client_Interface(char *refparam, struct dmctx *ctx, void *data, ch
adm_entry_get_linker_value(ctx, newvalue, &linker);
} else
adm_entry_get_linker_value(ctx, value, &linker);
uci_path_foreach_sections(icwmpd, "dmmap_dhcp_client", "interface", s) {
uci_path_foreach_sections(bbfdm, "dmmap_dhcp_client", "interface", s) {
dmuci_get_value_by_section_string(s, "section_name", &v);
if(strcmp(v, linker) == 0)
return FAULT_9007;
@ -1714,7 +1714,7 @@ int set_DHCPv4Client_Interface(char *refparam, struct dmctx *ctx, void *data, ch
adm_entry_get_linker_value(ctx, newvalue, &linker);
} else
adm_entry_get_linker_value(ctx, value, &linker);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dhcp_client_args->dhcp_client_dm, "section_name", linker);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_args->dhcp_client_dm, "section_name", linker);
break;
}
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(icwmpd, dhcp_client_opt_args->opt_sect, "cwmp_dhcpv4_sentopt_alias", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "cwmp_dhcpv4_sentopt_alias", value);
break;
}
return 0;
@ -2089,7 +2089,7 @@ int set_DHCPv4ClientSentOption_Tag(char *refparam, struct dmctx *ctx, void *data
dmasprintf(&opttagvalue, "%s:%s", value, dhcp_client_opt_args->value&&strlen(dhcp_client_opt_args->value)>0?dhcp_client_opt_args->value:"0");
add_elt_to_str_list(&v, opttagvalue);
dmuci_set_value_by_section(dhcp_client_opt_args->client_sect, "sendopts", v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dhcp_client_opt_args->opt_sect, "option_tag", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "option_tag", value);
break;
}
return 0;
@ -2119,7 +2119,7 @@ int set_DHCPv4ClientSentOption_Value(char *refparam, struct dmctx *ctx, void *da
dmasprintf(&opttagvalue, "%s:%s", dhcp_client_opt_args->option_tag, value);
add_elt_to_str_list(&v, opttagvalue);
dmuci_set_value_by_section(dhcp_client_opt_args->client_sect, "sendopts", v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dhcp_client_opt_args->opt_sect, "option_value", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "option_value", value);
break;
}
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(icwmpd, dhcp_client_opt_args->opt_sect, "cwmp_dhcpv4_reqtopt_alias", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "cwmp_dhcpv4_reqtopt_alias", value);
break;
}
return 0;
@ -2250,7 +2250,7 @@ int set_DHCPv4ClientReqOption_Tag(char *refparam, struct dmctx *ctx, void *data,
remove_elt_from_str_list(&v, dhcp_client_opt_args->option_tag);
add_elt_to_str_list(&v, value);
dmuci_set_value_by_section(dhcp_client_opt_args->client_sect, "reqopts", v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dhcp_client_opt_args->opt_sect, "option_tag", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "option_tag", value);
break;
}
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(icwmpd, dhcp_client_opt_args->opt_sect, "cwmp_dhcpv4_servpool_option_alias", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "cwmp_dhcpv4_servpool_option_alias", value);
break;
}
return 0;
@ -2437,7 +2437,7 @@ int set_DHCPv4ServerPoolOption_Tag(char *refparam, struct dmctx *ctx, void *data
dmuci_get_value_by_section_list(dhcp_client_opt_args->client_sect, "dhcp_option", &dhcp_option_list);
dmuci_del_list_value_by_section(dhcp_client_opt_args->client_sect, "dhcp_option", oldopttagvalue);
dmuci_add_list_value_by_section(dhcp_client_opt_args->client_sect, "dhcp_option", opttagvalue);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dhcp_client_opt_args->opt_sect, "option_tag", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "option_tag", value);
break;
}
return 0;
@ -2477,7 +2477,7 @@ int set_DHCPv4ServerPoolOption_Value(char *refparam, struct dmctx *ctx, void *da
dmuci_get_value_by_section_list(dhcp_client_opt_args->client_sect, "dhcp_option", &dhcp_option_list);
dmuci_del_list_value_by_section(dhcp_client_opt_args->client_sect, "dhcp_option", oldopttagvalue);
dmuci_add_list_value_by_section(dhcp_client_opt_args->client_sect, "dhcp_option", opttagvalue);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dhcp_client_opt_args->opt_sect, "option_value", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "option_value", value);
break;
}
return 0;
@ -2604,7 +2604,7 @@ int set_DHCPv4RelayForwarding_Interface(char *refparam, struct dmctx *ctx, void
adm_entry_get_linker_value(ctx, value, &linker);
if(linker == NULL)
return FAULT_9007;
uci_path_foreach_sections(icwmpd, "dmmap_dhcp_relay", "interface", s) {
uci_path_foreach_sections(bbfdm, "dmmap_dhcp_relay", "interface", s) {
dmuci_get_value_by_section_string(s, "section_name", &v);
if(strcmp(v, linker) == 0)
return FAULT_9007;
@ -2623,7 +2623,7 @@ int set_DHCPv4RelayForwarding_Interface(char *refparam, struct dmctx *ctx, void
adm_entry_get_linker_value(ctx, newvalue, &linker);
} else
adm_entry_get_linker_value(ctx, value, &linker);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dhcp_client_args->dhcp_client_dm, "section_name", linker);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_args->dhcp_client_dm, "section_name", linker);
break;
}
return 0;
@ -2978,7 +2978,7 @@ int get_DHCPv4Relay_ForwardingNumberOfEntries(char *refparam, struct dmctx *ctx,
uci_foreach_option_eq("network", "interface", "proto", "relay", s) {
nbre_confs++;
}
uci_path_foreach_sections(icwmpd, "dmmap_dhcp_relay", "interface", dmmap_sect) {
uci_path_foreach_sections(bbfdm, "dmmap_dhcp_relay", "interface", dmmap_sect) {
nbre_dmmaps++;
}
if(nbre_dmmaps ==0 || nbre_dmmaps < nbre_confs)
@ -3004,7 +3004,7 @@ int browseDhcpInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, ch
list_for_each_entry(p, &dup_list, list) {
dmuci_get_value_by_section_string(p->config_section, "interface", &interface);
init_dhcp_args(&curr_dhcp_args, p->config_section, interface);
idhcp = handle_update_instance(1, dmctx, &idhcp_last, update_instance_alias_icwmpd, 3, p->dmmap_section, "dhcp_instance", "dhcp_alias");
idhcp = handle_update_instance(1, dmctx, &idhcp_last, update_instance_alias_bbfdm, 3, p->dmmap_section, "dhcp_instance", "dhcp_alias");
dmuci_get_value_by_section_string(p->dmmap_section, "order", &v);
if(v==NULL || strlen(v) == 0)
set_section_order("dhcp", "dmmap_dhcp", "dhcp", p->dmmap_section, p->config_section, 0, idhcp);
@ -3028,7 +3028,7 @@ int browseDhcpStaticInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_da
synchronize_specific_config_sections_with_dmmap_cont("dhcp", "host", "dmmap_dhcp", "dhcp", ((struct dhcp_args *)prev_data)->interface, &dup_list);
list_for_each_entry(p, &dup_list, list) {
idhcp = handle_update_instance(2, dmctx, &idhcp_last, update_instance_alias_icwmpd, 3, p->dmmap_section, "ldhcpinstance", "ldhcpalias");
idhcp = handle_update_instance(2, dmctx, &idhcp_last, update_instance_alias_bbfdm, 3, p->dmmap_section, "ldhcpinstance", "ldhcpalias");
init_args_dhcp_host(&curr_dhcp_staticargs, p->config_section);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_dhcp_staticargs, idhcp) == DM_STOP)
break;
@ -3146,7 +3146,7 @@ int browseDHCPv4ClientInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_
if (ipv4addr[0] == '\0' && ipv6addr[0] == '\0' && strcmp(proto, "dhcp") != 0 && strcmp(proto, "dhcpv6") != 0 && strcmp(inst, "") == 0 && strcmp(type, "bridge") != 0) {
p->config_section=NULL;
DMUCI_SET_VALUE_BY_SECTION(icwmpd, p->dmmap_section, "section_name", "");
DMUCI_SET_VALUE_BY_SECTION(bbfdm, p->dmmap_section, "section_name", "");
}
}
@ -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_icwmpd, 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, "cwmp_dhcpv4client_instance", "cwmp_dhcpv4client_alias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, &dhcp_client_arg, instance) == DM_STOP)
break;
}
@ -3188,9 +3188,9 @@ int browseDHCPv4ClientSentOptionInst(struct dmctx *dmctx, DMNODE *parent_node, v
for (i= 0; i<length; i++){
buf= strsplit(sentopts[i], ":", &lgh2);
if ((dmmap_sect = get_dup_section_in_dmmap_eq("dmmap_dhcp_client", "send_option", section_name(dhcp_client_args->dhcp_client_conf), "option_tag", buf[0])) == NULL) {
dmuci_add_section_icwmpd("dmmap_dhcp_client", "send_option", &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "option_tag", buf[0]);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section_name", section_name(dhcp_client_args->dhcp_client_conf));
dmuci_add_section_bbfdm("dmmap_dhcp_client", "send_option", &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_tag", buf[0]);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(dhcp_client_args->dhcp_client_conf));
}
optionvalue=dmstrdup(buf[1]);
if(lgh2>2){
@ -3203,10 +3203,10 @@ int browseDHCPv4ClientSentOptionInst(struct dmctx *dmctx, DMNODE *parent_node, v
tmp= NULL;
}
}
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "option_value", optionvalue);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_value", optionvalue);
}
uci_path_foreach_option_eq(icwmpd, "dmmap_dhcp_client", "send_option", "section_name", dhcp_client_args->dhcp_client_conf?section_name(dhcp_client_args->dhcp_client_conf):"", dmmap_sect) {
uci_path_foreach_option_eq(bbfdm, "dmmap_dhcp_client", "send_option", "section_name", dhcp_client_args->dhcp_client_conf?section_name(dhcp_client_args->dhcp_client_conf):"", dmmap_sect) {
dmuci_get_value_by_section_string(dmmap_sect, "option_tag", &v1);
dmuci_get_value_by_section_string(dmmap_sect, "option_value", &v2);
dhcp_client_opt_args.client_sect= dhcp_client_args->dhcp_client_conf;
@ -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_icwmpd, 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, "cwmp_dhcpv4_sentopt_instance", "cwmp_dhcpv4_sentopt_alias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, &dhcp_client_opt_args, instance) == DM_STOP)
break;
}
@ -3237,20 +3237,20 @@ int browseDHCPv4ClientReqOptionInst(struct dmctx *dmctx, DMNODE *parent_node, vo
check_create_dmmap_package("dmmap_dhcp_client");
for (i= 0; i<length; i++){
if ((dmmap_sect = get_dup_section_in_dmmap_eq("dmmap_dhcp_client", "req_option", section_name(dhcp_client_args->dhcp_client_conf), "option_tag", reqtopts[i])) == NULL) {
dmuci_add_section_icwmpd("dmmap_dhcp_client", "req_option", &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "option_tag", reqtopts[i]);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section_name", section_name(dhcp_client_args->dhcp_client_conf));
dmuci_add_section_bbfdm("dmmap_dhcp_client", "req_option", &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_tag", reqtopts[i]);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(dhcp_client_args->dhcp_client_conf));
}
}
uci_path_foreach_option_eq(icwmpd, "dmmap_dhcp_client", "req_option", "section_name", dhcp_client_args->dhcp_client_conf?section_name(dhcp_client_args->dhcp_client_conf):"", dmmap_sect) {
uci_path_foreach_option_eq(bbfdm, "dmmap_dhcp_client", "req_option", "section_name", dhcp_client_args->dhcp_client_conf?section_name(dhcp_client_args->dhcp_client_conf):"", dmmap_sect) {
dmuci_get_value_by_section_string(dmmap_sect, "option_tag", &v1);
dhcp_client_opt_args.client_sect= dhcp_client_args->dhcp_client_conf;
dhcp_client_opt_args.option_tag= dmstrdup(v1);
dhcp_client_opt_args.value= dmstrdup("");
dhcp_client_opt_args.opt_sect= dmmap_sect;
instance= handle_update_instance(1, dmctx, &instnbr, update_instance_alias_icwmpd, 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, "cwmp_dhcpv4_reqtopt_instance", "cwmp_dhcpv4_reqtopt_alias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, &dhcp_client_opt_args, instance) == DM_STOP)
break;
}
@ -3273,9 +3273,9 @@ int browseDHCPv4ServerPoolOptionInst(struct dmctx *dmctx, DMNODE *parent_node, v
uci_foreach_element(dhcp_options_list, e) {
tagvalue= strsplit(e->name, ",", &length);
if ((dmmap_sect = get_dup_section_in_dmmap_eq("dmmap_dhcp", "servpool_option", section_name(curr_dhcp_args->dhcp_sec), "option_tag", tagvalue[0])) == NULL) {
dmuci_add_section_icwmpd("dmmap_dhcp", "servpool_option", &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "option_tag", tagvalue[0]);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section_name", section_name(curr_dhcp_args->dhcp_sec));
dmuci_add_section_bbfdm("dmmap_dhcp", "servpool_option", &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_tag", tagvalue[0]);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(curr_dhcp_args->dhcp_sec));
}
optionvalue=dmstrdup(tagvalue[1]);
if(length>2){
@ -3288,17 +3288,17 @@ int browseDHCPv4ServerPoolOptionInst(struct dmctx *dmctx, DMNODE *parent_node, v
tmp= NULL;
}
}
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "option_value", optionvalue);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_value", optionvalue);
}
}
uci_path_foreach_option_eq(icwmpd, "dmmap_dhcp", "servpool_option", "section_name", section_name(curr_dhcp_args->dhcp_sec), dmmap_sect) {
uci_path_foreach_option_eq(bbfdm, "dmmap_dhcp", "servpool_option", "section_name", section_name(curr_dhcp_args->dhcp_sec), dmmap_sect) {
dmuci_get_value_by_section_string(dmmap_sect, "option_tag", &v1);
dmuci_get_value_by_section_string(dmmap_sect, "option_value", &v2);
dhcp_client_opt_args.client_sect= curr_dhcp_args->dhcp_sec;
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_icwmpd, 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, "cwmp_dhcpv4_servpool_option_instance", "cwmp_dhcpv4_servpool_option_alias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, &dhcp_client_opt_args, instance) == DM_STOP)
break;
}
@ -3404,7 +3404,7 @@ int browseDHCPv4RelayForwardingInst(struct dmctx *dmctx, DMNODE *parent_node, vo
if (ipv4addr[0] == '\0' && ipv6addr[0] == '\0' && strcmp(inst, "") == 0 && strcmp(type, "bridge") != 0 && strcmp(proto, "relay") != 0) {
p->config_section=NULL;
DMUCI_SET_VALUE_BY_SECTION(icwmpd, p->dmmap_section, "section_name", "");
DMUCI_SET_VALUE_BY_SECTION(bbfdm, p->dmmap_section, "section_name", "");
}
}
@ -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_icwmpd, 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, "cwmp_dhcpv4relay_instance", "cwmp_dhcpv4relay_alias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, &dhcp_relay_arg, instance) == DM_STOP)
break;

64
dmtree/tr181/dhcpv6.c
View file

@ -221,7 +221,7 @@ inline int init_dhcpv6_client_args(struct clientv6_args *args, json_object *clie
struct uci_section* exist_other_section_dhcp6_same_order(struct uci_section *dmmap_sect, char * package, char* sect_type, char *order) {
struct uci_section *s;
uci_path_foreach_option_eq(icwmpd, package, sect_type, "order", order, s) {
uci_path_foreach_option_eq(bbfdm, package, sect_type, "order", order, s) {
if(strcmp(section_name(s), section_name(dmmap_sect)) != 0){
return s;
}
@ -235,7 +235,7 @@ int set_section_dhcp6_order(char *package, char *dmpackage, char* sect_type, str
dmuci_get_value_by_section_string(dmmap_sect, "order", &v);
if((v!=NULL || strlen(v)>0) && strcmp(v, order) == 0)
return 0;
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "order", order);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "order", order);
if(conf==NULL){
dmuci_get_value_by_section_string(dmmap_sect, "section_name", &sect_name);
get_config_section_of_dmmap_section(package, sect_type, sect_name, &s);
@ -337,7 +337,7 @@ int browseDHCPv6ServerPoolInst(struct dmctx *dmctx, DMNODE *parent_node, void *p
list_for_each_entry(p, &dup_list, list) {
dmuci_get_value_by_section_string(p->config_section, "interface", &interface);
init_dhcpv6_args(&curr_dhcp6_args, p->config_section, interface);
idhcp = handle_update_instance(1, dmctx, &idhcp_last, update_instance_alias_icwmpd, 3, p->dmmap_section, "dhcpv6_serv_pool_instance", "dhcpv6_serv_pool_alias");
idhcp = handle_update_instance(1, dmctx, &idhcp_last, update_instance_alias_bbfdm, 3, p->dmmap_section, "dhcpv6_serv_pool_instance", "dhcpv6_serv_pool_alias");
dmuci_get_value_by_section_string(p->dmmap_section, "order", &v);
if(v==NULL || strlen(v) == 0)
set_section_dhcp6_order("dhcp", "dmmap_dhcpv6", "dhcp", p->dmmap_section, p->config_section, 0, idhcp);
@ -400,9 +400,9 @@ int browseDHCPv6ServerPoolOptionInst(struct dmctx *dmctx, DMNODE *parent_node, v
uci_foreach_element(dhcp_options_list, e) {
tagvalue= strsplit(e->name, ",", &length);
if ((dmmap_sect = get_dup_section_in_dmmap_eq("dmmap_dhcpv6", "servpool_option", section_name(curr_dhcp_args->dhcp_sec), "option_tag", tagvalue[0])) == NULL) {
dmuci_add_section_icwmpd("dmmap_dhcpv6", "servpool_option", &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "option_tag", tagvalue[0]);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section_name", section_name(curr_dhcp_args->dhcp_sec));
dmuci_add_section_bbfdm("dmmap_dhcpv6", "servpool_option", &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_tag", tagvalue[0]);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "section_name", section_name(curr_dhcp_args->dhcp_sec));
}
optionvalue=dmstrdup(tagvalue[1]);
if(length>2){
@ -415,17 +415,17 @@ int browseDHCPv6ServerPoolOptionInst(struct dmctx *dmctx, DMNODE *parent_node, v
tmp= NULL;
}
}
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "option_value", optionvalue);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "option_value", optionvalue);
}
}
uci_path_foreach_option_eq(icwmpd, "dmmap_dhcpv6", "servpool_option", "section_name", section_name(curr_dhcp_args->dhcp_sec), dmmap_sect) {
uci_path_foreach_option_eq(bbfdm, "dmmap_dhcpv6", "servpool_option", "section_name", section_name(curr_dhcp_args->dhcp_sec), dmmap_sect) {
dmuci_get_value_by_section_string(dmmap_sect, "option_tag", &v1);
dmuci_get_value_by_section_string(dmmap_sect, "option_value", &v2);
dhcp_client_opt_args.client_sect= curr_dhcp_args->dhcp_sec;
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_icwmpd, 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, "cwmp_dhcpv6_servpool_option_instance", "cwmp_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_icwmpd("dmmap_dhcpv6", "interface", "cwmp_dhcpv6client_instance");
instancepara = get_last_instance_bbfdm("dmmap_dhcpv6", "interface", "cwmp_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_icwmpd("dmmap_dhcpv6", "interface", &dmmap_sect, &v);
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_icwmpd(dmmap_sect, instancepara, "cwmp_dhcpv6client_instance");
*instance = update_instance_bbfdm(dmmap_sect, instancepara, "cwmp_dhcpv6client_instance");
return 0;
}
@ -517,7 +517,7 @@ int delObjDHCPv6Client(char *refparam, struct dmctx *ctx, void *data, char *inst
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);
dmuci_delete_by_section_unnamed_icwmpd(dmmap_section, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dmmap_section, NULL, NULL);
dmuci_delete_by_section(dhcpv6_client_args->dhcp_client_conf, NULL, NULL);
}
break;
@ -575,16 +575,16 @@ int addObjDHCPv6ServerPool(char *refparam, struct dmctx *ctx, void *data, char *
struct uci_section *s = NULL, *dmmap_dhcp= NULL;
check_create_dmmap_package("dmmap_dhcpv6");
instancepara = get_last_instance_icwmpd("dmmap_dhcpv6", "dhcp", "dhcpv6_serv_pool_instance");
instancepara = get_last_instance_bbfdm("dmmap_dhcpv6", "dhcp", "dhcpv6_serv_pool_instance");
dmuci_add_section("dhcp", "dhcp", &s, &value);
dmuci_set_value_by_section(s, "dhcpv6", "server");
dmuci_set_value_by_section(s, "start", "100");
dmuci_set_value_by_section(s, "leasetime", "12h");
dmuci_set_value_by_section(s, "limit", "150");
dmuci_add_section_icwmpd("dmmap_dhcpv6", "dhcp", &dmmap_dhcp, &v);
dmuci_add_section_bbfdm("dmmap_dhcpv6", "dhcp", &dmmap_dhcp, &v);
dmuci_set_value_by_section(dmmap_dhcp, "section_name", section_name(s));
*instance = update_instance_icwmpd(dmmap_dhcp, instancepara, "dhcpv6_serv_pool_instance");
*instance = update_instance_bbfdm(dmmap_dhcp, instancepara, "dhcpv6_serv_pool_instance");
return 0;
}
@ -606,7 +606,7 @@ int delObjDHCPv6ServerPool(char *refparam, struct dmctx *ctx, void *data, char *
} else {
get_dmmap_section_of_config_section("dmmap_dhcpv6", "dhcp", section_name(((struct dhcpv6_args *)data)->dhcp_sec), &dmmap_section);
if(dmmap_section != NULL)
dmuci_delete_by_section_unnamed_icwmpd(dmmap_section, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dmmap_section, NULL, NULL);
dmuci_delete_by_section(((struct dhcpv6_args *)data)->dhcp_sec, NULL, NULL);
}
break;
@ -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_icwmpd_dmmap_opt("dmmap_dhcpv6", "servpool_option", "cwmp_dhcpv6_servpool_option_instance", "section_name", section_name(dhcp_arg->dhcp_sec));
dmuci_add_section_icwmpd("dmmap_dhcpv6", "servpool_option", &dmmap_sect, &value);
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));
dmuci_add_section_bbfdm("dmmap_dhcpv6", "servpool_option", &dmmap_sect, &value);
if(dhcp_arg->dhcp_sec != NULL)
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "section_name", section_name(dhcp_arg->dhcp_sec));
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "option_tag", "0");
*instance = update_instance_icwmpd(dmmap_sect, instancepara, "cwmp_dhcpv6_servpool_option_instance");
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");
return 0;
}
@ -670,12 +670,12 @@ int delObjDHCPv6ServerPoolOption(char *refparam, struct dmctx *ctx, void *data,
dmuci_del_list_value_by_section(((struct dhcpv6_client_option_args*) data)->client_sect, "dhcp_option", opt_value);
}
}
dmuci_delete_by_section_unnamed_icwmpd(((struct dhcpv6_client_option_args*) data)->opt_sect, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(((struct dhcpv6_client_option_args*) data)->opt_sect, NULL, NULL);
break;
case DEL_ALL:
dmuci_set_value_by_section(((struct dhcpv6_args*) data)->dhcp_sec, "dhcp_option", "");
uci_path_foreach_sections_safe(icwmpd, "dmmap_dhcpv6", "servpool_option", stmp, s) {
dmuci_delete_by_section_unnamed_icwmpd(s, NULL, NULL);
uci_path_foreach_sections_safe(bbfdm, "dmmap_dhcpv6", "servpool_option", stmp, s) {
dmuci_delete_by_section_unnamed_bbfdm(s, NULL, NULL);
}
break;
}
@ -688,7 +688,7 @@ int get_DHCPv6_ClientNumberOfEntries(char *refparam, struct dmctx *ctx, void *da
int cnt = 0;
char *proto;
uci_path_foreach_sections(icwmpd, "dmmap_dhcpv6", "interface", s)
uci_path_foreach_sections(bbfdm, "dmmap_dhcpv6", "interface", s)
{
cnt++;
}
@ -794,7 +794,7 @@ int set_DHCPv6Client_Interface(char *refparam, struct dmctx *ctx, void *data, ch
adm_entry_get_linker_value(ctx, newvalue, &linker);
} else
adm_entry_get_linker_value(ctx, value, &linker);
uci_path_foreach_sections(icwmpd, "dmmap_dhcpv6", "interface", s) {
uci_path_foreach_sections(bbfdm, "dmmap_dhcpv6", "interface", s) {
dmuci_get_value_by_section_string(s, "section_name", &v);
if(strcmp(v, linker) == 0)
return FAULT_9007;
@ -813,7 +813,7 @@ int set_DHCPv6Client_Interface(char *refparam, struct dmctx *ctx, void *data, ch
adm_entry_get_linker_value(ctx, newvalue, &linker);
} else
adm_entry_get_linker_value(ctx, value, &linker);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dhcpv6_client_args->dhcp_client_dm, "section_name", linker);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcpv6_client_args->dhcp_client_dm, "section_name", linker);
break;
}
return 0;
@ -1300,7 +1300,7 @@ int set_DHCPv6ServerPool_Alias(char *refparam, struct dmctx *ctx, void *data, ch
case VALUESET:
get_dmmap_section_of_config_section("dmmap_dhcpv6", "dhcp", section_name(dhcpv6_arg->dhcp_sec), &dmmap_sect);
if (dmmap_sect)
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "dhcpv6_serv_pool_alias", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "dhcpv6_serv_pool_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(icwmpd, dhcp_client_opt_args->opt_sect, "cwmp_dhcpv6_servpool_option_alias", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "cwmp_dhcpv6_servpool_option_alias", value);
break;
}
return 0;
@ -2010,7 +2010,7 @@ int set_DHCPv6ServerPoolOption_Tag(char *refparam, struct dmctx *ctx, void *data
dmuci_get_value_by_section_list(dhcp_client_opt_args->client_sect, "dhcp_option", &dhcp_option_list);
dmuci_del_list_value_by_section(dhcp_client_opt_args->client_sect, "dhcp_option", oldopttagvalue);
dmuci_add_list_value_by_section(dhcp_client_opt_args->client_sect, "dhcp_option", opttagvalue);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dhcp_client_opt_args->opt_sect, "option_tag", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "option_tag", value);
break;
}
return 0;
@ -2050,7 +2050,7 @@ int set_DHCPv6ServerPoolOption_Value(char *refparam, struct dmctx *ctx, void *da
dmuci_get_value_by_section_list(dhcp_client_opt_args->client_sect, "dhcp_option", &dhcp_option_list);
dmuci_del_list_value_by_section(dhcp_client_opt_args->client_sect, "dhcp_option", oldopttagvalue);
dmuci_add_list_value_by_section(dhcp_client_opt_args->client_sect, "dhcp_option", opttagvalue);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dhcp_client_opt_args->opt_sect, "option_value", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dhcp_client_opt_args->opt_sect, "option_value", value);
break;
}
return 0;

36
dmtree/tr181/dns.c
View file

@ -154,7 +154,7 @@ static unsigned char is_dns_server_in_dmmap(char *chk_ip, char *chk_interface)
struct uci_section *s = NULL;
char *ip, *interface;
uci_path_foreach_sections(icwmpd, "dmmap_dns", "dns_server", s) {
uci_path_foreach_sections(bbfdm, "dmmap_dns", "dns_server", s) {
dmuci_get_value_by_section_string(s, "ip", &ip);
dmuci_get_value_by_section_string(s, "interface", &interface);
if (strcmp(interface, chk_interface) == 0 && strcmp(ip, chk_ip) == 0) {
@ -174,7 +174,7 @@ static int dmmap_synchronizeDNSClientRelayServer(struct dmctx *dmctx, DMNODE *pa
int j, found;
check_create_dmmap_package("dmmap_dns");
uci_path_foreach_sections_safe(icwmpd, "dmmap_dns", "dns_server", stmp, s) {
uci_path_foreach_sections_safe(bbfdm, "dmmap_dns", "dns_server", stmp, s) {
dmuci_get_value_by_section_string(s, "ip", &vip);
dmuci_get_value_by_section_string(s, "interface", &viface);
found = 0;
@ -212,7 +212,7 @@ static int dmmap_synchronizeDNSClientRelayServer(struct dmctx *dmctx, DMNODE *pa
uci_foreach_element(v, e) {
if (is_dns_server_in_dmmap(e->name, section_name(s)))
continue;
dmuci_add_section_icwmpd("dmmap_dns", "dns_server", &sdns, &name);
dmuci_add_section_bbfdm("dmmap_dns", "dns_server", &sdns, &name);
dmuci_set_value_by_section(sdns, "ip", e->name);
dmuci_set_value_by_section(sdns, "interface", section_name(s));
dmuci_set_value_by_section(sdns, "enable", "1");
@ -225,7 +225,7 @@ static int dmmap_synchronizeDNSClientRelayServer(struct dmctx *dmctx, DMNODE *pa
dmjson_foreach_value_in_array(jobj, arrobj, ipdns, j, 1, "dns-server") {
if (ipdns[0] == '\0' || is_dns_server_in_dmmap(ipdns, section_name(s)))
continue;
dmuci_add_section_icwmpd("dmmap_dns", "dns_server", &sdns, &name);
dmuci_add_section_bbfdm("dmmap_dns", "dns_server", &sdns, &name);
dmuci_set_value_by_section(sdns, "ip", ipdns);
dmuci_set_value_by_section(sdns, "interface", section_name(s));
dmuci_set_value_by_section(sdns, "enable", "1");
@ -242,9 +242,9 @@ int browseServerInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data,
char *instance, *instnbr = NULL;
dmmap_synchronizeDNSClientRelayServer(dmctx, NULL, NULL, NULL);
uci_path_foreach_sections(icwmpd, "dmmap_dns", "dns_server", s)
uci_path_foreach_sections(bbfdm, "dmmap_dns", "dns_server", s)
{
instance = handle_update_instance(1, dmctx, &instnbr, update_instance_alias_icwmpd, 3, s, "dns_server_instance", "dns_server_alias");
instance = handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, s, "dns_server_instance", "dns_server_alias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)s, instance) == DM_STOP)
break;
@ -258,9 +258,9 @@ int browseRelayForwardingInst(struct dmctx *dmctx, DMNODE *parent_node, void *pr
char *instance, *instnbr = NULL;
dmmap_synchronizeDNSClientRelayServer(dmctx, NULL, NULL, NULL);
uci_path_foreach_sections(icwmpd, "dmmap_dns", "dns_server", s)
uci_path_foreach_sections(bbfdm, "dmmap_dns", "dns_server", s)
{
instance = handle_update_instance(1, dmctx, &instnbr, update_instance_alias_icwmpd, 3, s, "dns_server_instance", "dns_server_alias");
instance = handle_update_instance(1, dmctx, &instnbr, update_instance_alias_bbfdm, 3, s, "dns_server_instance", "dns_server_alias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)s, instance) == DM_STOP)
break;
@ -289,13 +289,13 @@ int add_client_server(char *refparam, struct dmctx *ctx, void *data, char **inst
char *v, *inst;
check_create_dmmap_package("dmmap_dns");
inst = get_last_instance_icwmpd("dmmap_dns", "dns_server", "dns_server_instance");
inst = get_last_instance_bbfdm("dmmap_dns", "dns_server", "dns_server_instance");
dmuci_add_list_value("network", "lan", "dns", "0.0.0.0");
dmuci_add_section_icwmpd("dmmap_dns", "dns_server", &s, &v);
dmuci_add_section_bbfdm("dmmap_dns", "dns_server", &s, &v);
dmuci_set_value_by_section(s, "ip", "0.0.0.0");
dmuci_set_value_by_section(s, "interface", "lan");
dmuci_set_value_by_section(s, "enable", "1");
*instance = update_instance_icwmpd(s, inst, "dns_server_instance");
*instance = update_instance_bbfdm(s, inst, "dns_server_instance");
return 0;
}
@ -305,13 +305,13 @@ int add_relay_forwarding(char *refparam, struct dmctx *ctx, void *data, char **i
char *v, *inst;
check_create_dmmap_package("dmmap_dns");
inst = get_last_instance_icwmpd("dmmap_dns", "dns_server", "dns_server_instance");
inst = get_last_instance_bbfdm("dmmap_dns", "dns_server", "dns_server_instance");
dmuci_add_list_value("network", "lan", "dns", "0.0.0.0");
dmuci_add_section_icwmpd("dmmap_dns", "dns_server", &s, &v);
dmuci_add_section_bbfdm("dmmap_dns", "dns_server", &s, &v);
dmuci_set_value_by_section(s, "ip", "0.0.0.0");
dmuci_set_value_by_section(s, "interface", "lan");
dmuci_set_value_by_section(s, "enable", "1");
*instance = update_instance_icwmpd(s, inst, "dns_server_instance");
*instance = update_instance_bbfdm(s, inst, "dns_server_instance");
return 0;
}
@ -340,7 +340,7 @@ int delete_client_server(char *refparam, struct dmctx *ctx, void *data, char *in
dmuci_get_value_by_section_list(s, "dns", &v);
if (v != NULL) {
uci_foreach_element_safe(v, e, tmp) {
uci_path_foreach_option_eq_safe(icwmpd, "dmmap_dns", "dns_server", "ip", tmp->name, stmp, ss) {
uci_path_foreach_option_eq_safe(bbfdm, "dmmap_dns", "dns_server", "ip", tmp->name, stmp, ss) {
dmuci_delete_by_section(ss, NULL, NULL);
}
dmuci_del_list_value_by_section(s, "dns", tmp->name);
@ -377,7 +377,7 @@ int delete_relay_forwarding(char *refparam, struct dmctx *ctx, void *data, char
dmuci_get_value_by_section_list(s, "dns", &v);
if (v != NULL) {
uci_foreach_element_safe(v, e, tmp) {
uci_path_foreach_option_eq_safe(icwmpd, "dmmap_dns", "dns_server", "ip", tmp->name, stmp, ss) {
uci_path_foreach_option_eq_safe(bbfdm, "dmmap_dns", "dns_server", "ip", tmp->name, stmp, ss) {
dmuci_delete_by_section(ss, NULL, NULL);
}
dmuci_del_list_value_by_section(s, "dns", tmp->name);
@ -414,7 +414,7 @@ int get_client_server_number_of_entries(char *refparam, struct dmctx *ctx, void
int cnt = 0;
dmmap_synchronizeDNSClientRelayServer(ctx, NULL, NULL, NULL);
uci_path_foreach_sections(icwmpd, "dmmap_dns", "dns_server", s)
uci_path_foreach_sections(bbfdm, "dmmap_dns", "dns_server", s)
{
cnt++;
}
@ -501,7 +501,7 @@ int get_relay_forward_number_of_entries(char *refparam, struct dmctx *ctx, void
int cnt = 0;
dmmap_synchronizeDNSClientRelayServer(ctx, NULL, NULL, NULL);
uci_path_foreach_sections(icwmpd, "dmmap_dns", "dns_server", s)
uci_path_foreach_sections(bbfdm, "dmmap_dns", "dns_server", s)
{
cnt++;
}

20
dmtree/tr181/dsl.c
View file

@ -314,14 +314,14 @@ static struct uci_section *update_create_dmmap_dsl_line(char *curr_id)
struct uci_section *s = NULL;
char *name, *instance;
uci_path_foreach_option_eq(icwmpd, "dmmap", "dsl_line", "id", curr_id, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap", "dsl_line", "id", curr_id, s) {
return s;
}
if (!s) {
dmasprintf(&instance, "%d", atoi(curr_id)+1);
DMUCI_ADD_SECTION(icwmpd, "dmmap", "dsl_line", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "id", curr_id);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "dsl_line_instance", instance);
DMUCI_ADD_SECTION(bbfdm, "dmmap", "dsl_line", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "id", curr_id);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "dsl_line_instance", instance);
dmfree(instance);
}
return s;
@ -332,14 +332,14 @@ static struct uci_section *update_create_dmmap_dsl_channel(char *curr_id)
struct uci_section *s = NULL;
char *name, *instance;
uci_path_foreach_option_eq(icwmpd, "dmmap", "dsl_channel", "id", curr_id, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap", "dsl_channel", "id", curr_id, s) {
return s;
}
if (!s) {
dmasprintf(&instance, "%d", atoi(curr_id)+1);
DMUCI_ADD_SECTION(icwmpd, "dmmap", "dsl_channel", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "id", curr_id);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "dsl_channel_instance", instance);
DMUCI_ADD_SECTION(bbfdm, "dmmap", "dsl_channel", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "id", curr_id);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "dsl_channel_instance", instance);
dmfree(instance);
}
return s;
@ -460,7 +460,7 @@ int get_DSL_LineNumberOfEntries(char *refparam, struct dmctx *ctx, void *data, c
struct uci_section *s = NULL;
int cnt = 0;
uci_path_foreach_sections(icwmpd, "dmmap", "dsl_line", s) {
uci_path_foreach_sections(bbfdm, "dmmap", "dsl_line", s) {
cnt++;
}
dmasprintf(value, "%d", cnt);
@ -472,7 +472,7 @@ int get_DSL_ChannelNumberOfEntries(char *refparam, struct dmctx *ctx, void *data
struct uci_section *s = NULL;
int cnt = 0;
uci_path_foreach_sections(icwmpd, "dmmap", "dsl_channel", s) {
uci_path_foreach_sections(bbfdm, "dmmap", "dsl_channel", s) {
cnt++;
}
dmasprintf(value, "%d", cnt);

32
dmtree/tr181/ethernet.c
View file

@ -184,7 +184,7 @@ static int is_mac_exist(char *macaddr)
struct uci_section *s = NULL;
char *mac;
uci_path_foreach_sections(icwmpd, DMMAP, "link", s) {
uci_path_foreach_sections(bbfdm, DMMAP, "link", s) {
dmuci_get_value_by_section_string(s, "mac", &mac);
if (strcmp(mac, macaddr) == 0)
return 1;
@ -209,7 +209,7 @@ static void create_link(char *ifname)
if (is_mac_exist(macaddr))
return;
dmuci_add_section_icwmpd(DMMAP, "link", &dmmap, &v);
dmuci_add_section_bbfdm(DMMAP, "link", &dmmap, &v);
dmuci_set_value_by_section(dmmap, "mac", macaddr);
dmuci_set_value_by_section(dmmap, "device", device);
dmuci_set_value_by_section(dmmap, "section_name", ifname);
@ -269,9 +269,9 @@ int browseEthernetLinkInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_
char *id_last = NULL, *id = NULL;
dmmap_synchronizeEthernetLink(dmctx, NULL, NULL, NULL);
uci_path_foreach_sections(icwmpd, DMMAP, "link", s) {
uci_path_foreach_sections(bbfdm, DMMAP, "link", s) {
args.section = s;
id = handle_update_instance(1, dmctx, &id_last, update_instance_alias_icwmpd, 3, s, "link_instance", "link_alias");
id = handle_update_instance(1, dmctx, &id_last, update_instance_alias_bbfdm, 3, s, "link_instance", "link_alias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&args, id) == DM_STOP) {
break;
}
@ -345,10 +345,10 @@ int addObjEthernetLink(char *refparam, struct dmctx *ctx, void *data, char **ins
char *inst, *v;
struct uci_section *dmmap_network= NULL;
inst = get_last_instance_icwmpd(DMMAP, "link", "link_instance");
inst = get_last_instance_bbfdm(DMMAP, "link", "link_instance");
dmuci_add_section_icwmpd(DMMAP, "link", &dmmap_network, &v);
*instance = update_instance_icwmpd(dmmap_network, inst, "link_instance");
dmuci_add_section_bbfdm(DMMAP, "link", &dmmap_network, &v);
*instance = update_instance_bbfdm(dmmap_network, inst, "link_instance");
return 0;
}
@ -359,7 +359,7 @@ int delObjEthernetLink(char *refparam, struct dmctx *ctx, void *data, char *inst
dmuci_delete_by_section(((struct dm_args *)data)->section, NULL, NULL);
break;
case DEL_ALL:
DMUCI_DEL_SECTION(icwmpd, DMMAP, "link", NULL, NULL);
DMUCI_DEL_SECTION(bbfdm, DMMAP, "link", NULL, NULL);
break;
}
@ -374,9 +374,9 @@ int addObjEthernetVLANTermination(char *refparam, struct dmctx *ctx, void *data,
check_create_dmmap_package("dmmap_network");
dmuci_get_option_value_string("cwmp", "cpe", "vlan_method", &vlan_method);
if(strcmp(vlan_method, "2") == 0)
inst = get_vlan_last_instance_icwmpd("dmmap_network", "device", "all_vlan_term_instance", vlan_method);
inst = get_vlan_last_instance_bbfdm("dmmap_network", "device", "all_vlan_term_instance", vlan_method);
else
inst = get_vlan_last_instance_icwmpd("dmmap_network", "device", "only_tagged_vlan_term_instance", vlan_method);
inst = get_vlan_last_instance_bbfdm("dmmap_network", "device", "only_tagged_vlan_term_instance", vlan_method);
dmuci_get_option_value_string("ports", "WAN", "ifname", &eth_wan);
dmasprintf(&vid, "%d", inst?atoi(inst)+4:4);
@ -388,12 +388,12 @@ int addObjEthernetVLANTermination(char *refparam, struct dmctx *ctx, void *data,
dmasprintf(&name, "%s.%s", eth_wan, vid);
dmuci_set_value("network", vlan_name, "name", name);
dmuci_add_section_icwmpd("dmmap_network", "device", &dmmap_network, &v);
dmuci_add_section_bbfdm("dmmap_network", "device", &dmmap_network, &v);
dmuci_set_value_by_section(dmmap_network, "section_name", vlan_name);
if(strcmp(vlan_method, "2") == 0)
*instance = update_instance_icwmpd(dmmap_network, inst, "all_vlan_term_instance");
*instance = update_instance_bbfdm(dmmap_network, inst, "all_vlan_term_instance");
else
*instance = update_instance_icwmpd(dmmap_network, inst, "only_tagged_vlan_term_instance");
*instance = update_instance_bbfdm(dmmap_network, inst, "only_tagged_vlan_term_instance");
return 0;
}
@ -421,7 +421,7 @@ int delObjEthernetVLANTermination(char *refparam, struct dmctx *ctx, void *data,
} else {
get_dmmap_section_of_config_section("dmmap_dropbear", "dropbear", section_name(((struct dm_args *)data)->section), &dmmap_section);
if(dmmap_section != NULL)
dmuci_delete_by_section_unnamed_icwmpd(dmmap_section, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dmmap_section, NULL, NULL);
dmuci_delete_by_section(((struct dm_args *)data)->section, NULL, NULL);
}
break;
@ -470,7 +470,7 @@ int get_Ethernet_LinkNumberOfEntries(char *refparam, struct dmctx *ctx, void *da
int cnt = 0;
dmmap_synchronizeEthernetLink(ctx, NULL, NULL, NULL);
uci_path_foreach_sections(icwmpd, DMMAP, "link", s)
uci_path_foreach_sections(bbfdm, DMMAP, "link", s)
{
cnt++;
}
@ -994,7 +994,7 @@ int get_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void *data,
get_dmmap_section_of_config_section("dmmap_network", "interface", section_name(s), &dmmap_section);
if (dmmap_section != NULL) {
dmuci_get_value_by_section_string(dmmap_section, "bridge_instance", &br_inst);
uci_path_foreach_option_eq(icwmpd, "dmmap_bridge_port", "bridge_port", "bridge_key", br_inst, port) {
uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "bridge_key", br_inst, port) {
dmuci_get_value_by_section_string(port, "mg_port", &mg);
if (strcmp(mg, "true") == 0)
sprintf(linker, "%s+", section_name(port));

20
dmtree/tr181/firewall.c
View file

@ -109,7 +109,7 @@ int browseLevelInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, c
check_create_dmmap_package("dmmap_firewall");
s = is_dmmap_section_exist("dmmap_firewall", "level");
if(!s)
dmuci_add_section_icwmpd("dmmap_firewall", "level", &s, &v);
dmuci_add_section_bbfdm("dmmap_firewall", "level", &s, &v);
instance = handle_update_instance(1, dmctx, &instnbr, update_instance_alias, 3, s, "firewall_level_instance", "firewall_level_alias");
DM_LINK_INST_OBJ(dmctx, parent_node, s, "1");
@ -124,7 +124,7 @@ int browseChainInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, c
check_create_dmmap_package("dmmap_firewall");
s = is_dmmap_section_exist("dmmap_firewall", "chain");
if(!s)
dmuci_add_section_icwmpd("dmmap_firewall", "chain", &s, &v);
dmuci_add_section_bbfdm("dmmap_firewall", "chain", &s, &v);
instance = handle_update_instance(1, dmctx, &instnbr, update_instance_alias, 3, s, "firewall_chain_instance", "firewall_chain_alias");
DM_LINK_INST_OBJ(dmctx, parent_node, s, "1");
@ -152,7 +152,7 @@ int add_firewall_rule(char *refparam, struct dmctx *ctx, void *data, char **inst
struct uci_section *s, *dmmap_firewall_rule;
char *last_inst= NULL, *sect_name= NULL, *rule_name, *v;
char ib[8];
last_inst= get_last_instance_icwmpd("dmmap_firewall", "rule", "firewall_chain_rule_instance");
last_inst= get_last_instance_bbfdm("dmmap_firewall", "rule", "firewall_chain_rule_instance");
if (last_inst)
sprintf(ib, "%s", last_inst);
else
@ -165,9 +165,9 @@ int add_firewall_rule(char *refparam, struct dmctx *ctx, void *data, char **inst
dmuci_set_value_by_section(s, "src", "wan");
dmuci_set_value_by_section(s, "target", "ACCEPT");
dmuci_add_section_icwmpd("dmmap_firewall", "rule", &dmmap_firewall_rule, &v);
dmuci_add_section_bbfdm("dmmap_firewall", "rule", &dmmap_firewall_rule, &v);
dmuci_set_value_by_section(dmmap_firewall_rule, "section_name", sect_name);
*instance = update_instance_icwmpd(dmmap_firewall_rule, last_inst, "firewall_chain_rule_instance");
*instance = update_instance_bbfdm(dmmap_firewall_rule, last_inst, "firewall_chain_rule_instance");
return 0;
}
@ -186,7 +186,7 @@ int delete_firewall_rule(char *refparam, struct dmctx *ctx, void *data, char *in
dmuci_delete_by_section_unnamed((struct uci_section *)data, NULL, NULL);
} else {
get_dmmap_section_of_config_section("dmmap_firewall", "rule", section_name((struct uci_section *)data), &dmmap_section);
dmuci_delete_by_section_unnamed_icwmpd(dmmap_section, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dmmap_section, NULL, NULL);
dmuci_delete_by_section((struct uci_section *)data, NULL, NULL);
}
break;
@ -781,7 +781,7 @@ int set_level_name(char *refparam, struct dmctx *ctx, void *data, char *instance
case VALUECHECK:
break;
case VALUESET:
DMUCI_SET_VALUE_BY_SECTION(icwmpd, level, "name", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, level, "name", value);
break;
}
return 0;
@ -794,7 +794,7 @@ int set_level_description(char *refparam, struct dmctx *ctx, void *data, char *i
case VALUECHECK:
break;
case VALUESET:
DMUCI_SET_VALUE_BY_SECTION(icwmpd, level, "description", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, level, "description", value);
break;
}
return 0;
@ -886,7 +886,7 @@ int set_chain_name(char *refparam, struct dmctx *ctx, void *data, char *instance
case VALUECHECK:
break;
case VALUESET:
DMUCI_SET_VALUE_BY_SECTION(icwmpd, chains, "name", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, chains, "name", value);
break;
}
return 0;
@ -928,7 +928,7 @@ int set_rule_description(char *refparam, struct dmctx *ctx, void *data, char *in
case VALUECHECK:
break;
case VALUESET:
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dms, "description", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dms, "description", value);
break;
}
return 0;

2
dmtree/tr181/hosts.c
View file

@ -70,7 +70,7 @@ int get_host_associateddevice(char *refparam, struct dmctx *ctx, void *data, cha
char *macaddr_linker = dmjson_get_value(((struct host_args *)data)->client, 1, "macaddr");
char *accesspointInstance = NULL, *wifiAssociativeDeviecPath;
uci_path_foreach_sections(icwmpd, "dmmap_wireless", "wifi-iface", ss) {
uci_path_foreach_sections(bbfdm, "dmmap_wireless", "wifi-iface", ss) {
dmuci_get_value_by_section_string(ss, "accesspointinstance", &accesspointInstance);
if(accesspointInstance[0] != '\0')
dmasprintf(&wifiAssociativeDeviecPath, "Device.WiFi.AccessPoint.%s.AssociatedDevice.", accesspointInstance);

22
dmtree/tr181/interfacestack.c
View file

@ -67,12 +67,12 @@ static struct uci_section *create_dmmap_interface_stack_section(char *curr_inst)
char *name;
check_create_dmmap_package("dmmap_interface_stack");
uci_path_foreach_option_eq(icwmpd, "dmmap_interface_stack", "interface_stack", "interface_stack_instance", curr_inst, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap_interface_stack", "interface_stack", "interface_stack_instance", curr_inst, s) {
return s;
}
if (!s) {
DMUCI_ADD_SECTION(icwmpd, "dmmap_interface_stack", "interface_stack", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "interface_stack_instance", curr_inst);
DMUCI_ADD_SECTION(bbfdm, "dmmap_interface_stack", "interface_stack", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "interface_stack_instance", curr_inst);
}
return s;
}
@ -253,7 +253,7 @@ int browseInterfaceStackInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
sprintf(buf_higheralias, "%s", higheralias);
if (strcmp(type, "bridge") == 0) {
br_inst = get_alias_by_section("dmmap_network", "interface", s, "bridge_instance");
uci_path_foreach_option_eq(icwmpd, "dmmap_bridge_port", "bridge_port", "bridge_key", br_inst, port) {
uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "bridge_key", br_inst, port) {
dmuci_get_value_by_section_string(port, "mg_port", &mg);
if (strcmp(mg, "true") == 0) {
sprintf(linker, "%s+", section_name(port));
@ -296,7 +296,7 @@ int browseInterfaceStackInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
br_inst = get_instance_by_section(dmctx, dmctx->instance_mode, "dmmap_network", "interface", s, "bridge_instance", "bridge_alias");
if (*br_inst == '\0')
continue;
uci_path_foreach_option_eq(icwmpd, "dmmap_bridge_port", "bridge_port", "bridge_key", br_inst, port) {
uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "bridge_key", br_inst, port) {
dmuci_get_value_by_section_string(port, "mg_port", &mg);
if (strcmp(mg, "true") == 0) {
sprintf(linker, "%s+", section_name(port));
@ -309,7 +309,7 @@ int browseInterfaceStackInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
}
}
uci_path_foreach_option_eq(icwmpd, "dmmap_bridge_port", "bridge_port", "bridge_key", br_inst, sd) {
uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "bridge_key", br_inst, sd) {
dmuci_get_value_by_section_string(sd, "mg_port", &mg);
if (strcmp(mg, "true") == 0)
continue;
@ -423,7 +423,7 @@ int browseInterfaceStackInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
adm_entry_get_linker_param(dmctx, dm_print_path("%s%cDSL%cChannel%c", dmroot, dm_delim, dm_delim, dm_delim), link_channel, &vb);
if (vb == NULL)
vb = "";
uci_path_foreach_sections(icwmpd, "dmmap", "dsl_channel", ss) {
uci_path_foreach_sections(bbfdm, "dmmap", "dsl_channel", ss) {
dmuci_get_value_by_section_string(ss, "dsl_channel_alias", &loweralias);
}
sprintf(buf_loweralias, "%s", loweralias);
@ -442,7 +442,7 @@ int browseInterfaceStackInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
adm_entry_get_linker_param(dmctx, dm_print_path("%s%cDSL%cLine%c", dmroot, dm_delim, dm_delim, dm_delim), link_line, &value);
if (value == NULL)
value = "";
uci_path_foreach_sections(icwmpd, "dmmap", "dsl_line", ss) {
uci_path_foreach_sections(bbfdm, "dmmap", "dsl_line", ss) {
dmuci_get_value_by_section_string(ss, "dsl_line_alias", &loweralias);
}
sprintf(buf_loweralias, "%s", loweralias);
@ -472,7 +472,7 @@ int get_Device_InterfaceStackNumberOfEntries(char *refparam, struct dmctx *ctx,
struct uci_section *s = NULL;
int cnt = 0;
uci_path_foreach_sections(icwmpd, "dmmap_interface_stack", "interface_stack", s)
uci_path_foreach_sections(bbfdm, "dmmap_interface_stack", "interface_stack", s)
{
cnt++;
}
@ -483,7 +483,7 @@ int get_Device_InterfaceStackNumberOfEntries(char *refparam, struct dmctx *ctx,
int get_InterfaceStack_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
struct uci_section *s = NULL;
uci_path_foreach_option_eq(icwmpd, "dmmap_interface_stack", "interface_stack", "interface_stack_instance", instance, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap_interface_stack", "interface_stack", "interface_stack_instance", instance, s) {
dmuci_get_value_by_section_string(s, "interface_stack_alias", value);
}
return 0;
@ -497,7 +497,7 @@ int set_InterfaceStack_Alias(char *refparam, struct dmctx *ctx, void *data, char
case VALUECHECK:
break;
case VALUESET:
uci_path_foreach_option_eq(icwmpd, "dmmap_interface_stack", "interface_stack", "interface_stack_instance", instance, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap_interface_stack", "interface_stack", "interface_stack_instance", instance, s) {
dmuci_set_value_by_section(s, "interface_stack_alias", value);
}
break;

54
dmtree/tr181/ip.c
View file

@ -563,7 +563,7 @@ int get_IPInterface_IPv4AddressNumberOfEntries(char *refparam, struct dmctx *ctx
char *inst;
*value = "0";
uci_path_foreach_option_eq(icwmpd, "dmmap_network", "interface", "section_name", section_name(((struct ip_args *)data)->ip_sec), s) {
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "interface", "section_name", section_name(((struct ip_args *)data)->ip_sec), s) {
dmuci_get_value_by_section_string(s, "ipv4_instance", &inst);
if(inst[0] != '\0')
*value = "1";
@ -577,7 +577,7 @@ int get_IPInterface_IPv6AddressNumberOfEntries(char *refparam, struct dmctx *ctx
int cnt = 0;
*value = "0";
uci_path_foreach_option_eq(icwmpd, "dmmap_network", "ipv6", "section_name", section_name(((struct ip_args *)data)->ip_sec), s) {
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6", "section_name", section_name(((struct ip_args *)data)->ip_sec), s) {
cnt++;
}
dmasprintf(value, "%d", cnt);
@ -590,7 +590,7 @@ int get_IPInterface_IPv6PrefixNumberOfEntries(char *refparam, struct dmctx *ctx,
int cnt = 0;
*value = "0";
uci_path_foreach_option_eq(icwmpd, "dmmap_network", "ipv6prefix", "section_name", section_name(((struct ip_args *)data)->ip_sec), s) {
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6prefix", "section_name", section_name(((struct ip_args *)data)->ip_sec), s) {
cnt++;
}
dmasprintf(value, "%d", cnt);
@ -1457,7 +1457,7 @@ int get_IPInterfaceIPv6Address_Alias(char *refparam, struct dmctx *ctx, void *da
struct uci_section *dmmap_section;
char *name;
uci_path_foreach_option_eq(icwmpd, "dmmap_network", "ipv6", "ipv6_instance", instance, dmmap_section) {
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6", "ipv6_instance", instance, dmmap_section) {
dmuci_get_value_by_section_string(dmmap_section, "section_name", &name);
if(strcmp(name, section_name(((struct ipv6_args *)data)->ip_sec)) == 0)
dmuci_get_value_by_section_string(dmmap_section, "ipv6_alias", value);
@ -1474,7 +1474,7 @@ int set_IPInterfaceIPv6Address_Alias(char *refparam, struct dmctx *ctx, void *da
case VALUECHECK:
return 0;
case VALUESET:
uci_path_foreach_option_eq(icwmpd, "dmmap_network", "ipv6", "ipv6_instance", instance, dmmap_section) {
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6", "ipv6_instance", instance, dmmap_section) {
dmuci_get_value_by_section_string(dmmap_section, "section_name", &name);
if(strcmp(name, section_name(((struct ipv6_args *)data)->ip_sec)) == 0)
break;
@ -1490,7 +1490,7 @@ int get_IPInterfaceIPv6Prefix_Alias(char *refparam, struct dmctx *ctx, void *dat
struct uci_section *dmmap_section;
char *name;
uci_path_foreach_option_eq(icwmpd, "dmmap_network", "ipv6prefix", "ipv6prefix_instance", instance, dmmap_section) {
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6prefix", "ipv6prefix_instance", instance, dmmap_section) {
dmuci_get_value_by_section_string(dmmap_section, "section_name", &name);
if(strcmp(name, section_name(((struct ipv6prefix_args *)data)->ip_sec)) == 0)
dmuci_get_value_by_section_string(dmmap_section, "ipv6prefix_alias", value);
@ -1507,7 +1507,7 @@ int set_IPInterfaceIPv6Prefix_Alias(char *refparam, struct dmctx *ctx, void *dat
case VALUECHECK:
return 0;
case VALUESET:
uci_path_foreach_option_eq(icwmpd, "dmmap_network", "ipv6prefix", "ipv6prefix_instance", instance, dmmap_section) {
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6prefix", "ipv6prefix_instance", instance, dmmap_section) {
dmuci_get_value_by_section_string(dmmap_section, "section_name", &name);
if(strcmp(name, section_name(((struct ipv6prefix_args *)data)->ip_sec)) == 0)
break;
@ -1559,7 +1559,7 @@ char *get_last_instance_cond(char* dmmap_package, char *package, char *section,
continue;
}
get_dmmap_section_of_config_section(dmmap_package, section, section_name(s), &dmmap_section);
inst = update_instance_icwmpd(dmmap_section, inst, opt_inst);
inst = update_instance_bbfdm(dmmap_section, inst, opt_inst);
}
return inst;
}
@ -1579,9 +1579,9 @@ int add_ip_interface(char *refparam, struct dmctx *ctx, void *data, char **insta
dmuci_set_value("network", ip_name, "", "interface");
dmuci_set_value("network", ip_name, "proto", "dhcp");
dmuci_add_section_icwmpd("dmmap_network", "interface", &dmmap_ip_interface, &v);
dmuci_add_section_bbfdm("dmmap_network", "interface", &dmmap_ip_interface, &v);
dmuci_set_value_by_section(dmmap_ip_interface, "section_name", ip_name);
*instance = update_instance_icwmpd(dmmap_ip_interface, last_inst, "ip_int_instance");
*instance = update_instance_bbfdm(dmmap_ip_interface, last_inst, "ip_int_instance");
return 0;
}
@ -1609,7 +1609,7 @@ int add_ipv4(char *refparam, struct dmctx *ctx, void *data, char **instancepara)
get_dmmap_section_of_config_section("dmmap_network", "interface", section_name(((struct ip_args *)data)->ip_sec), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "ipv4_instance", &instance);
*instancepara = update_instance_icwmpd(dmmap_section, instance, "ipv4_instance");
*instancepara = update_instance_bbfdm(dmmap_section, instance, "ipv4_instance");
if(instance[0] == '\0') {
dmuci_set_value_by_section(dmmap_section, "ipv4_instance", *instancepara);
dmuci_set_value_by_section(((struct ip_args *)data)->ip_sec, "ipaddr", "0.0.0.0");
@ -1648,15 +1648,15 @@ int add_ipv6(char *refparam, struct dmctx *ctx, void *data, char **instancepara)
break;
}
if(ip[0] == '\0') {
uci_path_foreach_option_eq(icwmpd, "dmmap_network", "ipv6", "section_name", section_name(((struct ipv6_args *)data)->ip_sec), s) {
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6", "section_name", section_name(((struct ipv6_args *)data)->ip_sec), s) {
dmuci_get_value_by_section_string(s, "ipv6_instance", &inst);
}
dmasprintf(&curr_inst, "%d", atoi(inst)+1);
dmuci_set_value_by_section(((struct ipv6_args *)data)->ip_sec, "ip6addr", "::");
dmuci_set_value_by_section(((struct ipv6_args *)data)->ip_sec, "proto", "static");
DMUCI_ADD_SECTION(icwmpd, "dmmap_network", "ipv6", &ss, &name);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, ss, "section_name", section_name(((struct ipv6_args *)data)->ip_sec));
DMUCI_SET_VALUE_BY_SECTION(icwmpd, ss, "ipv6_instance", curr_inst);
DMUCI_ADD_SECTION(bbfdm, "dmmap_network", "ipv6", &ss, &name);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, ss, "section_name", section_name(((struct ipv6_args *)data)->ip_sec));
DMUCI_SET_VALUE_BY_SECTION(bbfdm, ss, "ipv6_instance", curr_inst);
}
return 0;
}
@ -1690,15 +1690,15 @@ int add_ipv6_prefix(char *refparam, struct dmctx *ctx, void *data, char **instan
break;
}
if(ip[0] == '\0') {
uci_path_foreach_option_eq(icwmpd, "dmmap_network", "ipv6prefix", "section_name", section_name(((struct ipv6prefix_args *)data)->ip_sec), s) {
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6prefix", "section_name", section_name(((struct ipv6prefix_args *)data)->ip_sec), s) {
dmuci_get_value_by_section_string(s, "ipv6prefix_instance", &inst);
}
dmasprintf(&curr_inst, "%d", atoi(inst)+1);
dmuci_set_value_by_section(((struct ip_args *)data)->ip_sec, "ip6prefix", "::");
dmuci_set_value_by_section(((struct ipv6prefix_args *)data)->ip_sec, "proto", "static");
DMUCI_ADD_SECTION(icwmpd, "dmmap_network", "ipv6prefix", &ss, &name);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, ss, "section_name", section_name(((struct ipv6prefix_args *)data)->ip_sec));
DMUCI_SET_VALUE_BY_SECTION(icwmpd, ss, "ipv6prefix_instance", curr_inst);
DMUCI_ADD_SECTION(bbfdm, "dmmap_network", "ipv6prefix", &ss, &name);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, ss, "section_name", section_name(((struct ipv6prefix_args *)data)->ip_sec));
DMUCI_SET_VALUE_BY_SECTION(bbfdm, ss, "ipv6prefix_instance", curr_inst);
}
return 0;
}
@ -1867,15 +1867,15 @@ static struct uci_section *update_dmmap_network_ipv6(char *curr_inst, char *sect
struct uci_section *s = NULL;
char *inst, *name;
uci_path_foreach_option_eq(icwmpd, "dmmap_network", "ipv6", "section_name", section_name, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6", "section_name", section_name, s) {
dmuci_get_value_by_section_string(s, "ipv6_instance", &inst);
if(strcmp(curr_inst, inst) == 0)
return s;
}
if (!s) {
DMUCI_ADD_SECTION(icwmpd, "dmmap_network", "ipv6", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "section_name", section_name);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "ipv6_instance", curr_inst);
DMUCI_ADD_SECTION(bbfdm, "dmmap_network", "ipv6", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "section_name", section_name);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "ipv6_instance", curr_inst);
}
return s;
}
@ -1940,15 +1940,15 @@ static struct uci_section *update_dmmap_network_ipv6prefix(char *curr_inst, char
struct uci_section *s = NULL;
char *inst, *name;
uci_path_foreach_option_eq(icwmpd, "dmmap_network", "ipv6prefix", "section_name", section_name, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap_network", "ipv6prefix", "section_name", section_name, s) {
dmuci_get_value_by_section_string(s, "ipv6prefix_instance", &inst);
if(strcmp(curr_inst, inst) == 0)
return s;
}
if (!s) {
DMUCI_ADD_SECTION(icwmpd, "dmmap_network", "ipv6prefix", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "section_name", section_name);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "ipv6prefix_instance", curr_inst);
DMUCI_ADD_SECTION(bbfdm, "dmmap_network", "ipv6prefix", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "section_name", section_name);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "ipv6prefix_instance", curr_inst);
}
return s;
}

12
dmtree/tr181/nat.c
View file

@ -73,7 +73,7 @@ int add_NAT_InterfaceSetting(char *refparam, struct dmctx *ctx, void *data, char
struct uci_section *s = NULL, *dmmap_firewall = NULL;
check_create_dmmap_package("dmmap_firewall");
inst = get_last_instance_icwmpd("dmmap_firewall", "zone", "interface_setting_instance");
inst = get_last_instance_bbfdm("dmmap_firewall", "zone", "interface_setting_instance");
sprintf(name, "iface_set_%d", inst ? (atoi(inst)+1) : 1);
dmuci_add_section_and_rename("firewall", "zone", &s, &value);
dmuci_set_value_by_section(s, "input", "REJECT");
@ -81,9 +81,9 @@ int add_NAT_InterfaceSetting(char *refparam, struct dmctx *ctx, void *data, char
dmuci_set_value_by_section(s, "forward", "REJECT");
dmuci_set_value_by_section(s, "name", name);
dmuci_add_section_icwmpd("dmmap_firewall", "zone", &dmmap_firewall, &v);
dmuci_add_section_bbfdm("dmmap_firewall", "zone", &dmmap_firewall, &v);
dmuci_set_value_by_section(dmmap_firewall, "section_name", section_name(s));
*instance = update_instance_icwmpd(dmmap_firewall, inst, "interface_setting_instance");
*instance = update_instance_bbfdm(dmmap_firewall, inst, "interface_setting_instance");
return 0;
}
@ -129,7 +129,7 @@ int add_NAT_PortMapping(char *refparam, struct dmctx *ctx, void *data, char **in
struct uci_section *s = NULL, *dmmap_firewall = NULL;
check_create_dmmap_package("dmmap_firewall");
inst = get_last_instance_icwmpd("dmmap_firewall", "redirect", "port_mapping_instance");
inst = get_last_instance_bbfdm("dmmap_firewall", "redirect", "port_mapping_instance");
sprintf(name, "port_map_%d", inst ? (atoi(inst)+1) : 1);
dmuci_add_section_and_rename("firewall", "redirect", &s, &value);
dmuci_set_value_by_section(s, "name", name);
@ -137,9 +137,9 @@ int add_NAT_PortMapping(char *refparam, struct dmctx *ctx, void *data, char **in
dmuci_set_value_by_section(s, "target", "DNAT");
dmuci_set_value_by_section(s, "dest", "lan");
dmuci_add_section_icwmpd("dmmap_firewall", "redirect", &dmmap_firewall, &v);
dmuci_add_section_bbfdm("dmmap_firewall", "redirect", &dmmap_firewall, &v);
dmuci_set_value_by_section(dmmap_firewall, "section_name", section_name(s));
*instance = update_instance_icwmpd(dmmap_firewall, inst, "port_mapping_instance");
*instance = update_instance_bbfdm(dmmap_firewall, inst, "port_mapping_instance");
return 0;
}

6
dmtree/tr181/ppp.c
View file

@ -527,15 +527,15 @@ int add_ppp_interface(char *refparam, struct dmctx *ctx, void *data, char **inst
struct uci_section *dmmap_ppp = NULL;
check_create_dmmap_package("dmmap_network");
inst = get_last_instance_lev2_icwmpd("network", "interface", "dmmap_network", "ppp_int_instance", "proto", "ppp");
inst = get_last_instance_lev2_bbfdm("network", "interface", "dmmap_network", "ppp_int_instance", "proto", "ppp");
sprintf(name, "ppp_%d", inst ? (atoi(inst)+1) : 1);
dmuci_set_value("network", name, "", "interface");
dmuci_set_value("network", name, "proto", "ppp");
dmuci_set_value("network", name, "username", name);
dmuci_set_value("network", name, "password", name);
dmuci_add_section_icwmpd("dmmap_network", "interface", &dmmap_ppp, &v);
dmuci_add_section_bbfdm("dmmap_network", "interface", &dmmap_ppp, &v);
dmuci_set_value_by_section(dmmap_ppp, "section_name", name);
*instance = update_instance_icwmpd(dmmap_ppp, inst, "ppp_int_instance");
*instance = update_instance_bbfdm(dmmap_ppp, inst, "ppp_int_instance");
return 0;
}

6
dmtree/tr181/ptm.c
View file

@ -151,7 +151,7 @@ int add_ptm_link(char *refparam, struct dmctx *ctx, void *data, char **instancep
struct uci_section *dmmap_ptm = NULL;
check_create_dmmap_package("dmmap_dsl");
instance = get_last_instance_icwmpd("dmmap_dsl", "ptm-device", "ptmlinkinstance");
instance = get_last_instance_bbfdm("dmmap_dsl", "ptm-device", "ptmlinkinstance");
dmasprintf(&ptm_device, "ptm%d", instance ? atoi(instance) : 0);
dmasprintf(&instance_update, "%d", instance ? atoi(instance)+ 1 : 1);
dmuci_set_value("dsl", ptm_device, "", "ptm-device");
@ -159,9 +159,9 @@ int add_ptm_link(char *refparam, struct dmctx *ctx, void *data, char **instancep
dmuci_set_value("dsl", ptm_device, "device", ptm_device);
dmuci_set_value("dsl", ptm_device, "priority", "1");
dmuci_set_value("dsl", ptm_device, "portid", "1");
dmuci_add_section_icwmpd("dmmap_dsl", "ptm-device", &dmmap_ptm, &v);
dmuci_add_section_bbfdm("dmmap_dsl", "ptm-device", &dmmap_ptm, &v);
dmuci_set_value_by_section(dmmap_ptm, "section_name", ptm_device);
*instancepara = update_instance_icwmpd(dmmap_ptm, instance, "ptmlinkinstance");
*instancepara = update_instance_bbfdm(dmmap_ptm, instance, "ptmlinkinstance");
return 0;
}

28
dmtree/tr181/qos.c
View file

@ -335,7 +335,7 @@ struct uci_section *get_dup_qos_stats_section_in_dmmap(char *dmmap_package, char
{
struct uci_section *s;
uci_path_foreach_option_eq(icwmpd, dmmap_package, section_type, "dev_link", dev, s)
uci_path_foreach_option_eq(bbfdm, dmmap_package, section_type, "dev_link", dev, s)
{
return s;
}
@ -371,8 +371,8 @@ int browseQoSQueueStatsInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev
break;
case 2: sscanf(questatsout[i], " backlog %db %dp requeues %d\n", &queuests.backlog_b, &queuests.backlog_p, &queuests.backlog_requeues);
if ((dmmap_sect = get_dup_qos_stats_section_in_dmmap("dmmap_qos", "qos_queue_stats", queuests.dev)) == NULL) {
dmuci_add_section_icwmpd("dmmap_qos", "qos_queue_stats", &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dmmap_sect, "dev_link", queuests.dev);
dmuci_add_section_bbfdm("dmmap_qos", "qos_queue_stats", &dmmap_sect, &v);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dmmap_sect, "dev_link", queuests.dev);
}
queuests.dmsect= dmmap_sect;
@ -419,7 +419,7 @@ int addObjQoSClassification(char *refparam, struct dmctx *ctx, void *data, char
struct uci_section *s, *dmmap_qos_classify;
char *last_inst= NULL, *sect_name= NULL, *qos_comment, *v;
char ib[8];
last_inst= get_last_instance_icwmpd("dmmap_qos", "classify", "classifinstance");
last_inst= get_last_instance_bbfdm("dmmap_qos", "classify", "classifinstance");
if (last_inst)
sprintf(ib, "%s", last_inst);
else
@ -429,9 +429,9 @@ int addObjQoSClassification(char *refparam, struct dmctx *ctx, void *data, char
dmuci_add_section("qos", "classify", &s, &sect_name);
dmuci_set_value_by_section(s, "comment", qos_comment);
dmuci_add_section_icwmpd("dmmap_qos", "classify", &dmmap_qos_classify, &v);
dmuci_add_section_bbfdm("dmmap_qos", "classify", &dmmap_qos_classify, &v);
dmuci_set_value_by_section(dmmap_qos_classify, "section_name", sect_name);
*instance = update_instance_icwmpd(dmmap_qos_classify, last_inst, "classifinstance");
*instance = update_instance_bbfdm(dmmap_qos_classify, last_inst, "classifinstance");
return 0;
}
@ -452,7 +452,7 @@ int delObjQoSClassification(char *refparam, struct dmctx *ctx, void *data, char
dmuci_delete_by_section_unnamed(p->config_section, NULL, NULL);
} else {
get_dmmap_section_of_config_section("dmmap_qos", "classify", section_name(p->config_section), &dmmap_section);
dmuci_delete_by_section_unnamed_icwmpd(dmmap_section, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dmmap_section, NULL, NULL);
dmuci_delete_by_section(p->config_section, NULL, NULL);
}
break;
@ -540,7 +540,7 @@ int addObjQoSQueue(char *refparam, struct dmctx *ctx, void *data, char **instanc
struct uci_section *s, *dmmap_qos_class;
char *last_inst= NULL, *sect_name= NULL, *qos_comment, *v;
char ib[8];
last_inst= get_last_instance_icwmpd("dmmap_qos", "class", "queueinstance");
last_inst= get_last_instance_bbfdm("dmmap_qos", "class", "queueinstance");
if (last_inst)
sprintf(ib, "%s", last_inst);
else
@ -549,9 +549,9 @@ int addObjQoSQueue(char *refparam, struct dmctx *ctx, void *data, char **instanc
dmuci_add_section("qos", "class", &s, &sect_name);
dmuci_set_value_by_section(s, "packetsize", "1000");
dmuci_add_section_icwmpd("dmmap_qos", "class", &dmmap_qos_class, &v);
dmuci_add_section_bbfdm("dmmap_qos", "class", &dmmap_qos_class, &v);
dmuci_set_value_by_section(dmmap_qos_class, "section_name", sect_name);
*instance = update_instance_icwmpd(dmmap_qos_class, last_inst, "queueinstance");
*instance = update_instance_bbfdm(dmmap_qos_class, last_inst, "queueinstance");
return 0;
}
@ -572,7 +572,7 @@ int delObjQoSQueue(char *refparam, struct dmctx *ctx, void *data, char *instance
dmuci_delete_by_section_unnamed(p->config_section, NULL, NULL);
} else {
get_dmmap_section_of_config_section("dmmap_qos", "class", section_name(p->config_section), &dmmap_section);
dmuci_delete_by_section_unnamed_icwmpd(dmmap_section, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dmmap_section, NULL, NULL);
dmuci_delete_by_section(p->config_section, NULL, NULL);
}
break;
@ -622,7 +622,7 @@ int addObjQoSShaper(char *refparam, struct dmctx *ctx, void *data, char **instan
struct uci_section *s, *dmmap_qos_class;
char *last_inst= NULL, *sect_name= NULL, *qos_comment, *v;
char ib[8];
last_inst= get_last_instance_icwmpd_without_update("dmmap_qos", "class", "shaperinstance");
last_inst= get_last_instance_bbfdm_without_update("dmmap_qos", "class", "shaperinstance");
if (last_inst)
sprintf(ib, "%s", last_inst);
else
@ -631,9 +631,9 @@ int addObjQoSShaper(char *refparam, struct dmctx *ctx, void *data, char **instan
dmuci_add_section("qos", "class", &s, &sect_name);
dmuci_set_value_by_section(s, "limitrate", "1000");
dmuci_add_section_icwmpd("dmmap_qos", "class", &dmmap_qos_class, &v);
dmuci_add_section_bbfdm("dmmap_qos", "class", &dmmap_qos_class, &v);
dmuci_set_value_by_section(dmmap_qos_class, "section_name", sect_name);
*instance = update_instance_icwmpd(dmmap_qos_class, last_inst, "shaperinstance");
*instance = update_instance_bbfdm(dmmap_qos_class, last_inst, "shaperinstance");
return 0;
}

90
dmtree/tr181/routing.c
View file

@ -154,7 +154,7 @@ static bool is_proc_route_in_config(struct proc_routing *proute)
if (mask[0] == '\0' || strcmp(proute->mask, mask) == 0)
return true;
}
uci_path_foreach_sections(icwmpd, "dmmap_route_forwarding", "route_dynamic", s) {
uci_path_foreach_sections(bbfdm, "dmmap_route_forwarding", "route_dynamic", s) {
dmuci_get_value_by_section_string(s, "target", &target);
dmuci_get_value_by_section_string(s, "gateway", &gateway);
dmuci_get_value_by_section_string(s, "device", &device);
@ -183,7 +183,7 @@ static unsigned char is_proc_route6_in_config(char *ciface, char *cip, char *cgw
return 1;
}
}
uci_path_foreach_sections(icwmpd, "dmmap_route_forwarding", "route6_dynamic", s) {
uci_path_foreach_sections(bbfdm, "dmmap_route_forwarding", "route6_dynamic", s) {
dmuci_get_value_by_section_string(s, "target", &ip);
dmuci_get_value_by_section_string(s, "gateway", &gw);
dmuci_get_value_by_section_string(s, "device", &v);
@ -230,19 +230,19 @@ static int get_forwarding_last_inst()
int r = 0, dr = 0, ds = 0, max;
struct uci_section *s;
uci_path_foreach_sections(icwmpd, "dmmap_route_forwarding", "route", s) {
uci_path_foreach_sections(bbfdm, "dmmap_route_forwarding", "route", s) {
dmuci_get_value_by_section_string(s, "routeinstance", &tmp);
if (tmp[0] == '\0')
break;
rinst = tmp;
}
uci_path_foreach_sections(icwmpd, "dmmap_route_forwarding", "route_disabled", s) {
uci_path_foreach_sections(bbfdm, "dmmap_route_forwarding", "route_disabled", s) {
dmuci_get_value_by_section_string(s, "routeinstance", &tmp);
if (tmp[0] == '\0')
break;
dsinst = tmp;
}
uci_path_foreach_sections(icwmpd, "dmmap_route_forwarding", "route_dynamic", s) {
uci_path_foreach_sections(bbfdm, "dmmap_route_forwarding", "route_dynamic", s) {
dmuci_get_value_by_section_string(s, "routeinstance", &tmp);
if (tmp[0] == '\0')
break;
@ -255,7 +255,7 @@ static int get_forwarding_last_inst()
return max;
}
static char *forwarding_update_instance_alias_icwmpd(int action, char **last_inst, void *argv[])
static char *forwarding_update_instance_alias_bbfdm(int action, char **last_inst, void *argv[])
{
char *instance, *alias;
char buf[8] = {0};
@ -278,14 +278,14 @@ static char *forwarding_update_instance_alias_icwmpd(int action, char **last_ins
else {
sprintf(buf, "%d", atoi(*last_inst)+1);
}
instance = DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, inst_opt, buf);
instance = DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, inst_opt, buf);
}
*last_inst = instance;
if (action == INSTANCE_MODE_ALIAS) {
dmuci_get_value_by_section_string(s, alias_opt, &alias);
if (alias[0] == '\0') {
sprintf(buf, "cpe-%s", instance);
alias = DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, alias_opt, buf);
alias = DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, alias_opt, buf);
}
sprintf(buf, "[%s]", alias);
instance = dmstrdup(buf);
@ -299,13 +299,13 @@ static int get_forwarding6_last_inst()
int r = 0, dr = 0, max;
struct uci_section *s;
uci_path_foreach_sections(icwmpd, "dmmap_route_forwarding", "route6", s) {
uci_path_foreach_sections(bbfdm, "dmmap_route_forwarding", "route6", s) {
dmuci_get_value_by_section_string(s, "route6instance", &tmp);
if (tmp[0] == '\0')
break;
rinst = tmp;
}
uci_path_foreach_sections(icwmpd, "dmmap_route_forwarding", "route6_dynamic", s) {
uci_path_foreach_sections(bbfdm, "dmmap_route_forwarding", "route6_dynamic", s) {
dmuci_get_value_by_section_string(s, "route6instance", &tmp);
if (tmp[0] == '\0')
break;
@ -317,7 +317,7 @@ static int get_forwarding6_last_inst()
return max;
}
static char *forwarding6_update_instance_alias_icwmpd(int action, char **last_inst, void *argv[])
static char *forwarding6_update_instance_alias_bbfdm(int action, char **last_inst, void *argv[])
{
char *instance, *alias;
char buf[8] = {0};
@ -340,14 +340,14 @@ static char *forwarding6_update_instance_alias_icwmpd(int action, char **last_in
else {
sprintf(buf, "%d", atoi(*last_inst)+1);
}
instance = DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, inst_opt, buf);
instance = DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, inst_opt, buf);
}
*last_inst = instance;
if (action == INSTANCE_MODE_ALIAS) {
dmuci_get_value_by_section_string(s, alias_opt, &alias);
if (alias[0] == '\0') {
sprintf(buf, "cpe-%s", instance);
alias = DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, alias_opt, buf);
alias = DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, alias_opt, buf);
}
sprintf(buf, "[%s]", alias);
instance = dmstrdup(buf);
@ -365,7 +365,7 @@ static int dmmap_synchronizeRoutingRouterIPv4Forwarding(struct dmctx *dmctx, DMN
int found, last_inst;
check_create_dmmap_package("dmmap_route_forwarding");
uci_path_foreach_sections_safe(icwmpd, "dmmap_route_forwarding", "route_dynamic", stmp, s) {
uci_path_foreach_sections_safe(bbfdm, "dmmap_route_forwarding", "route_dynamic", stmp, s) {
dmuci_get_value_by_section_string(s, "target", &target);
dmuci_get_value_by_section_string(s, "device", &iface);
found = 0;
@ -410,14 +410,14 @@ static int dmmap_synchronizeRoutingRouterIPv4Forwarding(struct dmctx *dmctx, DMN
}
last_inst = get_forwarding_last_inst();
dmasprintf(&instance, "%d", last_inst+1);
DMUCI_ADD_SECTION(icwmpd, "dmmap_route_forwarding", "route_dynamic", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "target", proute.destination);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "netmask", proute.mask);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "metric", proute.metric);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "gateway", proute.gateway);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "device", proute.iface);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "interface", iface);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "routeinstance", instance);
DMUCI_ADD_SECTION(bbfdm, "dmmap_route_forwarding", "route_dynamic", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "target", proute.destination);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "netmask", proute.mask);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "metric", proute.metric);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "gateway", proute.gateway);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "device", proute.iface);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "interface", iface);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "routeinstance", instance);
dmfree(instance);
}
fclose(fp);
@ -437,7 +437,7 @@ static int dmmap_synchronizeRoutingRouterIPv6Forwarding(struct dmctx *dmctx, DMN
int found, last_inst;
check_create_dmmap_package("dmmap_route_forwarding");
uci_path_foreach_sections_safe(icwmpd, "dmmap_route_forwarding", "route6_dynamic", stmp, s) {
uci_path_foreach_sections_safe(bbfdm, "dmmap_route_forwarding", "route6_dynamic", stmp, s) {
dmuci_get_value_by_section_string(s, "target", &target);
dmuci_get_value_by_section_string(s, "device", &iface);
fp = fopen(PROC_ROUTE6, "r");
@ -504,14 +504,14 @@ static int dmmap_synchronizeRoutingRouterIPv6Forwarding(struct dmctx *dmctx, DMN
}
last_inst = get_forwarding6_last_inst();
dmasprintf(&instance, "%d", last_inst+1);
DMUCI_ADD_SECTION(icwmpd, "dmmap_route_forwarding", "route6_dynamic", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "target", ipstr);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "gateway", gwstr);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "interface", iface);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "device", dev);
DMUCI_ADD_SECTION(bbfdm, "dmmap_route_forwarding", "route6_dynamic", &s, &name);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "target", ipstr);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "gateway", gwstr);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "interface", iface);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "device", dev);
sprintf(buf, "%u", metric);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "metric", buf);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "route6instance", instance);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "metric", buf);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "route6instance", instance);
dmfree(instance);
}
fclose(fp);
@ -563,7 +563,7 @@ int get_RoutingRouter_IPv4ForwardingNumberOfEntries(char *refparam, struct dmctx
cnt++;
}
dmmap_synchronizeRoutingRouterIPv4Forwarding(ctx, NULL, NULL, NULL);
uci_path_foreach_sections(icwmpd, "dmmap_route_forwarding", "route_dynamic", s) {
uci_path_foreach_sections(bbfdm, "dmmap_route_forwarding", "route_dynamic", s) {
cnt++;
}
dmasprintf(value, "%d", cnt); // MEM WILL BE FREED IN DMMEMCLEAN
@ -580,7 +580,7 @@ int get_RoutingRouter_IPv6ForwardingNumberOfEntries(char *refparam, struct dmctx
cnt++;
}
dmmap_synchronizeRoutingRouterIPv6Forwarding(ctx, NULL, NULL, NULL);
uci_path_foreach_sections(icwmpd, "dmmap_route_forwarding", "route6_dynamic", s) {
uci_path_foreach_sections(bbfdm, "dmmap_route_forwarding", "route6_dynamic", s) {
cnt++;
}
dmasprintf(value, "%d", cnt); // MEM WILL BE FREED IN DMMEMCLEAN
@ -1220,9 +1220,9 @@ int add_ipv4forwarding(char *refparam, struct dmctx *ctx, void *data, char **ins
dmuci_set_value_by_section(s, "metric", "0");
dmuci_set_value_by_section(s, "interface", "lan");
dmuci_add_section_icwmpd("dmmap_route_forwarding", "route", &dmmap_route, &v);
dmuci_add_section_bbfdm("dmmap_route_forwarding", "route", &dmmap_route, &v);
dmuci_set_value_by_section(dmmap_route, "section_name", section_name(s));
*instancepara = update_instance_icwmpd(dmmap_route, instance, "routeinstance");
*instancepara = update_instance_bbfdm(dmmap_route, instance, "routeinstance");
return 0;
}
@ -1265,9 +1265,9 @@ int add_ipv6Forwarding(char *refparam, struct dmctx *ctx, void *data, char **ins
dmuci_set_value_by_section(s, "metric", "0");
dmuci_set_value_by_section(s, "interface", "lan");
dmuci_add_section_icwmpd("dmmap_route_forwarding", "route6", &dmmap_route, &v);
dmuci_add_section_bbfdm("dmmap_route_forwarding", "route6", &dmmap_route, &v);
dmuci_set_value_by_section(dmmap_route, "section_name", section_name(s));
*instancepara = update_instance_icwmpd(dmmap_route, instance, "route6instance");
*instancepara = update_instance_bbfdm(dmmap_route, instance, "route6instance");
return 0;
}
@ -1299,8 +1299,8 @@ int browseRouterInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data,
char *r = NULL, *r_last = NULL;
update_section_list(DMMAP,"router", NULL, 1, NULL, NULL, NULL, NULL, NULL);
uci_path_foreach_sections(icwmpd, "dmmap", "router", s) {
r = handle_update_instance(1, dmctx, &r_last, update_instance_alias_icwmpd, 3, s, "router_instance", "router_alias");
uci_path_foreach_sections(bbfdm, "dmmap", "router", s) {
r = handle_update_instance(1, dmctx, &r_last, update_instance_alias_bbfdm, 3, s, "router_instance", "router_alias");
DM_LINK_INST_OBJ(dmctx, parent_node, (void *)s, r);
break;
}
@ -1320,7 +1320,7 @@ int browseIPv4ForwardingInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
synchronize_specific_config_sections_with_dmmap("network", "route", "dmmap_route_forwarding", &dup_list);
list_for_each_entry(p, &dup_list, list) {
init_args_ipv4forward(&curr_routefwdargs, p->config_section, "1", ROUTE_STATIC);
iroute = handle_update_instance(1, dmctx, &iroute_last, forwarding_update_instance_alias_icwmpd, 4, p->dmmap_section, "routeinstance", "routealias", &find_max);
iroute = handle_update_instance(1, dmctx, &iroute_last, forwarding_update_instance_alias_bbfdm, 4, p->dmmap_section, "routeinstance", "routealias", &find_max);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_routefwdargs, iroute) == DM_STOP)
goto end;
}
@ -1328,15 +1328,15 @@ int browseIPv4ForwardingInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
synchronize_specific_config_sections_with_dmmap("network", "route_disabled", "dmmap_route_forwarding", &dup_list);
list_for_each_entry(p, &dup_list, list) {
init_args_ipv4forward(&curr_routefwdargs, p->config_section, "1", ROUTE_DISABLED);
iroute = handle_update_instance(1, dmctx, &iroute_last, forwarding_update_instance_alias_icwmpd, 4, p->dmmap_section, "routeinstance", "routealias", &find_max);
iroute = handle_update_instance(1, dmctx, &iroute_last, forwarding_update_instance_alias_bbfdm, 4, p->dmmap_section, "routeinstance", "routealias", &find_max);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_routefwdargs, iroute) == DM_STOP)
goto end;
}
free_dmmap_config_dup_list(&dup_list);
dmmap_synchronizeRoutingRouterIPv4Forwarding(dmctx, NULL, NULL, NULL);
uci_path_foreach_sections(icwmpd, "dmmap_route_forwarding", "route_dynamic", ss) {
uci_path_foreach_sections(bbfdm, "dmmap_route_forwarding", "route_dynamic", ss) {
init_args_ipv4forward(&curr_routefwdargs, ss, "0", ROUTE_DYNAMIC);
iroute = handle_update_instance(1, dmctx, &iroute_last, forwarding_update_instance_alias_icwmpd, 4, ss, "routeinstance", "routealias", &find_max);
iroute = handle_update_instance(1, dmctx, &iroute_last, forwarding_update_instance_alias_bbfdm, 4, ss, "routeinstance", "routealias", &find_max);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_routefwdargs, iroute) == DM_STOP)
goto end;
}
@ -1357,15 +1357,15 @@ int browseIPv6ForwardingInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
synchronize_specific_config_sections_with_dmmap("network", "route6", "dmmap_route_forwarding", &dup_list);
list_for_each_entry(p, &dup_list, list) {
init_args_ipv6forward(&curr_route6fwdargs, p->config_section, "1", ROUTE_STATIC);
iroute = handle_update_instance(1, dmctx, &iroute_last, forwarding6_update_instance_alias_icwmpd, 4, p->dmmap_section, "route6instance", "route6alias", &find_max);
iroute = handle_update_instance(1, dmctx, &iroute_last, forwarding6_update_instance_alias_bbfdm, 4, p->dmmap_section, "route6instance", "route6alias", &find_max);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_route6fwdargs, iroute) == DM_STOP)
goto end;
}
free_dmmap_config_dup_list(&dup_list);
dmmap_synchronizeRoutingRouterIPv6Forwarding(dmctx, NULL, NULL, NULL);
uci_path_foreach_sections(icwmpd, "dmmap_route_forwarding", "route6_dynamic", ss) {
uci_path_foreach_sections(bbfdm, "dmmap_route_forwarding", "route6_dynamic", ss) {
init_args_ipv6forward(&curr_route6fwdargs, ss, "0", ROUTE_DYNAMIC);
iroute = handle_update_instance(1, dmctx, &iroute_last, forwarding6_update_instance_alias_icwmpd, 4, ss, "route6instance", "route6alias", &find_max);
iroute = handle_update_instance(1, dmctx, &iroute_last, forwarding6_update_instance_alias_bbfdm, 4, ss, "route6instance", "route6alias", &find_max);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_route6fwdargs, iroute) == DM_STOP)
goto end;
}

54
dmtree/tr181/softwaremodules.c
View file

@ -102,14 +102,14 @@ char *add_softwaremodules_deploymentunit(char *uuid, char*url, char *username, c
struct uci_section *deploymentsection = NULL;
char duname[16];
uci_path_foreach_option_eq(icwmpd, "dmmap", "deploymentunit", "UUID", uuid, deploymentsection) {
DMUCI_SET_VALUE_BY_SECTION(icwmpd, deploymentsection, "URL", url);
DMUCI_SET_VALUE_BY_SECTION(icwmpd,deploymentsection, "URL", url);
DMUCI_SET_VALUE_BY_SECTION(icwmpd,deploymentsection, "Name", name);
DMUCI_SET_VALUE_BY_SECTION(icwmpd,deploymentsection, "Version", version);
DMUCI_SET_VALUE_BY_SECTION(icwmpd,deploymentsection, "username", username);
DMUCI_SET_VALUE_BY_SECTION(icwmpd,deploymentsection, "password", password);
DMUCI_SET_VALUE_BY_SECTION(icwmpd,deploymentsection, "Resolved", "1");
uci_path_foreach_option_eq(bbfdm, "dmmap", "deploymentunit", "UUID", uuid, deploymentsection) {
DMUCI_SET_VALUE_BY_SECTION(bbfdm, deploymentsection, "URL", url);
DMUCI_SET_VALUE_BY_SECTION(bbfdm,deploymentsection, "URL", url);
DMUCI_SET_VALUE_BY_SECTION(bbfdm,deploymentsection, "Name", name);
DMUCI_SET_VALUE_BY_SECTION(bbfdm,deploymentsection, "Version", version);
DMUCI_SET_VALUE_BY_SECTION(bbfdm,deploymentsection, "username", username);
DMUCI_SET_VALUE_BY_SECTION(bbfdm,deploymentsection, "password", password);
DMUCI_SET_VALUE_BY_SECTION(bbfdm,deploymentsection, "Resolved", "1");
dmuci_get_value_by_section_string(deploymentsection, "duinstance", &instance);
goto end;
}
@ -118,14 +118,14 @@ char *add_softwaremodules_deploymentunit(char *uuid, char*url, char *username, c
sprintf(duname, "du%d", 0);
else
sprintf(duname, "du%s", instance);
DMUCI_SET_VALUE(icwmpd, "dmmap", duname, NULL, "deploymentunit");
DMUCI_SET_VALUE(icwmpd, "dmmap", duname, "UUID", uuid);
DMUCI_SET_VALUE(icwmpd, "dmmap", duname, "URL", url);
DMUCI_SET_VALUE(icwmpd, "dmmap", duname, "Name", name);
DMUCI_SET_VALUE(icwmpd, "dmmap", duname, "Version", version);
DMUCI_SET_VALUE(icwmpd, "dmmap", duname, "username", username);
DMUCI_SET_VALUE(icwmpd, "dmmap", duname, "password", password);
DMUCI_SET_VALUE(icwmpd, "dmmap", duname, "Resolved", "1");
DMUCI_SET_VALUE(bbfdm, "dmmap", duname, NULL, "deploymentunit");
DMUCI_SET_VALUE(bbfdm, "dmmap", duname, "UUID", uuid);
DMUCI_SET_VALUE(bbfdm, "dmmap", duname, "URL", url);
DMUCI_SET_VALUE(bbfdm, "dmmap", duname, "Name", name);
DMUCI_SET_VALUE(bbfdm, "dmmap", duname, "Version", version);
DMUCI_SET_VALUE(bbfdm, "dmmap", duname, "username", username);
DMUCI_SET_VALUE(bbfdm, "dmmap", duname, "password", password);
DMUCI_SET_VALUE(bbfdm, "dmmap", duname, "Resolved", "1");
instance = get_last_instance(DMMAP, "deploymentunit", "duinstance");
return instance;
end:
@ -135,8 +135,8 @@ end:
int update_softwaremodules_url(char *uuid, char *url)
{
struct uci_section *s = NULL;
uci_path_foreach_option_eq(icwmpd, "dmmap", "deploymentunit", "UUID", uuid, s) {
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "URL", url);
uci_path_foreach_option_eq(bbfdm, "dmmap", "deploymentunit", "UUID", uuid, s) {
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "URL", url);
return 1;
}
return 0;
@ -147,7 +147,7 @@ char *get_softwaremodules_uuid(char *url)
char *uuid;
struct uci_section *s = NULL;
uci_path_foreach_option_eq(icwmpd, "dmmap", "deploymentunit", "url", url, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap", "deploymentunit", "url", url, s) {
dmuci_get_value_by_section_string(s, "UUID", &uuid);
return uuid;
@ -160,7 +160,7 @@ char *get_softwaremodules_url(char *uuid)
char *url;
struct uci_section *s = NULL;
uci_path_foreach_option_eq(icwmpd, "dmmap", "deploymentunit", "uuid", uuid, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap", "deploymentunit", "uuid", uuid, s) {
dmuci_get_value_by_section_string(s, "URL", &url);
return url;
}
@ -172,7 +172,7 @@ char *get_softwaremodules_username(char *uuid)
char *url;
struct uci_section *s = NULL;
uci_path_foreach_option_eq(icwmpd, "dmmap", "deploymentunit", "uuid", uuid, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap", "deploymentunit", "uuid", uuid, s) {
dmuci_get_value_by_section_string(s, "username", &url);
return url;
}
@ -184,7 +184,7 @@ char *get_softwaremodules_pass(char *uuid)
char *url;
struct uci_section *s = NULL;
uci_path_foreach_option_eq(icwmpd, "dmmap", "deploymentunit", "uuid", uuid, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap", "deploymentunit", "uuid", uuid, s) {
dmuci_get_value_by_section_string(s, "password", &url);
return url;
}
@ -196,7 +196,7 @@ char *get_softwaremodules_instance(char *uuid)
char *url;
struct uci_section *s = NULL;
uci_path_foreach_option_eq(icwmpd, "dmmap", "deploymentunit", "uuid", uuid, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap", "deploymentunit", "uuid", uuid, s) {
dmuci_get_value_by_section_string(s, "duinstance", &url);
return url;
}
@ -208,7 +208,7 @@ char *get_softwaremodules_name(char *uuid)
char *name;
struct uci_section *s = NULL;
uci_path_foreach_option_eq(icwmpd, "dmmap", "deploymentunit", "uuid", uuid, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap", "deploymentunit", "uuid", uuid, s) {
dmuci_get_value_by_section_string(s, "Name", &name);
return name;
}
@ -220,7 +220,7 @@ char *get_softwaremodules_version(char *uuid)
char *version;
struct uci_section *s = NULL;
uci_path_foreach_option_eq(icwmpd, "dmmap", "deploymentunit", "uuid", uuid, s) {
uci_path_foreach_option_eq(bbfdm, "dmmap", "deploymentunit", "uuid", uuid, s) {
dmuci_get_value_by_section_string(s, "Version", &version);
return version;
}
@ -233,8 +233,8 @@ int browsesoftwaremodules_deploymentunitInst(struct dmctx *dmctx, DMNODE *parent
char *permission = "1";
struct uci_section *s = NULL;
uci_path_foreach_sections(icwmpd, "dmmap", "deploymentunit", s) {
idu = handle_update_instance(1, dmctx, &idu_last, update_instance_alias_icwmpd, 3, s, "duinstance", "duinstance_alias");
uci_path_foreach_sections(bbfdm, "dmmap", "deploymentunit", s) {
idu = handle_update_instance(1, dmctx, &idu_last, update_instance_alias_bbfdm, 3, s, "duinstance", "duinstance_alias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)s, idu) == DM_STOP)
break;
}

8
dmtree/tr181/users.c
View file

@ -60,7 +60,7 @@ int add_users_user(char *refparam, struct dmctx *ctx, void *data, char **instanc
struct uci_section *s, *dmmap_user;
char *last_inst= NULL, *sect_name= NULL, *username, *v;
char ib[8];
last_inst= get_last_instance_icwmpd("dmmap_users", "user", "user_instance");
last_inst= get_last_instance_bbfdm("dmmap_users", "user", "user_instance");
if (last_inst)
sprintf(ib, "%s", last_inst);
else
@ -73,9 +73,9 @@ int add_users_user(char *refparam, struct dmctx *ctx, void *data, char **instanc
dmuci_set_value_by_section(s, "enabled", "1");
dmuci_set_value_by_section(s, "password", username);
dmuci_add_section_icwmpd("dmmap_users", "user", &dmmap_user, &v);
dmuci_add_section_bbfdm("dmmap_users", "user", &dmmap_user, &v);
dmuci_set_value_by_section(dmmap_user, "section_name", sect_name);
*instance = update_instance_icwmpd(dmmap_user, last_inst, "user_instance");
*instance = update_instance_bbfdm(dmmap_user, last_inst, "user_instance");
return 0;
}
@ -95,7 +95,7 @@ int delete_users_user(char *refparam, struct dmctx *ctx, void *data, char *insta
dmuci_delete_by_section_unnamed((struct uci_section *)data, NULL, NULL);
} else {
get_dmmap_section_of_config_section("dmmap_users", "user", section_name((struct uci_section *)data), &dmmap_section);
dmuci_delete_by_section_unnamed_icwmpd(dmmap_section, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dmmap_section, NULL, NULL);
dmuci_delete_by_section((struct uci_section *)data, NULL, NULL);
}
break;

20
dmtree/tr181/wifi.c
View file

@ -2584,7 +2584,7 @@ int set_WiFiEndPointProfile_Alias(char *refparam, struct dmctx *ctx, void *data,
get_dmmap_section_of_config_section("dmmap_wireless", "wifi-iface", section_name((struct uci_section*)data), &dmmap_section);
dmuci_get_value_by_section_string(dmmap_section, "endpointinstance", &epinst);
get_dmmap_section_of_config_section_eq("dmmap_wireless", "ep_profile", "ep_key", epinst, &dm);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, dm, "ep_profile_alias", value);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, dm, "ep_profile_alias", value);
break;
}
return 0;
@ -3200,7 +3200,7 @@ int add_wifi_ssid(char *refparam, struct dmctx *ctx, void *data, char **instance
struct uci_section *dmmap_wifi=NULL;
check_create_dmmap_package("dmmap_wireless");
inst = get_last_instance_icwmpd("dmmap_wireless", "wifi-iface", "ssidinstance");
inst = get_last_instance_bbfdm("dmmap_wireless", "wifi-iface", "ssidinstance");
sprintf(ssid, "Iopsys_%d", inst ? (atoi(inst)+1) : 1);
dmuci_add_section("wireless", "wifi-iface", &s, &value);
dmuci_set_value_by_section(s, "device", "wl0");
@ -3209,9 +3209,9 @@ int add_wifi_ssid(char *refparam, struct dmctx *ctx, void *data, char **instance
dmuci_set_value_by_section(s, "mode", "ap");
dmuci_set_value_by_section(s, "ssid", ssid);
dmuci_add_section_icwmpd("dmmap_wireless", "wifi-iface", &dmmap_wifi, &v);
dmuci_add_section_bbfdm("dmmap_wireless", "wifi-iface", &dmmap_wifi, &v);
dmuci_set_value_by_section(dmmap_wifi, "section_name", section_name(s));
*instance = update_instance_icwmpd(dmmap_wifi, inst, "ssidinstance");
*instance = update_instance_bbfdm(dmmap_wifi, inst, "ssidinstance");
return 0;
}
@ -3259,17 +3259,17 @@ int addObjWiFiEndPoint(char *refparam, struct dmctx *ctx, void *data, char **ins
int inst;
check_create_dmmap_package("dmmap_wireless");
instancepara1 = get_last_instance_lev2_icwmpd("wireless", "wifi-iface", "dmmap_wireless", "endpointinstance", "mode", "wet")?get_last_instance_lev2_icwmpd("wireless", "wifi-iface", "dmmap_wireless", "endpointinstance", "mode", "wet"):"0";
instancepara2 = get_last_instance_lev2_icwmpd("wireless", "wifi-iface", "dmmap_wireless", "endpointinstance", "mode", "sta")?get_last_instance_lev2_icwmpd("wireless", "wifi-iface", "dmmap_wireless", "endpointinstance", "mode", "sta"):"0";
instancepara1 = get_last_instance_lev2_bbfdm("wireless", "wifi-iface", "dmmap_wireless", "endpointinstance", "mode", "wet")?get_last_instance_lev2_bbfdm("wireless", "wifi-iface", "dmmap_wireless", "endpointinstance", "mode", "wet"):"0";
instancepara2 = get_last_instance_lev2_bbfdm("wireless", "wifi-iface", "dmmap_wireless", "endpointinstance", "mode", "sta")?get_last_instance_lev2_bbfdm("wireless", "wifi-iface", "dmmap_wireless", "endpointinstance", "mode", "sta"):"0";
instancepara=atoi(instancepara1)>atoi(instancepara2)?dmstrdup(instancepara1):dmstrdup(instancepara2);
dmuci_add_section("wireless", "wifi-iface", &endpoint_sec, &value);
dmuci_set_value_by_section(endpoint_sec, "device", "wl1");
dmuci_set_value_by_section(endpoint_sec, "mode", "wet");
dmuci_set_value_by_section(endpoint_sec, "network", "lan");
dmuci_add_section_icwmpd("dmmap_wireless", "wifi-iface", &dmmap_sec, &v);
dmuci_add_section_bbfdm("dmmap_wireless", "wifi-iface", &dmmap_sec, &v);
dmuci_set_value_by_section(dmmap_sec, "section_name", section_name(endpoint_sec));
*instance = update_instance_icwmpd(dmmap_sec, instancepara, "endpointinstance");
*instance = update_instance_bbfdm(dmmap_sec, instancepara, "endpointinstance");
return 0;
}
@ -3529,8 +3529,8 @@ int browseWiFiEndPointProfileInst(struct dmctx *dmctx, DMNODE *parent_node, void
dmuci_get_value_by_section_string(dmmap_section, "endpointinstance", &ep_instance);
s=is_dmmap_section_exist_eq("dmmap_wireless", "ep_profile", "ep_key", ep_instance);
if(!s)
dmuci_add_section_icwmpd("dmmap_wireless", "ep_profile", &s, &v);
DMUCI_SET_VALUE_BY_SECTION(icwmpd, s, "ep_key", ep_instance);
dmuci_add_section_bbfdm("dmmap_wireless", "ep_profile", &s, &v);
DMUCI_SET_VALUE_BY_SECTION(bbfdm, s, "ep_key", ep_instance);
instance = handle_update_instance(1, dmctx, &instnbr, update_instance_alias, 3, s, "ep_profile_instance", "ep_profile_alias");
DM_LINK_INST_OBJ(dmctx, parent_node, ep_args->wifi_enp_sec, "1");

10
dmtree/tr181/x_iopsys_eu_dropbear.c
View file

@ -45,7 +45,7 @@ int browseXIopsysEuDropbear(struct dmctx *dmctx, DMNODE *parent_node, void *prev
synchronize_specific_config_sections_with_dmmap("dropbear", "dropbear", "dmmap_dropbear", &dup_list);
list_for_each_entry(p, &dup_list, list) {
idropbear = handle_update_instance(1, dmctx, &idropbear_last, update_instance_alias_icwmpd, 3, p->dmmap_section, "dropbearinstance", "dropbearalias");
idropbear = handle_update_instance(1, dmctx, &idropbear_last, update_instance_alias_bbfdm, 3, p->dmmap_section, "dropbearinstance", "dropbearalias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, idropbear) == DM_STOP)
break;
}
@ -395,7 +395,7 @@ int add_dropbear_instance(char *refparam, struct dmctx *ctx, void *data, char **
struct uci_section *dropbear_sec = NULL, *dmmap_sec= NULL;
check_create_dmmap_package("dmmap_dropbear");
instance = get_last_instance_icwmpd("dmmap_dropbear", "dropbear", "dropbearinstance");
instance = get_last_instance_bbfdm("dmmap_dropbear", "dropbear", "dropbearinstance");
dmuci_add_section("dropbear", "dropbear", &dropbear_sec, &value);
dmuci_set_value_by_section(dropbear_sec, "verbose", "0");
@ -405,9 +405,9 @@ int add_dropbear_instance(char *refparam, struct dmctx *ctx, void *data, char **
dmuci_set_value_by_section(dropbear_sec, "SSHKeepAlive", "300");
dmuci_set_value_by_section(dropbear_sec, "IdleTimeout", "0");
dmuci_add_section_icwmpd("dmmap_dropbear", "dropbear", &dmmap_sec, &v);
dmuci_add_section_bbfdm("dmmap_dropbear", "dropbear", &dmmap_sec, &v);
dmuci_set_value_by_section(dmmap_sec, "section_name", section_name(dropbear_sec));
*instancepara = update_instance_icwmpd(dmmap_sec, instance, "dropbearinstance");
*instancepara = update_instance_bbfdm(dmmap_sec, instance, "dropbearinstance");
return 0;
}
@ -427,7 +427,7 @@ int delete_dropbear_instance(char *refparam, struct dmctx *ctx, void *data, char
dmuci_delete_by_section_unnamed((struct uci_section *)data, NULL, NULL);
} else {
get_dmmap_section_of_config_section("dmmap_dropbear", "dropbear", section_name((struct uci_section *)data), &dmmap_section);
dmuci_delete_by_section_unnamed_icwmpd(dmmap_section, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dmmap_section, NULL, NULL);
dmuci_delete_by_section((struct uci_section *)data, NULL, NULL);
}
break;

14
dmtree/tr181/x_iopsys_eu_ipacccfg.c
View file

@ -624,7 +624,7 @@ int add_ipacccfg_rule(char *refparam, struct dmctx *ctx, void *data, char **inst
struct uci_section *rule = NULL, *dmmap_rule= NULL;
check_create_dmmap_package("dmmap_firewall");
instance = get_last_instance_icwmpd("dmmap_firewall", "rule", "fruleinstance");
instance = get_last_instance_bbfdm("dmmap_firewall", "rule", "fruleinstance");
dmuci_add_section_and_rename("firewall", "rule", &rule, &value);
dmuci_set_value_by_section(rule, "type", "generic");
dmuci_set_value_by_section(rule, "name", "new_rule");
@ -635,9 +635,9 @@ int add_ipacccfg_rule(char *refparam, struct dmctx *ctx, void *data, char **inst
dmuci_set_value_by_section(rule, "hidden", "1");
dmuci_set_value_by_section(rule, "parental", "0");
dmuci_add_section_icwmpd("dmmap_firewall", "rule", &dmmap_rule, &v);
dmuci_add_section_bbfdm("dmmap_firewall", "rule", &dmmap_rule, &v);
dmuci_set_value_by_section(dmmap_rule, "section_name", section_name(rule));
*instancepara = update_instance_icwmpd(dmmap_rule, instance, "fruleinstance");
*instancepara = update_instance_bbfdm(dmmap_rule, instance, "fruleinstance");
return 0;
}
@ -686,15 +686,15 @@ int add_ipacccfg_port_forwarding(char *refparam, struct dmctx *ctx, void *data,
struct uci_section *redirect = NULL, *dmmap_redirect= NULL;
check_create_dmmap_package("dmmap_firewall");
instance = get_last_instance_icwmpd("dmmap_firewall", "redirect", "forwardinstance");
instance = get_last_instance_bbfdm("dmmap_firewall", "redirect", "forwardinstance");
dmuci_add_section_and_rename("firewall", "redirect", &redirect, &value);
dmuci_set_value_by_section(redirect, "enabled", "0");
dmuci_set_value_by_section(redirect, "target", "DNAT");
dmuci_set_value_by_section(redirect, "proto", "tcp udp");
dmuci_add_section_icwmpd("dmmap_firewall", "redirect", &dmmap_redirect, &v);
dmuci_add_section_bbfdm("dmmap_firewall", "redirect", &dmmap_redirect, &v);
dmuci_set_value_by_section(dmmap_redirect, "section_name", section_name(redirect));
*instancepara = update_instance_icwmpd(dmmap_redirect, instance, "forwardinstance");
*instancepara = update_instance_bbfdm(dmmap_redirect, instance, "forwardinstance");
return 0;
}
@ -798,7 +798,7 @@ int browseAccListInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data,
synchronize_specific_config_sections_with_dmmap("firewall", "rule", "dmmap_firewall", &dup_list);
list_for_each_entry(p, &dup_list, list) {
irule = handle_update_instance(1, dmctx, &irule_last, update_instance_alias_icwmpd, 3, p->dmmap_section, "fruleinstance", "frulealias");
irule = handle_update_instance(1, dmctx, &irule_last, update_instance_alias_bbfdm, 3, p->dmmap_section, "fruleinstance", "frulealias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, irule) == DM_STOP)
return 0;
}

10
dmtree/tr181/x_iopsys_eu_owsd.c
View file

@ -67,7 +67,7 @@ int browseXIopsysEuOwsdListenObj(struct dmctx *dmctx, DMNODE *parent_node, void
synchronize_specific_config_sections_with_dmmap("owsd", "owsd-listen", "dmmap_owsd", &dup_list);
list_for_each_entry(p, &dup_list, list) {
iowsd_listen = handle_update_instance(1, dmctx, &iowsd_listen_last, update_instance_alias_icwmpd, 3, p->dmmap_section, "olisteninstance", "olistenalias");
iowsd_listen = handle_update_instance(1, dmctx, &iowsd_listen_last, update_instance_alias_bbfdm, 3, p->dmmap_section, "olisteninstance", "olistenalias");
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, iowsd_listen) == DM_STOP)
break;
}
@ -504,16 +504,16 @@ int add_owsd_listen(char *refparam, struct dmctx *ctx, void *data, char **instan
struct uci_section *listen_sec = NULL, *dmmap_sec= NULL;
check_create_dmmap_package("dmmap_owsd");
instance = get_last_instance_icwmpd("dmmap_owsd", "owsd-listen", "olisteninstance");
instance = get_last_instance_bbfdm("dmmap_owsd", "owsd-listen", "olisteninstance");
dmuci_add_section("owsd", "owsd-listen", &listen_sec, &value);
dmuci_set_value_by_section(listen_sec, "ipv6", "on");
dmuci_set_value_by_section(listen_sec, "whitelist_interface_as_origin", "1");
dmuci_add_list_value_by_section(listen_sec, "origin", "*");
dmuci_add_section_icwmpd("dmmap_owsd", "owsd-listen", &dmmap_sec, &v);
dmuci_add_section_bbfdm("dmmap_owsd", "owsd-listen", &dmmap_sec, &v);
dmuci_set_value_by_section(dmmap_sec, "section_name", section_name(listen_sec));
*instancepara = update_instance_icwmpd(dmmap_sec, instance, "olisteninstance");
*instancepara = update_instance_bbfdm(dmmap_sec, instance, "olisteninstance");
return 0;
}
@ -535,7 +535,7 @@ int delete_owsd_listen_instance(char *refparam, struct dmctx *ctx, void *data, c
dmuci_delete_by_section_unnamed(owsd_listensection, NULL, NULL);
} else {
get_dmmap_section_of_config_section("dmmap_owsd", "owsd-listen", section_name(owsd_listensection), &dmmap_section);
dmuci_delete_by_section_unnamed_icwmpd(dmmap_section, NULL, NULL);
dmuci_delete_by_section_unnamed_bbfdm(dmmap_section, NULL, NULL);
dmuci_delete_by_section(owsd_listensection, NULL, NULL);
}
break;

14
dmuci.c
View file

@ -25,7 +25,7 @@
struct uci_context *uci_ctx;
struct uci_context *uci_varstate_ctx;
NEW_UCI_PATH(icwmpd, ICWMPD_CONFIG, ICWMPD_SAVEDIR)
NEW_UCI_PATH(bbfdm, BBFDM_CONFIG, BBFDM_SAVEDIR)
struct uci_section *dmuci_walk_state_section (char *package, char *stype, void *arg1, void *arg2, int cmp , int (*filter)(struct uci_section *s, void *value), struct uci_section *prev_section, int walk) {
struct uci_section *s = NULL;
struct uci_element *e, *m;
@ -346,7 +346,7 @@ int dmuci_commit_package(char *package)
int dmuci_commit(void)
{
char **configs = NULL;
char **icwmpd_configs = NULL;
char **bbfdm_configs = NULL;
char **p;
if ((uci_list_configs(uci_ctx, &configs) != UCI_OK) || !configs) {
@ -355,17 +355,17 @@ int dmuci_commit(void)
for (p = configs; *p; p++) {
dmuci_commit_package(*p);
}
if(uci_ctx_icwmpd)
if(uci_ctx_bbfdm)
{
if ((uci_list_configs(uci_ctx_icwmpd, &icwmpd_configs) != UCI_OK) || !icwmpd_configs) {
if ((uci_list_configs(uci_ctx_bbfdm, &bbfdm_configs) != UCI_OK) || !bbfdm_configs) {
return -1;
}
for (p = icwmpd_configs; *p; p++) {
DMUCI_COMMIT_PACKAGE(icwmpd, *p);
for (p = bbfdm_configs; *p; p++) {
DMUCI_COMMIT_PACKAGE(bbfdm, *p);
}
}
free(configs);
free(icwmpd_configs);
free(bbfdm_configs);
return 0;
}

20
dmuci.h
View file

@ -23,9 +23,9 @@
#define DB_CONFIG "/lib/db/config"
#define VARSTATE_CONFIG "/var/state"
#define ICWMPD_CONFIG "/etc/icwmpd"
#define ICWMPD_PATH "icwmpd"
#define ICWMPD_SAVEDIR "/tmp/.icwmpd"
#define BBFDM_CONFIG "/etc/bbfdm"
#define BBFDM_PATH "bbfdm"
#define BBFDM_SAVEDIR "/tmp/.bbfdm"
extern struct uci_context *uci_ctx;
extern struct uci_context *uci_varstate_ctx;
@ -164,17 +164,17 @@ int dmuci_add_list_value_by_section(struct uci_section *s, char *option, char *v
int dmuci_del_list_value_by_section(struct uci_section *s, char *option, char *value);
struct uci_section *dmuci_walk_section(char *package, char *stype, void *arg1, void *arg2, int cmp , int (*filter)(struct uci_section *s, void *value), struct uci_section *prev_section, int walk);
struct uci_section *dmuci_walk_state_section(char *package, char *stype, void *arg1, void *arg2, int cmp , int (*filter)(struct uci_section *s, void *value), struct uci_section *prev_section, int walk);
struct uci_section *dmuci_walk_section_icwmpd(char *package, char *stype, void *arg1, void *arg2, int cmp , int (*filter)(struct uci_section *s, void *value), struct uci_section *prev_section, int walk);
char *dmuci_set_value_by_section_icwmpd(struct uci_section *s, char *option, char *value);
struct uci_section *dmuci_walk_section_bbfdm(char *package, char *stype, void *arg1, void *arg2, int cmp , int (*filter)(struct uci_section *s, void *value), struct uci_section *prev_section, int walk);
char *dmuci_set_value_by_section_bbfdm(struct uci_section *s, char *option, char *value);
int dmuci_add_section_icwmpd(char *package, char *stype, struct uci_section **s, char **value);
int dmuci_add_section_bbfdm(char *package, char *stype, struct uci_section **s, char **value);
int dmuci_add_state_section(char *package, char *stype, struct uci_section **s, char **value);
char *dmuci_set_varstate_value(char *package, char *section, char *option, char *value);
char *dmuci_set_value_icwmpd(char *package, char *section, char *option, char *value);
int dmuci_delete_by_section_icwmpd(struct uci_section *s, char *option, char *value);
char *dmuci_set_value_bbfdm(char *package, char *section, char *option, char *value);
int dmuci_delete_by_section_bbfdm(struct uci_section *s, char *option, char *value);
int dmuci_rename_section_by_section(struct uci_section *s, char *value);
int dmuci_exit_icwmpd(void);
int dmuci_init_icwmpd(void);
int dmuci_exit_bbfdm(void);
int dmuci_init_bbfdm(void);
void init_uci_varstate_ctx(void);
void end_uci_varstate_ctx(void);
void uci_add_list_to_list(struct uci_list *addlist, struct uci_list *list);

6
json/convertor_json_to_c.py
View file

@ -219,13 +219,13 @@ def cprintAddDelObj( faddobj, fdelobj, name, mappingobj, dmobject ):
print >> fp, " struct uci_section *dmmap = NULL, *s = NULL;"
print >> fp, ""
print >> fp, " check_create_dmmap_package(\"%s\");" % dmmapfile
print >> fp, " inst = get_last_instance_icwmpd(\"%s\", \"%s\", \"%s\");" % (dmmapfile, sectiontype, name+"instance")
print >> fp, " inst = get_last_instance_bbfdm(\"%s\", \"%s\", \"%s\");" % (dmmapfile, sectiontype, name+"instance")
print >> fp, " dmuci_add_section_and_rename(\"%s\", \"%s\", &s, &value);" % (file, sectiontype)
print >> fp, " //dmuci_set_value_by_section(s, \"option\", \"value\");"
print >> fp, ""
print >> fp, " dmuci_add_section_icwmpd(\"%s\", \"%s\", &dmmap, &v);" % (dmmapfile, sectiontype)
print >> fp, " dmuci_add_section_bbfdm(\"%s\", \"%s\", &dmmap, &v);" % (dmmapfile, sectiontype)
print >> fp, " dmuci_set_value_by_section(dmmap, \"section_name\", section_name(s));"
print >> fp, " *instance = update_instance_icwmpd(dmmap, inst, \"%s\");" % (name+"instance")
print >> fp, " *instance = update_instance_bbfdm(dmmap, inst, \"%s\");" % (name+"instance")
else:
print >> fp, " //TODO"
print >> fp, " return 0;"

4
scripts/functions/download_launch
View file

@ -10,8 +10,8 @@ UCI_SET_VARSTATE="/sbin/uci -q ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/sta
UCI_ADD_VARSTATE="/sbin/uci -q ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/state add"
UCI_DELETE_VARSTATE="/sbin/uci -q ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/state delete"
CAPTURE_FILE="/tmp/download_dump"
DOWNLOAD_DIAGNOSTIC_FILE="/tmp/icwmp_download_diagnostic"
DOWNLOAD_DIAGNOSTIC_LOG_FILE="/tmp/icwmp_download_diagnostic_log"
DOWNLOAD_DIAGNOSTIC_FILE="/tmp/bbfdm_download_diagnostic"
DOWNLOAD_DIAGNOSTIC_LOG_FILE="/tmp/bbfdm_download_diagnostic_log"
CONNECTION_TIMEOUT=10
download_get() {

2
scripts/functions/upload_launch
View file

@ -10,7 +10,7 @@ UCI_SET_VARSTATE="/sbin/uci -q ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/sta
UCI_ADD_VARSTATE="/sbin/uci -q ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/state add"
UCI_DELETE_VARSTATE="/sbin/uci -q ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/state delete"
CAPTURE_FILE="/tmp/upload_dump"
UPLOAD_DIAGNOSTIC_FILE="/tmp/icwmp_upload_diagnostic"
UPLOAD_DIAGNOSTIC_FILE="/tmp/bbfdm_upload_diagnostic"
CONNECTION_TIMEOUT=20
upload_get() {