Merge pull request #38 from Bouke/remove-kCFSocketReadCallBack

kCFSocketReadCallBack is no longer defined
Bouke · Nov 29, 2020 · 276ca1c · 276ca1c · robreuss · Nov 29, 2020
2 parents 8d43882 + 81f3b87
commit 276ca1c
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 21 deletions.
diff --git a/Sources/NetService/FoundationCompat.swift b/Sources/NetService/FoundationCompat.swift
@@ -1,3 +1,5 @@
+import CoreFoundation
+
 #if os(Linux) && !compiler(>=5.0)
 import class Foundation.RunLoop
 import struct Foundation.RunLoopMode
@@ -12,3 +14,11 @@ extension RunLoopMode {
     }
 }
 #endif
+
+#if os(Linux)
+extension CFRunLoopMode {
+    static var commonModes: CFRunLoopMode {
+        return kCFRunLoopCommonModes
+    }
+}
+#endif
diff --git a/Sources/NetService/NetService.swift b/Sources/NetService/NetService.swift
@@ -14,7 +14,7 @@ import struct Foundation.TimeInterval
 
 import Cdns_sd
 
-private let _registerCallback: DNSServiceRegisterReply = { (sdRef, flags, errorCode, name, regtype, domain, context) in
+private let _registerCallback: DNSServiceRegisterReply = { (_, flags, errorCode, name, _, _, context) in
     let service: NetService = Unmanaged.fromOpaque(context!).takeUnretainedValue()
     guard errorCode == kDNSServiceErr_NoError else {
         service.didNotPublish(error: Int(errorCode))
@@ -33,7 +33,7 @@ private let _registerCallback: DNSServiceRegisterReply = { (sdRef, flags, errorC
     #endif
 }
 
-private let _resolveReply: DNSServiceResolveReply = { sdRef, flags, interfaceIndex, errorCode, fullname, hosttarget, port, txtLen, txtRecord, context in
+private let _resolveReply: DNSServiceResolveReply = { _, _, _, errorCode, _, hosttarget, port, txtLen, txtRecord, context in
     let service: NetService = Unmanaged.fromOpaque(context!).takeUnretainedValue()
     guard errorCode == kDNSServiceErr_NoError else {
         service.didNotResolve(error: Int(errorCode))
@@ -48,7 +48,7 @@ private let _resolveReply: DNSServiceResolveReply = { sdRef, flags, interfaceInd
         textRecord: textRecord)
 }
 
-private let _processResult: CFSocketCallBack = { (s, type, address, data, info) in
+private let _processResult: CFSocketCallBack = { (_, _, _, _, info) in
     let service: NetService = Unmanaged.fromOpaque(info!).takeUnretainedValue()
     service.processResult()
 }
@@ -222,9 +222,9 @@ public class NetService {
     public func setTXTRecord(_ recordData: Data?) -> Bool {
         textRecord = recordData
         if let serviceRef = serviceRef {
-            var record = textRecord ?? Data([0])
+            let record = textRecord ?? Data([0])
             let error = record.withUnsafeBytes { txtRecordPtr in
-                DNSServiceUpdateRecord(serviceRef, nil, 0, UInt16(record.count), txtRecordPtr, 0)
+                DNSServiceUpdateRecord(serviceRef, nil, 0, UInt16(record.count), txtRecordPtr.baseAddress!, 0)
             }
             guard error == 0 else {
                 return false
@@ -300,10 +300,10 @@ public class NetService {
         // TODO: map flags
 
         let regtype = self.type
-        var record = textRecord ?? Data([0])
+        let record = textRecord ?? Data([0])
 
         let error = record.withUnsafeBytes { txtRecordPtr in
-            DNSServiceRegister(&serviceRef, 0, 0, name, regtype, nil, nil, UInt16(port).bigEndian, UInt16(record.count), txtRecordPtr, _registerCallback, Unmanaged.passUnretained(self).toOpaque())
+            DNSServiceRegister(&serviceRef, 0, 0, name, regtype, nil, nil, UInt16(port).bigEndian, UInt16(record.count), txtRecordPtr.baseAddress!, _registerCallback, Unmanaged.passUnretained(self).toOpaque())
         }
         guard error == 0 else {
             didNotPublish(error: Int(error))
@@ -356,15 +356,15 @@ public class NetService {
 
         var context = CFSocketContext(version: 0, info: info, retain: nil, release: nil, copyDescription: nil)
 
-        socket = CFSocketCreateWithNative(nil, fd, CFOptionFlags(kCFSocketReadCallBack), _processResult, &context)
+        socket = CFSocketCreateWithNative(nil, fd, CFOptionFlags(CFSocketCallBackType.readCallBack.rawValue), _processResult, &context)
 
         // Don't close the underlying socket on invalidate, as it is owned by dns_sd.
         var socketFlags = CFSocketGetSocketFlags(socket)
         socketFlags &= ~CFOptionFlags(kCFSocketCloseOnInvalidate)
         CFSocketSetSocketFlags(socket, socketFlags)
 
         source = CFSocketCreateRunLoopSource(nil, socket, 0)
-        CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopCommonModes)
+        CFRunLoopAddSource(CFRunLoopGetCurrent(), source, CFRunLoopMode.commonModes)
     }
 
     /// The port on which the service is listening for connections.

diff --git a/Sources/NetService/NetServiceBrowser.swift b/Sources/NetService/NetServiceBrowser.swift
@@ -11,7 +11,7 @@ import struct Foundation.RunLoopMode
 
 import Cdns_sd
 
-private let _browseCallback: DNSServiceBrowseReply = { (sdRef, flags, interfaceIndex, errorCode, name, regtype, domain, context) in
+private let _browseCallback: DNSServiceBrowseReply = { (_, flags, _, errorCode, name, regtype, domain, context) in
     let browser: NetServiceBrowser = Unmanaged.fromOpaque(context!).takeUnretainedValue()
     guard errorCode == kDNSServiceErr_NoError else {
         browser.didNotSearch(error: Int(errorCode))
@@ -29,12 +29,12 @@ private let _browseCallback: DNSServiceBrowseReply = { (sdRef, flags, interfaceI
     }
 }
 
-private let _processResult: CFSocketCallBack = { (s, type, address, data, info) in
+private let _processResult: CFSocketCallBack = { (_, _, _, _, info) in
     let browser: NetServiceBrowser = Unmanaged.fromOpaque(info!).takeUnretainedValue()
     browser.processResult()
 }
 
-private let _enumDomainsReply: DNSServiceDomainEnumReply = { (sdRef, flags, interfaceIndex, errorCode, replyDomain, context) in
+private let _enumDomainsReply: DNSServiceDomainEnumReply = { (_, flags, _, errorCode, replyDomain, context) in
     let browser: NetServiceBrowser = Unmanaged.fromOpaque(context!).takeUnretainedValue()
     guard errorCode == kDNSServiceErr_NoError else {
         browser.didNotSearch(error: Int(errorCode))
@@ -178,15 +178,15 @@ public class NetServiceBrowser {
         let info = Unmanaged.passUnretained(self).toOpaque()
 
         var context = CFSocketContext(version: 0, info: info, retain: nil, release: nil, copyDescription: nil)
-        socket = CFSocketCreateWithNative(nil, fd, CFOptionFlags(kCFSocketReadCallBack), _processResult, &context)
+        socket = CFSocketCreateWithNative(nil, fd, CFOptionFlags(CFSocketCallBackType.readCallBack.rawValue), _processResult, &context)
 
         // Don't close the underlying socket on invalidate, as it is owned by dns_sd.
         var socketFlags = CFSocketGetSocketFlags(socket)
         socketFlags &= ~CFOptionFlags(kCFSocketCloseOnInvalidate)
         CFSocketSetSocketFlags(socket, socketFlags)
 
         source = CFSocketCreateRunLoopSource(nil, socket, 0)
-        CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopCommonModes)
+        CFRunLoopAddSource(CFRunLoopGetCurrent(), source, CFRunLoopMode.commonModes)
     }
 
     /// Halts a currently running search or resolution.

diff --git a/Sources/NetService/ServiceFlags.swift b/Sources/NetService/ServiceFlags.swift
@@ -1,11 +1,6 @@
 import CoreFoundation
 import Cdns_sd
 
-#if !os(Linux)
-    internal let kCFSocketReadCallBack = CFSocketCallBackType.readCallBack.rawValue
-    internal let kCFRunLoopCommonModes = CFRunLoopMode.commonModes
-#endif
-
 struct ServiceFlags: OptionSet {
     public let rawValue: DNSServiceFlags
     init(rawValue: DNSServiceFlags) {

diff --git a/Sources/dns-sd/Delegate.swift b/Sources/dns-sd/Delegate.swift
@@ -145,7 +145,7 @@ class ResolveServiceDelegate: BaseDelegate, NetServiceDelegate {
         for memory in addresses {
             var ss = sockaddr_storage()
             _ = memory.withUnsafeBytes {
-                memcpy(&ss, $0, memory.count)
+                memcpy(&ss, $0.baseAddress!, memory.count)
             }
             let buffer = UnsafeMutablePointer<CChar>.allocate(capacity: Int(NI_MAXHOST))
 

diff --git a/Sources/dns-sd/main.swift b/Sources/dns-sd/main.swift
@@ -74,7 +74,7 @@ case "-R":
     let service = NetService(domain: register[2], type: register[1], name: register[0], port: port)
     var keyvalues = [String: Data]()
     for keyvalue in register.dropFirst(4) {
-        var components = keyvalue.split(separator: "=", maxSplits: 1, omittingEmptySubsequences: false)
+        let components = keyvalue.split(separator: "=", maxSplits: 1, omittingEmptySubsequences: false)
         if components.count != 2 {
             print("Invalid key value pair")
             exit(-1)