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

bbf : Removed hardcodings for L2 VLAN deployments

Browse source
This commit is contained in:
jjoseph 2020-03-26 19:38:28 +05:30 • committed by Amin Ben Ramdhane
parent 8656c9e64d
commit 687fbf1a08
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dmtree/tr181/bridging.c
View file

@ -1798,7 +1798,7 @@ static int set_port_lower_layer(char *refparam, struct dmctx *ctx, void *data, c
/* Get the upstream interface. */
struct uci_section *port_s = NULL;
char intf_tag[50] = {0};
uci_foreach_option_eq("ports", "ethport", "name", "WAN", port_s) {
uci_foreach_option_eq("ports", "ethport", "uplink", "1", port_s) {
char *iface;
dmuci_get_value_by_section_string(port_s, "ifname", &iface);
if (*iface != '\0') {

21
dmtree/tr181/ethernet.c
View file

@ -425,7 +425,7 @@ static int addObjEthernetVLANTermination(char *refparam, struct dmctx *ctx, void
char *mac;
struct uci_section *port_s = NULL;
char intf_tag[50] = {0};
uci_foreach_option_eq("ports", "ethport", "name", "WAN", port_s) {
uci_foreach_option_eq("ports", "ethport", "uplink", "1", port_s) {
char *iface;
dmuci_get_value_by_section_string(port_s, "ifname", &iface);
if (*iface != '\0') {
@ -974,7 +974,7 @@ static int get_EthernetLink_LastChange(char *refparam, struct dmctx *ctx, void *
static int get_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
struct uci_section *s = NULL;
char *link_mac, *type, *ifname, *mac, *br_inst, *mg, *p, linker[64] = "";
char *link_mac, *type, *ifname, *mac, *br_inst, *mg, linker[64] = "";
struct uci_section *dmmap_section, *port;
dmuci_get_value_by_section_string(((struct dm_args *)data)->section, "mac", &link_mac);
@ -1006,9 +1006,18 @@ static int get_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void
}
} else {
/* For upstream interface, set the lowerlayer to wan port of Ethernet.Interface */
p = get_device(section_name(s));
if (p) {
adm_entry_get_linker_param(ctx, dm_print_path("%s%cEthernet%cInterface%c", dmroot, dm_delim, dm_delim, dm_delim), p, value);
struct uci_section *port_s = NULL;
char intf_tag[50] = {0};
uci_foreach_option_eq("ports", "ethport", "uplink", "1", port_s) {
char *iface;
dmuci_get_value_by_section_string(port_s, "ifname", &iface);
if (*iface != '\0') {
strncpy(intf_tag, iface, sizeof(intf_tag));
}
}
strcat(intf_tag, ".1");
if (intf_tag[0] != '\0') {
adm_entry_get_linker_param(ctx, dm_print_path("%s%cEthernet%cInterface%c", dmroot, dm_delim, dm_delim, dm_delim), intf_tag, value);
if (*value == NULL)
*value = "";
}
@ -1103,7 +1112,7 @@ static int set_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void
/* Get the upstream interface. */
struct uci_section *port_s = NULL;
char intf_tag[50] = {0};
uci_foreach_option_eq("ports", "ethport", "name", "WAN", port_s) {
uci_foreach_option_eq("ports", "ethport", "uplink", "1", port_s) {
char *iface;
dmuci_get_value_by_section_string(port_s, "ifname", &iface);
if (*iface != '\0') {