diff --git a/client/macos/.gitignore b/client/macos/.gitignore index 746adbb..fb3122c 100644 --- a/client/macos/.gitignore +++ b/client/macos/.gitignore @@ -5,3 +5,6 @@ # Xcode-related **/dgph **/xcuserdata/ + +# libbox 嵌入式核心(204MB,scripts/build-libbox.sh 产出,不入 git) +**/Frameworks/Libbox.xcframework/ diff --git a/client/macos/PacketTunnel/Info.plist b/client/macos/PacketTunnel/Info.plist index 7b85c14..93bfb1c 100644 --- a/client/macos/PacketTunnel/Info.plist +++ b/client/macos/PacketTunnel/Info.plist @@ -2,37 +2,15 @@ - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - Pangolin Tunnel - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - + NetworkExtension - NEMachServiceName - $(TeamIdentifierPrefix)group.com.pangolin.pangolin NEProviderClasses com.apple.networkextension.packet-tunnel $(PRODUCT_MODULE_NAME).PacketTunnelProvider - CFBundlePackageType - XPC! diff --git a/client/macos/PacketTunnel/PacketTunnelProvider.swift b/client/macos/PacketTunnel/PacketTunnelProvider.swift index b92fead..d7ce2a3 100644 --- a/client/macos/PacketTunnel/PacketTunnelProvider.swift +++ b/client/macos/PacketTunnel/PacketTunnelProvider.swift @@ -20,7 +20,7 @@ import NetworkExtension import os // import Libbox // ← gomobile bind 产物;加入 xcframework 后解开 -private let log = Logger(subsystem: "com.pangolin.pangolin.tunnel", category: "provider") +private let log = Logger(subsystem: "com.pangolin.pangolin.PacketTunnel", category: "provider") class PacketTunnelProvider: NEPacketTunnelProvider { // libbox 服务句柄(类型来自 Libbox 模块,加入 xcframework 后改为 LibboxBoxService)。 diff --git a/client/macos/Runner/VpnChannel.swift b/client/macos/Runner/VpnChannel.swift index 15df2f7..e36ae2f 100644 --- a/client/macos/Runner/VpnChannel.swift +++ b/client/macos/Runner/VpnChannel.swift @@ -18,7 +18,7 @@ import os private let log = Logger(subsystem: "com.pangolin.pangolin", category: "vpn") final class VpnChannel: NSObject { - private static let tunnelBundleId = "com.pangolin.pangolin.tunnel" + private static let tunnelBundleId = "com.pangolin.pangolin.PacketTunnel" private var statusSink: FlutterEventSink? private var statsSink: FlutterEventSink?