mirror of
https://github.com/leonboe1/QuickDrop.git
synced 2026-11-21 22:05:59 +00:00
Skip Ipv6 check
This commit is contained in:
1 parent
d9f23f9b44
commit
3522a64955
3 files changed
+38
-63
No files matched your search
+37
-25
@@ -5,6 +5,7 @@
|
||||
// Created by Grishka on 08.04.2023.
|
||||
//
|
||||
|
||||
import Network
|
||||
import Cocoa
|
||||
import UserNotifications
|
||||
import NearbyShare
|
||||
@@ -89,35 +90,43 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
|
||||
|
||||
UNUserNotificationCenter.current().delegate=self
|
||||
|
||||
|
||||
let hasConnection = isConnectedToNetwork()
|
||||
log("Currently used interface: \(getActiveNetworkInterface())")
|
||||
|
||||
if hasConnection {
|
||||
let scanner = DeviceToDeviceHeuristicScanner()
|
||||
scanner.scan { allowed in
|
||||
if allowed {
|
||||
log("✅ Device-to-device likely allowed (peer responded on LAN).")
|
||||
log("Currently used interface: \(getActiveNetworkInterface() ?? "Unknown")")
|
||||
|
||||
let monitor = NWPathMonitor()
|
||||
monitor.pathUpdateHandler = { path in
|
||||
if path.status == .satisfied {
|
||||
if path.supportsIPv4 && !path.supportsIPv6 {
|
||||
log("Detected IPv4-only network.")
|
||||
self.performDeviceToDeviceCheck()
|
||||
} else if !path.supportsIPv4 && path.supportsIPv6 {
|
||||
log("IPv6-only network, likely iPhone hotspot. Skipping device-to-device check.")
|
||||
} else if path.supportsIPv4 && path.supportsIPv6 {
|
||||
log("Detected Dual stack network.")
|
||||
self.performDeviceToDeviceCheck()
|
||||
} else {
|
||||
|
||||
let scanner2 = IPv6DeviceScanner()
|
||||
scanner2.scan() { devices in
|
||||
if devices.isEmpty {
|
||||
log("❌ No local devices responded — peer-to-peer may be blocked.")
|
||||
|
||||
self.openAlert(type: .ApIsolation)
|
||||
} else {
|
||||
log("✅ Found IPv6 devices (excluding router):")
|
||||
for ip in devices {
|
||||
print(" • \(ip)")
|
||||
}
|
||||
}
|
||||
}
|
||||
log("Detected no IP support")
|
||||
}
|
||||
} else {
|
||||
log("Network unavailable")
|
||||
}
|
||||
|
||||
monitor.cancel()
|
||||
}
|
||||
else {
|
||||
log("❌ Network unavailable, skipping device-to-device check.")
|
||||
|
||||
let queue = DispatchQueue(label: "NetworkMonitor")
|
||||
monitor.start(queue: queue)
|
||||
}
|
||||
|
||||
|
||||
func performDeviceToDeviceCheck() {
|
||||
let scanner = DeviceToDeviceHeuristicScanner()
|
||||
scanner.scan { allowed in
|
||||
if allowed {
|
||||
log("✅ Device-to-device likely allowed (peer responded on LAN).")
|
||||
self.apIsolationAlertWindow?.close()
|
||||
} else {
|
||||
self.openAlert(type: .ApIsolation)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -214,6 +223,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, UNUserNotificationCenterDele
|
||||
|
||||
|
||||
func openAlert(type: AlertType) {
|
||||
|
||||
log("Opening Alert for \(type)")
|
||||
|
||||
DispatchQueue.main.async { [self] in
|
||||
|
||||
// Create an NSWindow to host the SwiftUI view
|
||||
|
||||
@@ -15,6 +15,7 @@ class IPv6DeviceScanner {
|
||||
/// - completion: Callback with a list of detected device IPs (excluding router).
|
||||
func scan(timeout: TimeInterval = 2.0, completion: @escaping ([String]) -> Void) {
|
||||
|
||||
|
||||
let interface = getActiveNetworkInterface() ?? "en0"
|
||||
|
||||
let process = Process()
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
//
|
||||
// NetworkConnectionCheck.swift
|
||||
// QuickDrop
|
||||
//
|
||||
// Created by Leon Böttger on 16.05.25.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import SystemConfiguration
|
||||
|
||||
/// Returns true if the device is connected to any network (Wi-Fi, Ethernet, etc.)
|
||||
func isConnectedToNetwork() -> Bool {
|
||||
var zeroAddress = sockaddr_in(
|
||||
sin_len: UInt8(MemoryLayout<sockaddr_in>.size),
|
||||
sin_family: sa_family_t(AF_INET),
|
||||
sin_port: 0,
|
||||
sin_addr: in_addr(s_addr: 0),
|
||||
sin_zero: (0,0,0,0,0,0,0,0)
|
||||
)
|
||||
|
||||
guard let defaultRouteReachability = withUnsafePointer(to: &zeroAddress, {
|
||||
$0.withMemoryRebound(to: sockaddr.self, capacity: 1) { zeroSockAddress in
|
||||
SCNetworkReachabilityCreateWithAddress(nil, zeroSockAddress)
|
||||
}
|
||||
}) else {
|
||||
return false
|
||||
}
|
||||
|
||||
var flags = SCNetworkReachabilityFlags()
|
||||
if !SCNetworkReachabilityGetFlags(defaultRouteReachability, &flags) {
|
||||
return false
|
||||
}
|
||||
|
||||
let isReachable = flags.contains(.reachable)
|
||||
let needsConnection = flags.contains(.connectionRequired)
|
||||
|
||||
return isReachable && !needsConnection
|
||||
}
|
||||
Reference in new issue
Block a user