Device.(ATM/PTM).Link.{i}.LowerLayers: fix its value after updating the DSL index

This commit is contained in:
Amin Ben Ramdhane 2020-12-30 20:38:35 +01:00
parent 00adaec949
commit db54efa61d
3 changed files with 5 additions and 5 deletions

View file

@ -157,7 +157,7 @@ static int set_atm_link_type(char *refparam, struct dmctx *ctx, void *data, char
static int get_atm_lower_layer(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
char linker[32];
snprintf(linker, sizeof(linker), "channel_%d", atoi(instance)-1);
snprintf(linker, sizeof(linker), "channel_%d", atoi(instance));
adm_entry_get_linker_param(ctx, "Device.DSL.Channel.", linker, value); // MEM WILL BE FREED IN DMMEMCLEAN
if (*value == NULL)
*value = "";

View file

@ -539,7 +539,7 @@ int browseInterfaceStackInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
snprintf(buf_higheralias, sizeof(buf_higheralias), "%s%s", *loweralias ? loweralias : *bridge_port_inst ? "cpe-" : "", (*loweralias == '\0' && *bridge_port_inst) ? bridge_port_inst : "");
char *link_channel = "channel_0";
char *link_channel = "channel_1";
adm_entry_get_linker_param(dmctx, "Device.DSL.Channel.", link_channel, &vb);
if (vb == NULL)
vb = "";
@ -561,7 +561,7 @@ int browseInterfaceStackInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
snprintf(buf_higheralias, sizeof(buf_higheralias), "%s%s", *loweralias ? loweralias : *bridge_port_inst ? "cpe-" : "", (*loweralias == '\0' && *bridge_port_inst) ? bridge_port_inst : "");
char *link_line = "line_0";
char *link_line = "line_1";
adm_entry_get_linker_param(dmctx, "Device.DSL.Line.", link_line, &value);
if (value == NULL)
value = "";
@ -569,7 +569,7 @@ int browseInterfaceStackInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
struct uci_section *dsl_s = NULL;
uci_path_foreach_sections(bbfdm, "dmmap", "dsl_line", dsl_s) {
dmuci_get_value_by_section_string(dsl_s, "dsl_line_alias", &loweralias);
bridge_port_inst = get_instance_by_section(dmctx->instance_mode, "dmmap", "dsl_line", "id", "0", "dsl_line_instance", "dsl_line_alias");
bridge_port_inst = get_instance_by_section(dmctx->instance_mode, "dmmap", "dsl_line", "id", "1", "dsl_line_instance", "dsl_line_alias");
}
snprintf(buf_loweralias, sizeof(buf_loweralias), "%s%s", *loweralias ? loweralias : *bridge_port_inst ? "cpe-" : "", (*loweralias == '\0' && *bridge_port_inst) ? bridge_port_inst : "");

View file

@ -54,7 +54,7 @@ static int get_ptm_link_name(char *refparam, struct dmctx *ctx, void *data, char
static int get_ptm_lower_layer(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
char linker[32];
snprintf(linker, sizeof(linker), "channel_%d", atoi(instance)-1);
snprintf(linker, sizeof(linker), "channel_%d", atoi(instance));
adm_entry_get_linker_param(ctx, "Device.DSL.Channel.", linker, value); // MEM WILL BE FREED IN DMMEMCLEAN
if (*value == NULL)
*value = "";