mirror/icwmp
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/icwmp.git synced 2026-03-14 04:49:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ticket refs #8441 : fix issue for tr098 data model parameters

Browse source
This commit is contained in:
Anis Ellouze 2016-05-24 17:46:41 +01:00
parent 7ba89db3d5
commit 9ec671ebf0
2 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
dm/dmtree/tr098/landevice.c
View file

@ -1109,7 +1109,7 @@ int get_lan_eth_iface_cfg_enable(char *refparam, struct dmctx *ctx, char **value
dmubus_call("network.device", "status", UBUS_ARGS{{"name", ethargs->eth}}, 1, &res);
DM_ASSERT(res, *value = "");
json_select(res, "link", -1, NULL, value, NULL);
json_select(res, "up", -1, NULL, value, NULL);
return 0;
}
@ -1155,8 +1155,11 @@ int get_lan_eth_iface_cfg_maxbitrate(char *refparam, struct dmctx *ctx, char **v
char *pch, *spch, *v;
int len;
struct ldethargs *ethargs = (struct ldethargs *)ctx->args;
struct uci_section *s;
dmuci_get_option_value_string("ports", "@ethports[0]", ethargs->eth, value);
uci_foreach_option_eq("ports", "ethport", "ifname", ethargs->eth, s) {
dmuci_get_value_by_section_string(s, "speed", value);
}
if ((*value)[0] == '\0')
return 0;
else {
@ -1177,16 +1180,21 @@ int set_lan_eth_iface_cfg_maxbitrate(char *refparam, struct dmctx *ctx, int acti
char *val = NULL;
char *duplex;
struct ldethargs *ethargs = (struct ldethargs *)ctx->args;
struct uci_section *s, *sec;
switch (action) {
case VALUECHECK:
return 0;
case VALUESET:
uci_foreach_option_eq("ports", "ethport", "ifname", ethargs->eth, s) {
sec = s;
break;
}
if (strcasecmp(value, "auto") == 0) {
dmuci_set_value("ports", "@ethports[0]", ethargs->eth, "auto");
dmuci_set_value_by_section(sec, "speed", value);
return 0;
} else {
dmuci_get_option_value_string("ports", "@ethports[0]", ethargs->eth, &duplex);
dmuci_get_value_by_section_string(sec, "speed", &duplex);
if (strcmp(duplex, "auto") == 0)
duplex = "FD";
else {
@ -1198,7 +1206,7 @@ int set_lan_eth_iface_cfg_maxbitrate(char *refparam, struct dmctx *ctx, int acti
duplex = "FD";
}
dmastrcat(&val, value, duplex);
dmuci_set_value("ports", "@ethports[0]", ethargs->eth, val);
dmuci_set_value_by_section(sec, "speed", val);
dmfree(val);
}
return 0;
@ -1211,8 +1219,11 @@ int get_lan_eth_iface_cfg_duplexmode(char *refparam, struct dmctx *ctx, char **v
{
char *tmp;
struct ldethargs *ethargs = (struct ldethargs *)ctx->args;
dmuci_get_option_value_string("ports", "@ethports[0]", ethargs->eth, &tmp);
struct uci_section *s;
uci_foreach_option_eq("ports", "ethport", "ifname", ethargs->eth, s) {
dmuci_get_value_by_section_string(s, "speed", &tmp);
}
if (strcmp(tmp, "auto") == 0) {
*value = "Auto";
}
@ -1234,32 +1245,37 @@ int set_lan_eth_iface_cfg_duplexmode(char *refparam, struct dmctx *ctx, int acti
{
char *m, *spch, *rate, *val = NULL;
struct ldethargs *ethargs = (struct ldethargs *)ctx->args;
struct uci_section *s, *sec;
switch (action) {
case VALUECHECK:
return 0;
case VALUESET:
uci_foreach_option_eq("ports", "ethport", "ifname", ethargs->eth, s) {
sec = s;
break;
}
if (strcasecmp(value, "auto") == 0) {
dmuci_set_value("ports", "@ethports[0]", ethargs->eth, "auto");
dmuci_set_value_by_section(sec, "speed", "auto");
return 0;
}
dmuci_get_option_value_string("ports", "@ethports[0]", ethargs->eth, &m);
dmuci_get_value_by_section_string(sec, "speed", &m);
m = dmstrdup(m);
rate = m;
if (strcmp(rate, "auto") == 0)
if (strcasecmp(rate, "auto") == 0)
rate = "100";
else {
strtok_r(rate, "FHfh", &spch);
}
if (strcmp(value, "full") == 0)
if (strcasecmp(value, "full") == 0)
dmastrcat(&val, rate, "FD");
else if (strcmp(value, "half") == 0)
else if (strcasecmp(value, "half") == 0)
dmastrcat(&val, rate, "HD");
else {
dmfree(m);
return 0;
}
dmuci_set_value("ports", "@ethports[0]", ethargs->eth, val);
dmuci_set_value_by_section(sec, "speed", val);
dmfree(m);
dmfree(val);
return 0;

2
dm/dmtree/tr181/ethernet.c
View file

@ -137,7 +137,7 @@ int set_eth_port_maxbitrate(char *refparam, struct dmctx *ctx, int action, char
return 0;
case VALUESET:
if (strcasecmp(value, "disabled") == 0 ) {
dmuci_set_value_by_section(cur_eth_port_args.eth_port_sec, "speed", value);
dmuci_set_value_by_section(cur_eth_port_args.eth_port_sec, "speed", "disabled");
} else if (strcasecmp(value, "auto") == 0 || strcmp(value, "-1") == 0) {
dmuci_set_value_by_section(cur_eth_port_args.eth_port_sec, "speed", "auto");
} else {