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

Fix the value of Device.Ethernet.Link.{i}.LowerLayers parameter of wan interface + fix indentation

Browse source
This commit is contained in:
Amin Ben Ramdhane 2020-03-25 17:33:29 +01:00
parent f1a7b2cbaf
commit 682e6f3977
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
dmtree/tr181/ethernet.c
View file

@ -968,12 +968,11 @@ static int get_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void
} }
} else { } else {
/* for upstream interface, set the lowerlayer to wan port of Ethernet.Interface */ /* for upstream interface, set the lowerlayer to wan port of Ethernet.Interface */
p = strchr(ifname, '.'); p = get_device(section_name(s));
if (p) { if (p) {
/*linker of wan port of interface is eth0.1*/ adm_entry_get_linker_param(ctx, dm_print_path("%s%cEthernet%cInterface%c", dmroot, dm_delim, dm_delim, dm_delim), p, value);
*(p+1) = '1'; if (*value == NULL)
*(p+2) = '\0'; *value = "";
adm_entry_get_linker_param(ctx, dm_print_path("%s%cEthernet%cInterface%c", dmroot, dm_delim, dm_delim, dm_delim), ifname, value);
} }
} }
break; break;
@ -984,17 +983,17 @@ static int get_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void
static int set_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action) static int set_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{ {
char lower_layer[250] = {0}; char lower_layer[250] = {0};
switch (action) { switch (action) {
case VALUECHECK: case VALUECHECK:
if (dm_validate_string_list(value, -1, -1, 1024, -1, -1, NULL, 0, NULL, 0)) if (dm_validate_string_list(value, -1, -1, 1024, -1, -1, NULL, 0, NULL, 0))
return FAULT_9007; return FAULT_9007;
break; break;
case VALUESET: case VALUESET:
if (value[strlen(value)-1]!='.') { if (value[strlen(value)-1] != '.')
snprintf(lower_layer, sizeof(lower_layer), "%s.", value); snprintf(lower_layer, sizeof(lower_layer), "%s.", value);
} else { else
strncpy(lower_layer, value, sizeof(lower_layer)); strncpy(lower_layer, value, sizeof(lower_layer));
}
/* Check if the value is valid or not. */ /* Check if the value is valid or not. */
if (strncmp(lower_layer, "Device.Bridging.Bridge.", 23) == 0) { if (strncmp(lower_layer, "Device.Bridging.Bridge.", 23) == 0) {
@ -1032,14 +1031,12 @@ static int set_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void
if (strncmp(sec, sec_name, sizeof(sec)) == 0) { if (strncmp(sec, sec_name, sizeof(sec)) == 0) {
char *type, *ifname; char *type, *ifname;
dmuci_get_value_by_section_string(intf_s, "type", &type); dmuci_get_value_by_section_string(intf_s, "type", &type);
if (*type == '\0' || strcmp(type, "bridge") != 0) { if (*type == '\0' || strcmp(type, "bridge") != 0)
return -1; return -1;
}
dmuci_get_value_by_section_string(intf_s, "ifname", &ifname); dmuci_get_value_by_section_string(intf_s, "ifname", &ifname);
if (*ifname == '\0') { if (*ifname == '\0')
return -1; return -1;
}
/* Add ethernet link params to dmmap link section. */ /* Add ethernet link params to dmmap link section. */
uci_path_foreach_sections(bbfdm, DMMAP, "link", s) { uci_path_foreach_sections(bbfdm, DMMAP, "link", s) {
@ -1063,16 +1060,15 @@ static int set_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void
} else if (strncmp(lower_layer, "Device.Ethernet.Interface.", 26) == 0) { } else if (strncmp(lower_layer, "Device.Ethernet.Interface.", 26) == 0) {
/* Find the linker of the lowerlayer value to be set. */ /* Find the linker of the lowerlayer value to be set. */
char *linker; char *linker;
adm_entry_get_linker_value(ctx, lower_layer, &linker); adm_entry_get_linker_value(ctx, lower_layer, &linker);
/* Check if linker is present in network UCI, if yes the update /* Check if linker is present in network UCI, if yes the update
* the proto, else create a interface and device section. */ * the proto, else create a interface and device section. */
char intf[20] = {0}; char intf[20] = {0};
if (strcmp(linker, "eth5.1") == 0) { if (strcmp(linker, "eth5.1") == 0)
strncpy(intf, linker, sizeof(intf)); strncpy(intf, linker, sizeof(intf));
} else { else
snprintf(intf, sizeof(intf), "%s.%s", linker, "1"); snprintf(intf, sizeof(intf), "%s.%s", linker, "1");
}
struct uci_section *s = NULL, *link_s = NULL; struct uci_section *s = NULL, *link_s = NULL;
char *val; char *val;
@ -1119,10 +1115,10 @@ static int set_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void
/* Add config device section. */ /* Add config device section. */
struct uci_section *dev_s; struct uci_section *dev_s;
dmuci_add_section_and_rename("network", "device", &dev_s, &val); dmuci_add_section_and_rename("network", "device", &dev_s, &val);
dmuci_set_value_by_section(dev_s, "type", "untagged"); dmuci_set_value_by_section(dev_s, "type", "untagged");
char *tok = strtok(linker, "."); char *tok = strtok(linker, ".");
dmuci_set_value_by_section(dev_s, "ifname", tok); dmuci_set_value_by_section(dev_s, "ifname", tok);
dmuci_set_value_by_section(dev_s, "name", intf); dmuci_set_value_by_section(dev_s, "name", intf);
} }
} else { } else {
return -1; return -1;