feat: support OS DNS configurator & Router on darwin #87
Conversation
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
ethanndickson
commented
Jul 17, 2025
Comment on lines
89
to
92
| func TailscaleULARange() netip.Prefix { | ||
| tsUlaRange.Do(func() { mustPrefix(&tsUlaRange.v, "fd7a:115c:a1e0::/48") }) | ||
| tsUlaRange.Do(func() { mustPrefix(&tsUlaRange.v, "fd60:627a:a42b::/48") }) | ||
| return tsUlaRange.v | ||
| } |
There was a problem hiding this comment.
This is to address:
tailscale/wgengine/router/router_userspace_bsd.go
Lines 143 to 151 in f14d20d
| @@ -73,8 +73,10 @@ const ( | |||
| CoderServiceIPv6String = "fd60:627a:a42b::53" | |||
| ) | |||
|
|
|||
| // These are all unfortunately Coder IP ranges, not Tailscale IP ranges. | |||
There was a problem hiding this comment.
Dean suggested not renaming to minimize the diff.
ethanndickson
commented
Jul 17, 2025
| @@ -1064,7 +1065,7 @@ func (de *endpoint) handleCallMeMaybe(m *disco.CallMeMaybe) { | |||
| } | |||
| var newEPs []netip.AddrPort | |||
| for _, ep := range m.MyNumber { | |||
| if ep.Addr().Is6() && ep.Addr().IsLinkLocalUnicast() { | |||
| if (ep.Addr().Is6() && ep.Addr().IsLinkLocalUnicast()) || tsaddr.IsTailscaleIP(ep.Addr()) { | |||
There was a problem hiding this comment.
This is so we don't discover Coder tailnet IPs as peer endpoints.
There was a problem hiding this comment.
As we drop the network extension, we're going to start informing the OS of the magicDNS server by modifying /etc/resolvers
ethanndickson
changed the title
ethanndickson
commented
Jul 17, 2025
| @@ -55,7 +55,7 @@ func (c *darwinConfigurator) SetDNS(cfg OSConfig) error { | |||
| // Add a dummy file to /etc/resolver with a "search ..." directive if we have | |||
| // search suffixes to add. | |||
| if len(cfg.SearchDomains) > 0 { | |||
There was a problem hiding this comment.
We don't currently use search domains.
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.
See self-review.