Skip to content

iOS: extract configuration into a separate namespace #137

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

Open
ailinykh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

iOS: extract configuration into a separate namespace #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 15 additions & 6 deletions ios/vpn/NewNode VPN/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,16 @@ import Network
import NetworkExtension


class ViewController: UIViewController {
private extension String {
static let applicationGroupIdentifier = "group.com.newnode.vpn"
static let wormholeStatisticMessageIdentifier = "DisplayStats"

static let tunnelBundleIdentifier = "com.newnode.vpn.tunnel"
static let tunnelServerAddress = "NewNode"
static let tunnelLocalizedDescription = "NewNode"
}

final class ViewController: UIViewController {

@IBOutlet var gradient: GradientView!
@IBOutlet weak var powerButton: UIButton!
Expand All @@ -26,7 +35,7 @@ class ViewController: UIViewController {
@IBOutlet weak var logo: UIImageView!
@IBOutlet var statTexts: [UILabel]!
let monitor = NWPathMonitor()
let wormhole = MMWormhole(applicationGroupIdentifier: "group.com.newnode.vpn", optionalDirectory: nil)
let wormhole = MMWormhole(applicationGroupIdentifier: .applicationGroupIdentifier, optionalDirectory: nil)

var toggleState: Bool {
get {
Expand Down Expand Up @@ -56,7 +65,7 @@ class ViewController: UIViewController {
}
monitor.start(queue: .main)

wormhole.listenForMessage(withIdentifier: "DisplayStats", listener: { (message) -> Void in
wormhole.listenForMessage(withIdentifier: .wormholeStatisticMessageIdentifier, listener: { (message) -> Void in
if let o = message as? NSDictionary, let direct = o["direct_bytes"] as? UInt64, let peer = o["peers_bytes"] as? UInt64 {
self.updateStatistics(direct: direct, peer: peer)
}
Expand Down Expand Up @@ -178,11 +187,11 @@ class ViewController: UIViewController {
if managers.count == 0 {
let manager = NETunnelProviderManager()
let providerProtocol = NETunnelProviderProtocol()
providerProtocol.providerBundleIdentifier = "com.newnode.vpn.tunnel"
providerProtocol.serverAddress = "NewNode"
providerProtocol.providerBundleIdentifier = .tunnelBundleIdentifier
providerProtocol.serverAddress = .tunnelServerAddress
manager.protocolConfiguration = providerProtocol
manager.isEnabled = true
manager.localizedDescription = "NewNode"
manager.localizedDescription = .tunnelLocalizedDescription

manager.saveToPreferences(completionHandler: { (error: Error?) in
os_log("saveToPreferences %@", error?.localizedDescription ?? "")
Expand Down
20 changes: 14 additions & 6 deletions ios/vpn/Tunnel/PacketTunnelProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,25 @@
import NetworkExtension
import os.log

enum NewNodeError: Error {
private enum NewNodeError: Error {
case initializationError
}

class PacketTunnelProvider: NEPacketTunnelProvider {
private extension String {
static let applicationGroupIdentifier = "group.com.newnode.vpn"
static let wormholeStatisticMessageIdentifier = "DisplayStats"
}

private extension Notification.Name {
static let displayStatistic = Notification.Name("DisplayStats")
}

final class PacketTunnelProvider: NEPacketTunnelProvider {

override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
super.startTunnel(options: options, completionHandler: completionHandler)

NotificationCenter.default.addObserver(self, selector:#selector(displayStats), name:
Notification.Name("DisplayStats"), object: nil)
NotificationCenter.default.addObserver(self, selector:#selector(displayStats), name: .displayStatistic, object: nil)

let cachesPath = NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true).last!
chdir(cachesPath)
Expand Down Expand Up @@ -65,8 +73,8 @@ class PacketTunnelProvider: NEPacketTunnelProvider {

@objc func displayStats(notification: NSNotification) {
let o = notification.userInfo
let wormhole = MMWormhole(applicationGroupIdentifier: "group.com.newnode.vpn", optionalDirectory: nil)
wormhole.passMessageObject(o as NSDictionary?, identifier: "DisplayStats")
let wormhole = MMWormhole(applicationGroupIdentifier: .applicationGroupIdentifier, optionalDirectory: nil)
wormhole.passMessageObject(o as NSDictionary?, identifier: .wormholeStatisticMessageIdentifier)
}

override func stopTunnel(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
Expand Down