zhangyuheng/ClashX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature: add get current dns function

Browse Source
This commit is contained in:
yicheng 2020-04-29 21:25:18 +08:00
parent 3e6c937008
commit c89490c559
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ClashX/General/Utils/ClashStatusTool.swift
View File

@ -11,8 +11,8 @@ import Cocoa
class ClashStatusTool {
static func checkPortConfig(cfg: ClashConfig?) {
guard let cfg = cfg else { return }
Logger.log("checkPortConfig: \(cfg.port) \(cfg.socketPort)", level: .debug)
if cfg.port == 0 || cfg.socketPort == 0 {
Logger.log("checkPortConfig: \(cfg.port) \(cfg.socketPort)", level: .error)
let alert = NSAlert()
alert.messageText = NSLocalizedString("ClashX Start Error!", comment: "")
alert.informativeText = NSLocalizedString("Ports Open Fail, Please try to restart ClashX", comment: "")

22
ClashX/General/Utils/NetworkChangeNotifier.swift
View File

@ -59,6 +59,7 @@ class NetworkChangeNotifier {
}
@objc static func onWakeNote(note: NSNotification) {
NotificationCenter.default.post(name: .systemNetworkStatusIPUpdate, object: nil)
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
@ -88,19 +89,26 @@ class NetworkChangeNotifier {
}
static func getPrimaryInterface() -> String? {
let key: CFString
let store: SCDynamicStore?
let dict: [String: String]?
store = SCDynamicStoreCreate(nil, "ClashX" as CFString, nil, nil)
let store = SCDynamicStoreCreate(nil, "ClashX" as CFString, nil, nil)
if store == nil {
return nil
}
key = SCDynamicStoreKeyCreateNetworkGlobalEntity(nil, kSCDynamicStoreDomainState, kSCEntNetIPv4)
dict = SCDynamicStoreCopyValue(store, key) as? [String: String]
let key = SCDynamicStoreKeyCreateNetworkGlobalEntity(nil, kSCDynamicStoreDomainState, kSCEntNetIPv4)
let dict = SCDynamicStoreCopyValue(store, key) as? [String: String]
return dict?[kSCDynamicStorePropNetPrimaryInterface as String]
}
static func getCurrentDns() -> [String] {
let store = SCDynamicStoreCreate(nil, "ClashX" as CFString, nil, nil)
if store == nil {
return []
}
let key = SCDynamicStoreKeyCreateNetworkGlobalEntity(nil, kSCDynamicStoreDomainState, kSCEntNetDNS)
let dnsArr = SCDynamicStoreCopyValue(store, key) as? [String:[String]]
return dnsArr?[kSCPropNetDNSServerAddresses as String] ?? []
}
static func getPrimaryIPAddress(allowIPV6: Bool = false) -> String? {
guard let primary = getPrimaryInterface() else {