From 37b6092aef9f875b95debdafba7da9933fc10a34 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 31 Oct 2019 14:37:07 +0100 Subject: luci-base, luci-mod-network, luci-app-firewall: migrate luci/getHostHints Signed-off-by: Jo-Philipp Wich --- modules/luci-base/htdocs/luci-static/resources/network.js | 2 +- modules/luci-base/root/usr/libexec/rpcd/luci | 7 ------- modules/luci-base/root/usr/share/rpcd/acl.d/luci-base.json | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) (limited to 'modules/luci-base') diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js index 665024fd7e..ed14af4887 100644 --- a/modules/luci-base/htdocs/luci-static/resources/network.js +++ b/modules/luci-base/htdocs/luci-static/resources/network.js @@ -68,7 +68,7 @@ var callLuciBoardJSON = rpc.declare({ }); var callLuciHostHints = rpc.declare({ - object: 'luci', + object: 'luci-rpc', method: 'getHostHints', expect: { '': {} } }); diff --git a/modules/luci-base/root/usr/libexec/rpcd/luci b/modules/luci-base/root/usr/libexec/rpcd/luci index 13a83dfd14..8a3e0b0c0f 100755 --- a/modules/luci-base/root/usr/libexec/rpcd/luci +++ b/modules/luci-base/root/usr/libexec/rpcd/luci @@ -166,13 +166,6 @@ local methods = { end }, - getHostHints = { - call = function() - local sys = require "luci.sys" - return sys.net.host_hints() - 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 5256c8bb2c..6f08cd7df9 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,8 +41,8 @@ "ubus": { "file": [ "list", "read", "stat" ], "iwinfo": [ "assoclist", "freqlist", "txpowerlist", "countrylist" ], - "luci": [ "getDUIDHints", "getHostHints", "getIfaddrs", "getInitList", "getLocaltime", "getTimezones", "getLEDs", "getNetworkDevices", "getUSBDevices", "getWirelessDevices", "getSwconfigFeatures", "getSwconfigPortState", "getBlockDevices", "getMountPoints" ], - "luci-rpc": [ "getBoardJSON", "getDHCPLeases" ], + "luci": [ "getDUIDHints", "getIfaddrs", "getInitList", "getLocaltime", "getTimezones", "getLEDs", "getNetworkDevices", "getUSBDevices", "getWirelessDevices", "getSwconfigFeatures", "getSwconfigPortState", "getBlockDevices", "getMountPoints" ], + "luci-rpc": [ "getBoardJSON", "getDHCPLeases", "getHostHints" ], "network.device": [ "status" ], "network.interface": [ "dump" ], "network": [ "get_proto_handlers" ], -- cgit v1.2.3