Merge branch 'pr/27' into test

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

@@ -448,14 +448,26 @@ function wizard_add()
 	-- 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
-		ucic:set("shadowsocks-libev","sss0","disabled","0")
+		--ucic:set("shadowsocks-libev","sss0","disabled","0")
 		ucic:set("v2ray","main","enabled","0")
+		ucic:foreach("shadowsocks-libev", "server", function(s)
+			local sectionname = s[".name"]
+			ucic:set("shadowsocks-libev",sectionname,"disabled","0")
+		end)
 	elseif default_proxy == "v2ray" and serversnb > 0 and serversnb > disablednb then
-		ucic:set("shadowsocks-libev","sss0","disabled","1")
+		--ucic:set("shadowsocks-libev","sss0","disabled","1")
 		ucic:set("v2ray","main","enabled","1")
+		ucic:foreach("shadowsocks-libev", "server", function(s)
+			local sectionname = s[".name"]
+			ucic:set("shadowsocks-libev",sectionname,"disabled","1")
+		end)
 	else
-		ucic:set("shadowsocks-libev","sss0","disabled","1")
+		--ucic:set("shadowsocks-libev","sss0","disabled","1")
 		ucic:set("v2ray","main","enabled","0")
+		ucic:foreach("shadowsocks-libev", "server", function(s)
+			local sectionname = s[".name"]
+			ucic:set("shadowsocks-libev",sectionname,"disabled","1")
+		end)
 	end
 	ucic:set("openmptcprouter","settings","proxy",default_proxy)
 	ucic:save("openmptcprouter")
@@ -719,6 +731,7 @@ function wizard_add()
 
 	-- Restart all
 	if gostatus == true then
+		luci.sys.call("/etc/init.d/macvlan restart >/dev/null 2>/dev/null")
 		luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null")
 		luci.sys.call("/etc/init.d/omr-tracker stop >/dev/null 2>/dev/null")
 		luci.sys.call("/etc/init.d/mptcp restart >/dev/null 2>/dev/null")
@@ -800,7 +813,8 @@ function settings_add()
 	
 	-- Disable IPv6
 	local disable_ipv6 = luci.http.formvalue("enableipv6") or "1"
-	local dump = require("luci.util").ubus("openmptcprouter", "disableipv6", { disable_ipv6 = tonumber(disable_ipv6)})
+	ucic:set("openmptcprouter","settings","disable_ipv6",disable_ipv6)
+	--local dump = require("luci.util").ubus("openmptcprouter", "disableipv6", { disable_ipv6 = tonumber(disable_ipv6)})
 
 	-- Enable/disable external check
 	local externalcheck = luci.http.formvalue("externalcheck") or "1"
@@ -897,6 +911,7 @@ function settings_add()
 
 	-- Apply all settings
 	luci.sys.call("/etc/init.d/openmptcprouter restart >/dev/null 2>/dev/null")
+	luci.sys.call("/etc/init.d/omr-6in4 restart >/dev/null 2>/dev/null")
 
 	-- Done, redirect
 	luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/settings"))

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

@@ -103,7 +103,7 @@
 					}
 				}
 				temp += '<tr><td></td></tr><tr><td><a href="#" id="omr">';
-				var equipmentIcon = '<img src="<%=resource%>/overthebox.png" style:"top: 0px;" />';
+				var equipmentIcon = '<img src="<%=resource%>/openmptcprouter.png" style:"top: 0px;" />';
 				var title = String.format("%s (%s)", mArray.openmptcprouter.hostname, mArray.openmptcprouter.local_addr);
 				var statusMessageClass = "";
 				var statusIcon = "<%=resource%>/openmptcprouter/images/statusOK.png";
@@ -266,6 +266,9 @@
 					} else if (mArray.openmptcprouter.shadowsocks_enabled == true && mArray.openmptcprouter.ss_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)
+					{
+						statusMessage += '<%:Can\'t get public IP address from V2Ray%>' + '<br/>';
 					} else if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.external_check == true)
 					{
 						statusMessage += '<%:No WAN IP address detected in less than 1 second%>' + '<br/>';

luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename

@@ -32,6 +32,7 @@ _set_intf_name() {
 					ip link set ${ifname} up
 					[ "$existif" = "1" ] && ip link set ${ifname}tmp ${$INTERFACE}
 				fi
+			fi
 		elif [ -f /dev/${DEVICE_NAME} ] && [ -n "$MODALIAS" ] && [ "$modalias" = "$MODALIAS" ]; then
 			if [ "$device" != "/dev/${DEVICE_NAME}" ]; then
 				ln -s /dev/${DEVICE_NAME} /dev/$intfname

luci-app-openmptcprouter/root/etc/sysctl.d/zzz_openmptcprouter.conf

@@ -1,5 +1,4 @@
 net.ipv4.tcp_keepalive_time=7200
-net.ipv6.conf.all.disable_ipv6=0
 net.ipv4.tcp_fin_timeout=60
 net.ipv4.tcp_syn_retries=3
 net.ipv4.tcp_retries1=3

mptcp/files/usr/share/omr/post-tracking.d/post-tracking

@@ -671,26 +671,28 @@ if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.lc)" = "" ] || [ $(($(
 		[ -n "$asn" ] && {
 			uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.asn="$asn"
 		}
-		if [ -n "$(uci -q get network.$OMR_TRACKER_INTERFACE.mtu)" ]; then
-			mtu=$(uci -q get network.$OMR_TRACKER_INTERFACE.mtu)
-			[ -n "$mtu" ] && {
-				uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.mtu=$mtu
-				ip link set dev $OMR_TRACKER_DEVICE mtu $mtu > /dev/null 2>&1
-			}
-		else
-			[ -n "$serverip" ] && [ "$serverip" != "127.0.0.1" ] && {
-				local mtu=$(omr-mtu $OMR_TRACKER_DEVICE_IP $serverip)
+		if [ "$OMR_TRACKER_INTERFACE" != "omrvpn" ] && [ "$(uci -q get glorytun.vpn.enable)" != "1" ]; then
+			if [ -n "$(uci -q get network.$OMR_TRACKER_INTERFACE.mtu)" ]; then
+				mtu=$(uci -q get network.$OMR_TRACKER_INTERFACE.mtu)
 				[ -n "$mtu" ] && {
 					uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.mtu=$mtu
 					ip link set dev $OMR_TRACKER_DEVICE mtu $mtu > /dev/null 2>&1
 				}
-			} || {
-				local mtu=$(omr-mtu $OMR_TRACKER_DEVICE_IP 1.1.1.1)
-				[ -n "$mtu" ] && {
-					uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.mtu=$mtu
-					ip link set dev $OMR_TRACKER_DEVICE mtu $mtu > /dev/null 2>&1
+			else
+				[ -n "$serverip" ] && [ "$serverip" != "127.0.0.1" ] && {
+					local mtu=$(omr-mtu $OMR_TRACKER_DEVICE_IP $serverip)
+					[ -n "$mtu" ] && {
+						uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.mtu=$mtu
+						ip link set dev $OMR_TRACKER_DEVICE mtu $mtu > /dev/null 2>&1
+					}
+				} || {
+					local mtu=$(omr-mtu $OMR_TRACKER_DEVICE_IP 1.1.1.1)
+					[ -n "$mtu" ] && {
+						uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.mtu=$mtu
+						ip link set dev $OMR_TRACKER_DEVICE mtu $mtu > /dev/null 2>&1
+					}
 				}
-			}
+			fi
 		fi
 		uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.state='up'
 		uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.lc=$(date +"%s")

omr-6in4/files/etc/init.d/omr-6in4

@@ -22,6 +22,7 @@ set_ipv6_state() {
 	#sysctl -qw net.ipv6.conf.all.disable_ipv6=$disable_ipv6
 	#sed -i "s:^net.ipv6.conf.all.disable_ipv6=[0-9]*:net.ipv6.conf.all.disable_ipv6=$disable_ipv6:" /etc/sysctl.d/zzz_openmptcprouter.conf
 	sed -i "s:^net.ipv6.conf.all.disable_ipv6=[0-9]*::" /etc/sysctl.d/zzz_openmptcprouter.conf
+	sysctl -qw net.ipv6.conf.all.disable_ipv6=0
 
 	uci -q batch <<-EOF >/dev/null
 		set firewall.@defaults[0].disable_ipv6=$disable_ipv6
@@ -100,8 +101,9 @@ set_ipv6_state() {
 
 start_service() {
 	[ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ] && [ "$(uci -q get network.lan.ipv6)" != "1" ] && set_ipv6_state
-	[ "$(uci -q get openmptcprouter.settings.disable_ipv6)" = "1" ] && {
+	[ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "0" ] && {
 		ifdown omr6in4
+		/etc/init.d/odhcpd stop
 		return
 	}
 	[ "$(ifstatus omr6in4 | jsonfilter -e '@.up' | tr -d '\n')" != "true" ] && ifup omr6in4

openmptcprouter/files/etc/uci-defaults/2020-omr-vpn

@@ -24,6 +24,13 @@ if [ "$(uci -q get glorytun.vpn.localip)" = "10.0.0.2" ]; then
 	EOF
 fi
 
+if [ "$(uci -q get network.omrvpn.txqueuelen)" = "1000" ]; then
+	uci -q batch <<-EOF >/dev/null
+		set network.omrvpn.txqueuelen=100
+		commit network
+	EOF
+fi
+
 if [ "$(uci -q get openvpn.omr.proto)" != "tcp-client" ]; then
 	uci -q batch <<-EOF >/dev/null
 		set openvpn.omr=openvpn

v2ray-core/files/etc/init.d/v2ray

@@ -414,7 +414,7 @@ add_v2ray_redirect_rules() {
 
 	# This part need a rewrite
 	v2ray-rules -l ${port} -L ${port} -s $OUTBOUND_SERVERS_V4 --rule-name def --src-default forward --dst-default forward --local-default forward
-	v2ray-rules6 -l $((port+1)) -L $((port+1)) --rule-name def --src-default forward --dst-default forward --local-default forward
+	[ "$(uci -q get v2ray.main.inbounds | grep omr6)" != "" ] && v2ray-rules6 -l $((port+1)) -L $((port+1)) --rule-name def --src-default forward --dst-default forward --local-default forward
 	[ -f /etc/init.d/omr-bypass ] && {
 		logger -t "v2ray" "Reload omr-bypass rules"
 		/etc/init.d/omr-bypass reload_rules