remove unnecessary param associations

fix #8 and fix #18

Makefile

@@ -8,7 +8,7 @@ LUCI_TITLE:=LuCI for Tailscale
 LUCI_DEPENDS:=+tailscale
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.3
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

htdocs/luci-static/resources/view/tailscale/setting.js

@@ -151,7 +151,7 @@ return view.extend({
 
 		s.tab('advance',_('Advanced Settings'));
 
-		o = s.taboption('advance',form.Flag, 'acceptRoutes', _('Auto Mesh'), _('Accept subnet routes that other nodes advertise.'));
+		o = s.taboption('advance',form.Flag, 'acceptRoutes', _('Accept Routes'), _('Accept subnet routes that other nodes advertise.'));
 		o.default = o.disabled;
 		o.rmempty = false;
 

po/templates/tailscale.pot

@@ -34,7 +34,7 @@ msgid "Auth Key"
 msgstr ""
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150
-msgid "Auto Mesh"
+msgid "Accept Routes"
 msgstr ""
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:185

po/zh_Hans/tailscale.po

@@ -29,7 +29,7 @@ msgstr "参数列表"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:148
 msgid "Advanced Settings"
-msgstr "高级选项"
+msgstr "高级设置"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:99
 msgid "Are you sure you want to logout and unbind the current device?"
@@ -40,16 +40,16 @@ msgid "Auth Key"
 msgstr "认证密钥"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150
-msgid "Auto Mesh"
-msgstr "自动组网"
+msgid "Accept Routes"
+msgstr "启用路由"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:185
 msgid "Available flags"
 msgstr "可用参数"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:113
 msgid "Basic Settings"
-msgstr "基础选项"
+msgstr "基础设置"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:108
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:122
@@ -82,7 +82,7 @@ msgstr "广播子网路由至 Tailscale，例如：<code>10.0.0.0/24</code>。"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:183
 msgid "Extra Settings"
-msgstr "附加选项"
+msgstr "附加设置"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:134
 msgid "Firewall Mode"

po/zh_Hant/tailscale.po

@@ -29,7 +29,7 @@ msgstr "參數列表"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:148
 msgid "Advanced Settings"
-msgstr "高級選項"
+msgstr "高級設置"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:99
 msgid "Are you sure you want to logout and unbind the current device?"
@@ -40,16 +40,16 @@ msgid "Auth Key"
 msgstr "認證密鑰"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150
-msgid "Auto Mesh"
-msgstr "自動組網"
+msgid "Accept Routes"
+msgstr "啟用路由"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:185
 msgid "Available flags"
 msgstr "可用參數"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:113
 msgid "Basic Settings"
-msgstr "基礎選項"
+msgstr "基礎設置"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:108
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:122
@@ -82,7 +82,7 @@ msgstr "廣播子網路由至 Tailscale，例如：<code>10.0.0.0/24</code>。"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:183
 msgid "Extra Settings"
-msgstr "附加選項"
+msgstr "附加設置"
 
 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:134
 msgid "Firewall Mode"

root/etc/init.d/tailscale

@@ -45,7 +45,7 @@ custom_instance() {
 	[ "$acceptDNS" = "0" ] && ARGS="$ARGS --accept-dns=false"
 	[ "$advertiseExitNode" = "1" ] && ARGS="$ARGS --advertise-exit-node"
 	[ -n "$advertiseRoutes" ] && ARGS="$ARGS --advertise-routes=$advertiseRoutes"
-	[ "$s2s" = "1" ] && ARGS="$ARGS --snat-subnet-routes=false --stateful-filtering=false"
+	[ "$s2s" = "1" ] && ARGS="$ARGS --snat-subnet-routes=false"
 	[ -n "$flags" ] && ARGS="$ARGS $flags"
 	[ -n "$loginServer" ] && ARGS="$ARGS --login-server=$loginServer"
 	[ -n "$authkey" ] && ARGS="$ARGS --authkey=$authkey"
@@ -86,8 +86,8 @@ custom_instance() {
 			fi
 		fi
 
-		config_get_bool acceptRoutes $cfg 'acceptRoutes'
-		if [ "$acceptRoutes" == "1" ];  then
+		config_get access $cfg 'access'
+		if [ -n "$access" ];  then
 			if [ -z "$(uci -q get firewall.tszone)" ];  then
 				uci set firewall.tszone='zone'
 				uci set firewall.tszone.input='ACCEPT'
@@ -101,7 +101,6 @@ custom_instance() {
 			uci -q delete firewall.tszone
 		fi
 
-		config_get access $cfg 'access'
 		if [ "${access//tsfwlan/}" != "$access" ]; then
 			uci set firewall.tsfwlan=forwarding
 			uci set firewall.tsfwlan.dest='lan'