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

TR-181: Remove deprecated Device.Hosts.Host.{i}. parameters: AddressSource, LeaseTimeRemaining

Browse source 
- These parameters are obsolete in TR-181 2.14
This commit is contained in:
Amin Ben Ramdhane 2020-11-16 10:15:03 +01:00
parent 63f866e4de
commit 91879726a6
5 changed files with 1 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dmtree/tr181/hosts-iopsyswrt.c
View file

@ -102,14 +102,6 @@ int os__get_HostsHost_IPAddress(char *refparam, struct dmctx *ctx, void *data, c
return 0;
}
/*#Device.Hosts.Host.{i}.AddressSource!UBUS:router.network/hosts//hosts[@i-1].addrsrc*/
int os__get_HostsHost_AddressSource(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
*value = dmjson_get_value((json_object *)data, 1, "addrsrc");
*value = (strcmp(*value, "dhcp") == 0) ? "DHCP" : "Static";
return 0;
}
int os__get_HostsHost_DHCPClient(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
char *linker = dmjson_get_value((json_object *)data, 1, "macaddr");
@ -119,13 +111,6 @@ int os__get_HostsHost_DHCPClient(char *refparam, struct dmctx *ctx, void *data,
return 0;
}
/*#Device.Hosts.Host.{i}.LeaseTimeRemaining!UBUS:router.network/hosts//hosts[@i-1].leasetmrmn*/
int os__get_HostsHost_LeaseTimeRemaining(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
*value = dmjson_get_value((json_object *)data, 1, "leasetmrmn");
return 0;
}
int os__get_HostsHost_AssociatedDevice(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
char *linker = dmjson_get_value((json_object *)data, 1, "macaddr");

10
dmtree/tr181/hosts-openwrt.c
View file

@ -50,21 +50,11 @@ int os__get_HostsHost_IPAddress(char *refparam, struct dmctx *ctx, void *data, c
return not_implemented(value);
}
int os__get_HostsHost_AddressSource(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
return not_implemented(value);
}
int os__get_HostsHost_DHCPClient(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
return not_implemented(value);
}
int os__get_HostsHost_LeaseTimeRemaining(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
return not_implemented(value);
}
int os__get_HostsHost_AssociatedDevice(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
return not_implemented(value);

2
dmtree/tr181/hosts.c
View file

@ -37,9 +37,7 @@ DMLEAF tHostsHostParams[] = {
/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
{"PhysAddress", &DMREAD, DMT_STRING, os__get_HostsHost_PhysAddress, NULL, NULL, NULL, BBFDM_BOTH},
{"IPAddress", &DMREAD, DMT_STRING, os__get_HostsHost_IPAddress, NULL, NULL, NULL, BBFDM_BOTH},
{"AddressSource", &DMREAD, DMT_STRING, os__get_HostsHost_AddressSource, NULL, NULL, NULL, BBFDM_BOTH},
{"DHCPClient", &DMREAD, DMT_STRING, os__get_HostsHost_DHCPClient, NULL, NULL, NULL, BBFDM_BOTH},
{"LeaseTimeRemaining", &DMREAD, DMT_INT, os__get_HostsHost_LeaseTimeRemaining, NULL, NULL, NULL, BBFDM_BOTH},
{"AssociatedDevice", &DMREAD, DMT_STRING, os__get_HostsHost_AssociatedDevice, NULL, NULL, NULL, BBFDM_BOTH},
{"Layer1Interface", &DMREAD, DMT_STRING, os__get_HostsHost_Layer1Interface, NULL, NULL, NULL, BBFDM_BOTH},
{"Layer3Interface", &DMREAD, DMT_STRING, os__get_HostsHost_Layer3Interface, NULL, NULL, NULL, BBFDM_BOTH},

2
dmtree/tr181/os.h
View file

@ -39,9 +39,7 @@ int get_linker_host(char *refparam, struct dmctx *dmctx, void *data, char *insta
int os__get_Hosts_HostNumberOfEntries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value);
int os__get_HostsHost_PhysAddress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value);
int os__get_HostsHost_IPAddress(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value);
int os__get_HostsHost_AddressSource(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value);
int os__get_HostsHost_DHCPClient(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value);
int os__get_HostsHost_LeaseTimeRemaining(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value);
int os__get_HostsHost_AssociatedDevice(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value);
int os__get_HostsHost_Layer1Interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value);
int os__get_HostsHost_Layer3Interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value);

57
json/tr181.json
View file

@ -54427,17 +54427,6 @@
"Static",
"AutoIP",
"None"
],
"mapping": [
{
"type": "ubus",
"ubus": {
"object": "router.network",
"method": "hosts",
"args": {},
"key": "hosts[@i-1].addrsrc"
}
}
]
},
"DHCPClient": {
@ -54469,18 +54458,7 @@
"min": -1
}
],
"unit": "seconds",
"mapping": [
{
"type": "ubus",
"ubus": {
"object": "router.network",
"method": "hosts",
"args": {},
"key": "hosts[@i-1].leasetmrmn"
}
}
]
"unit": "seconds"
},
"AssociatedDevice": {
"type": "string",
@ -54571,17 +54549,6 @@
{
"max": 255
}
],
"mapping": [
{
"type": "ubus",
"ubus": {
"object": "router.network",
"method": "hosts",
"args": {},
"key": "hosts[@i-1].dhcpopts.vcid"
}
}
]
},
"ClientID": {
@ -54597,17 +54564,6 @@
{
"max": 65535
}
],
"mapping": [
{
"type": "ubus",
"ubus": {
"object": "router.network",
"method": "hosts",
"args": {},
"key": "hosts[@i-1].dhcpopts.clid"
}
}
]
},
"UserClassID": {
@ -54623,17 +54579,6 @@
{
"max": 65535
}
],
"mapping": [
{
"type": "ubus",
"ubus": {
"object": "router.network",
"method": "hosts",
"args": {},
"key": "hosts[@i-1].dhcpopts.ucid"
}
}
]
},
"HostName": {