anlicheng/swiftlib_sdlan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add debug info

Browse Source
This commit is contained in:
anlicheng 2025-08-19 17:03:27 +08:00
parent 2c05d71dbe
commit 77a631a001
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Sources/Punchnet/ARPPacket.swift
View File

@ -6,7 +6,14 @@
// //
import Foundation import Foundation
struct ARPPacket { struct ARPPacket: CustomStringConvertible {
var description: String {
return """
opcode: \(self.opcode), sender_ip: \(SDLUtil.int32ToIp(self.senderIP)), sender_mac: \(SDLUtil.formatMacAddress(mac: senderMAC)),
target_ip: \(SDLUtil.int32ToIp(self.targetIP)), target_mac: \(SDLUtil.formatMacAddress(mac: targetMAC))
"""
}
// ARP操作码 // ARP操作码
enum Opcode: UInt16 { enum Opcode: UInt16 {
case request = 0x01 case request = 0x01

11
Sources/Punchnet/SDLContext.swift
View File

@ -232,7 +232,7 @@ public class SDLContext: @unchecked Sendable {
private func handleSuperEvent(event: SDLSuperClient.SuperEvent) async throws { private func handleSuperEvent(event: SDLSuperClient.SuperEvent) async throws {
switch event { switch event {
case .ready: case .ready:
self.logger.log("[SDLContext] get registerSuper, mac address: \(Self.formatMacAddress(mac: self.devAddr.mac))", level: .debug) self.logger.log("[SDLContext] get registerSuper, mac address: \(SDLUtil.formatMacAddress(mac: self.devAddr.mac))", level: .debug)
guard let message = try await self.superClient?.registerSuper(context: self).get() else { guard let message = try await self.superClient?.registerSuper(context: self).get() else {
return return
} }
@ -391,7 +391,7 @@ public class SDLContext: @unchecked Sendable {
await self.arpServer.append(ip: arpPacket.senderIP, mac: arpPacket.senderMAC) await self.arpServer.append(ip: arpPacket.senderIP, mac: arpPacket.senderMAC)
} }
} else { } else {
self.logger.log("[SDLContext] get invalid arp packet, target_ip: \(arpPacket)", level: .debug) self.logger.log("[SDLContext] get invalid arp packet: \(arpPacket), target_ip: \(SDLUtil.int32ToIp(arpPacket.targetIP)), net ip: \(SDLUtil.int32ToIp(self.devAddr.netAddr))", level: .debug)
} }
} else { } else {
self.logger.log("[SDLContext] get invalid arp packet", level: .debug) self.logger.log("[SDLContext] get invalid arp packet", level: .debug)
@ -622,11 +622,4 @@ public class SDLContext: @unchecked Sendable {
return Data(macAddress) return Data(macAddress)
} }
// 将mac地址转换成字符串
private static func formatMacAddress(mac: Data) -> String {
let bytes = [UInt8](mac)
return bytes.map { String(format: "%02X", $0) }.joined(separator: ":").lowercased()
}
} }

6
Sources/Punchnet/SDLUtil.swift
View File

@ -43,4 +43,10 @@ struct SDLUtil {
return ip & mask == compareIp & mask return ip & mask == compareIp & mask
} }
public static func formatMacAddress(mac: Data) -> String {
let bytes = [UInt8](mac)
return bytes.map { String(format: "%02X", $0) }.joined(separator: ":").lowercased()
}
} }