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

VLANTermination: Update device option of interface section only if the old device option is not empty

Browse source
This commit is contained in:
Amin Ben Ramdhane 2022-01-21 12:49:17 +01:00
parent 2fc977434f
commit a6c13758fe
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dmtree/tr181/ethernet.c
View file

@ -1378,11 +1378,11 @@ static int set_EthernetVLANTermination_LowerLayers(char *refparam, struct dmctx
} else {
/* type != macvlan */
struct uci_section *s = NULL;
char *vid, *old_name;
char *vid = NULL, *old_name = NULL;
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "name", &old_name);
dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "vid", &vid);
if (*vid != '\0')
if (vid && *vid != '\0')
snprintf(new_name, sizeof(new_name), "%s.%s", vlan_linker, vid);
else
snprintf(new_name, sizeof(new_name), "%s", vlan_linker);
@ -1390,12 +1390,14 @@ static int set_EthernetVLANTermination_LowerLayers(char *refparam, struct dmctx
if (ethernet___name_exists_in_devices(new_name))
return -1;
// if device is lowerlayer to an ip interface, then
// the ifname of the ip interface also needs to be updated
uci_foreach_option_eq("network", "interface", "device", old_name, s) {
dmuci_set_value_by_section(s, "device", new_name);
}
if (old_name && *old_name != 0) {
// if device is lowerlayer to an ip interface, then
// the device of the ip interface also needs to be updated
uci_foreach_option_eq("network", "interface", "device", old_name, s) {
dmuci_set_value_by_section(s, "device", new_name);
}
}
}
// Set ifname and name options of device section