nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-wan-dnsmasq: allow configuring static DNS servers

Browse Source
This commit is contained in:
Matthias Schiffer 2014-08-09 14:29:24 +02:00
parent 488ed1bdd7
commit d8f0c531c9
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-wan-dnsmasq/files/etc/config/gluon-wan-dnsmasq Normal file
View File

@ -0,0 +1,2 @@
config 'static'
# list 'server' '192.168.0.1' # Example

2
package/gluon-wan-dnsmasq/files/etc/init.d/gluon-wan-dnsmasq
View File

@ -16,7 +16,7 @@ RESOLV_CONF=$RESOLV_CONF_DIR/resolv.conf
start() { start() {
mkdir -p $RESOLV_CONF_DIR mkdir -p $RESOLV_CONF_DIR
touch $RESOLV_CONF /lib/gluon/wan-dnsmasq/update.lua
LD_PRELOAD=libpacketmark.so LIBPACKETMARK_MARK=$PACKET_MARK service_start /usr/sbin/dnsmasq -x $SERVICE_PID_FILE -u root -i lo -p $PORT -h -r $RESOLV_CONF LD_PRELOAD=libpacketmark.so LIBPACKETMARK_MARK=$PACKET_MARK service_start /usr/sbin/dnsmasq -x $SERVICE_PID_FILE -u root -i lo -p $PORT -h -r $RESOLV_CONF
} }

18
package/gluon-wan-dnsmasq/files/lib/gluon/wan-dnsmasq/update.lua
View File

@ -5,21 +5,31 @@ local RESOLV_CONF = RESOLV_CONF_DIR .. '/resolv.conf'
local ubus = require('ubus').connect() local ubus = require('ubus').connect()
local uci = require('luci.model.uci').cursor()
local fs = require 'nixio.fs' local fs = require 'nixio.fs'
local function write_servers(f, iface) local function write_servers(f, servers)
local servers = ubus:call('network.interface.' .. iface, 'status', {}).inactive['dns-server']
for _, server in ipairs(servers) do for _, server in ipairs(servers) do
f:write('nameserver ', server, '\n') f:write('nameserver ', server, '\n')
end end
end end
local function write_interface_servers(f, iface)
write_servers(f, ubus:call('network.interface.' .. iface, 'status', {}).inactive['dns-server'])
end
fs.mkdirr(RESOLV_CONF_DIR) fs.mkdirr(RESOLV_CONF_DIR)
local f = io.open(RESOLV_CONF, 'w+') local f = io.open(RESOLV_CONF, 'w+')
pcall(write_servers, f, 'wan6') local static = uci:get_first('gluon-wan-dnsmasq', 'static', 'server')
pcall(write_servers, f, 'wan')
if type(static) == 'table' and #static > 0 then
write_servers(f, static)
else
pcall(write_interface_servers, f, 'wan6')
pcall(write_interface_servers, f, 'wan')
end
f:close() f:close()