morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed wrong ICMP response detection (#1111)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2022-10-11 16:58:28 +02:00
parent f8b74030a2
commit 65c15a7b6f
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/Net/readers.swift
View File

@@ -575,7 +575,7 @@ internal class ConnectivityReader: Reader<Bool> {
}
private var lastHost: String = ""
private var addr: Data? = nil
private let timeout: TimeInterval = 7
private let timeout: TimeInterval = 5
private var socket: CFSocket?
private var socketSource: CFRunLoopSource?
@@ -633,7 +633,7 @@ internal class ConnectivityReader: Reader<Bool> {
}
override func setup() {
self.interval = 3
self.interval = 1
self.addr = self.resolve()
self.setConn()
@@ -679,12 +679,11 @@ internal class ConnectivityReader: Reader<Bool> {
}
private func socketCallback(data: Data? = nil, error: CFSocketError? = nil) {
if let data = data {
self.status = validateResponse(data)
} else {
self.status = false
guard let data = data, validateResponse(data) else {
return
}
self.status = error == nil
self.isPinging = false
self.timeoutTimer?.invalidate()
self.timeoutTimer = nil
@@ -701,7 +700,7 @@ internal class ConnectivityReader: Reader<Bool> {
let payload = data.subdata(in: (data.count - payloadSize)..<data.count)
let uuid = UUID(uuid: icmpHeader.payload)
guard uuid == fingerprint else { return false }
guard uuid == self.fingerprint else { return false }
guard icmpHeader.checksum == computeChecksum(header: icmpHeader, additionalPayload: [UInt8](payload)) else { return false }
guard icmpHeader.type == 0 else { return false }
guard icmpHeader.code == 0 else { return false }