]> git.ipfire.org Git - thirdparty/wireguard-apple.git/commitdiff
Remove unused code: InternetReachability
authorRoopesh Chander <roop@roopc.net>
Thu, 13 Dec 2018 18:15:21 +0000 (23:45 +0530)
committerRoopesh Chander <roop@roopc.net>
Thu, 13 Dec 2018 18:15:21 +0000 (23:45 +0530)
Signed-off-by: Roopesh Chander <roop@roopc.net>
WireGuard/WireGuard.xcodeproj/project.pbxproj
WireGuard/WireGuard/Tunnel/InternetReachability.swift [deleted file]

index 049071b4170fd7399321ac0837b8a55355619ba9..4e6f6d874d622b628047bb67be167dec5c5dc826 100644 (file)
@@ -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 */; };
                6FF4AC2B211EC776002C96EB /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Config.xcconfig; path = Config/Config.xcconfig; sourceTree = "<group>"; };
                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 = "<group>"; };
-               6FF717E421B2CB1E0045A474 /* InternetReachability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InternetReachability.swift; sourceTree = "<group>"; };
                6FFA5D942194454A0001E2F7 /* NETunnelProviderProtocol+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NETunnelProviderProtocol+Extension.swift"; sourceTree = "<group>"; };
                6FFA5D9F21958ECC0001E2F7 /* ErrorNotifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorNotifier.swift; sourceTree = "<group>"; };
                6FFA5DA32197085D0001E2F7 /* ActivateOnDemandSetting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivateOnDemandSetting.swift; sourceTree = "<group>"; };
                        children = (
                                6F7774EE21722D97006A79B3 /* TunnelsManager.swift */,
                                6FFA5DA32197085D0001E2F7 /* ActivateOnDemandSetting.swift */,
-                               6FF717E421B2CB1E0045A474 /* InternetReachability.swift */,
                        );
                        path = Tunnel;
                        sourceTree = "<group>";
                                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 (file)
index 2e50852..0000000
+++ /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<sockaddr_in>.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
-    }
-}