Repository navigation
Conversation
Node extraction kept only `proxies`, so an airport's `dns.nameserver-policy` and `dns.proxy-server-nameserver-policy` were dropped and its DNS routing never reached the running configuration. Carry both tables into the derived node document instead of discarding them. The existing override merge unions these maps with the user's own patch taking precedence, so domains the user configured stay under their control while the airport's remaining domains are still honoured. A payload without a dns section produces the same document as before.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
When a subscription is reduced to its nodes,
derivedSubscriptionbuilt the node document fromproxiesalone. The airport'sdns.nameserver-policyanddns.proxy-server-nameserver-policywere dropped there, so its DNS routing policy never reached the main configuration.This carries both tables into the derived node document instead of discarding them:
ProxyImportResultgainsdnsNameServerPolicy/dnsProxyServerNameserverPolicydecodereads them from the kernel report, treating a missing or empty table asnilderivedSubscriptionemits adnssection when either table is presentThe merge semantics already existed:
mergeOverrideruns the user's patch over the node document and unions map values, with the user's side winning. So conflicting domains stay under the user's control while the airport's remaining domains are still honoured — no change to the merge layer was needed, only to what reaches it.A payload without a
dnssection produces a byte-identical document to before. Validation is unaffected:validateConfigShapeis a shape check, andvalidateDNSForIOSonly requiresnameserverwhenenable: true, which the user's mergeddnsprovides.Depends on the kernel-side report fields: ProjectClash/Clash#11