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

Device.Bridging. object: add support for the wireless interfaces

Browse source
This commit is contained in:
Amin Ben Ramdhane 2020-05-28 20:26:01 +01:00
parent a2c10c7cbe
commit 1b83b77387
2 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
dmtree/tr181/bridging.c
View file

@ -407,6 +407,20 @@ static int is_bridge_port_management_in_dmmap(char *br_inst)
return 0;
}
static int is_wireless_ifname_exist(char *br_section_name, char *ifname)
{
struct uci_section *s = NULL;
uci_foreach_option_eq("wireless", "wifi-iface", "network", br_section_name, s) {
// get ifname from wireless/wifi-iface section
char *curr_ifname;
dmuci_get_value_by_section_string(s, "ifname", &curr_ifname);
if (strcmp(curr_ifname, ifname) == 0)
return 1;
}
return 0;
}
static void set_linker_bridge_port_management(char *br_inst, char *linker)
{
struct uci_section *s = NULL;
@ -445,7 +459,7 @@ static int dmmap_synchronizeBridgingBridgePort(struct dmctx *dmctx, DMNODE *pare
// device is available in ifname list ==> skip it
char *device;
dmuci_get_value_by_section_string(s, "device", &device);
if (dm_strword(br_args->ifname, device) != NULL)
if (dm_strword(br_args->ifname, device) != NULL || is_wireless_ifname_exist(section_name(br_args->bridge_sec), device))
continue;
// else ==> delete section
@ -490,6 +504,30 @@ static int dmmap_synchronizeBridgingBridgePort(struct dmctx *dmctx, DMNODE *pare
linker_req = true;
}
dmfree(br_ifname);
struct uci_section *ss = NULL;
uci_foreach_option_eq("wireless", "wifi-iface", "network", section_name(br_args->bridge_sec), ss) {
// get ifname from wireless/wifi-iface section
char *ifname;
dmuci_get_value_by_section_string(ss, "ifname", &ifname);
if (is_bridge_port_device_exist(br_args->br_inst, ifname))
continue;
struct uci_section *sbr_port = NULL;
char *sbr_name;
dmuci_add_section_bbfdm("dmmap_bridge_port", "bridge_port", &sbr_port, &sbr_name);
dmuci_set_value_by_section(sbr_port, "device", ifname);
dmuci_set_value_by_section(sbr_port, "br_inst", br_args->br_inst);
dmuci_set_value_by_section(sbr_port, "interface", section_name(br_args->bridge_sec));
dmuci_set_value_by_section(sbr_port, "management", "0");
snprintf(plinker, sizeof(plinker), "br_%s:%s+%s", br_args->br_inst, section_name(sbr_port), ifname);
dmstrappendstr(p, plinker);
dmstrappendchr(p, ',');
linker_req = true;
}
p = p -1;
dmstrappendend(p);

2
dmtree/tr181/interfacestack.c
View file

@ -400,7 +400,7 @@ int browseInterfaceStackInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
vb = "";
dmuci_get_value_by_section_string(sd, "bridge_port_alias", &loweralias);
bridge_port_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_bridge_port", "bridge_port", sd, "bridge_port_instance", "bridge_port_alias");
dmuci_get_value_by_section_string(sd, "bridge_port_instance", &bridge_port_inst);
if (*loweralias == '\0')
snprintf(buf_loweralias, sizeof(buf_loweralias), "cpe-%s", bridge_port_inst);
else