@@ -92,16 +92,14 @@ open class SocketPort: Port {}
92
92
93
93
#if canImport(Glibc) && !os(Android) && !os(OpenBSD)
94
94
import Glibc
95
- fileprivate let SOCK_STREAM = Int32 ( Glibc . SOCK_STREAM. rawValue)
96
- fileprivate let SOCK_DGRAM = Int32 ( Glibc . SOCK_DGRAM. rawValue)
97
- fileprivate let IPPROTO_TCP = Int32 ( Glibc . IPPROTO_TCP)
95
+ fileprivate let FOUNDATION_SOCK_STREAM = Int32 ( SOCK_STREAM . rawValue)
96
+ fileprivate let FOUNDATION_IPPROTO_TCP = Int32 ( IPPROTO_TCP)
98
97
#endif
99
98
100
99
#if canImport(Glibc) && os(Android) || os(OpenBSD)
101
100
import Glibc
102
- fileprivate let SOCK_STREAM = Int32 ( Glibc . SOCK_STREAM)
103
- fileprivate let SOCK_DGRAM = Int32 ( Glibc . SOCK_DGRAM)
104
- fileprivate let IPPROTO_TCP = Int32 ( Glibc . IPPROTO_TCP)
101
+ fileprivate let FOUNDATION_SOCK_STREAM = Int32 ( SOCK_STREAM)
102
+ fileprivate let FOUNDATION_IPPROTO_TCP = Int32 ( IPPROTO_TCP)
105
103
fileprivate let INADDR_ANY : in_addr_t = 0
106
104
#if os(OpenBSD)
107
105
fileprivate let INADDR_LOOPBACK = 0x7f000001
@@ -123,7 +121,8 @@ import WinSDK
123
121
fileprivate typealias sa_family_t = ADDRESS_FAMILY
124
122
fileprivate typealias in_port_t = USHORT
125
123
fileprivate typealias in_addr_t = UInt32
126
- fileprivate let IPPROTO_TCP = Int32 ( WinSDK . IPPROTO_TCP. rawValue)
124
+ fileprivate let FOUNDATION_SOCK_STREAM = SOCK_STREAM
125
+ fileprivate let FOUNDATION_IPPROTO_TCP = Int32 ( WinSDK . IPPROTO_TCP. rawValue)
127
126
#endif
128
127
129
128
// MARK: Darwin representation of socket addresses
@@ -484,7 +483,7 @@ open class SocketPort : Port {
484
483
485
484
let data = withUnsafeBytes ( of: address) { Data ( $0) }
486
485
487
- self . init ( protocolFamily: PF_INET, socketType: SOCK_STREAM , protocol: IPPROTO_TCP , address: data)
486
+ self . init ( protocolFamily: PF_INET, socketType: FOUNDATION_SOCK_STREAM , protocol: FOUNDATION_IPPROTO_TCP , address: data)
488
487
}
489
488
490
489
private final func createNonuniquedCore( from socket: CFSocket , protocolFamily family: Int32 , socketType type: Int32 , protocol: Int32 ) {
@@ -500,7 +499,7 @@ open class SocketPort : Port {
500
499
var context = CFSocketContext ( )
501
500
context. info = Unmanaged . passUnretained ( self ) . toOpaque ( )
502
501
var s : CFSocket
503
- if type == SOCK_STREAM {
502
+ if type == FOUNDATION_SOCK_STREAM {
504
503
s = CFSocketCreate ( nil , family, type, `protocol`, CFOptionFlags ( kCFSocketAcceptCallBack) , __NSFireSocketAccept, & context)
505
504
} else {
506
505
s = CFSocketCreate ( nil , family, type, `protocol`, CFOptionFlags ( kCFSocketDataCallBack) , __NSFireSocketDatagram, & context)
@@ -519,7 +518,7 @@ open class SocketPort : Port {
519
518
var context = CFSocketContext ( )
520
519
context. info = Unmanaged . passUnretained ( self ) . toOpaque ( )
521
520
var s : CFSocket
522
- if type == SOCK_STREAM {
521
+ if type == FOUNDATION_SOCK_STREAM {
523
522
s = CFSocketCreateWithNative ( nil , CFSocketNativeHandle ( sock) , CFOptionFlags ( kCFSocketAcceptCallBack) , __NSFireSocketAccept, & context)
524
523
} else {
525
524
s = CFSocketCreateWithNative ( nil , CFSocketNativeHandle ( sock) , CFOptionFlags ( kCFSocketDataCallBack) , __NSFireSocketDatagram, & context)
@@ -543,7 +542,7 @@ open class SocketPort : Port {
543
542
sinAddr. sin_addr = inAddr
544
543
545
544
let data = withUnsafeBytes ( of: sinAddr) { Data ( $0) }
546
- self . init ( remoteWithProtocolFamily: PF_INET, socketType: SOCK_STREAM , protocol: IPPROTO_TCP , address: data)
545
+ self . init ( remoteWithProtocolFamily: PF_INET, socketType: FOUNDATION_SOCK_STREAM , protocol: FOUNDATION_IPPROTO_TCP , address: data)
547
546
return
548
547
}
549
548
}
@@ -556,7 +555,7 @@ open class SocketPort : Port {
556
555
sinAddr. sin6_addr = in6Addr
557
556
558
557
let data = withUnsafeBytes ( of: sinAddr) { Data ( $0) }
559
- self . init ( remoteWithProtocolFamily: PF_INET, socketType: SOCK_STREAM , protocol: IPPROTO_TCP , address: data)
558
+ self . init ( remoteWithProtocolFamily: PF_INET, socketType: FOUNDATION_SOCK_STREAM , protocol: FOUNDATION_IPPROTO_TCP , address: data)
560
559
return
561
560
}
562
561
}
@@ -573,7 +572,7 @@ open class SocketPort : Port {
573
572
withUnsafeBytes ( of: in_addr_t ( INADDR_LOOPBACK) . bigEndian) { buffer. copyMemory ( from: $0) }
574
573
}
575
574
let data = withUnsafeBytes ( of: sinAddr) { Data ( $0) }
576
- self . init ( remoteWithProtocolFamily: PF_INET, socketType: SOCK_STREAM , protocol: IPPROTO_TCP , address: data)
575
+ self . init ( remoteWithProtocolFamily: PF_INET, socketType: FOUNDATION_SOCK_STREAM , protocol: FOUNDATION_IPPROTO_TCP , address: data)
577
576
}
578
577
579
578
private static let remoteSocketCoresLock = NSLock ( )
@@ -1049,7 +1048,7 @@ open class SocketPort : Port {
1049
1048
if let connector = core. connectors [ signature] , CFSocketIsValid ( connector) {
1050
1049
return connector
1051
1050
} else {
1052
- if signature. socketType == SOCK_STREAM {
1051
+ if signature. socketType == FOUNDATION_SOCK_STREAM {
1053
1052
if let connector = CFSocketCreate ( nil , socketKind. protocolFamily, socketKind. socketType, socketKind. protocol, CFOptionFlags ( kCFSocketDataCallBack) , __NSFireSocketData, & context) , CFSocketIsValid ( connector) {
1054
1053
var timeout = time - Date. timeIntervalSinceReferenceDate
1055
1054
if timeout < 0 || timeout >= SocketPort . maximumTimeout {
0 commit comments