';
+ var equipmentIcon = '
';
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%>' + ''; + } 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%>' + '
'; } else if (mArray.openmptcprouter.wan_addr == "" && mArray.openmptcprouter.external_check == true) { statusMessage += '<%:No WAN IP address detected in less than 1 second%>' + '
'; diff --git a/luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename b/luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename index 0d8c6a7cf..0928e0140 100644 --- a/luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename +++ b/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 diff --git a/luci-app-openmptcprouter/root/etc/sysctl.d/zzz_openmptcprouter.conf b/luci-app-openmptcprouter/root/etc/sysctl.d/zzz_openmptcprouter.conf index d759def1b..a6c46d370 100644 --- a/luci-app-openmptcprouter/root/etc/sysctl.d/zzz_openmptcprouter.conf +++ b/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 diff --git a/luci-app-shadowsocks-libev/.DS_Store b/luci-app-shadowsocks-libev/.DS_Store new file mode 100644 index 000000000..267ce486b Binary files /dev/null and b/luci-app-shadowsocks-libev/.DS_Store differ diff --git a/luci-app-shutdown/.DS_Store b/luci-app-shutdown/.DS_Store new file mode 100644 index 000000000..62557add9 Binary files /dev/null and b/luci-app-shutdown/.DS_Store differ diff --git a/luci-app-snmpd/.DS_Store b/luci-app-snmpd/.DS_Store new file mode 100644 index 000000000..e2117360d Binary files /dev/null and b/luci-app-snmpd/.DS_Store differ diff --git a/luci-app-status/.DS_Store b/luci-app-status/.DS_Store new file mode 100644 index 000000000..65c9b2afc Binary files /dev/null and b/luci-app-status/.DS_Store differ diff --git a/luci-app-status/luasrc/.DS_Store b/luci-app-status/luasrc/.DS_Store new file mode 100644 index 000000000..2e1d71256 Binary files /dev/null and b/luci-app-status/luasrc/.DS_Store differ diff --git a/luci-app-status/po/.DS_Store b/luci-app-status/po/.DS_Store new file mode 100644 index 000000000..e7ef5ed90 Binary files /dev/null and b/luci-app-status/po/.DS_Store differ diff --git a/luci-base/.DS_Store b/luci-base/.DS_Store new file mode 100644 index 000000000..a6395ef94 Binary files /dev/null and b/luci-base/.DS_Store differ diff --git a/luci-theme-openmptcprouter/.DS_Store b/luci-theme-openmptcprouter/.DS_Store new file mode 100644 index 000000000..25181bc59 Binary files /dev/null and b/luci-theme-openmptcprouter/.DS_Store differ diff --git a/luci-theme-openmptcprouter/htdocs/.DS_Store b/luci-theme-openmptcprouter/htdocs/.DS_Store new file mode 100644 index 000000000..40450b903 Binary files /dev/null and b/luci-theme-openmptcprouter/htdocs/.DS_Store differ diff --git a/luci-theme-openmptcprouter/htdocs/luci-static/.DS_Store b/luci-theme-openmptcprouter/htdocs/luci-static/.DS_Store new file mode 100644 index 000000000..3736afdac Binary files /dev/null and b/luci-theme-openmptcprouter/htdocs/luci-static/.DS_Store differ diff --git a/luci-theme-openmptcprouter/htdocs/luci-static/resources/.DS_Store b/luci-theme-openmptcprouter/htdocs/luci-static/resources/.DS_Store new file mode 100644 index 000000000..642bdd0eb Binary files /dev/null and b/luci-theme-openmptcprouter/htdocs/luci-static/resources/.DS_Store differ diff --git a/luci-theme-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/.DS_Store b/luci-theme-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/.DS_Store new file mode 100644 index 000000000..b27391782 Binary files /dev/null and b/luci-theme-openmptcprouter/htdocs/luci-static/resources/openmptcprouter/.DS_Store differ diff --git a/mptcp/.DS_Store b/mptcp/.DS_Store new file mode 100644 index 000000000..7f3055402 Binary files /dev/null and b/mptcp/.DS_Store differ diff --git a/mptcp/files/.DS_Store b/mptcp/files/.DS_Store new file mode 100644 index 000000000..f177d78c7 Binary files /dev/null and b/mptcp/files/.DS_Store differ diff --git a/mptcp/files/usr/.DS_Store b/mptcp/files/usr/.DS_Store new file mode 100644 index 000000000..5d49eab18 Binary files /dev/null and b/mptcp/files/usr/.DS_Store differ diff --git a/mptcp/files/usr/share/.DS_Store b/mptcp/files/usr/share/.DS_Store new file mode 100644 index 000000000..509554931 Binary files /dev/null and b/mptcp/files/usr/share/.DS_Store differ diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking index d837d2623..15d729cec 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking +++ b/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") diff --git a/omr-6in4/.DS_Store b/omr-6in4/.DS_Store new file mode 100644 index 000000000..7c7a4bd74 Binary files /dev/null and b/omr-6in4/.DS_Store differ diff --git a/omr-6in4/files/etc/init.d/omr-6in4 b/omr-6in4/files/etc/init.d/omr-6in4 index e9898170c..9d22cabb2 100755 --- a/omr-6in4/files/etc/init.d/omr-6in4 +++ b/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 diff --git a/omr-tracker/.DS_Store b/omr-tracker/.DS_Store new file mode 100644 index 000000000..0706c24e1 Binary files /dev/null and b/omr-tracker/.DS_Store differ diff --git a/omr-tracker/files/.DS_Store b/omr-tracker/files/.DS_Store new file mode 100644 index 000000000..5d05dc450 Binary files /dev/null and b/omr-tracker/files/.DS_Store differ diff --git a/openmptcprouter/.DS_Store b/openmptcprouter/.DS_Store new file mode 100644 index 000000000..005211b26 Binary files /dev/null and b/openmptcprouter/.DS_Store differ diff --git a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn index 371936b56..201c4c226 100755 --- a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn +++ b/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 diff --git a/v2ray-core/.DS_Store b/v2ray-core/.DS_Store new file mode 100644 index 000000000..a65233b50 Binary files /dev/null and b/v2ray-core/.DS_Store differ diff --git a/v2ray-core/files/etc/init.d/v2ray b/v2ray-core/files/etc/init.d/v2ray index 3e4b38c64..98aacf26e 100755 --- a/v2ray-core/files/etc/init.d/v2ray +++ b/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