Add conf-file option.

Luci add custom.conf
Bugfix for timer
Update address matching.

package/openwrt/control/conffiles

@@ -1 +1,3 @@
 /etc/config/smartdns
+/etc/smartdns/address.conf
+/etc/smartdns/custom.conf

package/openwrt/custom.conf

@@ -0,0 +1,11 @@
+# Add custom settings here.
+
+# set log level
+# log-level [level], level=error, warn, info, debug
+# log-level error
+
+# log-size k,m,g
+# log-size 128k
+
+# log-file /var/log/smartdns.log
+# log-num 2

package/openwrt/files/etc/init.d/smartdns

@@ -8,6 +8,7 @@ SERVICE_DAEMONIZE=1
 BASECONFIGFILE="/etc/smartdns/smartdns.conf"
 SMARTDNS_CONF="/var/etc/smartdns.conf"
 ADDRESS_CONF="/etc/smartdns/address.conf"
+CUSTOM_CONF="/etc/smartdns/custom.conf"
 SMARTDNS_CONF_TMP="${SMARTDNS_CONF}.tmp"
 
 set_iptable()
@@ -141,8 +142,8 @@ start_service() {
 
 	config_foreach load_server "server"
 
-	echo "# address" >> $SMARTDNS_CONF_TMP
-	grep "^ *address " $ADDRESS_CONF >> $SMARTDNS_CONF_TMP
+	echo "conf-file $ADDRESS_CONF" >> $SMARTDNS_CONF_TMP
+	echo "conf-file $CUSTOM_CONF" >> $SMARTDNS_CONF_TMP
 
 	config_get_bool "enabled" "$section" "enabled" '0'
 	mv $SMARTDNS_CONF_TMP $SMARTDNS_CONF

package/openwrt/make.sh

@@ -7,6 +7,7 @@ SMARTDNS_DIR=$CURR_DIR/../../
 SMARTDNS_BIN=$SMARTDNS_DIR/src/smartdns
 SMARTDNS_CONF=$SMARTDNS_DIR/etc/smartdns/smartdns.conf
 ADDRESS_CONF=$CURR_DIR/address.conf
+CUSTOM_CONF=$CURR_DIR/custom.conf
 
 showhelp()
 {
@@ -32,6 +33,7 @@ build()
 
     cp $SMARTDNS_CONF  $ROOT/root/etc/smartdns/
     cp $ADDRESS_CONF $ROOT/root/etc/smartdns/
+    cp $CUSTOM_CONF $ROOT/root/etc/smartdns/
     cp $CURR_DIR/files/etc $ROOT/root/ -af
     cp $SMARTDNS_BIN $ROOT/root/usr/sbin