wangjia/pangolin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

Merge branch 'main' into feat/configurable-proxy

Browse Source 
# Conflicts:
#	.gitignore
#	client/lib/l10n/strings_es.dart
#	client/lib/l10n/strings_ja.dart
#	client/lib/l10n/strings_ko.dart
#	client/lib/l10n/strings_ru.dart
#	docs/index.html
#	scripts/local_test.sh
This commit is contained in:
wangjia
2026-07-28 07:17:34 +08:00
parent 7776fc4d6c 4ca21f9ee9
commit c99a9b1106
46 changed files with 5136 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/android/build.gradle
+3
View File
@@ -1,5 +1,8 @@
allprojects {
repositories {
// 国内镜像优先(见 settings.gradle 同注);原仓库保留作 fallback。
maven { url "https://maven.aliyun.com/repository/google" }
maven { url "https://maven.aliyun.com/repository/public" }
google()
mavenCentral()
}
client/android/gradle/wrapper/gradle-wrapper.properties
Vendored
+3 -1
View File
@@ -2,4 +2,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
# 国内镜像:services.gradle.org 被 GFW 墙(SSL 重置),CI runner 在墙内下载发行版会失败。
# 腾讯云 gradle 镜像提供同一份 zip。见 client/android/{settings,build}.gradle 的 maven 镜像同理。
distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.7-bin.zip
client/android/settings.gradle
+5
View File
@@ -10,6 +10,11 @@ pluginManagement {
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
repositories {
// 国内镜像优先(CI runner 在墙内,直连 google/central/gradlePluginPortal 会被 GFW 重置);
// 原仓库保留作 fallback。与 deploy-client.yml 的 GOPROXY/PUB 镜像同理。
maven { url "https://maven.aliyun.com/repository/google" }
maven { url "https://maven.aliyun.com/repository/public" }
maven { url "https://maven.aliyun.com/repository/gradle-plugin" }
google()
mavenCentral()
gradlePluginPortal()
client/ios/PacketTunnel/PacketTunnelProvider.swift
+15
View File
@@ -206,6 +206,7 @@ final class PangolinPlatformInterface: NSObject, LibboxPlatformInterfaceProtocol
let ipv4 = NEIPv4Settings(addresses: v4addrs.map(\.address),
subnetMasks: v4addrs.map(\.mask))
ipv4.includedRoutes = includedRoutes4(options)
ipv4.excludedRoutes = excludedRoutes4(options)
settings.ipv4Settings = ipv4
}
let v6addrs = routePrefixes(options.getInet6Address())
@@ -213,6 +214,7 @@ final class PangolinPlatformInterface: NSObject, LibboxPlatformInterfaceProtocol
let ipv6 = NEIPv6Settings(addresses: v6addrs.map(\.address),
networkPrefixLengths: v6addrs.map { NSNumber(value: $0.prefix) })
ipv6.includedRoutes = includedRoutes6(options)
ipv6.excludedRoutes = excludedRoutes6(options)
settings.ipv6Settings = ipv6
}
if let dns = try? options.getDNSServerAddress(), !dns.value.isEmpty {
@@ -311,6 +313,19 @@ final class PangolinPlatformInterface: NSObject, LibboxPlatformInterfaceProtocol
networkPrefixLength: NSNumber(value: $0.prefix)) }
}
// 排除路由:sing-box config 的 route_exclude_address(私有 LAN 网段)经 libbox
// 暴露在此。之前只设 includedRoutes、丢了 excludedRoutes → strict_route 把 LAN 也
// 抓进隧道,VPN 开着连不上局域网/NAS/家里机器。设上 excludedRoutes 后 LAN 直连。
private func excludedRoutes4(_ o: any LibboxTunOptionsProtocol) -> [NEIPv4Route] {
routePrefixes(o.getInet4RouteExcludeAddress())
.map { NEIPv4Route(destinationAddress: $0.address, subnetMask: $0.mask) }
}
private func excludedRoutes6(_ o: any LibboxTunOptionsProtocol) -> [NEIPv6Route] {
routePrefixes(o.getInet6RouteExcludeAddress())
.map { NEIPv6Route(destinationAddress: $0.address,
networkPrefixLength: NSNumber(value: $0.prefix)) }
}
// utun fd:getpeername 得 sockaddr_ctl,匹配 utun 控制 id(WireGuard 技法)
private static func tunFd() -> Int32? {
var ctlInfo = ctl_info()
client/lib/l10n/strings_es.dart
+1 -1
View File
@@ -343,7 +343,7 @@ class StringsEs extends AppText {
@override
String get payMethodCrypto => 'USDT (TRC20)';
@override
String get choosePayMethod => 'Elige el método de pago';
String get choosePayMethod => 'Elige un método de pago';
@override
String get proMonthly => 'Pro · Mensual';
@override
client/lib/l10n/strings_ja.dart
+1 -1
View File
@@ -345,7 +345,7 @@ class StringsJa extends AppText {
@override
String get choosePayMethod => 'お支払い方法を選択';
@override
String get proMonthly => 'Pro · 月額';
String get proMonthly => 'Pro・月額';
@override
String get proQuarterly => 'Pro · 3か月';
@override
client/lib/l10n/strings_ru.dart
+2 -2
View File
@@ -333,7 +333,7 @@ class StringsRu extends AppText {
@override
String get ob3Sub => 'Сквозное шифрование. Мы не храним журналы просмотров.';
@override
String get purchaseTitle => 'Покупка тарифа';
String get purchaseTitle => 'Купить тариф';
@override
String get paymentTitle => 'Оплата';
@override
@@ -345,7 +345,7 @@ class StringsRu extends AppText {
@override
String get choosePayMethod => 'Выберите способ оплаты';
@override
String get proMonthly => 'Pro · Месяц';
String get proMonthly => 'Pro · Помесячно';
@override
String get proQuarterly => 'Pro · Квартал';
@override
client/macos/PacketTunnel/PacketTunnelProvider.swift
+15
View File
@@ -201,6 +201,7 @@ final class PangolinPlatformInterface: NSObject, LibboxPlatformInterfaceProtocol
let ipv4 = NEIPv4Settings(addresses: v4addrs.map(\.address),
subnetMasks: v4addrs.map(\.mask))
ipv4.includedRoutes = includedRoutes4(options)
ipv4.excludedRoutes = excludedRoutes4(options)
settings.ipv4Settings = ipv4
}
let v6addrs = routePrefixes(options.getInet6Address())
@@ -208,6 +209,7 @@ final class PangolinPlatformInterface: NSObject, LibboxPlatformInterfaceProtocol
let ipv6 = NEIPv6Settings(addresses: v6addrs.map(\.address),
networkPrefixLengths: v6addrs.map { NSNumber(value: $0.prefix) })
ipv6.includedRoutes = includedRoutes6(options)
ipv6.excludedRoutes = excludedRoutes6(options)
settings.ipv6Settings = ipv6
}
if let dns = try? options.getDNSServerAddress(), !dns.value.isEmpty {
@@ -301,6 +303,19 @@ final class PangolinPlatformInterface: NSObject, LibboxPlatformInterfaceProtocol
networkPrefixLength: NSNumber(value: $0.prefix)) }
}
// 排除路由:sing-box config 的 route_exclude_address(私有 LAN 网段)经 libbox
// 暴露在此。之前只设 includedRoutes、丢了 excludedRoutes → strict_route 把 LAN 也
// 抓进隧道,VPN 开着连不上局域网/NAS/家里机器。设上 excludedRoutes 后 LAN 直连。
private func excludedRoutes4(_ o: any LibboxTunOptionsProtocol) -> [NEIPv4Route] {
routePrefixes(o.getInet4RouteExcludeAddress())
.map { NEIPv4Route(destinationAddress: $0.address, subnetMask: $0.mask) }
}
private func excludedRoutes6(_ o: any LibboxTunOptionsProtocol) -> [NEIPv6Route] {
routePrefixes(o.getInet6RouteExcludeAddress())
.map { NEIPv6Route(destinationAddress: $0.address,
networkPrefixLength: NSNumber(value: $0.prefix)) }
}
// utun fd:getpeername 得 sockaddr_ctl,匹配 utun 控制 id(WireGuard 技法)
private static func tunFd() -> Int32? {
var ctlInfo = ctl_info()