Merge branch 'test' into develop

luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua

@@ -505,6 +505,11 @@ function wizard_add()
 	ucic:set("openmptcprouter","settings","mptcpovervpn",mptcpovervpn_vpn)
 	ucic:save("openmptcprouter")
 
+	-- Get Country
+	local country = luci.http.formvalue("country") or "world"
+	ucic:set("openmptcprouter","settings","country",country)
+	ucic:save("openmptcprouter")
+
 	-- Get Proxy set by default
 	local default_proxy = luci.http.formvalue("default_proxy") or "shadowsocks"
 	if default_proxy == "shadowsocks" and serversnb > 0 and serversnb > disablednb then

luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm

@@ -250,16 +250,16 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
 					var title = String.format("%s (%s)", _('Direct output'), mArray.openmptcprouter.wan_addr6);
 					statusMessageClass = "warning";
 					statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
-				} else if (mArray.openmptcprouter.ss_addr != "" && mArray.openmptcprouter.vps_status != "DOWN")
+				} else if (mArray.openmptcprouter.proxy_addr != "" && mArray.openmptcprouter.vps_status != "DOWN")
 				{
-					var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.ss_addr);
+					var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.proxy_addr);
 				} else if (mArray.openmptcprouter.external_check == false) {
 					var title = String.format("%s ?", mArray.openmptcprouter.vps_hostname);
 				} else {
 					var title = '<%:No output%>';
 					statusMessage += '<%:No output%>' + '<br/>';
 				}
-				if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.wan_addr6 == "" && mArray.openmptcprouter.ss_addr == "" && mArray.openmptcprouter.external_check == true)
+				if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.wan_addr6 == "" && mArray.openmptcprouter.proxy_addr == "" && mArray.openmptcprouter.external_check == true)
 				{
 					statusMessage += '<%:No server IP address, No WAN IP address%>' + '<br/>';
 				}
@@ -279,10 +279,10 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
 					if (mArray.openmptcprouter.vps_status == "DOWN")
 					{
 						statusMessage += '<%:Can\'t ping server%>' + '<br/>';
-					} else if (mArray.openmptcprouter.shadowsocks_enabled == true && mArray.openmptcprouter.ss_addr == "" && mArray.openmptcprouter.external_check == true)
+					} else if (mArray.openmptcprouter.shadowsocks_enabled == true && mArray.openmptcprouter.proxy_addr == "" && mArray.openmptcprouter.external_check == true)
 					{
 						statusMessage += '<%:Can\'t get public IP address from ShadowSocks%>' + '<br/>';
-					} else if (mArray.openmptcprouter.v2ray_enabled == true && mArray.openmptcprouter.ss_addr == "" && mArray.openmptcprouter.external_check == true)
+					} else if (mArray.openmptcprouter.v2ray_enabled == true && mArray.openmptcprouter.proxy_addr == "" && mArray.openmptcprouter.external_check == true)
 					{
 						statusMessage += '<%:Can\'t get public IP address from V2Ray%>' + '<br/>';
 					} else if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.wan_addr6 == "" && mArray.openmptcprouter.external_check == true)

luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm

@@ -147,9 +147,9 @@
 	    </div>
 	</fieldset>
 	<fieldset class="cbi-section" id="server_common">
-	    <legend><%:Common server settings%></legend>
+	    <legend><%:Advanced settings%></legend>
 	    <div class="cbi-value">
-		<label class="cbi-value-title"><%:Advanced settings%></label>
+		<label class="cbi-value-title"><%:Show advanced settings%></label>
 		<div class="cbi-value-field">
 		    <input type="checkbox" class="cbi-input-checkbox" id="showadv" value="1" onclick="jsshowadv()" />
 		</div>
@@ -382,6 +382,24 @@
 		</div>
 	    </div>
 	</fieldset>
+	<fieldset class="cbi-section" id="country">
+	    <legend><%:Country settings%></legend>
+	    <div class="cbi-section-descr"><%:Set configuration for countries with some specificities.%></div>
+	    <div class="cbi-value">
+		<label class="cbi-value-title"><%:Country%></label>
+		<div class="cbi-value-field">
+		    <select class="cbi-input-select" name="country" size="1">
+			<option value="" <% if uci:get("openmptcprouter","settings","country") == nil then %>selected="selected"<% end %>><%:None%></option>
+			<option value="world" <% if uci:get("openmptcprouter","settings","country") == "world" then %>selected="selected"<% end %>><%:World%></option>
+			<option value="china" <% if uci:get("openmptcprouter","settings","country") == "china" then %>selected="selected"<% end %>><%:China%></option>
+		    </select>
+		    <br />
+		    <div class="cbi-value-description">
+		        <%:For China, set an accessible DNS and disable DNSSEC.%>
+		    </div>
+		</div>
+	    </div>
+	</fieldset>
 	</span>
 	<hr />
 	<fieldset class="cbi-section" id="laninterfaces">

luci-app-openmptcprouter/root/etc/init.d/openmptcprouter

@@ -135,6 +135,24 @@ start_service() {
 	sed -i -e '/tcp_fin_timeout/d' -e '/tcp_keepalive_time/d' -e '/nf_conntrack_max/d' -e '/tcp_syn_retries/d' -e '/tcp_fastopen/d' -e '/tcp_retries2/d' -e '/tcp_retries1/d' -e '/ip_default_ttl/d' /etc/sysctl.conf
 	sed -i -e '/tcp_fin_timeout/d' -e '/tcp_keepalive_time/d' -e '/nf_conntrack_max/d' -e '/tcp_syn_retries/d' -e '/tcp_fastopen/d' -e '/tcp_retries2/d' -e '/tcp_retries1/d' -e '/ip_default_ttl/d' /etc/sysctl.d/10-default.conf
 
+	if [ "$(uci -q get openmptcprouter.settings.country)" = "china" ] && [ -n "$(uci -q get dhcp.@dnsmasq[0].server | grep '127.0.0.1#5353')" ]; then
+		uci -q batch <<-EOF > /dev/null
+			del_list dhcp.@dnsmasq[0].server='127.0.0.1#5353'
+			add_list dhcp.@dnsmasq[0].server='114.114.114.114'
+			set dhcp.@dnsmasq[0].dnsseccheckunsigned='0'
+			delete dhcp.@dnsmasq[0].dnssec='1'
+			commit dhcp
+		EOF
+	elif [ "$(uci -q get openmptcprouter.settings.country)" = "world" ] && [ -n "$(uci -q get dhcp.@dnsmasq[0].server | grep '114.114.114.114')" ]; then
+		uci -q batch <<-EOF > /dev/null
+			add_list dhcp.@dnsmasq[0].server='127.0.0.1#5353'
+			del_list dhcp.@dnsmasq[0].server='114.114.114.114'
+			set dhcp.@dnsmasq[0].dnsseccheckunsigned='1'
+			set dhcp.@dnsmasq[0].dnssec='1'
+			commit dhcp
+		EOF
+	fi
+
 	if [ "$(uci -q get rpcd.@rpcd[0].socket)" != "/var/run/ubus/ubus.sock" ]; then
 		uci -q batch <<-EOF >/dev/null
 			set rpcd.@rpcd[0].socket='/var/run/ubus/ubus.sock'

luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter

@@ -772,7 +772,7 @@ function interfaces_status()
 		mArray.openmptcprouter["ipv6"] = "enabled"
 	end
 
-	mArray.openmptcprouter["ss_addr"] = ""
+	mArray.openmptcprouter["proxy_addr"] = ""
 	--mArray.openmptcprouter["ss_addr6"] = ""
 	mArray.openmptcprouter["wan_addr"] = ""
 	mArray.openmptcprouter["wan_addr6"] = ""
@@ -808,15 +808,15 @@ function interfaces_status()
 			mArray.openmptcprouter["external_check"] = false
 		end
 		-- shadowsocksaddr
-		mArray.openmptcprouter["ss_addr"] = uci:get("openmptcprouter","omr","detected_ss_ipv4") or ""
-		if mArray.openmptcprouter["ss_addr"] == "" and mArray.openmptcprouter["service_addr"] ~= "" then
+		mArray.openmptcprouter["proxy_addr"] = uci:get("openmptcprouter","omr","detected_ss_ipv4") or ""
+		if mArray.openmptcprouter["proxy_addr"] == "" and mArray.openmptcprouter["service_addr"] ~= "" then
 			tracker_ip = uci:get("shadowsocks-libev","tracker_sss0","local_address") or ""
 			if tracker_ip ~= "" then
 				local tracker_port = uci:get("shadowsocks-libev","tracker_sss0","local_port")
 				if mArray.openmptcprouter["external_check"] ~= false then
-					mArray.openmptcprouter["ss_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " " .. check_ipv4_website))
-					if mArray.openmptcprouter["ss_addr"] == "" then
-						mArray.openmptcprouter["ss_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " ifconfig.co"))
+					mArray.openmptcprouter["proxy_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " " .. check_ipv4_website))
+					if mArray.openmptcprouter["proxy_addr"] == "" then
+						mArray.openmptcprouter["proxy_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " ifconfig.co"))
 					end
 					--mArray.openmptcprouter["ss_addr6"] = sys.exec("curl -s -6 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ipv6.openmptcprouter.com")
 				end