Skip to content

Commit 6946f2f

Browse files
committed
Review feedback
1 parent 2f4aa40 commit 6946f2f

2 files changed

Lines changed: 13 additions & 11 deletions

File tree

Sources/SwiftNetwork/Protocols/Checksum.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,16 @@ struct ChecksumFlags: OptionSet {
6262
static let partial = ChecksumFlags(rawValue: 0x01)
6363
static let zeroInvert = ChecksumFlags(rawValue: 0x02)
6464
static let ip = ChecksumFlags(rawValue: 0x04)
65-
static let tcpv4 = ChecksumFlags(rawValue: 0x08)
66-
static let udpv4 = ChecksumFlags(rawValue: 0x10)
67-
static let tcpv6 = ChecksumFlags(rawValue: 0x20)
68-
static let udpv6 = ChecksumFlags(rawValue: 0x40)
65+
static let tcpIPv4 = ChecksumFlags(rawValue: 0x08)
66+
static let udpIPv4 = ChecksumFlags(rawValue: 0x10)
67+
static let tcpIPv6 = ChecksumFlags(rawValue: 0x20)
68+
static let udpIPv6 = ChecksumFlags(rawValue: 0x40)
6969
}
7070

7171
struct InterfaceChecksumFlags: OptionSet {
7272
let rawValue: UInt32
73-
static let csumUDP = InterfaceChecksumFlags(rawValue: 0x0000_0004)
74-
static let csumUDPIPV6 = InterfaceChecksumFlags(rawValue: 0x0000_0040)
73+
static let csumUDPIPv4 = InterfaceChecksumFlags(rawValue: 0x0000_0004)
74+
static let csumUDPIPv6 = InterfaceChecksumFlags(rawValue: 0x0000_0040)
7575
}
7676

7777
@available(Network 0.1.0, *)

Sources/SwiftNetwork/Protocols/UDPProtocol.swift

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ public struct UDPProtocol: NetworkProtocol {
159159
if self.maximumDatagramSize > UDPProtocol.headerLength {
160160
self.maximumDatagramSize -= UDPProtocol.headerLength
161161
}
162-
let udpCsumOffload: UInt32 = path.hardwareChecksumFlags
163-
if isIPv4 && ((udpCsumOffload & InterfaceChecksumFlags.csumUDP.rawValue) != 0)
164-
|| !isIPv4 && ((udpCsumOffload & InterfaceChecksumFlags.csumUDPIPV6.rawValue) != 0)
162+
let udpChecksumOffload: UInt32 = path.hardwareChecksumFlags
163+
if isIPv4 && ((udpChecksumOffload & InterfaceChecksumFlags.csumUDPIPv4.rawValue) != 0)
164+
|| !isIPv4 && ((udpChecksumOffload & InterfaceChecksumFlags.csumUDPIPv6.rawValue) != 0)
165165
{
166166
self.flags.insert(.fullChecksumOffload)
167167
self.flags.remove(.partialChecksumOffload)
@@ -218,6 +218,7 @@ public struct UDPProtocol: NetworkProtocol {
218218
if udpOptions.fullChecksumOffload {
219219
self.flags.insert(.fullChecksumOffload)
220220
}
221+
#if !NETWORK_EMBEDDED
221222
if let transport = parameters.defaultStack.transport {
222223
if transport.options == udpOptions, udpOptions.useQUICStats {
223224
self.flags.insert(.upperTransportIsQUIC)
@@ -228,6 +229,7 @@ public struct UDPProtocol: NetworkProtocol {
228229
self.flags.insert(.upperTransportIsQUIC)
229230
}
230231
}
232+
#endif
231233
}
232234
}
233235

@@ -436,8 +438,8 @@ public struct UDPProtocol: NetworkProtocol {
436438
if self.flags.contains(.fullChecksumOffload) {
437439
let csumFlags: ChecksumFlags =
438440
isIPv4
439-
? [.udpv4, .zeroInvert]
440-
: [.udpv6, .zeroInvert]
441+
? [.udpIPv4, .zeroInvert]
442+
: [.udpIPv6, .zeroInvert]
441443
frame.checksumOffloadFlags |= csumFlags.rawValue
442444
}
443445

0 commit comments

Comments
 (0)