From 740ffd68b6c81fc251f6917b872d845002793463 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Thu, 13 Dec 2018 23:45:21 +0530 Subject: Remove unused code: InternetReachability Signed-off-by: Roopesh Chander --- WireGuard/WireGuard.xcodeproj/project.pbxproj | 4 -- .../WireGuard/Tunnel/InternetReachability.swift | 51 ---------------------- 2 files changed, 55 deletions(-) delete mode 100644 WireGuard/WireGuard/Tunnel/InternetReachability.swift diff --git a/WireGuard/WireGuard.xcodeproj/project.pbxproj b/WireGuard/WireGuard.xcodeproj/project.pbxproj index 049071b..4e6f6d8 100644 --- a/WireGuard/WireGuard.xcodeproj/project.pbxproj +++ b/WireGuard/WireGuard.xcodeproj/project.pbxproj @@ -51,7 +51,6 @@ 6FF3527321C2616C0008484E /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FF3526E21C23FA10008484E /* Logger.swift */; }; 6FF4AC1F211EC472002C96EB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6FF4AC1E211EC472002C96EB /* Assets.xcassets */; }; 6FF4AC22211EC472002C96EB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6FF4AC20211EC472002C96EB /* LaunchScreen.storyboard */; }; - 6FF717E521B2CB1E0045A474 /* InternetReachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FF717E421B2CB1E0045A474 /* InternetReachability.swift */; }; 6FFA5D8921942F320001E2F7 /* PacketTunnelSettingsGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F5D0C472183C6A3000F85AD /* PacketTunnelSettingsGenerator.swift */; }; 6FFA5D8E2194370D0001E2F7 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F7774E72172020C006A79B3 /* Configuration.swift */; }; 6FFA5D8F2194370D0001E2F7 /* IPAddressRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F7774E9217229DB006A79B3 /* IPAddressRange.swift */; }; @@ -153,7 +152,6 @@ 6FF4AC2B211EC776002C96EB /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Config.xcconfig; path = Config/Config.xcconfig; sourceTree = ""; }; 6FF4AC462120B9E0002C96EB /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; }; 6FF4AC482120B9E0002C96EB /* WireGuard.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WireGuard.entitlements; sourceTree = ""; }; - 6FF717E421B2CB1E0045A474 /* InternetReachability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InternetReachability.swift; sourceTree = ""; }; 6FFA5D942194454A0001E2F7 /* NETunnelProviderProtocol+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NETunnelProviderProtocol+Extension.swift"; sourceTree = ""; }; 6FFA5D9F21958ECC0001E2F7 /* ErrorNotifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorNotifier.swift; sourceTree = ""; }; 6FFA5DA32197085D0001E2F7 /* ActivateOnDemandSetting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivateOnDemandSetting.swift; sourceTree = ""; }; @@ -265,7 +263,6 @@ children = ( 6F7774EE21722D97006A79B3 /* TunnelsManager.swift */, 6FFA5DA32197085D0001E2F7 /* ActivateOnDemandSetting.swift */, - 6FF717E421B2CB1E0045A474 /* InternetReachability.swift */, ); path = Tunnel; sourceTree = ""; @@ -651,7 +648,6 @@ 6FDEF806218725D200D8FBF6 /* SettingsTableViewController.swift in Sources */, 6F7774E1217181B1006A79B3 /* MainViewController.swift in Sources */, 6FFA5DA42197085D0001E2F7 /* ActivateOnDemandSetting.swift in Sources */, - 6FF717E521B2CB1E0045A474 /* InternetReachability.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/WireGuard/WireGuard/Tunnel/InternetReachability.swift b/WireGuard/WireGuard/Tunnel/InternetReachability.swift deleted file mode 100644 index 2e50852..0000000 --- a/WireGuard/WireGuard/Tunnel/InternetReachability.swift +++ /dev/null @@ -1,51 +0,0 @@ -// SPDX-License-Identifier: MIT -// Copyright © 2018 WireGuard LLC. All Rights Reserved. - -import SystemConfiguration - -class InternetReachability { - - enum Status { - case unknown - case notReachable - case reachableOverWiFi - case reachableOverCellular - } - - static func currentStatus() -> Status { - var status: Status = .unknown - if let reachabilityRef = InternetReachability.reachabilityRef() { - var flags = SCNetworkReachabilityFlags(rawValue: 0) - SCNetworkReachabilityGetFlags(reachabilityRef, &flags) - status = Status(reachabilityFlags: flags) - } - return status - } - - private static func reachabilityRef() -> SCNetworkReachability? { - let addrIn = sockaddr_in(sin_len: UInt8(MemoryLayout.size), - sin_family: sa_family_t(AF_INET), - sin_port: 0, - sin_addr: in_addr(s_addr: 0), - sin_zero: (0, 0, 0, 0, 0, 0, 0, 0)) - return withUnsafePointer(to: addrIn) { addrInPtr in - addrInPtr.withMemoryRebound(to: sockaddr.self, capacity: 1) { addrPtr in - return SCNetworkReachabilityCreateWithAddress(nil, addrPtr) - } - } - } -} - -extension InternetReachability.Status { - init(reachabilityFlags flags: SCNetworkReachabilityFlags) { - var status: InternetReachability.Status = .notReachable - if flags.contains(.reachable) { - if flags.contains(.isWWAN) { - status = .reachableOverCellular - } else { - status = .reachableOverWiFi - } - } - self = status - } -} -- cgit v1.2.3-59-g8ed1b