Skip to content

fix(tunnel): add manual routes to the derived ones instead of replacing them #32

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

Merged
chenx-dust merged 1 commit into from
Aug 11, 2026
Merged

fix(tunnel): add manual routes to the derived ones instead of replacing them #32

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
41 changes: 22 additions & 19 deletions EasyTierNetworkExtension/BuilderHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,35 +60,38 @@ func buildSettings(_ options: EasyTierOptions) -> NEPacketTunnelNetworkSettings

func buildIPv4Routes(info: RunningInfo?, options: EasyTierOptions) -> [NEIPv4Route] {
var cidrs = Set<RunningIPv4CIDR>()
// Additive: manual routes used to replace the derived ones, which made every peer's
// proxied subnet unreachable as soon as one manual route existed. includedRoutes is the
// only way a route reaches the tun device here, so there is no system table to fall back
// on. The overlap pass below drops whatever is redundant.
if !options.routes.isEmpty {
logger.info("buildIPv4Routes() found manual routes: \(options.routes.count)")
for route in options.routes {
if let normalized = normalizeCIDR(route) {
cidrs.insert(normalized)
}
}
} else {
if let routes = info?.routes {
for route in routes {
for cidr in route.proxyCIDRs {
if let normalized = normalizeCIDR(cidr) {
cidrs.insert(normalized)
}
}
if let routes = info?.routes {
for route in routes {
for cidr in route.proxyCIDRs {
if let normalized = normalizeCIDR(cidr) {
cidrs.insert(normalized)
}
}
}
if let ipv4 = options.ipv4, let cidr = RunningIPv4CIDR(from: ipv4) {
cidrs.insert(.init(address: ipv4MaskedSubnet(cidr), length: cidr.networkLength))
}
if let ipv4 = info?.myNodeInfo?.virtualIPv4 {
cidrs.insert(.init(address: ipv4MaskedSubnet(ipv4), length: ipv4.networkLength))
}
if options.magicDNS {
cidrs.insert(magicDNSCIDR)
}
if cidrs.isEmpty {
logger.warning("buildIPv4Routes() no routes")
}
}
if let ipv4 = options.ipv4, let cidr = RunningIPv4CIDR(from: ipv4) {
cidrs.insert(.init(address: ipv4MaskedSubnet(cidr), length: cidr.networkLength))
}
if let ipv4 = info?.myNodeInfo?.virtualIPv4 {
cidrs.insert(.init(address: ipv4MaskedSubnet(ipv4), length: ipv4.networkLength))
}
if options.magicDNS {
cidrs.insert(magicDNSCIDR)
}
if cidrs.isEmpty {
logger.warning("buildIPv4Routes() no routes")
}
var sortedCIDRs = Array(cidrs)
sortedCIDRs.sort { $0.networkLength < $1.networkLength }
Expand Down