mirror
/
swift-nio-transport-services
mirror of https://github.com/apple/swift-nio-transport-services.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes #8, and cleans some switch cases. (#9) 

Motivation:

One bugfix, some cleanliness.

Modifications:

`NIOTSListenerChannel.doClose0()` now evaluates and updates `self.bindPromise` irrespective of whether `self.nwListener` had been set.

Also, some case statements could be better: I've swapped `case _ as Thing:` with `case is Thing:`, and I've inlined the `let` value from `case _ as Thing: let thing = x as! Thing` to simply be `case let x as Thing:`.

Result:

If the call to create the `NWListener` in `NIOTSListenerChannel.beginActivating0()` throws an error, any promise passed to that method will now correctly be updated, where before it would be silently ignored, potentially causing a waiting caller to wait forever.

Also, no case statements remain that might cause damage to my tooth enamel.
This commit is contained in:
Jim Dovey 2018-10-16 02:29:47 -07:00 committed by Cory Benfield
parent e14a834008
commit 9e8685be61
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Sources/NIOTransportServices/NIOTSListenerChannel.swift
View File

@ -147,14 +147,12 @@ extension NIOTSListenerChannel: Channel {
// TODO: Many more channel options, both from NIO and Network.framework.
switch option {
case _ as AutoReadOption:
case is AutoReadOption:
// AutoRead is currently mandatory for TS listeners.
if value as! AutoReadOption.OptionType == false {
throw ChannelError.operationUnsupported
}
case _ as SocketOption:
let optionValue = option as! SocketOption
case let optionValue as SocketOption:
// SO_REUSEADDR and SO_REUSEPORT are handled here.
switch optionValue.value {
case (SOL_SOCKET, SO_REUSEADDR):
@ -187,11 +185,9 @@ extension NIOTSListenerChannel: Channel {
}
switch option {
case _ as AutoReadOption:
case is AutoReadOption:
return autoRead as! T.OptionType
case _ as SocketOption:
let optionValue = option as! SocketOption
case let optionValue as SocketOption:
// SO_REUSEADDR and SO_REUSEPORT are handled here.
switch optionValue.value {
case (SOL_SOCKET, SO_REUSEADDR):
@ -313,16 +309,12 @@ extension NIOTSListenerChannel: StateManagedChannel {
}
public func doClose0(error: Error) {
guard let listener = self.nwListener else {
// We don't have a connection to close here, so we're actually done. Our old state
// was idle.
return
// Step 1: tell the networking stack (if created) that we're done.
if let listener = self.nwListener {
listener.cancel()
}
// Step 1 is to tell the network stack we're done.
listener.cancel()
// Step 2 is to cancel a pending bind promise, if any.
// Step 2: fail any pending bind promise.
if let pendingBind = self.bindPromise {
self.bindPromise = nil
pendingBind.fail(error: error)