From b5169cf341dc9f43561604db6ae192cfc58148df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trev=C3=B6r=20Anne=20Denise?= Date: Wed, 18 Dec 2019 18:42:55 +0100 Subject: [PATCH] Remove parts of #139 relying on the Network framework Use the UNIX implementation across all platforms to avoid unnecessary complexity introduced by platform specific implementations --- Sources/AsyncHTTPClient/Utils.swift | 32 ++++++++--------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/Sources/AsyncHTTPClient/Utils.swift b/Sources/AsyncHTTPClient/Utils.swift index 398720b43..5f7d4b1a5 100644 --- a/Sources/AsyncHTTPClient/Utils.swift +++ b/Sources/AsyncHTTPClient/Utils.swift @@ -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