From 359b0af7ae0395a35c9294752db929263897b7b2 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Wed, 31 Dec 2025 10:06:59 +0800 Subject: [PATCH] Remove tun2socks and related dependencies --- .github/workflows/build.yml | 20 +++--- .gitmodules | 6 -- badvpn | 1 - compile-tun2socks.sh | 32 ---------- libancillary | 1 - tun2socks.mk | 124 ------------------------------------ 6 files changed, 10 insertions(+), 174 deletions(-) delete mode 160000 badvpn delete mode 100644 compile-tun2socks.sh delete mode 160000 libancillary delete mode 100644 tun2socks.mk diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e644dd9af..965328c6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,26 +38,26 @@ jobs: \ ndkVersion = "28.2.13676358"' ${{ github.workspace }}/V2rayNG/app/build.gradle.kts - - name: Restore cached libtun2socks - id: cache-libtun2socks-restore + - name: Restore cached libhevtun + id: cache-libhevtun-restore uses: actions/cache/restore@v4 with: path: ${{ github.workspace }}/libs - key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}-${{ hashFiles('compile-tun2socks.sh') }}--${{ hashFiles('compile-hevtun.sh') }} + key: libhevtun-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('compile-hevtun.sh') }} - - name: Build libtun2socks - if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true' + - name: Build libhevtun + if: steps.cache-libhevtun-restore.outputs.cache-hit != 'true' run: | - bash compile-tun2socks.sh && bash compile-hevtun.sh + bash compile-hevtun.sh - - name: Save libtun2socks - if: steps.cache-libtun2socks-restore.outputs.cache-hit != 'true' + - name: Save libhevtun + if: steps.cache-libhevtun-restore.outputs.cache-hit != 'true' uses: actions/cache/save@v4 with: path: ${{ github.workspace }}/libs - key: libtun2socks-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('.git/modules/badvpn/HEAD') }}-${{ hashFiles('.git/modules/libancillary/HEAD') }}-${{ hashFiles('compile-tun2socks.sh') }}--${{ hashFiles('compile-hevtun.sh') }} + key: libhevtun-${{ runner.os }}-${{ env.NDK_HOME }}-${{ hashFiles('.git/modules/hev-socks5-tunnel/HEAD') }}-${{ hashFiles('compile-hevtun.sh') }} - - name: Copy libtun2socks + - name: Copy libhevtun run: | cp -r ${{ github.workspace }}/libs ${{ github.workspace }}/V2rayNG/app diff --git a/.gitmodules b/.gitmodules index 873f22c76..0e9eca3ee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,12 +4,6 @@ [submodule "AndroidLibXrayLite"] path = AndroidLibXrayLite url = https://github.com/2dust/AndroidLibXrayLite -[submodule "badvpn"] - path = badvpn - url = https://github.com/XTLS/badvpn -[submodule "libancillary"] - path = libancillary - url = https://github.com/shadowsocks/libancillary [submodule "hev-socks5-tunnel"] path = hev-socks5-tunnel url = https://github.com/heiher/hev-socks5-tunnel diff --git a/badvpn b/badvpn deleted file mode 160000 index e68480088..000000000 --- a/badvpn +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e68480088a48c8930d29f54e30e9d6deaaf32c47 diff --git a/compile-tun2socks.sh b/compile-tun2socks.sh deleted file mode 100644 index c0db62186..000000000 --- a/compile-tun2socks.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -set -o errexit -set -o pipefail -set -o nounset -# Set magic variables for current file & dir -__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -__file="${__dir}/$(basename "${BASH_SOURCE[0]}")" -__base="$(basename ${__file} .sh)" -if [[ ! -d $NDK_HOME ]]; then - echo "Android NDK: NDK_HOME not found. please set env \$NDK_HOME" - exit 1 -fi -TMPDIR=$(mktemp -d) -clear_tmp () { - rm -rf $TMPDIR -} -trap 'echo -e "Aborted, error $? in command: $BASH_COMMAND"; trap ERR; clear_tmp; exit 1' ERR INT -install -m644 $__dir/tun2socks.mk $TMPDIR/ -pushd $TMPDIR -ln -s $__dir/badvpn badvpn -ln -s $__dir/libancillary libancillary -$NDK_HOME/ndk-build \ - NDK_PROJECT_PATH=. \ - APP_BUILD_SCRIPT=./tun2socks.mk \ - APP_ABI=all \ - APP_PLATFORM=android-21 \ - NDK_LIBS_OUT=$TMPDIR/libs \ - NDK_OUT=$TMPDIR/tmp \ - APP_SHORT_COMMANDS=false LOCAL_SHORT_COMMANDS=false -B -j4 -cp -r $TMPDIR/libs $__dir/ -popd -rm -rf $TMPDIR diff --git a/libancillary b/libancillary deleted file mode 160000 index 232d69a5e..000000000 --- a/libancillary +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 232d69a5ebb4461b572bd3f3b97088091e01c243 diff --git a/tun2socks.mk b/tun2socks.mk deleted file mode 100644 index 1fab134e5..000000000 --- a/tun2socks.mk +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright (C) 2009 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -LOCAL_PATH := $(call my-dir) -ROOT_PATH := $(LOCAL_PATH) -######################################################## -## libancillary -######################################################## -include $(CLEAR_VARS) -ANCILLARY_SOURCE := fd_recv.c fd_send.c -LOCAL_MODULE := libancillary -#LOCAL_CFLAGS += -I$(LOCAL_PATH)/libancillary -LOCAL_C_INCLUDES := $(LOCAL_PATH)/libancillary -LOCAL_SRC_FILES := $(addprefix libancillary/, $(ANCILLARY_SOURCE)) -include $(BUILD_STATIC_LIBRARY) -######################################################## -## tun2socks -######################################################## -include $(CLEAR_VARS) -LOCAL_CFLAGS := -std=gnu99 -LOCAL_CFLAGS += -DBADVPN_THREADWORK_USE_PTHREAD -DBADVPN_LINUX -DBADVPN_BREACTOR_BADVPN -D_GNU_SOURCE -LOCAL_CFLAGS += -DBADVPN_USE_SIGNALFD -DBADVPN_USE_EPOLL -LOCAL_CFLAGS += -DBADVPN_LITTLE_ENDIAN -DBADVPN_THREAD_SAFE -LOCAL_CFLAGS += -DNDEBUG -DANDROID -LOCAL_CFLAGS += -I -LOCAL_STATIC_LIBRARIES := libancillary -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/badvpn/lwip/src/include/ipv4 \ - $(LOCAL_PATH)/badvpn/lwip/src/include/ipv6 \ - $(LOCAL_PATH)/badvpn/lwip/src/include \ - $(LOCAL_PATH)/badvpn/lwip/custom \ - $(LOCAL_PATH)/badvpn \ - $(LOCAL_PATH)/libancillary -TUN2SOCKS_SOURCES := \ - base/BLog_syslog.c \ - system/BReactor_badvpn.c \ - system/BSignal.c \ - system/BConnection_common.c \ - system/BConnection_unix.c \ - system/BTime.c \ - system/BUnixSignal.c \ - system/BNetwork.c \ - system/BDatagram_common.c \ - system/BDatagram_unix.c \ - flow/StreamRecvInterface.c \ - flow/PacketRecvInterface.c \ - flow/PacketPassInterface.c \ - flow/StreamPassInterface.c \ - flow/SinglePacketBuffer.c \ - flow/BufferWriter.c \ - flow/PacketBuffer.c \ - flow/PacketStreamSender.c \ - flow/PacketPassConnector.c \ - flow/PacketProtoFlow.c \ - flow/PacketPassFairQueue.c \ - flow/PacketProtoEncoder.c \ - flow/PacketProtoDecoder.c \ - socksclient/BSocksClient.c \ - tuntap/BTap.c \ - lwip/src/core/udp.c \ - lwip/src/core/memp.c \ - lwip/src/core/init.c \ - lwip/src/core/pbuf.c \ - lwip/src/core/tcp.c \ - lwip/src/core/tcp_out.c \ - lwip/src/core/netif.c \ - lwip/src/core/def.c \ - lwip/src/core/ip.c \ - lwip/src/core/mem.c \ - lwip/src/core/tcp_in.c \ - lwip/src/core/stats.c \ - lwip/src/core/inet_chksum.c \ - lwip/src/core/timeouts.c \ - lwip/src/core/ipv4/icmp.c \ - lwip/src/core/ipv4/igmp.c \ - lwip/src/core/ipv4/ip4_addr.c \ - lwip/src/core/ipv4/ip4_frag.c \ - lwip/src/core/ipv4/ip4.c \ - lwip/src/core/ipv4/autoip.c \ - lwip/src/core/ipv6/ethip6.c \ - lwip/src/core/ipv6/inet6.c \ - lwip/src/core/ipv6/ip6_addr.c \ - lwip/src/core/ipv6/mld6.c \ - lwip/src/core/ipv6/dhcp6.c \ - lwip/src/core/ipv6/icmp6.c \ - lwip/src/core/ipv6/ip6.c \ - lwip/src/core/ipv6/ip6_frag.c \ - lwip/src/core/ipv6/nd6.c \ - lwip/custom/sys.c \ - tun2socks/tun2socks.c \ - base/DebugObject.c \ - base/BLog.c \ - base/BPending.c \ - flowextra/PacketPassInactivityMonitor.c \ - tun2socks/SocksUdpGwClient.c \ - udpgw_client/UdpGwClient.c \ - socks_udp_client/SocksUdpClient.c -LOCAL_MODULE := tun2socks -LOCAL_LDLIBS := -ldl -llog -LOCAL_LDFLAGS=-Wl,--build-id=none -LOCAL_SRC_FILES := $(addprefix badvpn/, $(TUN2SOCKS_SOURCES)) -LOCAL_BUILD_SCRIPT := BUILD_EXECUTABLE -LOCAL_MAKEFILE := $(local-makefile) -$(call check-defined-LOCAL_MODULE,$(LOCAL_BUILD_SCRIPT)) -$(call check-LOCAL_MODULE,$(LOCAL_MAKEFILE)) -$(call check-LOCAL_MODULE_FILENAME) -# we are building target objects -my := TARGET_ -$(call handle-module-filename,lib,$(TARGET_SONAME_EXTENSION)) -$(call handle-module-built) -LOCAL_MODULE_CLASS := EXECUTABLE -include $(BUILD_SYSTEM)/build-module.mk