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 487e01ad5..f1f354957 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking +++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking @@ -951,30 +951,30 @@ if [ "$multipath_config" = "on" ] || [ "$multipath_config" = "backup" ]; then if [ "$OMR_TRACKER_DEVICE_IP" != "" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.vpn)" != "1" ] && [ "$(pgrep glorytun-udp)" != "" ] && [ "$(glorytun-udp path | grep $OMR_TRACKER_DEVICE_IP)" = "" ] && [ -n "$(resolveip -4 $serverip)" ]; then if [ "$download" != "0" ] && [ "$download" != "" ] && [ "$upload" != "0" ] && [ "$upload" != "" ]; then if [ "$(uci -q get glorytun-udp.vpn.rateauto)" = "1" ]; then - glorytun-udp path addr $OMR_TRACKER_DEVICE_IP to addr $serverip dev ${gtudp_dev} port ${gtudp_port} set up rate auto tx $((upload*1000/8)) rx $((download*1000/8)) pref 1 > /dev/null 2>&1 + glorytun-udp path addr $OMR_TRACKER_DEVICE_IP to addr $serverip port ${gtudp_port} dev ${gtudp_dev} set up rate auto tx $((upload*1000/8)) rx $((download*1000/8)) pref 1 > /dev/null 2>&1 else - glorytun-udp path addr $OMR_TRACKER_DEVICE_IP to addr $serverip dev ${gtudp_dev} port ${gtudp_port} set up rate fixed tx $((upload*1000/8)) rx $((download*1000/8)) pref 1 > /dev/null 2>&1 + glorytun-udp path addr $OMR_TRACKER_DEVICE_IP to addr $serverip port ${gtudp_port} dev ${gtudp_dev} set up rate fixed tx $((upload*1000/8)) rx $((download*1000/8)) pref 1 > /dev/null 2>&1 fi else if [ "$(uci -q get glorytun-udp.vpn.rateauto)" = "1" ]; then - glorytun-udp path addr $OMR_TRACKER_DEVICE_IP to addr $serverip dev ${gtudp_dev} port ${gtudp_port} set up rate auto tx 12500000 rx 12500000 pref 1 > /dev/null 2>&1 + glorytun-udp path addr $OMR_TRACKER_DEVICE_IP to addr $serverip port ${gtudp_port} dev ${gtudp_dev} set up rate auto tx 12500000 rx 12500000 pref 1 > /dev/null 2>&1 else - glorytun-udp path addr $OMR_TRACKER_DEVICE_IP to addr $serverip dev ${gtudp_dev} port ${gtudp_port} set up rate fixed tx 12500000 rx 12500000 pref 1 > /dev/null 2>&1 + glorytun-udp path addr $OMR_TRACKER_DEVICE_IP to addr $serverip port ${gtudp_port} dev ${gtudp_dev} set up rate fixed tx 12500000 rx 12500000 pref 1 > /dev/null 2>&1 fi fi fi if [ "$OMR_TRACKER_DEVICE_IP6" != "" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.vpn)" != "1" ] && [ "$(pgrep glorytun-udp)" != "" ] && [ "$(glorytun-udp path | grep $OMR_TRACKER_DEVICE_IP6)" = "" ] && [ -n "$(resolveip -6 $serverip)" ]; then if [ "$download" != "0" ] && [ "$download" != "" ] && [ "$upload" != "0" ] && [ "$upload" != "" ]; then if [ "$(uci -q get glorytun-udp.vpn.rateauto)" = "1" ]; then - glorytun-udp path addr $OMR_TRACKER_DEVICE_IP6 to addr $serverip dev ${gtudp_dev} port ${gtudp_port} set up rate auto tx $((upload*1000/8)) rx $((download*1000/8)) pref 1 > /dev/null 2>&1 + glorytun-udp path addr $OMR_TRACKER_DEVICE_IP6 to addr $serverip port ${gtudp_port} dev ${gtudp_dev} set up rate auto tx $((upload*1000/8)) rx $((download*1000/8)) pref 1 > /dev/null 2>&1 else - glorytun-udp path addr $OMR_TRACKER_DEVICE_IP6 to addr $serverip dev ${gtudp_dev} port ${gtudp_port} set up rate fixed tx $((upload*1000/8)) rx $((download*1000/8)) pref 1 > /dev/null 2>&1 + glorytun-udp path addr $OMR_TRACKER_DEVICE_IP6 to addr $serverip port ${gtudp_port} dev ${gtudp_dev} set up rate fixed tx $((upload*1000/8)) rx $((download*1000/8)) pref 1 > /dev/null 2>&1 fi else if [ "$(uci -q get glorytun-udp.vpn.rateauto)" = "1" ]; then - glorytun-udp path addr $OMR_TRACKER_DEVICE_IP6 to addr $serverip dev ${gtudp_dev} port ${gtudp_port} set up rate auto tx 12500000 rx 12500000 pref 1 > /dev/null 2>&1 + glorytun-udp path addr $OMR_TRACKER_DEVICE_IP6 to addr $serverip port ${gtudp_port} dev ${gtudp_dev} set up rate auto tx 12500000 rx 12500000 pref 1 > /dev/null 2>&1 else - glorytun-udp path addr $OMR_TRACKER_DEVICE_IP6 to addr $serverip dev ${gtudp_dev} port ${gtudp_port} set up rate fixed tx 12500000 rx 12500000 pref 1 > /dev/null 2>&1 + glorytun-udp path addr $OMR_TRACKER_DEVICE_IP6 to addr $serverip port ${gtudp_port} dev ${gtudp_dev} set up rate fixed tx 12500000 rx 12500000 pref 1 > /dev/null 2>&1 fi fi fi diff --git a/shadowsocks-v2ray-plugin/Makefile b/shadowsocks-v2ray-plugin/Makefile index 47c86fc93..9c0e125fd 100644 --- a/shadowsocks-v2ray-plugin/Makefile +++ b/shadowsocks-v2ray-plugin/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git #PKG_SOURCE_URL:=https://github.com/shadowsocks/v2ray-plugin.git PKG_SOURCE_URL:=https://github.com/teddysun/v2ray-plugin.git #PKG_SOURCE_VERSION:=63a74bef9e9f639bc199255db9d452d96f01d11a -PKG_SOURCE_VERSION:=8d3ee91a84691a0a6b1823eb15a89a303a5bc3cf +PKG_SOURCE_VERSION:=6c0c5fb15851e13b36fe2eeaaba97fd27c9d291b PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 diff --git a/v2ray-core/Makefile b/v2ray-core/Makefile index 4b7cfb71a..7fb4219d3 100644 --- a/v2ray-core/Makefile +++ b/v2ray-core/Makefile @@ -9,16 +9,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-core -PKG_VERSION:=4.34.0 +PKG_VERSION:=4.35.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/v2fly/v2ray-core/archive/v$(PKG_VERSION) -PKG_HASH:=b250f569cb0369f394f63184e748f1df0c90500feb8a1bf2276257c4c8b81bee +PKG_HASH:=ef469a99c7db8596f8556478b478e2701ce2783af9affb7f3cb28201718e7d35 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Xingwang Liao +PKG_MAINTAINER:=Yannick Chabanois PKG_CONFIG_DEPENDS := \ CONFIG_V2RAY_JSON_V2CTL \ @@ -55,7 +55,7 @@ PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 -GO_PKG:=v2ray.com/core +GO_PKG:=github.com/v2fly/v2ray-core/v4 GO_PKG_LDFLAGS:=-s -w include $(INCLUDE_DIR)/package.mk @@ -63,7 +63,7 @@ include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk define Package/v2ray-core TITLE:=A platform for building proxies - URL:=https://www.v2ray.com + URL:=https://www.v2fly.org SECTION:=net CATEGORY:=Network SUBMENU:=Project V @@ -85,132 +85,132 @@ V2RAY_SED_ARGS:= ifeq ($(CONFIG_V2RAY_JSON_INTERNAL),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/main\/json"/\/\/ &/; \ - /\/\/ _ "v2ray.com\/core\/main\/jsonem"/s/\/\/ //; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/main\/json"/\/\/ &/; \ + /\/\/ _ "github.com\/v2fly\/v2ray-core\/v4\/main\/jsonem"/s/\/\/ //; else ifeq ($(CONFIG_V2RAY_JSON_NONE),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/main\/json"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/main\/json"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_CUSTOM),y) ifeq ($(CONFIG_V2RAY_DISABLE_DNS),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/app\/dns"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/app\/dns"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_LOG),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/app\/log"/\/\/ &/; \ - s/_ "v2ray.com\/core\/app\/log\/command"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/app\/log"/\/\/ &/; \ + s/_ "github.com\/v2fly\/v2ray-core\/v4\/app\/log\/command"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_POLICY),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/app\/policy"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/app\/policy"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_REVERSE),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/app\/reverse"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/app\/reverse"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_ROUTING),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/app\/router"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/app\/router"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_STATISTICS),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/app\/stats"/\/\/ &/; \ - s/_ "v2ray.com\/core\/app\/stats\/command"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/app\/stats"/\/\/ &/; \ + s/_ "github.com\/v2fly\/v2ray-core\/v4\/app\/stats\/command"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_BLACKHOLE_PROTO),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/proxy\/blackhole"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/proxy\/blackhole"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_DNS_PROXY),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/proxy\/dns"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/proxy\/dns"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_DOKODEMO_PROTO),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/proxy\/dokodemo"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/proxy\/dokodemo"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_FREEDOM_PROTO),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/proxy\/freedom"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/proxy\/freedom"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_MTPROTO_PROXY),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/proxy\/mtproto"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/proxy\/mtproto"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_HTTP_PROTO),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/proxy\/http"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/proxy\/http"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_SHADOWSOCKS_PROTO),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/proxy\/shadowsocks"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/proxy\/shadowsocks"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_SOCKS_PROTO),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/proxy\/socks"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/proxy\/socks"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_VMESS_PROTO),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/proxy\/vmess\/inbound"/\/\/ &/; \ - s/_ "v2ray.com\/core\/proxy\/vmess\/outbound"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/proxy\/vmess\/inbound"/\/\/ &/; \ + s/_ "github.com\/v2fly\/v2ray-core\/v4\/proxy\/vmess\/outbound"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_TCP_TRANS),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/transport\/internet\/tcp"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/transport\/internet\/tcp"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_MKCP_TRANS),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/transport\/internet\/kcp"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/transport\/internet\/kcp"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_WEBSOCKET_TRANS),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/transport\/internet\/websocket"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/transport\/internet\/websocket"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_HTTP2_TRANS),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/transport\/internet\/http"/\/\/ &/; \ - s/_ "v2ray.com\/core\/transport\/internet\/headers\/http"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/transport\/internet\/http"/\/\/ &/; \ + s/_ "github.com\/v2fly\/v2ray-core\/v4\/transport\/internet\/headers\/http"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_DOMAIN_SOCKET_TRANS),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/transport\/internet\/domainsocket"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/transport\/internet\/domainsocket"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_QUIC_TRANS),y) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/transport\/internet\/quic"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/transport\/internet\/quic"/\/\/ &/; endif ifeq ($(CONFIG_V2RAY_DISABLE_MKCP_TRANS)$(CONFIG_V2RAY_DISABLE_QUIC_TRANS),yy) V2RAY_SED_ARGS += \ - s/_ "v2ray.com\/core\/transport\/internet\/headers\/noop"/\/\/ &/; \ - s/_ "v2ray.com\/core\/transport\/internet\/headers\/srtp"/\/\/ &/; \ - s/_ "v2ray.com\/core\/transport\/internet\/headers\/tls"/\/\/ &/; \ - s/_ "v2ray.com\/core\/transport\/internet\/headers\/utp"/\/\/ &/; \ - s/_ "v2ray.com\/core\/transport\/internet\/headers\/wechat"/\/\/ &/; \ - s/_ "v2ray.com\/core\/transport\/internet\/headers\/wireguard"/\/\/ &/; + s/_ "github.com\/v2fly\/v2ray-core\/v4\/transport\/internet\/headers\/noop"/\/\/ &/; \ + s/_ "github.com\/v2fly\/v2ray-core\/v4\/transport\/internet\/headers\/srtp"/\/\/ &/; \ + s/_ "github.com\/v2fly\/v2ray-core\/v4\/transport\/internet\/headers\/tls"/\/\/ &/; \ + s/_ "github.com\/v2fly\/v2ray-core\/v4\/transport\/internet\/headers\/utp"/\/\/ &/; \ + s/_ "github.com\/v2fly\/v2ray-core\/v4\/transport\/internet\/headers\/wechat"/\/\/ &/; \ + s/_ "github.com\/v2fly\/v2ray-core\/v4\/transport\/internet\/headers\/wireguard"/\/\/ &/; endif endif @@ -260,7 +260,7 @@ endif endef define Build/Compile - $(eval GO_PKG_BUILD_PKG:=v2ray.com/core/main) + $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/main) $(call GoPackage/Build/Compile) mv -f $(GO_PKG_BUILD_BIN_DIR)/main $(GO_PKG_BUILD_BIN_DIR)/v2ray @@ -269,7 +269,7 @@ ifeq ($(CONFIG_V2RAY_COMPRESS_UPX),y) endif ifneq ($(CONFIG_V2RAY_EXCLUDE_V2CTL),y) - $(eval GO_PKG_BUILD_PKG:=v2ray.com/core/infra/control/main) + $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/infra/control/main) $(call GoPackage/Build/Compile) mv -f $(GO_PKG_BUILD_BIN_DIR)/main $(GO_PKG_BUILD_BIN_DIR)/v2ctl