mirror of
https://github.com/netbirdio/netbird.git
synced 2026-05-19 07:09:56 +00:00
[client] iOS: structured ResolvedIPs collection for domain routes (#6090)
* [client] iOS: structured ResolvedIPs collection for domain routes Replace comma-joined ResolvedIPs string with a gomobile-friendly ResolvedIPs collection (Add/Get/Size), mirroring the Android bridge in client/android/network_domains.go. This allows the iOS app to match domain-route resolved IPs against connected peer routes without parsing CSV strings, fixing the route status indicator for dynamic (DNS) routes. * [client] iOS: align dynamic route exposure with Android bridge For dynamic (DNS) routes the Swift side previously received "invalid Prefix" as the Network value, forcing UI code to special-case that sentinel. The Android bridge uses Domains.SafeString() instead so peer.routes entries (which also derive from Domains.SafeString()) match directly. Mirror that here. Also fix the resolved IP lookup: resolvedDomains is keyed by the resolved domain (e.g. api.ipify.org), not the configured pattern (e.g. *.ipify.org). Group entries by ParentDomain like the daemon does in client/server/network.go, so wildcard route patterns get their resolved IPs populated.
This commit is contained in:
@@ -34,7 +34,34 @@ type DomainDetails struct {
|
||||
|
||||
type DomainInfo struct {
|
||||
Domain string
|
||||
ResolvedIPs string
|
||||
resolvedIPs ResolvedIPs
|
||||
}
|
||||
|
||||
func (d *DomainInfo) AddResolvedIP(ipAddress string) {
|
||||
d.resolvedIPs.Add(ipAddress)
|
||||
}
|
||||
|
||||
func (d *DomainInfo) GetResolvedIPs() *ResolvedIPs {
|
||||
return &d.resolvedIPs
|
||||
}
|
||||
|
||||
type ResolvedIPs struct {
|
||||
items []string
|
||||
}
|
||||
|
||||
func (r *ResolvedIPs) Add(ipAddress string) {
|
||||
r.items = append(r.items, ipAddress)
|
||||
}
|
||||
|
||||
func (r *ResolvedIPs) Get(i int) string {
|
||||
if i < 0 || i >= len(r.items) {
|
||||
return ""
|
||||
}
|
||||
return r.items[i]
|
||||
}
|
||||
|
||||
func (r *ResolvedIPs) Size() int {
|
||||
return len(r.items)
|
||||
}
|
||||
|
||||
// Add new PeerInfo to the collection
|
||||
|
||||
Reference in New Issue
Block a user