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

T#8433: IPv6Enable does not disable ipv6 for the required interface

Browse source
This commit is contained in:
Amin Ben Ramdhane 2022-08-08 10:33:26 +00:00
parent 9f8c5f5f28
commit 2ea3d2b52e
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dmtree/json/tr181.json
View file

@ -50515,7 +50515,7 @@
"uci": {
"file": "network",
"section": {
"type": "interface",
"type": "device",
"index": "@i-1"
},
"option": {

19
dmtree/tr181/ip.c
View file

@ -1232,15 +1232,24 @@ static int set_IPInterface_IPv4Enable(char *refparam, struct dmctx *ctx, void *d
return 0;
}
/*#Device.IP.Interface.{i}.IPv6Enable!UCI:network/interface,@i-1/ipv6*/
/*#Device.IP.Interface.{i}.IPv6Enable!UCI:network/device,@i-1/ipv6*/
static int get_IPInterface_IPv6Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
*value = dmuci_get_value_by_section_fallback_def((struct uci_section *)data, "ipv6", "1");
char *device = NULL;
dmuci_get_value_by_section_string((struct uci_section *)data, "device", &device);
if (DM_STRLEN(device)) {
struct uci_section *device_s = get_dup_section_in_config_opt("network", "device", "name", device);
*value = device_s ? dmuci_get_value_by_section_fallback_def(device_s, "ipv6", "1") : "1";
} else {
*value = "1";
}
return 0;
}
static int set_IPInterface_IPv6Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
char *device = NULL;
bool b;
switch (action) {
@ -1250,7 +1259,11 @@ static int set_IPInterface_IPv6Enable(char *refparam, struct dmctx *ctx, void *d
break;
case VALUESET:
string_to_bool(value, &b);
dmuci_set_value_by_section((struct uci_section *)data, "ipv6", b ? "1" : "0");
dmuci_get_value_by_section_string((struct uci_section *)data, "device", &device);
if (DM_STRLEN(device)) {
struct uci_section *device_s = get_dup_section_in_config_opt("network", "device", "name", device);
if (device_s) dmuci_set_value_by_section(device_s, "ipv6", b ? "1" : "0");
}
break;
}
return 0;