diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm index b616b2191..03d88add2 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm @@ -241,7 +241,7 @@
- <%:Set the default Proxy used for TCP when ShadowSocks is enabled, for TCP and UDP when V2Ray VLESS or VMESS is enabled.%> + <%:Set the default Proxy used for TCP when ShadowSocks is enabled, for TCP and UDP when V2Ray VLESS, VMESS or Trojan is enabled.%> <%:Only ShadowSocks is supported with server multiple IPs for now.%>
diff --git a/v2ray-core/files/etc/init.d/v2ray b/v2ray-core/files/etc/init.d/v2ray index 1c122c897..7adbfa052 100755 --- a/v2ray-core/files/etc/init.d/v2ray +++ b/v2ray-core/files/etc/init.d/v2ray @@ -448,7 +448,7 @@ add_v2ray_redirect_rules() { v2ray-rules -f #logger -t "v2ray" "v2ray-rules -l ${port} -L ${port} -s $OUTBOUND_SERVERS_V4 --rule-name def --src-default forward --dst-default forward --local-default forward" commandline="-l ${port} -s $OUTBOUND_SERVERS_V4 --rule-name def --src-default forward --dst-default forward --local-default forward" - [ "$(uci -q get v2ray.main_transparent_proxy.redirect_udp)" = "1" ] && ([ "$(uci -q get v2ray.omrout.protocol)" = "vless" ] || [ "$(uci -q get v2ray.omrout.protocol)" = "vmess" ]) && commandline="$commandline -L ${port}" + [ "$(uci -q get v2ray.main_transparent_proxy.redirect_udp)" = "1" ] && [ "$(uci -q get v2ray.omrout.protocol)" != "socks" ] && commandline="$commandline -L ${port}" v2ray-rules $commandline [ "$(uci -q get v2ray.main.inbounds | grep omr6)" != "" ] && [ -n "$OUTBOUND_SERVERS_V6" ] && { v2ray-rules6 -f @@ -1885,7 +1885,7 @@ init_transparent_proxy() { TRANSPARENT_PROXY_PORT="$redirect_port" TRANSPARENT_PROXY_USE_TPROXY="$use_tproxy" - if [ "x$redirect_udp" = "x1" ] && [ "$(uci -q get v2ray.omrout.protocol)" != "trojan" ] && [ "$(uci -q get v2ray.omrout.protocol)" != "socks" ]; then + if [ "x$redirect_udp" = "x1" ] && [ "$(uci -q get v2ray.omrout.protocol)" != "socks" ]; then TRANSPARENT_PROXY_ADDITION="udp" elif [ "x$redirect_dns" = "x1" ] ; then TRANSPARENT_PROXY_ADDITION="dns" diff --git a/v2ray-core/files/etc/uci-defaults/3010-omr-v2ray b/v2ray-core/files/etc/uci-defaults/3010-omr-v2ray index e72351856..df545a5b6 100644 --- a/v2ray-core/files/etc/uci-defaults/3010-omr-v2ray +++ b/v2ray-core/files/etc/uci-defaults/3010-omr-v2ray @@ -6,7 +6,7 @@ if [ -z "$(uci -q get v2ray.main)" ]; then set v2ray.main=v2ray set v2ray.main.v2ray_file='/usr/bin/v2ray' set v2ray.main.mem_percentage='0' - set v2ray.main.loglevel='debug' + set v2ray.main.loglevel='error' set v2ray.main.access_log='/dev/null' set v2ray.main.error_log='/dev/null' set v2ray.main.enabled='0' @@ -30,7 +30,7 @@ if [ -z "$(uci -q get v2ray.main)" ]; then set v2ray.main_transparent_proxy.proxy_mode='default' set v2ray.main_transparent_proxy.apnic_delegated_mirror='apnic' set v2ray.main_transparent_proxy.gfwlist_mirror='github' - set v2ray.main_transparent_proxy.redirect_udp='1' + set v2ray.main_transparent_proxy.redirect_udp='0' set v2ray.main_transparent_proxy.redirect_port='1897' set v2ray.omrout=outbound set v2ray.omrout.tag='omrout_tunnel' @@ -197,5 +197,4 @@ if [ "$(uci -q get v2ray.omrout.s_socks_port)" = "" ]; then EOF fi -fi exit 0 \ No newline at end of file diff --git a/v2ray-core/patches/add-mptcp-support.patch b/v2ray-core/patches/add-mptcp-support.patch index 4878679da..85ba7a316 100644 --- a/v2ray-core/patches/add-mptcp-support.patch +++ b/v2ray-core/patches/add-mptcp-support.patch @@ -2444,7 +2444,7 @@ index 729899015..41f70be7b 100644 + if x != nil { + return x.Mptcp + } -+ return false ++ return true +} + var File_transport_internet_config_proto protoreflect.FileDescriptor