Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
55 changes: 49 additions & 6 deletions LocalDevVPN/ContentView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import Foundation
import NetworkExtension
import SwiftUI
import Darwin

import NavigationBackport

Expand All@@ -16,6 +17,30 @@ extension Bundle {
var tunnelBundleID: String { bundleIdentifier!.appending(".TunnelProv") }
}

private func getCurrentWiFiIP() -> String? {
var address: String?
var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)
}
}
}
freeifaddrs(ifaddr)
return address
}

// MARK: - Logging Utility

class VPNLogger: ObservableObject {
Expand DownExpand Up@@ -66,7 +91,11 @@ class TunnelManager: ObservableObject {
private var tunnelSubnetMask: String {
UserDefaults.standard.string(forKey: "TunnelSubnetMask") ?? "255.255.255.0"
}


private var useWiFiSubnet: Bool {
UserDefaults.standard.bool(forKey: "useWiFiSubnet")
}

private var tunnelBundleId: String {
Bundle.main.bundleIdentifier!.appending(".TunnelProv")
}
Expand DownExpand Up@@ -503,6 +532,7 @@ class TunnelManager: ObservableObject {
"TunnelDeviceIP": self.tunnelDeviceIp as NSObject,
"TunnelFakeIP": self.tunnelFakeIp as NSObject,
"TunnelSubnetMask": self.tunnelSubnetMask as NSObject,
"UseWiFiSubnet": self.useWiFiSubnet as NSObject,
]

do {
Expand DownExpand Up@@ -783,6 +813,14 @@ extension View {
struct StatusOverviewCard: View {
@StateObject private var tunnelManager = TunnelManager.shared
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false

private var currentIP: String {
if useWiFiSubnet, let wifiIP = getCurrentWiFiIP() {
return wifiIP
}
return deviceIP
}

var body: some View {
DashboardCard {
Expand DownExpand Up@@ -827,7 +865,7 @@ struct StatusOverviewCard: View {
private var statusTip: String {
switch tunnelManager.tunnelStatus {
case .connected:
return String(format: NSLocalizedString("connected_to_ip", comment: ""), deviceIP)
return String(format: NSLocalizedString("connected_to_ip", comment: ""), currentIP)
case .connecting:
return NSLocalizedString("ios_might_ask_you_to_allow_the_vpn", comment: "")
case .disconnecting:
Expand DownExpand Up@@ -1087,6 +1125,7 @@ struct SettingsView: View {
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("TunnelFakeIP") private var fakeIP = "10.7.0.1"
@AppStorage("TunnelSubnetMask") private var subnetMask = "255.255.255.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false
@AppStorage("autoConnect") private var autoConnect = false
@AppStorage("shownTunnelAlert") private var shownTunnelAlert = false
@StateObject private var tunnelManager = TunnelManager.shared
Expand All@@ -1106,10 +1145,14 @@ struct SettingsView: View {
}

Section(header: Text("network_configuration")) {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
Toggle("match_wifi_subnet", isOn: $useWiFiSubnet)

if !useWiFiSubnet {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
}
}
}

Expand Down
1 change: 1 addition & 0 deletions LocalDevVPN/Localization/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@
"auto_connect_on_launch" = "Auto Connect on Launch";
"connection_logs" = "Connection Logs";
"network_configuration" = "Network Configuration";
"match_wifi_subnet" = "Match WiFi Subnet";
"device_ip" = "Device IP";
"tunnel_ip" = "Tunnel IP";
"subnet_mask" = "Subnet Mask";
Expand Down
90 changes: 83 additions & 7 deletions TunnelProv/PacketTunnelProvider.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
//

import NetworkExtension
import Darwin

class PacketTunnelProvider: NEPacketTunnelProvider {
var tunnelDeviceIp: String = "10.7.0.0"
Expand All@@ -16,20 +17,46 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
private var fakeIpValue: UInt32 = 0

override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
let useWifiSubnet = options?["UseWiFiSubnet"] as? Bool ?? false

if useWifiSubnet {
if let wifiInfo = getWiFiNetworkInfo() {
tunnelDeviceIp = wifiInfo.ipAddress
tunnelSubnetMask = wifiInfo.subnetMask
let fakeIpParts = wifiInfo.ipAddress.split(separator: ".")
if fakeIpParts.count == 4 {
tunnelFakeIp = "\(fakeIpParts[0]).\(fakeIpParts[1]).\(fakeIpParts[2]).\(Int(fakeIpParts[3])! + 1)"
}
}
} else {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
}
if let subnetMask = options?["TunnelSubnetMask"] as? String {
tunnelSubnetMask = subnetMask
}
}

deviceIpValue = ipToUInt32(tunnelDeviceIp)
fakeIpValue = ipToUInt32(tunnelFakeIp)

let settings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: tunnelDeviceIp)
let ipv4 = NEIPv4Settings(addresses: [tunnelDeviceIp], subnetMasks: [tunnelSubnetMask])
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]

let localSubnet = calculateNetworkAddress(ip: tunnelDeviceIp, mask: tunnelSubnetMask)
let localRoute = NEIPv4Route(destinationAddress: localSubnet, subnetMask: tunnelSubnetMask)

if useWifiSubnet {
ipv4.includedRoutes = [localRoute]
ipv4.excludedRoutes = [.default()]
} else {
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]
}

settings.ipv4Settings = ipv4

setTunnelNetworkSettings(settings) { error in
Expand DownExpand Up@@ -69,4 +96,53 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
}
return (b1 << 24) | (b2 << 16) | (b3 << 8) | b4
}

private func getWiFiNetworkInfo() -> (ipAddress: String, subnetMask: String)? {
var address: String?
var subnetMask: String?

var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)

var maskHostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_netmask, socklen_t(interface.ifa_netmask.pointee.sa_len),
&maskHostname, socklen_t(maskHostname.count), nil, socklen_t(0), NI_NUMERICHOST)
subnetMask = String(cString: maskHostname)
}
}
}
freeifaddrs(ifaddr)

if let addr = address, let mask = subnetMask {
return (addr, mask)
}
return nil
}

private func calculateNetworkAddress(ip: String, mask: String) -> String {
let ipParts = ip.split(separator: ".").compactMap { UInt32($0) }
let maskParts = mask.split(separator: ".").compactMap { UInt32($0) }

guard ipParts.count == 4, maskParts.count == 4 else { return ip }

let network = (ipParts[0] & maskParts[0]) |
(ipParts[1] & maskParts[1]) |
(ipParts[2] & maskParts[2]) |
(ipParts[3] & maskParts[3])

return "\(network >> 24 & 0xFF).\(network >> 16 & 0xFF).\(network >> 8 & 0xFF).\(network & 0xFF)"
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
iOS 26.4b1 patch by sh4tteredd · Pull Request #18 · jkcoxson/LocalDevVPN · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
55 changes: 49 additions & 6 deletions LocalDevVPN/ContentView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import Foundation
import NetworkExtension
import SwiftUI
import Darwin

import NavigationBackport

Expand All@@ -16,6 +17,30 @@ extension Bundle {
var tunnelBundleID: String { bundleIdentifier!.appending(".TunnelProv") }
}

private func getCurrentWiFiIP() -> String? {
var address: String?
var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)
}
}
}
freeifaddrs(ifaddr)
return address
}

// MARK: - Logging Utility

class VPNLogger: ObservableObject {
Expand DownExpand Up@@ -66,7 +91,11 @@ class TunnelManager: ObservableObject {
private var tunnelSubnetMask: String {
UserDefaults.standard.string(forKey: "TunnelSubnetMask") ?? "255.255.255.0"
}


private var useWiFiSubnet: Bool {
UserDefaults.standard.bool(forKey: "useWiFiSubnet")
}

private var tunnelBundleId: String {
Bundle.main.bundleIdentifier!.appending(".TunnelProv")
}
Expand DownExpand Up@@ -503,6 +532,7 @@ class TunnelManager: ObservableObject {
"TunnelDeviceIP": self.tunnelDeviceIp as NSObject,
"TunnelFakeIP": self.tunnelFakeIp as NSObject,
"TunnelSubnetMask": self.tunnelSubnetMask as NSObject,
"UseWiFiSubnet": self.useWiFiSubnet as NSObject,
]

do {
Expand DownExpand Up@@ -783,6 +813,14 @@ extension View {
struct StatusOverviewCard: View {
@StateObject private var tunnelManager = TunnelManager.shared
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false

private var currentIP: String {
if useWiFiSubnet, let wifiIP = getCurrentWiFiIP() {
return wifiIP
}
return deviceIP
}

var body: some View {
DashboardCard {
Expand DownExpand Up@@ -827,7 +865,7 @@ struct StatusOverviewCard: View {
private var statusTip: String {
switch tunnelManager.tunnelStatus {
case .connected:
return String(format: NSLocalizedString("connected_to_ip", comment: ""), deviceIP)
return String(format: NSLocalizedString("connected_to_ip", comment: ""), currentIP)
case .connecting:
return NSLocalizedString("ios_might_ask_you_to_allow_the_vpn", comment: "")
case .disconnecting:
Expand DownExpand Up@@ -1087,6 +1125,7 @@ struct SettingsView: View {
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("TunnelFakeIP") private var fakeIP = "10.7.0.1"
@AppStorage("TunnelSubnetMask") private var subnetMask = "255.255.255.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false
@AppStorage("autoConnect") private var autoConnect = false
@AppStorage("shownTunnelAlert") private var shownTunnelAlert = false
@StateObject private var tunnelManager = TunnelManager.shared
Expand All@@ -1106,10 +1145,14 @@ struct SettingsView: View {
}

Section(header: Text("network_configuration")) {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
Toggle("match_wifi_subnet", isOn: $useWiFiSubnet)

if !useWiFiSubnet {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
}
}
}

Expand Down
1 change: 1 addition & 0 deletions LocalDevVPN/Localization/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@
"auto_connect_on_launch" = "Auto Connect on Launch";
"connection_logs" = "Connection Logs";
"network_configuration" = "Network Configuration";
"match_wifi_subnet" = "Match WiFi Subnet";
"device_ip" = "Device IP";
"tunnel_ip" = "Tunnel IP";
"subnet_mask" = "Subnet Mask";
Expand Down
90 changes: 83 additions & 7 deletions TunnelProv/PacketTunnelProvider.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
//

import NetworkExtension
import Darwin

class PacketTunnelProvider: NEPacketTunnelProvider {
var tunnelDeviceIp: String = "10.7.0.0"
Expand All@@ -16,20 +17,46 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
private var fakeIpValue: UInt32 = 0

override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
let useWifiSubnet = options?["UseWiFiSubnet"] as? Bool ?? false

if useWifiSubnet {
if let wifiInfo = getWiFiNetworkInfo() {
tunnelDeviceIp = wifiInfo.ipAddress
tunnelSubnetMask = wifiInfo.subnetMask
let fakeIpParts = wifiInfo.ipAddress.split(separator: ".")
if fakeIpParts.count == 4 {
tunnelFakeIp = "\(fakeIpParts[0]).\(fakeIpParts[1]).\(fakeIpParts[2]).\(Int(fakeIpParts[3])! + 1)"
}
}
} else {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
}
if let subnetMask = options?["TunnelSubnetMask"] as? String {
tunnelSubnetMask = subnetMask
}
}

deviceIpValue = ipToUInt32(tunnelDeviceIp)
fakeIpValue = ipToUInt32(tunnelFakeIp)

let settings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: tunnelDeviceIp)
let ipv4 = NEIPv4Settings(addresses: [tunnelDeviceIp], subnetMasks: [tunnelSubnetMask])
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]

let localSubnet = calculateNetworkAddress(ip: tunnelDeviceIp, mask: tunnelSubnetMask)
let localRoute = NEIPv4Route(destinationAddress: localSubnet, subnetMask: tunnelSubnetMask)

if useWifiSubnet {
ipv4.includedRoutes = [localRoute]
ipv4.excludedRoutes = [.default()]
} else {
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]
}

settings.ipv4Settings = ipv4

setTunnelNetworkSettings(settings) { error in
Expand DownExpand Up@@ -69,4 +96,53 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
}
return (b1 << 24) | (b2 << 16) | (b3 << 8) | b4
}

private func getWiFiNetworkInfo() -> (ipAddress: String, subnetMask: String)? {
var address: String?
var subnetMask: String?

var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)

var maskHostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_netmask, socklen_t(interface.ifa_netmask.pointee.sa_len),
&maskHostname, socklen_t(maskHostname.count), nil, socklen_t(0), NI_NUMERICHOST)
subnetMask = String(cString: maskHostname)
}
}
}
freeifaddrs(ifaddr)

if let addr = address, let mask = subnetMask {
return (addr, mask)
}
return nil
}

private func calculateNetworkAddress(ip: String, mask: String) -> String {
let ipParts = ip.split(separator: ".").compactMap { UInt32($0) }
let maskParts = mask.split(separator: ".").compactMap { UInt32($0) }

guard ipParts.count == 4, maskParts.count == 4 else { return ip }

let network = (ipParts[0] & maskParts[0]) |
(ipParts[1] & maskParts[1]) |
(ipParts[2] & maskParts[2]) |
(ipParts[3] & maskParts[3])

return "\(network >> 24 & 0xFF).\(network >> 16 & 0xFF).\(network >> 8 & 0xFF).\(network & 0xFF)"
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' iOS 26.4b1 patch by sh4tteredd · Pull Request #18 · jkcoxson/LocalDevVPN · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
55 changes: 49 additions & 6 deletions LocalDevVPN/ContentView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import Foundation
import NetworkExtension
import SwiftUI
import Darwin

import NavigationBackport

Expand All@@ -16,6 +17,30 @@ extension Bundle {
var tunnelBundleID: String { bundleIdentifier!.appending(".TunnelProv") }
}

private func getCurrentWiFiIP() -> String? {
var address: String?
var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)
}
}
}
freeifaddrs(ifaddr)
return address
}

// MARK: - Logging Utility

class VPNLogger: ObservableObject {
Expand DownExpand Up@@ -66,7 +91,11 @@ class TunnelManager: ObservableObject {
private var tunnelSubnetMask: String {
UserDefaults.standard.string(forKey: "TunnelSubnetMask") ?? "255.255.255.0"
}


private var useWiFiSubnet: Bool {
UserDefaults.standard.bool(forKey: "useWiFiSubnet")
}

private var tunnelBundleId: String {
Bundle.main.bundleIdentifier!.appending(".TunnelProv")
}
Expand DownExpand Up@@ -503,6 +532,7 @@ class TunnelManager: ObservableObject {
"TunnelDeviceIP": self.tunnelDeviceIp as NSObject,
"TunnelFakeIP": self.tunnelFakeIp as NSObject,
"TunnelSubnetMask": self.tunnelSubnetMask as NSObject,
"UseWiFiSubnet": self.useWiFiSubnet as NSObject,
]

do {
Expand DownExpand Up@@ -783,6 +813,14 @@ extension View {
struct StatusOverviewCard: View {
@StateObject private var tunnelManager = TunnelManager.shared
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false

private var currentIP: String {
if useWiFiSubnet, let wifiIP = getCurrentWiFiIP() {
return wifiIP
}
return deviceIP
}

var body: some View {
DashboardCard {
Expand DownExpand Up@@ -827,7 +865,7 @@ struct StatusOverviewCard: View {
private var statusTip: String {
switch tunnelManager.tunnelStatus {
case .connected:
return String(format: NSLocalizedString("connected_to_ip", comment: ""), deviceIP)
return String(format: NSLocalizedString("connected_to_ip", comment: ""), currentIP)
case .connecting:
return NSLocalizedString("ios_might_ask_you_to_allow_the_vpn", comment: "")
case .disconnecting:
Expand DownExpand Up@@ -1087,6 +1125,7 @@ struct SettingsView: View {
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("TunnelFakeIP") private var fakeIP = "10.7.0.1"
@AppStorage("TunnelSubnetMask") private var subnetMask = "255.255.255.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false
@AppStorage("autoConnect") private var autoConnect = false
@AppStorage("shownTunnelAlert") private var shownTunnelAlert = false
@StateObject private var tunnelManager = TunnelManager.shared
Expand All@@ -1106,10 +1145,14 @@ struct SettingsView: View {
}

Section(header: Text("network_configuration")) {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
Toggle("match_wifi_subnet", isOn: $useWiFiSubnet)

if !useWiFiSubnet {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
}
}
}

Expand Down
1 change: 1 addition & 0 deletions LocalDevVPN/Localization/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@
"auto_connect_on_launch" = "Auto Connect on Launch";
"connection_logs" = "Connection Logs";
"network_configuration" = "Network Configuration";
"match_wifi_subnet" = "Match WiFi Subnet";
"device_ip" = "Device IP";
"tunnel_ip" = "Tunnel IP";
"subnet_mask" = "Subnet Mask";
Expand Down
90 changes: 83 additions & 7 deletions TunnelProv/PacketTunnelProvider.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
//

import NetworkExtension
import Darwin

class PacketTunnelProvider: NEPacketTunnelProvider {
var tunnelDeviceIp: String = "10.7.0.0"
Expand All@@ -16,20 +17,46 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
private var fakeIpValue: UInt32 = 0

override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
let useWifiSubnet = options?["UseWiFiSubnet"] as? Bool ?? false

if useWifiSubnet {
if let wifiInfo = getWiFiNetworkInfo() {
tunnelDeviceIp = wifiInfo.ipAddress
tunnelSubnetMask = wifiInfo.subnetMask
let fakeIpParts = wifiInfo.ipAddress.split(separator: ".")
if fakeIpParts.count == 4 {
tunnelFakeIp = "\(fakeIpParts[0]).\(fakeIpParts[1]).\(fakeIpParts[2]).\(Int(fakeIpParts[3])! + 1)"
}
}
} else {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
}
if let subnetMask = options?["TunnelSubnetMask"] as? String {
tunnelSubnetMask = subnetMask
}
}

deviceIpValue = ipToUInt32(tunnelDeviceIp)
fakeIpValue = ipToUInt32(tunnelFakeIp)

let settings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: tunnelDeviceIp)
let ipv4 = NEIPv4Settings(addresses: [tunnelDeviceIp], subnetMasks: [tunnelSubnetMask])
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]

let localSubnet = calculateNetworkAddress(ip: tunnelDeviceIp, mask: tunnelSubnetMask)
let localRoute = NEIPv4Route(destinationAddress: localSubnet, subnetMask: tunnelSubnetMask)

if useWifiSubnet {
ipv4.includedRoutes = [localRoute]
ipv4.excludedRoutes = [.default()]
} else {
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]
}

settings.ipv4Settings = ipv4

setTunnelNetworkSettings(settings) { error in
Expand DownExpand Up@@ -69,4 +96,53 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
}
return (b1 << 24) | (b2 << 16) | (b3 << 8) | b4
}

private func getWiFiNetworkInfo() -> (ipAddress: String, subnetMask: String)? {
var address: String?
var subnetMask: String?

var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)

var maskHostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_netmask, socklen_t(interface.ifa_netmask.pointee.sa_len),
&maskHostname, socklen_t(maskHostname.count), nil, socklen_t(0), NI_NUMERICHOST)
subnetMask = String(cString: maskHostname)
}
}
}
freeifaddrs(ifaddr)

if let addr = address, let mask = subnetMask {
return (addr, mask)
}
return nil
}

private func calculateNetworkAddress(ip: String, mask: String) -> String {
let ipParts = ip.split(separator: ".").compactMap { UInt32($0) }
let maskParts = mask.split(separator: ".").compactMap { UInt32($0) }

guard ipParts.count == 4, maskParts.count == 4 else { return ip }

let network = (ipParts[0] & maskParts[0]) |
(ipParts[1] & maskParts[1]) |
(ipParts[2] & maskParts[2]) |
(ipParts[3] & maskParts[3])

return "\(network >> 24 & 0xFF).\(network >> 16 & 0xFF).\(network >> 8 & 0xFF).\(network & 0xFF)"
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' iOS 26.4b1 patch by sh4tteredd · Pull Request #18 · jkcoxson/LocalDevVPN · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
55 changes: 49 additions & 6 deletions LocalDevVPN/ContentView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import Foundation
import NetworkExtension
import SwiftUI
import Darwin

import NavigationBackport

Expand All@@ -16,6 +17,30 @@ extension Bundle {
var tunnelBundleID: String { bundleIdentifier!.appending(".TunnelProv") }
}

private func getCurrentWiFiIP() -> String? {
var address: String?
var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)
}
}
}
freeifaddrs(ifaddr)
return address
}

// MARK: - Logging Utility

class VPNLogger: ObservableObject {
Expand DownExpand Up@@ -66,7 +91,11 @@ class TunnelManager: ObservableObject {
private var tunnelSubnetMask: String {
UserDefaults.standard.string(forKey: "TunnelSubnetMask") ?? "255.255.255.0"
}


private var useWiFiSubnet: Bool {
UserDefaults.standard.bool(forKey: "useWiFiSubnet")
}

private var tunnelBundleId: String {
Bundle.main.bundleIdentifier!.appending(".TunnelProv")
}
Expand DownExpand Up@@ -503,6 +532,7 @@ class TunnelManager: ObservableObject {
"TunnelDeviceIP": self.tunnelDeviceIp as NSObject,
"TunnelFakeIP": self.tunnelFakeIp as NSObject,
"TunnelSubnetMask": self.tunnelSubnetMask as NSObject,
"UseWiFiSubnet": self.useWiFiSubnet as NSObject,
]

do {
Expand DownExpand Up@@ -783,6 +813,14 @@ extension View {
struct StatusOverviewCard: View {
@StateObject private var tunnelManager = TunnelManager.shared
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false

private var currentIP: String {
if useWiFiSubnet, let wifiIP = getCurrentWiFiIP() {
return wifiIP
}
return deviceIP
}

var body: some View {
DashboardCard {
Expand DownExpand Up@@ -827,7 +865,7 @@ struct StatusOverviewCard: View {
private var statusTip: String {
switch tunnelManager.tunnelStatus {
case .connected:
return String(format: NSLocalizedString("connected_to_ip", comment: ""), deviceIP)
return String(format: NSLocalizedString("connected_to_ip", comment: ""), currentIP)
case .connecting:
return NSLocalizedString("ios_might_ask_you_to_allow_the_vpn", comment: "")
case .disconnecting:
Expand DownExpand Up@@ -1087,6 +1125,7 @@ struct SettingsView: View {
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("TunnelFakeIP") private var fakeIP = "10.7.0.1"
@AppStorage("TunnelSubnetMask") private var subnetMask = "255.255.255.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false
@AppStorage("autoConnect") private var autoConnect = false
@AppStorage("shownTunnelAlert") private var shownTunnelAlert = false
@StateObject private var tunnelManager = TunnelManager.shared
Expand All@@ -1106,10 +1145,14 @@ struct SettingsView: View {
}

Section(header: Text("network_configuration")) {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
Toggle("match_wifi_subnet", isOn: $useWiFiSubnet)

if !useWiFiSubnet {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
}
}
}

Expand Down
1 change: 1 addition & 0 deletions LocalDevVPN/Localization/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@
"auto_connect_on_launch" = "Auto Connect on Launch";
"connection_logs" = "Connection Logs";
"network_configuration" = "Network Configuration";
"match_wifi_subnet" = "Match WiFi Subnet";
"device_ip" = "Device IP";
"tunnel_ip" = "Tunnel IP";
"subnet_mask" = "Subnet Mask";
Expand Down
90 changes: 83 additions & 7 deletions TunnelProv/PacketTunnelProvider.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
//

import NetworkExtension
import Darwin

class PacketTunnelProvider: NEPacketTunnelProvider {
var tunnelDeviceIp: String = "10.7.0.0"
Expand All@@ -16,20 +17,46 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
private var fakeIpValue: UInt32 = 0

override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
let useWifiSubnet = options?["UseWiFiSubnet"] as? Bool ?? false

if useWifiSubnet {
if let wifiInfo = getWiFiNetworkInfo() {
tunnelDeviceIp = wifiInfo.ipAddress
tunnelSubnetMask = wifiInfo.subnetMask
let fakeIpParts = wifiInfo.ipAddress.split(separator: ".")
if fakeIpParts.count == 4 {
tunnelFakeIp = "\(fakeIpParts[0]).\(fakeIpParts[1]).\(fakeIpParts[2]).\(Int(fakeIpParts[3])! + 1)"
}
}
} else {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
}
if let subnetMask = options?["TunnelSubnetMask"] as? String {
tunnelSubnetMask = subnetMask
}
}

deviceIpValue = ipToUInt32(tunnelDeviceIp)
fakeIpValue = ipToUInt32(tunnelFakeIp)

let settings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: tunnelDeviceIp)
let ipv4 = NEIPv4Settings(addresses: [tunnelDeviceIp], subnetMasks: [tunnelSubnetMask])
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]

let localSubnet = calculateNetworkAddress(ip: tunnelDeviceIp, mask: tunnelSubnetMask)
let localRoute = NEIPv4Route(destinationAddress: localSubnet, subnetMask: tunnelSubnetMask)

if useWifiSubnet {
ipv4.includedRoutes = [localRoute]
ipv4.excludedRoutes = [.default()]
} else {
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]
}

settings.ipv4Settings = ipv4

setTunnelNetworkSettings(settings) { error in
Expand DownExpand Up@@ -69,4 +96,53 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
}
return (b1 << 24) | (b2 << 16) | (b3 << 8) | b4
}

private func getWiFiNetworkInfo() -> (ipAddress: String, subnetMask: String)? {
var address: String?
var subnetMask: String?

var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)

var maskHostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_netmask, socklen_t(interface.ifa_netmask.pointee.sa_len),
&maskHostname, socklen_t(maskHostname.count), nil, socklen_t(0), NI_NUMERICHOST)
subnetMask = String(cString: maskHostname)
}
}
}
freeifaddrs(ifaddr)

if let addr = address, let mask = subnetMask {
return (addr, mask)
}
return nil
}

private func calculateNetworkAddress(ip: String, mask: String) -> String {
let ipParts = ip.split(separator: ".").compactMap { UInt32($0) }
let maskParts = mask.split(separator: ".").compactMap { UInt32($0) }

guard ipParts.count == 4, maskParts.count == 4 else { return ip }

let network = (ipParts[0] & maskParts[0]) |
(ipParts[1] & maskParts[1]) |
(ipParts[2] & maskParts[2]) |
(ipParts[3] & maskParts[3])

return "\(network >> 24 & 0xFF).\(network >> 16 & 0xFF).\(network >> 8 & 0xFF).\(network & 0xFF)"
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' iOS 26.4b1 patch by sh4tteredd · Pull Request #18 · jkcoxson/LocalDevVPN · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
55 changes: 49 additions & 6 deletions LocalDevVPN/ContentView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import Foundation
import NetworkExtension
import SwiftUI
import Darwin

import NavigationBackport

Expand All@@ -16,6 +17,30 @@ extension Bundle {
var tunnelBundleID: String { bundleIdentifier!.appending(".TunnelProv") }
}

private func getCurrentWiFiIP() -> String? {
var address: String?
var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)
}
}
}
freeifaddrs(ifaddr)
return address
}

// MARK: - Logging Utility

class VPNLogger: ObservableObject {
Expand DownExpand Up@@ -66,7 +91,11 @@ class TunnelManager: ObservableObject {
private var tunnelSubnetMask: String {
UserDefaults.standard.string(forKey: "TunnelSubnetMask") ?? "255.255.255.0"
}


private var useWiFiSubnet: Bool {
UserDefaults.standard.bool(forKey: "useWiFiSubnet")
}

private var tunnelBundleId: String {
Bundle.main.bundleIdentifier!.appending(".TunnelProv")
}
Expand DownExpand Up@@ -503,6 +532,7 @@ class TunnelManager: ObservableObject {
"TunnelDeviceIP": self.tunnelDeviceIp as NSObject,
"TunnelFakeIP": self.tunnelFakeIp as NSObject,
"TunnelSubnetMask": self.tunnelSubnetMask as NSObject,
"UseWiFiSubnet": self.useWiFiSubnet as NSObject,
]

do {
Expand DownExpand Up@@ -783,6 +813,14 @@ extension View {
struct StatusOverviewCard: View {
@StateObject private var tunnelManager = TunnelManager.shared
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false

private var currentIP: String {
if useWiFiSubnet, let wifiIP = getCurrentWiFiIP() {
return wifiIP
}
return deviceIP
}

var body: some View {
DashboardCard {
Expand DownExpand Up@@ -827,7 +865,7 @@ struct StatusOverviewCard: View {
private var statusTip: String {
switch tunnelManager.tunnelStatus {
case .connected:
return String(format: NSLocalizedString("connected_to_ip", comment: ""), deviceIP)
return String(format: NSLocalizedString("connected_to_ip", comment: ""), currentIP)
case .connecting:
return NSLocalizedString("ios_might_ask_you_to_allow_the_vpn", comment: "")
case .disconnecting:
Expand DownExpand Up@@ -1087,6 +1125,7 @@ struct SettingsView: View {
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("TunnelFakeIP") private var fakeIP = "10.7.0.1"
@AppStorage("TunnelSubnetMask") private var subnetMask = "255.255.255.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false
@AppStorage("autoConnect") private var autoConnect = false
@AppStorage("shownTunnelAlert") private var shownTunnelAlert = false
@StateObject private var tunnelManager = TunnelManager.shared
Expand All@@ -1106,10 +1145,14 @@ struct SettingsView: View {
}

Section(header: Text("network_configuration")) {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
Toggle("match_wifi_subnet", isOn: $useWiFiSubnet)

if !useWiFiSubnet {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
}
}
}

Expand Down
1 change: 1 addition & 0 deletions LocalDevVPN/Localization/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@
"auto_connect_on_launch" = "Auto Connect on Launch";
"connection_logs" = "Connection Logs";
"network_configuration" = "Network Configuration";
"match_wifi_subnet" = "Match WiFi Subnet";
"device_ip" = "Device IP";
"tunnel_ip" = "Tunnel IP";
"subnet_mask" = "Subnet Mask";
Expand Down
90 changes: 83 additions & 7 deletions TunnelProv/PacketTunnelProvider.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
//

import NetworkExtension
import Darwin

class PacketTunnelProvider: NEPacketTunnelProvider {
var tunnelDeviceIp: String = "10.7.0.0"
Expand All@@ -16,20 +17,46 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
private var fakeIpValue: UInt32 = 0

override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
let useWifiSubnet = options?["UseWiFiSubnet"] as? Bool ?? false

if useWifiSubnet {
if let wifiInfo = getWiFiNetworkInfo() {
tunnelDeviceIp = wifiInfo.ipAddress
tunnelSubnetMask = wifiInfo.subnetMask
let fakeIpParts = wifiInfo.ipAddress.split(separator: ".")
if fakeIpParts.count == 4 {
tunnelFakeIp = "\(fakeIpParts[0]).\(fakeIpParts[1]).\(fakeIpParts[2]).\(Int(fakeIpParts[3])! + 1)"
}
}
} else {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
}
if let subnetMask = options?["TunnelSubnetMask"] as? String {
tunnelSubnetMask = subnetMask
}
}

deviceIpValue = ipToUInt32(tunnelDeviceIp)
fakeIpValue = ipToUInt32(tunnelFakeIp)

let settings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: tunnelDeviceIp)
let ipv4 = NEIPv4Settings(addresses: [tunnelDeviceIp], subnetMasks: [tunnelSubnetMask])
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]

let localSubnet = calculateNetworkAddress(ip: tunnelDeviceIp, mask: tunnelSubnetMask)
let localRoute = NEIPv4Route(destinationAddress: localSubnet, subnetMask: tunnelSubnetMask)

if useWifiSubnet {
ipv4.includedRoutes = [localRoute]
ipv4.excludedRoutes = [.default()]
} else {
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]
}

settings.ipv4Settings = ipv4

setTunnelNetworkSettings(settings) { error in
Expand DownExpand Up@@ -69,4 +96,53 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
}
return (b1 << 24) | (b2 << 16) | (b3 << 8) | b4
}

private func getWiFiNetworkInfo() -> (ipAddress: String, subnetMask: String)? {
var address: String?
var subnetMask: String?

var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)

var maskHostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_netmask, socklen_t(interface.ifa_netmask.pointee.sa_len),
&maskHostname, socklen_t(maskHostname.count), nil, socklen_t(0), NI_NUMERICHOST)
subnetMask = String(cString: maskHostname)
}
}
}
freeifaddrs(ifaddr)

if let addr = address, let mask = subnetMask {
return (addr, mask)
}
return nil
}

private func calculateNetworkAddress(ip: String, mask: String) -> String {
let ipParts = ip.split(separator: ".").compactMap { UInt32($0) }
let maskParts = mask.split(separator: ".").compactMap { UInt32($0) }

guard ipParts.count == 4, maskParts.count == 4 else { return ip }

let network = (ipParts[0] & maskParts[0]) |
(ipParts[1] & maskParts[1]) |
(ipParts[2] & maskParts[2]) |
(ipParts[3] & maskParts[3])

return "\(network >> 24 & 0xFF).\(network >> 16 & 0xFF).\(network >> 8 & 0xFF).\(network & 0xFF)"
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' iOS 26.4b1 patch by sh4tteredd · Pull Request #18 · jkcoxson/LocalDevVPN · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
55 changes: 49 additions & 6 deletions LocalDevVPN/ContentView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import Foundation
import NetworkExtension
import SwiftUI
import Darwin

import NavigationBackport

Expand All@@ -16,6 +17,30 @@ extension Bundle {
var tunnelBundleID: String { bundleIdentifier!.appending(".TunnelProv") }
}

private func getCurrentWiFiIP() -> String? {
var address: String?
var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)
}
}
}
freeifaddrs(ifaddr)
return address
}

// MARK: - Logging Utility

class VPNLogger: ObservableObject {
Expand DownExpand Up@@ -66,7 +91,11 @@ class TunnelManager: ObservableObject {
private var tunnelSubnetMask: String {
UserDefaults.standard.string(forKey: "TunnelSubnetMask") ?? "255.255.255.0"
}


private var useWiFiSubnet: Bool {
UserDefaults.standard.bool(forKey: "useWiFiSubnet")
}

private var tunnelBundleId: String {
Bundle.main.bundleIdentifier!.appending(".TunnelProv")
}
Expand DownExpand Up@@ -503,6 +532,7 @@ class TunnelManager: ObservableObject {
"TunnelDeviceIP": self.tunnelDeviceIp as NSObject,
"TunnelFakeIP": self.tunnelFakeIp as NSObject,
"TunnelSubnetMask": self.tunnelSubnetMask as NSObject,
"UseWiFiSubnet": self.useWiFiSubnet as NSObject,
]

do {
Expand DownExpand Up@@ -783,6 +813,14 @@ extension View {
struct StatusOverviewCard: View {
@StateObject private var tunnelManager = TunnelManager.shared
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false

private var currentIP: String {
if useWiFiSubnet, let wifiIP = getCurrentWiFiIP() {
return wifiIP
}
return deviceIP
}

var body: some View {
DashboardCard {
Expand DownExpand Up@@ -827,7 +865,7 @@ struct StatusOverviewCard: View {
private var statusTip: String {
switch tunnelManager.tunnelStatus {
case .connected:
return String(format: NSLocalizedString("connected_to_ip", comment: ""), deviceIP)
return String(format: NSLocalizedString("connected_to_ip", comment: ""), currentIP)
case .connecting:
return NSLocalizedString("ios_might_ask_you_to_allow_the_vpn", comment: "")
case .disconnecting:
Expand DownExpand Up@@ -1087,6 +1125,7 @@ struct SettingsView: View {
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("TunnelFakeIP") private var fakeIP = "10.7.0.1"
@AppStorage("TunnelSubnetMask") private var subnetMask = "255.255.255.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false
@AppStorage("autoConnect") private var autoConnect = false
@AppStorage("shownTunnelAlert") private var shownTunnelAlert = false
@StateObject private var tunnelManager = TunnelManager.shared
Expand All@@ -1106,10 +1145,14 @@ struct SettingsView: View {
}

Section(header: Text("network_configuration")) {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
Toggle("match_wifi_subnet", isOn: $useWiFiSubnet)

if !useWiFiSubnet {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
}
}
}

Expand Down
1 change: 1 addition & 0 deletions LocalDevVPN/Localization/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@
"auto_connect_on_launch" = "Auto Connect on Launch";
"connection_logs" = "Connection Logs";
"network_configuration" = "Network Configuration";
"match_wifi_subnet" = "Match WiFi Subnet";
"device_ip" = "Device IP";
"tunnel_ip" = "Tunnel IP";
"subnet_mask" = "Subnet Mask";
Expand Down
90 changes: 83 additions & 7 deletions TunnelProv/PacketTunnelProvider.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
//

import NetworkExtension
import Darwin

class PacketTunnelProvider: NEPacketTunnelProvider {
var tunnelDeviceIp: String = "10.7.0.0"
Expand All@@ -16,20 +17,46 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
private var fakeIpValue: UInt32 = 0

override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
let useWifiSubnet = options?["UseWiFiSubnet"] as? Bool ?? false

if useWifiSubnet {
if let wifiInfo = getWiFiNetworkInfo() {
tunnelDeviceIp = wifiInfo.ipAddress
tunnelSubnetMask = wifiInfo.subnetMask
let fakeIpParts = wifiInfo.ipAddress.split(separator: ".")
if fakeIpParts.count == 4 {
tunnelFakeIp = "\(fakeIpParts[0]).\(fakeIpParts[1]).\(fakeIpParts[2]).\(Int(fakeIpParts[3])! + 1)"
}
}
} else {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
}
if let subnetMask = options?["TunnelSubnetMask"] as? String {
tunnelSubnetMask = subnetMask
}
}

deviceIpValue = ipToUInt32(tunnelDeviceIp)
fakeIpValue = ipToUInt32(tunnelFakeIp)

let settings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: tunnelDeviceIp)
let ipv4 = NEIPv4Settings(addresses: [tunnelDeviceIp], subnetMasks: [tunnelSubnetMask])
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]

let localSubnet = calculateNetworkAddress(ip: tunnelDeviceIp, mask: tunnelSubnetMask)
let localRoute = NEIPv4Route(destinationAddress: localSubnet, subnetMask: tunnelSubnetMask)

if useWifiSubnet {
ipv4.includedRoutes = [localRoute]
ipv4.excludedRoutes = [.default()]
} else {
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]
}

settings.ipv4Settings = ipv4

setTunnelNetworkSettings(settings) { error in
Expand DownExpand Up@@ -69,4 +96,53 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
}
return (b1 << 24) | (b2 << 16) | (b3 << 8) | b4
}

private func getWiFiNetworkInfo() -> (ipAddress: String, subnetMask: String)? {
var address: String?
var subnetMask: String?

var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)

var maskHostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_netmask, socklen_t(interface.ifa_netmask.pointee.sa_len),
&maskHostname, socklen_t(maskHostname.count), nil, socklen_t(0), NI_NUMERICHOST)
subnetMask = String(cString: maskHostname)
}
}
}
freeifaddrs(ifaddr)

if let addr = address, let mask = subnetMask {
return (addr, mask)
}
return nil
}

private func calculateNetworkAddress(ip: String, mask: String) -> String {
let ipParts = ip.split(separator: ".").compactMap { UInt32($0) }
let maskParts = mask.split(separator: ".").compactMap { UInt32($0) }

guard ipParts.count == 4, maskParts.count == 4 else { return ip }

let network = (ipParts[0] & maskParts[0]) |
(ipParts[1] & maskParts[1]) |
(ipParts[2] & maskParts[2]) |
(ipParts[3] & maskParts[3])

return "\(network >> 24 & 0xFF).\(network >> 16 & 0xFF).\(network >> 8 & 0xFF).\(network & 0xFF)"
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' iOS 26.4b1 patch by sh4tteredd · Pull Request #18 · jkcoxson/LocalDevVPN · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
55 changes: 49 additions & 6 deletions LocalDevVPN/ContentView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import Foundation
import NetworkExtension
import SwiftUI
import Darwin

import NavigationBackport

Expand All@@ -16,6 +17,30 @@ extension Bundle {
var tunnelBundleID: String { bundleIdentifier!.appending(".TunnelProv") }
}

private func getCurrentWiFiIP() -> String? {
var address: String?
var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)
}
}
}
freeifaddrs(ifaddr)
return address
}

// MARK: - Logging Utility

class VPNLogger: ObservableObject {
Expand DownExpand Up@@ -66,7 +91,11 @@ class TunnelManager: ObservableObject {
private var tunnelSubnetMask: String {
UserDefaults.standard.string(forKey: "TunnelSubnetMask") ?? "255.255.255.0"
}


private var useWiFiSubnet: Bool {
UserDefaults.standard.bool(forKey: "useWiFiSubnet")
}

private var tunnelBundleId: String {
Bundle.main.bundleIdentifier!.appending(".TunnelProv")
}
Expand DownExpand Up@@ -503,6 +532,7 @@ class TunnelManager: ObservableObject {
"TunnelDeviceIP": self.tunnelDeviceIp as NSObject,
"TunnelFakeIP": self.tunnelFakeIp as NSObject,
"TunnelSubnetMask": self.tunnelSubnetMask as NSObject,
"UseWiFiSubnet": self.useWiFiSubnet as NSObject,
]

do {
Expand DownExpand Up@@ -783,6 +813,14 @@ extension View {
struct StatusOverviewCard: View {
@StateObject private var tunnelManager = TunnelManager.shared
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false

private var currentIP: String {
if useWiFiSubnet, let wifiIP = getCurrentWiFiIP() {
return wifiIP
}
return deviceIP
}

var body: some View {
DashboardCard {
Expand DownExpand Up@@ -827,7 +865,7 @@ struct StatusOverviewCard: View {
private var statusTip: String {
switch tunnelManager.tunnelStatus {
case .connected:
return String(format: NSLocalizedString("connected_to_ip", comment: ""), deviceIP)
return String(format: NSLocalizedString("connected_to_ip", comment: ""), currentIP)
case .connecting:
return NSLocalizedString("ios_might_ask_you_to_allow_the_vpn", comment: "")
case .disconnecting:
Expand DownExpand Up@@ -1087,6 +1125,7 @@ struct SettingsView: View {
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("TunnelFakeIP") private var fakeIP = "10.7.0.1"
@AppStorage("TunnelSubnetMask") private var subnetMask = "255.255.255.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false
@AppStorage("autoConnect") private var autoConnect = false
@AppStorage("shownTunnelAlert") private var shownTunnelAlert = false
@StateObject private var tunnelManager = TunnelManager.shared
Expand All@@ -1106,10 +1145,14 @@ struct SettingsView: View {
}

Section(header: Text("network_configuration")) {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
Toggle("match_wifi_subnet", isOn: $useWiFiSubnet)

if !useWiFiSubnet {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
}
}
}

Expand Down
1 change: 1 addition & 0 deletions LocalDevVPN/Localization/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@
"auto_connect_on_launch" = "Auto Connect on Launch";
"connection_logs" = "Connection Logs";
"network_configuration" = "Network Configuration";
"match_wifi_subnet" = "Match WiFi Subnet";
"device_ip" = "Device IP";
"tunnel_ip" = "Tunnel IP";
"subnet_mask" = "Subnet Mask";
Expand Down
90 changes: 83 additions & 7 deletions TunnelProv/PacketTunnelProvider.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
//

import NetworkExtension
import Darwin

class PacketTunnelProvider: NEPacketTunnelProvider {
var tunnelDeviceIp: String = "10.7.0.0"
Expand All@@ -16,20 +17,46 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
private var fakeIpValue: UInt32 = 0

override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
let useWifiSubnet = options?["UseWiFiSubnet"] as? Bool ?? false

if useWifiSubnet {
if let wifiInfo = getWiFiNetworkInfo() {
tunnelDeviceIp = wifiInfo.ipAddress
tunnelSubnetMask = wifiInfo.subnetMask
let fakeIpParts = wifiInfo.ipAddress.split(separator: ".")
if fakeIpParts.count == 4 {
tunnelFakeIp = "\(fakeIpParts[0]).\(fakeIpParts[1]).\(fakeIpParts[2]).\(Int(fakeIpParts[3])! + 1)"
}
}
} else {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
}
if let subnetMask = options?["TunnelSubnetMask"] as? String {
tunnelSubnetMask = subnetMask
}
}

deviceIpValue = ipToUInt32(tunnelDeviceIp)
fakeIpValue = ipToUInt32(tunnelFakeIp)

let settings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: tunnelDeviceIp)
let ipv4 = NEIPv4Settings(addresses: [tunnelDeviceIp], subnetMasks: [tunnelSubnetMask])
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]

let localSubnet = calculateNetworkAddress(ip: tunnelDeviceIp, mask: tunnelSubnetMask)
let localRoute = NEIPv4Route(destinationAddress: localSubnet, subnetMask: tunnelSubnetMask)

if useWifiSubnet {
ipv4.includedRoutes = [localRoute]
ipv4.excludedRoutes = [.default()]
} else {
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]
}

settings.ipv4Settings = ipv4

setTunnelNetworkSettings(settings) { error in
Expand DownExpand Up@@ -69,4 +96,53 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
}
return (b1 << 24) | (b2 << 16) | (b3 << 8) | b4
}

private func getWiFiNetworkInfo() -> (ipAddress: String, subnetMask: String)? {
var address: String?
var subnetMask: String?

var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)

var maskHostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_netmask, socklen_t(interface.ifa_netmask.pointee.sa_len),
&maskHostname, socklen_t(maskHostname.count), nil, socklen_t(0), NI_NUMERICHOST)
subnetMask = String(cString: maskHostname)
}
}
}
freeifaddrs(ifaddr)

if let addr = address, let mask = subnetMask {
return (addr, mask)
}
return nil
}

private func calculateNetworkAddress(ip: String, mask: String) -> String {
let ipParts = ip.split(separator: ".").compactMap { UInt32($0) }
let maskParts = mask.split(separator: ".").compactMap { UInt32($0) }

guard ipParts.count == 4, maskParts.count == 4 else { return ip }

let network = (ipParts[0] & maskParts[0]) |
(ipParts[1] & maskParts[1]) |
(ipParts[2] & maskParts[2]) |
(ipParts[3] & maskParts[3])

return "\(network >> 24 & 0xFF).\(network >> 16 & 0xFF).\(network >> 8 & 0xFF).\(network & 0xFF)"
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); iOS 26.4b1 patch by sh4tteredd · Pull Request #18 · jkcoxson/LocalDevVPN · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,6 +74,7 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
Expand Down
55 changes: 49 additions & 6 deletions LocalDevVPN/ContentView.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
import Foundation
import NetworkExtension
import SwiftUI
import Darwin

import NavigationBackport

Expand All@@ -16,6 +17,30 @@ extension Bundle {
var tunnelBundleID: String { bundleIdentifier!.appending(".TunnelProv") }
}

private func getCurrentWiFiIP() -> String? {
var address: String?
var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)
}
}
}
freeifaddrs(ifaddr)
return address
}

// MARK: - Logging Utility

class VPNLogger: ObservableObject {
Expand DownExpand Up@@ -66,7 +91,11 @@ class TunnelManager: ObservableObject {
private var tunnelSubnetMask: String {
UserDefaults.standard.string(forKey: "TunnelSubnetMask") ?? "255.255.255.0"
}


private var useWiFiSubnet: Bool {
UserDefaults.standard.bool(forKey: "useWiFiSubnet")
}

private var tunnelBundleId: String {
Bundle.main.bundleIdentifier!.appending(".TunnelProv")
}
Expand DownExpand Up@@ -503,6 +532,7 @@ class TunnelManager: ObservableObject {
"TunnelDeviceIP": self.tunnelDeviceIp as NSObject,
"TunnelFakeIP": self.tunnelFakeIp as NSObject,
"TunnelSubnetMask": self.tunnelSubnetMask as NSObject,
"UseWiFiSubnet": self.useWiFiSubnet as NSObject,
]

do {
Expand DownExpand Up@@ -783,6 +813,14 @@ extension View {
struct StatusOverviewCard: View {
@StateObject private var tunnelManager = TunnelManager.shared
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false

private var currentIP: String {
if useWiFiSubnet, let wifiIP = getCurrentWiFiIP() {
return wifiIP
}
return deviceIP
}

var body: some View {
DashboardCard {
Expand DownExpand Up@@ -827,7 +865,7 @@ struct StatusOverviewCard: View {
private var statusTip: String {
switch tunnelManager.tunnelStatus {
case .connected:
return String(format: NSLocalizedString("connected_to_ip", comment: ""), deviceIP)
return String(format: NSLocalizedString("connected_to_ip", comment: ""), currentIP)
case .connecting:
return NSLocalizedString("ios_might_ask_you_to_allow_the_vpn", comment: "")
case .disconnecting:
Expand DownExpand Up@@ -1087,6 +1125,7 @@ struct SettingsView: View {
@AppStorage("TunnelDeviceIP") private var deviceIP = "10.7.0.0"
@AppStorage("TunnelFakeIP") private var fakeIP = "10.7.0.1"
@AppStorage("TunnelSubnetMask") private var subnetMask = "255.255.255.0"
@AppStorage("useWiFiSubnet") private var useWiFiSubnet = false
@AppStorage("autoConnect") private var autoConnect = false
@AppStorage("shownTunnelAlert") private var shownTunnelAlert = false
@StateObject private var tunnelManager = TunnelManager.shared
Expand All@@ -1106,10 +1145,14 @@ struct SettingsView: View {
}

Section(header: Text("network_configuration")) {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
Toggle("match_wifi_subnet", isOn: $useWiFiSubnet)

if !useWiFiSubnet {
Group {
networkConfigRow(label: "tunnel_ip", text: $deviceIP)
networkConfigRow(label: "device_ip", text: $fakeIP)
networkConfigRow(label: "subnet_mask", text: $subnetMask)
}
}
}

Expand Down
1 change: 1 addition & 0 deletions LocalDevVPN/Localization/en.lproj/Localizable.strings
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,6 +57,7 @@
"auto_connect_on_launch" = "Auto Connect on Launch";
"connection_logs" = "Connection Logs";
"network_configuration" = "Network Configuration";
"match_wifi_subnet" = "Match WiFi Subnet";
"device_ip" = "Device IP";
"tunnel_ip" = "Tunnel IP";
"subnet_mask" = "Subnet Mask";
Expand Down
90 changes: 83 additions & 7 deletions TunnelProv/PacketTunnelProvider.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
//

import NetworkExtension
import Darwin

class PacketTunnelProvider: NEPacketTunnelProvider {
var tunnelDeviceIp: String = "10.7.0.0"
Expand All@@ -16,20 +17,46 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
private var fakeIpValue: UInt32 = 0

override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
let useWifiSubnet = options?["UseWiFiSubnet"] as? Bool ?? false

if useWifiSubnet {
if let wifiInfo = getWiFiNetworkInfo() {
tunnelDeviceIp = wifiInfo.ipAddress
tunnelSubnetMask = wifiInfo.subnetMask
let fakeIpParts = wifiInfo.ipAddress.split(separator: ".")
if fakeIpParts.count == 4 {
tunnelFakeIp = "\(fakeIpParts[0]).\(fakeIpParts[1]).\(fakeIpParts[2]).\(Int(fakeIpParts[3])! + 1)"
}
}
} else {
if let deviceIp = options?["TunnelDeviceIP"] as? String {
tunnelDeviceIp = deviceIp
}
if let fakeIp = options?["TunnelFakeIP"] as? String {
tunnelFakeIp = fakeIp
}
if let subnetMask = options?["TunnelSubnetMask"] as? String {
tunnelSubnetMask = subnetMask
}
}

deviceIpValue = ipToUInt32(tunnelDeviceIp)
fakeIpValue = ipToUInt32(tunnelFakeIp)

let settings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: tunnelDeviceIp)
let ipv4 = NEIPv4Settings(addresses: [tunnelDeviceIp], subnetMasks: [tunnelSubnetMask])
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]

let localSubnet = calculateNetworkAddress(ip: tunnelDeviceIp, mask: tunnelSubnetMask)
let localRoute = NEIPv4Route(destinationAddress: localSubnet, subnetMask: tunnelSubnetMask)

if useWifiSubnet {
ipv4.includedRoutes = [localRoute]
ipv4.excludedRoutes = [.default()]
} else {
ipv4.includedRoutes = [NEIPv4Route(destinationAddress: tunnelDeviceIp, subnetMask: tunnelSubnetMask)]
ipv4.excludedRoutes = [.default()]
}

settings.ipv4Settings = ipv4

setTunnelNetworkSettings(settings) { error in
Expand DownExpand Up@@ -69,4 +96,53 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
}
return (b1 << 24) | (b2 << 16) | (b3 << 8) | b4
}

private func getWiFiNetworkInfo() -> (ipAddress: String, subnetMask: String)? {
var address: String?
var subnetMask: String?

var ifaddr: UnsafeMutablePointer<ifaddrs>?
guard getifaddrs(&ifaddr) == 0 else { return nil }
guard let firstAddr = ifaddr else { return nil }

for ifptr in sequence(first: firstAddr, next: { $0.pointee.ifa_next }) {
let interface = ifptr.pointee
let addrFamily = interface.ifa_addr.pointee.sa_family

if addrFamily == UInt8(AF_INET) {
let name = String(cString: interface.ifa_name)
if name == "en0" {
var hostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_addr, socklen_t(interface.ifa_addr.pointee.sa_len),
&hostname, socklen_t(hostname.count), nil, socklen_t(0), NI_NUMERICHOST)
address = String(cString: hostname)

var maskHostname = [CChar](repeating: 0, count: Int(NI_MAXHOST))
getnameinfo(interface.ifa_netmask, socklen_t(interface.ifa_netmask.pointee.sa_len),
&maskHostname, socklen_t(maskHostname.count), nil, socklen_t(0), NI_NUMERICHOST)
subnetMask = String(cString: maskHostname)
}
}
}
freeifaddrs(ifaddr)

if let addr = address, let mask = subnetMask {
return (addr, mask)
}
return nil
}

private func calculateNetworkAddress(ip: String, mask: String) -> String {
let ipParts = ip.split(separator: ".").compactMap { UInt32($0) }
let maskParts = mask.split(separator: ".").compactMap { UInt32($0) }

guard ipParts.count == 4, maskParts.count == 4 else { return ip }

let network = (ipParts[0] & maskParts[0]) |
(ipParts[1] & maskParts[1]) |
(ipParts[2] & maskParts[2]) |
(ipParts[3] & maskParts[3])

return "\(network >> 24 & 0xFF).\(network >> 16 & 0xFF).\(network >> 8 & 0xFF).\(network & 0xFF)"
}
}