mirror of
https://github.com/tailscale/tailscale.git
synced 2026-07-29 16:56:32 -04:00
ipn/ipnlocal: check WIP env var before doing conn25
registering of split dns routes. Updates tailscale/corp#43680 Signed-off-by: Fran Bull <fran@tailscale.com>
This commit is contained in:
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
"go4.org/netipx"
|
"go4.org/netipx"
|
||||||
"tailscale.com/appc"
|
"tailscale.com/appc"
|
||||||
|
"tailscale.com/envknob"
|
||||||
"tailscale.com/feature/buildfeatures"
|
"tailscale.com/feature/buildfeatures"
|
||||||
"tailscale.com/ipn"
|
"tailscale.com/ipn"
|
||||||
"tailscale.com/net/dns"
|
"tailscale.com/net/dns"
|
||||||
@@ -1545,7 +1546,7 @@ func dnsConfigForNetmap(nm *netmap.NetworkMap, peers map[tailcfg.NodeID]tailcfg.
|
|||||||
// Add split DNS routes, with no regard to exit node configuration.
|
// Add split DNS routes, with no regard to exit node configuration.
|
||||||
addSplitDNSRoutes(nm.DNS.Routes)
|
addSplitDNSRoutes(nm.DNS.Routes)
|
||||||
|
|
||||||
if buildfeatures.HasConn25 && !prefs.AppConnector().Advertise {
|
if (envknob.UseWIPCode() || testenv.InTest()) && buildfeatures.HasConn25 && !prefs.AppConnector().Advertise {
|
||||||
// Add split DNS routes for conn25
|
// Add split DNS routes for conn25
|
||||||
if appRoutes := appc.AppDNSRoutes(nm.HasCap, nm.SelfNode); appRoutes != nil {
|
if appRoutes := appc.AppDNSRoutes(nm.HasCap, nm.SelfNode); appRoutes != nil {
|
||||||
addSplitDNSRoutes(appRoutes)
|
addSplitDNSRoutes(appRoutes)
|
||||||
|
|||||||
Reference in New Issue
Block a user