mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2026-02-03 20:37:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

T#9195: LowerLayers of Ethernet.VLANTermination can not be set the created...

Browse source
This commit is contained in:
Amin Ben Romdhane 2022-12-02 13:20:56 +00:00
parent 90ac63e15a
commit fff93eb60f
1 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
dmtree/tr181/ethernet.c
View file

@ -1486,26 +1486,36 @@ static int get_EthernetVLANTermination_LastChange(char *refparam, struct dmctx *
static int get_EthernetVLANTermination_LowerLayers(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
char *name, *type, *ifname;
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->dmmap_section, "LowerLayers", value);
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "name", &name);
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "type", &type);
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "ifname", &ifname);
if (DM_STRLEN(*value) == 0) {
char *name = NULL, *type = NULL, *ifname = NULL;
if (DM_LSTRNCMP(type, "8021ad", 6) == 0) {
// 8021ad device, will have a vlan termination object as its lowerlayer
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "name", &name);
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "type", &type);
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "ifname", &ifname);
char *inner_vid, *dev_name;
if (DM_LSTRNCMP(type, "8021ad", 6) == 0) {
// 8021ad device, will have a vlan termination object as its lowerlayer
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "inner_vid", &inner_vid);
if (*ifname == '\0' || *inner_vid == '\0')
return -1;
dmasprintf(&dev_name, "%s.%s", ifname, inner_vid);
adm_entry_get_linker_param(ctx, "Device.Ethernet.VLANTermination.", dev_name, value);
char *inner_vid, *dev_name;
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "inner_vid", &inner_vid);
if (*ifname == '\0' || *inner_vid == '\0')
return -1;
dmasprintf(&dev_name, "%s.%s", ifname, inner_vid);
adm_entry_get_linker_param(ctx, "Device.Ethernet.VLANTermination.", dev_name, value);
} else {
adm_entry_get_linker_param(ctx, "Device.Ethernet.Link.", name, value);
if (!(*value) || (*value)[0] == 0)
adm_entry_get_linker_param(ctx, "Device.Ethernet.Link.", ifname, value);
}
} else {
adm_entry_get_linker_param(ctx, "Device.Ethernet.Link.", name, value);
if (!(*value) || (*value)[0] == 0)
adm_entry_get_linker_param(ctx, "Device.Ethernet.Link.", ifname, value);
char *linker = NULL;
adm_entry_get_linker_value(ctx, *value, &linker);
if (!linker || *linker == 0)
*value = "";
}
return 0;
@ -1533,6 +1543,9 @@ static int set_EthernetVLANTermination_LowerLayers(char *refparam, struct dmctx
case VALUESET:
adm_entry_get_linker_value(ctx, value, &vlan_linker);
// Store LowerLayers value under dmmap section
dmuci_set_value_by_section(((struct dmmap_dup *)data)->dmmap_section, "LowerLayers", value);
if (!vlan_linker || vlan_linker[0] == 0) {
// Set ifname and name options of device section to empty value
dmuci_set_value_by_section(((struct dmmap_dup *)data)->config_section, "ifname", "");