diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-10-31 15:01:26 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-11-01 12:03:33 +0100 |
| commit | 6e633b3ed29edcbe6ce8d0bafaf064fe2e6c2c03 (patch) | |
| tree | 6cb4353349f9c84734ab57938a5f738bd04b8369 /modules/luci-base/root/usr | |
| parent | cc1cbdaf3296bf8360c68127aadae46f08e66e1f (diff) | |
luci-base: consolidate network.js data acquisition
The new luci-rpc/getNetworkDevices procedure offers netdev enumeration
with included IPv4 and IPv6 address information as well as 64bit traffic
counters, so we can remove the calls to network.device/status and
luci/getIfaddrs now as we're able to obtain all info from a single source.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-base/root/usr')
| -rwxr-xr-x | modules/luci-base/root/usr/libexec/rpcd/luci | 6 | ||||
| -rw-r--r-- | modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json | 3 |
2 files changed, 1 insertions, 8 deletions
diff --git a/modules/luci-base/root/usr/libexec/rpcd/luci b/modules/luci-base/root/usr/libexec/rpcd/luci index ae504fd3e3..4eb62d2152 100755 --- a/modules/luci-base/root/usr/libexec/rpcd/luci +++ b/modules/luci-base/root/usr/libexec/rpcd/luci @@ -160,12 +160,6 @@ local methods = { end }, - getIfaddrs = { - call = function() - return { result = nixio.getifaddrs() } - end - }, - getDUIDHints = { call = function() local fp = io.open('/var/hosts/odhcpd') diff --git a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json index 8b47aa83f3..d801f0168f 100644 --- a/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json +++ b/modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json @@ -41,9 +41,8 @@ "ubus": { "file": [ "list", "read", "stat" ], "iwinfo": [ "assoclist", "freqlist", "txpowerlist", "countrylist" ], - "luci": [ "getDUIDHints", "getIfaddrs", "getInitList", "getLocaltime", "getTimezones", "getLEDs", "getUSBDevices", "getSwconfigFeatures", "getSwconfigPortState", "getBlockDevices", "getMountPoints" ], + "luci": [ "getDUIDHints", "getInitList", "getLocaltime", "getTimezones", "getLEDs", "getUSBDevices", "getSwconfigFeatures", "getSwconfigPortState", "getBlockDevices", "getMountPoints" ], "luci-rpc": [ "getBoardJSON", "getDHCPLeases", "getHostHints", "getNetworkDevices", "getWirelessDevices" ], - "network.device": [ "status" ], "network.interface": [ "dump" ], "network": [ "get_proto_handlers" ], "system": [ "validate_firmware_image" ], |