Skip to content

Remove parts of #139 relying on the Network framework #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 19, 2019
Merged

Remove parts of #139 relying on the Network framework #147

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5169cf
Remove parts of #139 relying on the Network framework
PopFlamingo Dec 18, 2019
50830f2
Merge branch 'master' into sni-bugfix-compatfix
weissi Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 9 additions & 23 deletions Sources/AsyncHTTPClient/Utils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,17 @@
import NIO
import NIOHTTP1

#if canImport(Network)
import Network

internal extension String {
var isIPAddress: Bool {
if IPv4Address(self) != nil || IPv6Address(self) != nil {
return true
}
return false
internal extension String {
var isIPAddress: Bool {
var ipv4Addr = in_addr()
var ipv6Addr = in6_addr()

return self.withCString { ptr in
inet_pton(AF_INET, ptr, &ipv4Addr) == 1 ||
inet_pton(AF_INET6, ptr, &ipv6Addr) == 1
}
}

#else
internal extension String {
var isIPAddress: Bool {
var ipv4Addr = in_addr()
var ipv6Addr = in6_addr()

return self.withCString { ptr in
inet_pton(AF_INET, ptr, &ipv4Addr) == 1 ||
inet_pton(AF_INET6, ptr, &ipv6Addr) == 1
}
}
}
#endif
}

public final class HTTPClientCopyingDelegate: HTTPClientResponseDelegate {
public typealias Response = Void
Expand Down