Carthage copy-frameworks + Filter changed extension reload
This commit is contained in:
@@ -17,9 +17,9 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<string>$(MARKETING_VERSION)</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<string>$(CURRENT_PROJECT_VERSION)</string>
|
||||
<key>NSExtension</key>
|
||||
<dict>
|
||||
<key>NSExtensionPointIdentifier</key>
|
||||
|
||||
@@ -38,11 +38,15 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
|
||||
let proxyServerPort: UInt16 = 9090
|
||||
let proxyServerAddress = "127.0.0.1"
|
||||
var proxyServer: GCDHTTPProxyServer!
|
||||
|
||||
func reloadDomainFilter() {
|
||||
domainFilters = db?.loadFilters() ?? [:]
|
||||
}
|
||||
|
||||
override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
|
||||
ZLog("startTunnel")
|
||||
do {
|
||||
db = try SQLiteDatabase.open(path: DB_PATH)
|
||||
db = try SQLiteDatabase.open()
|
||||
try db!.createTable(table: DNSQuery.self)
|
||||
} catch {
|
||||
completionHandler(error)
|
||||
@@ -53,8 +57,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
|
||||
}
|
||||
proxyServer = nil
|
||||
|
||||
// Load domain filter
|
||||
domainFilters = db!.loadFilters() ?? [:]
|
||||
reloadDomainFilter()
|
||||
|
||||
// Create proxy
|
||||
let settings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: proxyServerAddress)
|
||||
@@ -111,9 +114,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
|
||||
|
||||
override func handleAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)?) {
|
||||
ZLog("handleAppMessage")
|
||||
if let handler = completionHandler {
|
||||
handler(messageData)
|
||||
}
|
||||
reloadDomainFilter()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
10
GlassVPN/input.xcfilelist
Normal file
10
GlassVPN/input.xcfilelist
Normal file
@@ -0,0 +1,10 @@
|
||||
$(SRCROOT)/Carthage/Build/iOS/CocoaAsyncSocket.framework
|
||||
$(SRCROOT)/Carthage/Build/iOS/CocoaLumberjack.framework
|
||||
$(SRCROOT)/Carthage/Build/iOS/CocoaLumberjackSwift.framework
|
||||
$(SRCROOT)/Carthage/Build/iOS/lwip.framework
|
||||
$(SRCROOT)/Carthage/Build/iOS/MMDB.framework
|
||||
$(SRCROOT)/Carthage/Build/iOS/NEKit.framework
|
||||
$(SRCROOT)/Carthage/Build/iOS/Resolver.framework
|
||||
$(SRCROOT)/Carthage/Build/iOS/Sodium.framework
|
||||
$(SRCROOT)/Carthage/Build/iOS/tun2socks.framework
|
||||
$(SRCROOT)/Carthage/Build/iOS/Yaml.framework
|
||||
10
GlassVPN/output.xcfilelist
Normal file
10
GlassVPN/output.xcfilelist
Normal file
@@ -0,0 +1,10 @@
|
||||
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/CocoaAsyncSocket.framework
|
||||
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/CocoaLumberjack.framework
|
||||
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/CocoaLumberjackSwift.framework
|
||||
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/lwip.framework
|
||||
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/MMDB.framework
|
||||
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/NEKit.framework
|
||||
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Resolver.framework
|
||||
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Sodium.framework
|
||||
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/tun2socks.framework
|
||||
$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Yaml.framework
|
||||
Reference in New Issue
Block a user