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

Ticket refs #14406: TR-069: Move TR related UCI options from original config to /etc/icwmpd/dmmap (Device.Bridging.Bridge.x.VLANPort.x)

Browse source
This commit is contained in:
Amin Ben Ramdhane 2018-11-07 14:58:55 +01:00
parent a90f67aa2a
commit 03ea9f2c93
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dm/dmtree/tr181/bridging.c
View file

@ -1296,25 +1296,29 @@ end:
int browseBridgeVlanPortInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance)
{
struct uci_section *vlan_s;
char *vlan = NULL, *vlan_last = NULL, *type, *is_lan= NULL;
struct bridging_vlan_args curr_bridging_vlan_args = {0};
struct bridging_args *br_args = (struct bridging_args *)prev_data;
struct dmmap_dup *p;
LIST_HEAD(dup_list);
dmuci_get_value_by_section_string(br_args->bridge_sec, "is_lan", &is_lan);
if(is_lan==NULL || strcmp(is_lan, "1")!=0){
uci_foreach_sections("network", "device", vlan_s) {
if(!vlan_s)
synchronize_specific_config_sections_with_dmmap("network", "device", "dmmap_network", &dup_list);
list_for_each_entry(p, &dup_list, list) {
if(!p->config_section)
goto end;
//Check if VLAN or NOT
dmuci_get_value_by_section_string(vlan_s, "type", &type);
dmuci_get_value_by_section_string(p->config_section, "type", &type);
if (strcmp(type, "untagged")!=0) {
vlan = handle_update_instance(2, dmctx, &vlan_last, update_instance_alias, 3, vlan_s, "bridge_vlan_instance", "bridge_vlan_alias");
init_bridging_vlan_args(&curr_bridging_vlan_args, vlan_s, br_args->bridge_sec, vlan_last, br_args->br_key);
dmuci_set_value_by_section(p->dmmap_section, "bridge_key", br_args->br_key);
vlan = handle_update_instance(2, dmctx, &vlan_last, update_instance_alias, 3, p->dmmap_section, "bridge_vlan_instance", "bridge_vlan_alias");
init_bridging_vlan_args(&curr_bridging_vlan_args, p->config_section, br_args->bridge_sec, vlan_last, br_args->br_key);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_bridging_vlan_args, vlan) == DM_STOP)
goto end;
}
}
free_dmmap_config_dup_list(&dup_list);
}
end:
return 0;