From 9f63ccc5f0d376d2102f25e38f2ee9a7a7529e04 Mon Sep 17 00:00:00 2001
From: tzmax <71716824+tzmax@users.noreply.github.com>
Date: Tue, 24 Jan 2023 07:30:20 +0800
Subject: [PATCH] feat: support tun mode
---
README.md | 49 +++++-
V2RayX/AdvancedWindow.xib | 32 ++--
V2RayX/AppDelegate.h | 4 +-
V2RayX/AppDelegate.m | 78 ++++++++-
V2RayX/Base.lproj/MainMenu.xib | 13 +-
V2RayX/TransportWindow.xib | 6 +-
V2RayX/dlcorex.sh | 2 +-
V2RayXS.xcodeproj/project.pbxproj | 58 ++++++-
.../Tun2socks.xcframework/Info.plist | 53 ++++++
.../ios-arm64/Tun2socks.framework/Headers | 1 +
.../ios-arm64/Tun2socks.framework/Modules | 1 +
.../ios-arm64/Tun2socks.framework/Resources | 1 +
.../ios-arm64/Tun2socks.framework/Tun2socks | 1 +
.../Versions/A/Headers/Tun2socks.h | 13 ++
.../Versions/A/Headers/Tun2socks.objc.h | 65 ++++++++
.../Versions/A/Headers/Universe.objc.h | 29 ++++
.../Versions/A/Headers/ref.h | 35 ++++
.../Versions/A/Modules/module.modulemap | 8 +
.../Versions/A/Resources/Info.plist | 6 +
.../Tun2socks.framework/Versions/A/Tun2socks | Bin 0 -> 3923632 bytes
.../Tun2socks.framework/Versions/Current | 1 +
.../Tun2socks.framework/Headers | 1 +
.../Tun2socks.framework/Modules | 1 +
.../Tun2socks.framework/Resources | 1 +
.../Tun2socks.framework/Tun2socks | 1 +
.../Versions/A/Headers/Tun2socks.h | 13 ++
.../Versions/A/Headers/Tun2socks.objc.h | 65 ++++++++
.../Versions/A/Headers/Universe.objc.h | 29 ++++
.../Versions/A/Headers/ref.h | 35 ++++
.../Versions/A/Modules/module.modulemap | 8 +
.../Versions/A/Resources/Info.plist | 6 +
.../Tun2socks.framework/Versions/A/Tun2socks | Bin 0 -> 7468344 bytes
.../Tun2socks.framework/Versions/Current | 1 +
.../Tun2socks.framework/Headers | 1 +
.../Tun2socks.framework/Modules | 1 +
.../Tun2socks.framework/Resources | 1 +
.../Tun2socks.framework/Tun2socks | 1 +
.../Versions/A/Headers/Tun2socks.h | 13 ++
.../Versions/A/Headers/Tun2socks.objc.h | 65 ++++++++
.../Versions/A/Headers/Universe.objc.h | 29 ++++
.../Versions/A/Headers/ref.h | 35 ++++
.../Versions/A/Modules/module.modulemap | 8 +
.../Versions/A/Resources/Info.plist | 6 +
.../Tun2socks.framework/Versions/A/Tun2socks | Bin 0 -> 6938112 bytes
.../Tun2socks.framework/Versions/Current | 1 +
v2rayx_sysconf/main.m | 157 +++++++++++++++++-
v2rayx_sysconf/route.h | 26 +++
v2rayx_sysconf/route.m | 86 ++++++++++
v2rayx_sysconf/sysconf_version.h | 2 +-
v2rayx_sysconf/tun.h | 14 ++
v2rayx_sysconf/tun.m | 68 ++++++++
51 files changed, 1083 insertions(+), 48 deletions(-)
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/Info.plist
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64/Tun2socks.framework/Headers
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64/Tun2socks.framework/Modules
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64/Tun2socks.framework/Resources
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64/Tun2socks.framework/Tun2socks
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64/Tun2socks.framework/Versions/A/Headers/Tun2socks.h
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64/Tun2socks.framework/Versions/A/Headers/Tun2socks.objc.h
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64/Tun2socks.framework/Versions/A/Headers/Universe.objc.h
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64/Tun2socks.framework/Versions/A/Headers/ref.h
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64/Tun2socks.framework/Versions/A/Modules/module.modulemap
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64/Tun2socks.framework/Versions/A/Resources/Info.plist
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64/Tun2socks.framework/Versions/A/Tun2socks
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64/Tun2socks.framework/Versions/Current
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64_x86_64-simulator/Tun2socks.framework/Headers
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64_x86_64-simulator/Tun2socks.framework/Modules
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64_x86_64-simulator/Tun2socks.framework/Resources
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64_x86_64-simulator/Tun2socks.framework/Tun2socks
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64_x86_64-simulator/Tun2socks.framework/Versions/A/Headers/Tun2socks.h
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64_x86_64-simulator/Tun2socks.framework/Versions/A/Headers/Tun2socks.objc.h
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64_x86_64-simulator/Tun2socks.framework/Versions/A/Headers/Universe.objc.h
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64_x86_64-simulator/Tun2socks.framework/Versions/A/Headers/ref.h
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64_x86_64-simulator/Tun2socks.framework/Versions/A/Modules/module.modulemap
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64_x86_64-simulator/Tun2socks.framework/Versions/A/Resources/Info.plist
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64_x86_64-simulator/Tun2socks.framework/Versions/A/Tun2socks
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/ios-arm64_x86_64-simulator/Tun2socks.framework/Versions/Current
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/macos-arm64_x86_64/Tun2socks.framework/Headers
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/macos-arm64_x86_64/Tun2socks.framework/Modules
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/macos-arm64_x86_64/Tun2socks.framework/Resources
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/macos-arm64_x86_64/Tun2socks.framework/Tun2socks
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/macos-arm64_x86_64/Tun2socks.framework/Versions/A/Headers/Tun2socks.h
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/macos-arm64_x86_64/Tun2socks.framework/Versions/A/Headers/Tun2socks.objc.h
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/macos-arm64_x86_64/Tun2socks.framework/Versions/A/Headers/Universe.objc.h
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/macos-arm64_x86_64/Tun2socks.framework/Versions/A/Headers/ref.h
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/macos-arm64_x86_64/Tun2socks.framework/Versions/A/Modules/module.modulemap
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/macos-arm64_x86_64/Tun2socks.framework/Versions/A/Resources/Info.plist
create mode 100644 v2rayx_sysconf/Tun2socks.xcframework/macos-arm64_x86_64/Tun2socks.framework/Versions/A/Tun2socks
create mode 120000 v2rayx_sysconf/Tun2socks.xcframework/macos-arm64_x86_64/Tun2socks.framework/Versions/Current
create mode 100644 v2rayx_sysconf/route.h
create mode 100644 v2rayx_sysconf/route.m
create mode 100644 v2rayx_sysconf/tun.h
create mode 100644 v2rayx_sysconf/tun.m
diff --git a/README.md b/README.md
index b7b8ee8..c231955 100644
--- a/README.md
+++ b/README.md
@@ -8,21 +8,50 @@
> This repo is based on the [Cenmrev/V2RayX](https://github.com/Cenmrev/V2RayX) project for maintenance and update, uses the [Xray-core](https://github.com/XTLS/Xray-core) implementation to support the VLESS and XTLS protocol, and the copyright of the application belongs to the original author [@Contents](https://github.com/Cenmrev). Pay tribute to [@Contents](https://github.com/Cenmrev), Thanks to the [@XTLS](https://github.com/XTLS) community and all contributors
+## What is XTLS? Xray?
-## What is V2Ray?
+**READ THIS**: [XTLS? Xray? V2Ray?](https://xtls.github.io).
-**READ THIS**: [Project V2Ray](http://www.v2ray.com).
+**YOU SHOULD READ XTLS'S OFFICIAL INSTRUCTION BEFORE USING V2RAYXS!**
-**YOU SHOULD READ V2RAY'S OFFICIAL INSTRUCTION BEFORE USING V2RAYX!**
+## What is Tun Mode? (Experimental)
-> ~~Other V2Ray clients on macOS: [V2RayU](https://github.com/yanue/v2rayu).
-(Not related to or endorsed by authors of this repo. USE AT YOUR OWN RISK. The project may have failed.)~~
+**Warn**: You must read this part of the document before using tun mode.
-## What is XTLS? Xray?
+First of all, please note that this function is an experimental function and is still under development and design. Due to the particularity of the tun mode, I hope you can use it after fully understanding it.
-**READ THIS**: [XTLS? Xray? V2Ray?](https://xtls.github.io).
+This mode adopts the tun2socks method to forward all traffic, realizes the creation of a utun virtual network card device, and transmits the traffic of the tun device to your server through the socks5 proxy, and then the application sets up the routing table, and sets the default gateway to this tun device (please Note that this step may cause the default gateway routing settings of your device to be damaged. Although I have done a backup and repair process in the application, I cannot guarantee that it will be effective on all devices, please use it with caution!)
+
+Finally, if you are interested in this technology, you can also try to contact me or submit a PR to help me improve this function. If you can recommend this software to friends or post a blog and be able to link this project in other post replies, I will Very happy 😋, thank you for your attention and contribution (Welcome to contribute documents in other languages)
+
+1. Please understand what transparent proxy is, if PAC mode and global mode can meet your needs, please try to use it
+
+2. You have a certain understanding of the computer network and can solve the network problem of your device independently
+
+### Have you encountered a problem?
+
+Q: After using tun mode, the device is disconnected from the network? (recommended reference this page [What is a transparent proxy?](https://xtls.github.io/Xray-docs-next/document/level-2/transparent_proxy/transparent_proxy.html))
+
+A: It may be that the route of the default gateway is broken. You can check your routing table by executing the `netstat -r` command through the device terminal. Normally, there will be a `default` route, as follows
+
+```
+tzmaxdeMacBookPro: tzmax$ netstat -r
+Routing tables
+
+Internet:
+Destination Gateway Flags Netif Expire
+default 192.168.1.1 UGScg en0
+127 localhost UCS lo0
+localhost localhost UH lo0
+………
+```
+
+Q: Which tun device does the V2RayXS create?
+
+A: The name of the tun device on macos will be determined by the system, but the tun device created by V2RayXS will be bound to the `10.0.0.0` network segment by default, which can be used as a reference to find
+
+for more questions, you can also check issues first, and submit issues if you do not find a solution.
-**YOU SHOULD READ XTLS'S OFFICIAL INSTRUCTION BEFORE USING V2RAYXS!**
## Download V2RayXS
Download from [Releases](https://github.com/tzmax/V2RayXS/releases).
@@ -80,6 +109,8 @@ So, to totally uninstall V2RayXS, just delete V2RayXS.app and the files above. :
## Acknowledge
+This repo is based on the [Cenmrev/V2RayX](https://github.com/Cenmrev/V2RayX) project for maintenance and update.
+
V2RayXS uses [GCDWebServer](https://github.com/swisspol/GCDWebServer) to provide a local pac server. V2RayXS also uses many ideas and codes from [ShadowsocksX](https://github.com/shadowsocks/shadowsocks-iOS/tree/master), especially, the codes of [v2rays_sysconfig](https://github.com/tzmax/V2RayXS/blob/master/v2rayx_sysconf/main.m) are simply copied from [shadowsocks_sysconf](https://github.com/shadowsocks/shadowsocks-iOS/blob/master/shadowsocks_sysconf/main.m) with some modifications.
## Donation
@@ -88,7 +119,7 @@ If Project V2Ray or V2RayX (V2RayXS) helped you, you can also help us by donatio
To donate to Project V2Ray, you may refer to [this page](https://www.v2ray.com/chapter_00/02_donate.html).
- To donate to Project Xray, you may refer to [this page](https://xtls.github.io/#%E5%B8%AE%E5%8A%A9-xray-%E5%8F%98%E5%BE%97%E6%9B%B4%E5%BC%BA).
+To donate to Project Xray, you may refer to [this page](https://xtls.github.io/#%E5%B8%AE%E5%8A%A9-xray-%E5%8F%98%E5%BE%97%E6%9B%B4%E5%BC%BA).
## Disclaimer
diff --git a/V2RayX/AdvancedWindow.xib b/V2RayX/AdvancedWindow.xib
index 7aa333d..03bb110 100644
--- a/V2RayX/AdvancedWindow.xib
+++ b/V2RayX/AdvancedWindow.xib
@@ -62,7 +62,7 @@
-
+
@@ -168,15 +168,15 @@ Gw
-
+
-
+
-
+
@@ -186,11 +186,11 @@ Gw
-
+
-
+
@@ -1059,18 +1059,18 @@ will match all private IPs.
-
+
-
+
-
+
-
+
@@ -1090,7 +1090,7 @@ will match all private IPs.
-
+
@@ -1127,18 +1127,18 @@ Gw
-
+
-
+
-
+
-
+
@@ -1158,7 +1158,7 @@ Gw
-
+
diff --git a/V2RayX/AppDelegate.h b/V2RayX/AppDelegate.h
index b115617..7bc9b1a 100644
--- a/V2RayX/AppDelegate.h
+++ b/V2RayX/AppDelegate.h
@@ -17,7 +17,8 @@
typedef enum ProxyMode : NSInteger{
pacMode,
globalMode,
- manualMode
+ manualMode,
+ tunMode
} ProxyMode;
@@ -91,6 +92,7 @@ int runCommandLine(NSString* launchPath, NSArray* arguments);
@property (weak) IBOutlet NSMenu *ruleSetMenuList;
@property (weak, nonatomic) IBOutlet NSMenuItem *globalModeItem;
@property (weak) IBOutlet NSMenuItem *manualModeItem;
+@property (weak) IBOutlet NSMenuItem *tunModeItem;
@property (weak, nonatomic) IBOutlet NSMenuItem *serversItem;
@property (weak, nonatomic) IBOutlet NSMenu *serverListMenu;
@property (weak, nonatomic) IBOutlet NSMenu *pacListMenu;
diff --git a/V2RayX/AppDelegate.m b/V2RayX/AppDelegate.m
index e4874e3..f042d87 100644
--- a/V2RayX/AppDelegate.m
+++ b/V2RayX/AppDelegate.m
@@ -84,7 +84,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
NSNumber* setingVersion = [[NSUserDefaults standardUserDefaults] objectForKey:@"setingVersion"];
if(setingVersion == nil || [setingVersion integerValue] != kV2RayXSettingVersion) {
NSAlert *noServerAlert = [[NSAlert alloc] init];
- [noServerAlert setMessageText:@"If you are running V2RayX for the first time, ignore this message. \nSorry, unknown settings!\nAll V2RayX settings will be reset."];
+ [noServerAlert setMessageText:@"If you are running V2RayXS for the first time, ignore this message. \nSorry, unknown settings!\nAll V2RayXS settings will be reset."];
[noServerAlert runModal];
[self writeDefaultSettings]; //explicitly write default settings to user defaults file
}
@@ -146,6 +146,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
_pacModeItem.tag = pacMode;
_globalModeItem.tag = globalMode;
_manualModeItem.tag = manualMode;
+ _tunModeItem.tag = tunMode;
// read defaults
[self readDefaults];
@@ -491,6 +492,10 @@ - (void)saveConfigInfo {
}
- (void)applicationWillTerminate:(NSNotification *)aNotification {
+ // close the tun device helper
+ if (proxyMode == tunMode) {
+ closeHelperApplicationTask();
+ }
//stop monitor pac
if (dispatchPacSource) {
dispatch_source_cancel(dispatchPacSource);
@@ -581,6 +586,7 @@ - (IBAction)didChangeStatus:(id)sender {
[self updateSystemProxy];
} else {
[self unloadV2ray];
+ closeHelperApplicationTask();
}
[self updateMenus];
[self updatePacMenuList];
@@ -618,6 +624,7 @@ - (void)updateMenus {
[_pacModeItem setState:proxyMode == pacMode];
[_manualModeItem setState:proxyMode == manualMode];
[_globalModeItem setState:proxyMode == globalMode];
+ [_tunModeItem setState:proxyMode == tunMode];
}
- (void)updatePacMenuList {
@@ -674,6 +681,9 @@ - (void)switchPac:(id)sender {
-(void)updateSystemProxy {
NSArray *arguments;
+
+ closeHelperApplicationTask();
+
if (proxyState) {
if (proxyMode == pacMode) { // pac mode
// close system proxy first to refresh pac file
@@ -684,12 +694,16 @@ -(void)updateSystemProxy {
} else {
if (proxyMode == manualMode) { // manualMode mode
arguments = @[@"-v"]; // do nothing
- } else { // global mode
+ } else {
+ NSInteger cusHttpPort = 0;
+ NSInteger cusSocksPort = 0;
+
+ NSMutableArray *serverAddress = [[NSMutableArray alloc] init];
+
+ // global mode
if(useMultipleServer || !useCusProfile) {
arguments = @[@"global", [NSString stringWithFormat:@"%ld", localPort], [NSString stringWithFormat:@"%ld", httpPort]];
} else {
- NSInteger cusHttpPort = 0;
- NSInteger cusSocksPort = 0;
NSDictionary* cusJson = [NSJSONSerialization JSONObjectWithData:[NSData dataWithContentsOfFile:cusProfiles[selectedCusServerIndex]] options:0 error:nil];
if (cusJson[@"inboundDetour"] != nil && [cusJson[@"inboundDetour"] isKindOfClass:[NSArray class]]) {
for (NSDictionary *inboundDetour in cusJson[@"inboundDetour"]) {
@@ -710,6 +724,40 @@ -(void)updateSystemProxy {
NSLog(@"socks: %ld, http: %ld", cusSocksPort, cusHttpPort);
arguments = @[@"global", [NSString stringWithFormat:@"%ld", cusSocksPort], [NSString stringWithFormat:@"%ld", cusHttpPort]];
}
+
+ // tun mode
+ if(proxyMode == tunMode) {
+
+ if(!useCusProfile) {
+
+ // Get the currently selected server
+ NSDictionary* profile = profiles[selectedServerIndex];
+ if(profile != NULL && profile[@"settings"] != NULL && profile[@"settings"][@"vnext"] != NULL && [profile[@"settings"][@"vnext"] isKindOfClass:[NSArray class]]) {
+ for (NSDictionary *vnextItem in profile[@"settings"][@"vnext"]) {
+ if(vnextItem[@"address"] != NULL) {
+ [serverAddress addObject: vnextItem[@"address"]];
+ }
+ }
+ }
+
+ // Count all servers.
+ for (NSDictionary *profile in profiles) {
+ if(profile != NULL && profile[@"settings"] != NULL && profile[@"settings"][@"vnext"] != NULL && [profile[@"settings"][@"vnext"] isKindOfClass:[NSArray class]]) {
+ for (NSDictionary *vnextItem in profile[@"settings"][@"vnext"]) {
+ if(vnextItem[@"address"] != NULL && ![serverAddress containsObject: vnextItem[@"address"]]) {
+ [serverAddress addObject: vnextItem[@"address"]];
+ }
+ }
+ }
+ }
+ }
+
+ if(serverAddress.count < 1) {
+ [serverAddress addObject: @""];
+ }
+ arguments = @[@"tun", serverAddress[0], [NSString stringWithFormat:@"%ld", localPort]];
+ }
+
}
}
dispatch_async(taskQueue, ^{
@@ -1049,8 +1097,30 @@ - (IBAction)viewConfigJson:(NSMenuItem *)sender {
[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"http://127.0.0.1:%d/config.json", webServerPort]]];
}
+
+NSTask *helperApplicationTask;
+
+void closeHelperApplicationTask() {
+ if(helperApplicationTask != NULL) {
+ // NSLog(@"tzmax: commTask terminate");
+ [helperApplicationTask interrupt]; // push SIGINT signal, enable the helper to perform the cleanup task.
+ sleep(1);
+ // usleep(800 * 1000);
+ [helperApplicationTask terminate];
+ helperApplicationTask = NULL;
+ return;
+ }
+}
+
int runCommandLine(NSString* launchPath, NSArray* arguments) {
NSTask *task = [[NSTask alloc] init];
+
+ // take notes helperApplicationTask
+ closeHelperApplicationTask();
+ if(helperApplicationTask == NULL && [arguments[0] isEqual: @"tun"]) {
+ helperApplicationTask = task;
+ }
+
[task setLaunchPath:launchPath];
[task setArguments:arguments];
NSPipe *stdoutpipe = [NSPipe pipe];
diff --git a/V2RayX/Base.lproj/MainMenu.xib b/V2RayX/Base.lproj/MainMenu.xib
index cf4c2d2..712fc77 100644
--- a/V2RayX/Base.lproj/MainMenu.xib
+++ b/V2RayX/Base.lproj/MainMenu.xib
@@ -1,8 +1,8 @@
-
+
-
+
@@ -25,6 +25,7 @@
+
@@ -708,7 +709,7 @@
+