Add an option to enable Multipath TCP on clients #766
Conversation
|
Hi @Aperence, sorry for the delay in getting a review here. I'll take a look now. |
| } | ||
|
|
||
| public init(tlsConfiguration: TLSConfiguration? = nil, | ||
| redirectConfiguration: RedirectConfiguration? = nil, | ||
| timeout: Timeout = Timeout(), | ||
| proxy: Proxy? = nil, | ||
| ignoreUncleanSSLShutdown: Bool = false, | ||
| decompression: Decompression = .disabled) { | ||
| decompression: Decompression = .disabled, | ||
| enableMultipath: Bool = false) { |
There was a problem hiding this comment.
Unfortunately, we can't add new parameters to public methods. This will need a new method that has the extra parameter.
There was a problem hiding this comment.
Does it require a new method, or do you prefer simply having the field enableMPTCP as public in the configuration, allowing to set it freely ?
| public init( | ||
| tlsConfiguration: TLSConfiguration? = nil, | ||
| redirectConfiguration: RedirectConfiguration? = nil, | ||
| timeout: Timeout = Timeout(), | ||
| connectionPool: ConnectionPool = ConnectionPool(), | ||
| proxy: Proxy? = nil, | ||
| ignoreUncleanSSLShutdown: Bool = false, | ||
| decompression: Decompression = .disabled | ||
| decompression: Decompression = .disabled, | ||
| enableMultipath: Bool = false |
There was a problem hiding this comment.
Unfortunately, we can't add new parameters here. We need a new method, with the new parameter.
| @@ -780,7 +788,8 @@ public class HTTPClient { | |||
| maximumAllowedIdleTimeInConnectionPool: TimeAmount = .seconds(60), | |||
| proxy: Proxy? = nil, | |||
| ignoreUncleanSSLShutdown: Bool = false, | |||
| decompression: Decompression = .disabled) { | |||
| decompression: Decompression = .disabled, | |||
| enableMultipath: Bool = false) { | |||
| @@ -799,7 +809,8 @@ public class HTTPClient { | |||
| proxy: Proxy? = nil, | |||
| ignoreUncleanSSLShutdown: Bool = false, | |||
| decompression: Decompression = .disabled, | |||
| backgroundActivityLogger: Logger?) { | |||
| backgroundActivityLogger: Logger?, | |||
| enableMultipath: Bool = false) { | |||
| } | ||
|
|
||
| public init(certificateVerification: CertificateVerification, | ||
| redirectConfiguration: RedirectConfiguration? = nil, | ||
| timeout: Timeout = Timeout(), | ||
| proxy: Proxy? = nil, | ||
| ignoreUncleanSSLShutdown: Bool = false, | ||
| decompression: Decompression = .disabled) { | ||
| decompression: Decompression = .disabled, | ||
| enableMultipath: Bool = false) { |
Aperence
force-pushed
the
mptcp-support
branch
from
1a7f321
to
6190e9e
Compare
|
Hello @Lukasa, First, thanks for the review ! I've removed the changes to the methods' signatures. It is still possible to set the enableMultipath field as it is public, but if you prefer, I can also introduce a method for it. I've added also another test that enables MPTCP, and check that we can still fetch https://httpbin.org/get, as requested. I remain available if other changes are needed. |
Lukasa
added
the
semver/minor
|
@swift-server-bot test this please |
|
Ok, looks like the linux tests fail with |
Aperence
force-pushed
the
mptcp-support
branch
from
f26c6d2
to
b8faf9e
Compare
|
Just added the do-catch now ! |
Multipath TCP (MPTCP) is a TCP extension allowing to enhance the reliability of the network by using multiple interfaces. This extension provides a seamless handover between interfaces in case of deterioration of the connection on the original one. In the context of iOS and Mac OS X, it could be really interesting to leverage the capabilities of MPTCP as they could benefit from their multiple interfaces (ethernet + Wi-fi for Mac OS X, Wi-fi + cellular for iOS). This contribution introduces patches to HTTPClient.Configuration and establishment of the Bootstraps. A supplementary field "enableMultipath" was added to the configuration, allowing to request the use of MPTCP. This flag is then used when creating the channels to configure the client. Note that in the future, it might also be potentially interesting to offer more precise configuration options for MPTCP on MacOS, as the Network framework allows also to select a type of service, instead of just offering the option to create MPTCP connections. Currently, when enabling MPTCP, only the Handover mode is used.
Aperence
force-pushed
the
mptcp-support
branch
from
b8faf9e
to
068512c
Compare
|
Applied required changes |
Co-authored-by: Cory Benfield <[email protected]>
|
@swift-server-bot test this please |
| } | ||
| let response = try client.get(url: self.defaultHTTPBinURLPrefix + "get").wait() | ||
| XCTAssertEqual(.ok, response.status) | ||
| } catch let error as IOError where error.errnoCode == EINVAL { |
There was a problem hiding this comment.
Just tried running this locally, it turns out EPROTONOSUPPORT is also sometimes thrown on Linux, so we need to add that to the list.
There was a problem hiding this comment.
Added this, I've checked the documentation and it seems that it could also raise an ENOPROTOOPT error, so I've added this one too to the list
|
@swift-server-bot test this please |
Multipath TCP (MPTCP) is a TCP extension allowing to enhance the reliability of the network by using multiple interfaces. This extension provides a seamless handover between interfaces in case of deterioration of the connection on the original one. In the context of iOS and Mac OS X, it could be really interesting to leverage the capabilities of MPTCP as they could benefit from their multiple interfaces (ethernet + Wi-fi for Mac OS X, Wi-fi + cellular for iOS).
This contribution introduces patches to HTTPClient.Configuration and establishment of the Bootstraps. A supplementary field "enableMultipath" was added to the configuration, allowing to request the use of MPTCP. This flag is then used when creating the channels to configure the client.
Note that in the future, it might also be potentially interesting to offer more precise configuration options for MPTCP on MacOS, as the Network framework allows also to select a type of service, instead of just offering the option to create MPTCP connections. Currently, when enabling MPTCP, only the Handover mode is used.