Skip to content

fix: avoid interference with Tailscale on Windows #69

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
deansheather merged 3 commits into from
Feb 27, 2025
Merged

fix: avoid interference with Tailscale on Windows #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04da327
fix: do not touch hosts file on windows
deansheather Feb 26, 2025
3b46bf5
fix: avoid conflict with Tailscale DNS in registry
deansheather Feb 26, 2025
2fe031e
fix: use hosts file with different section
deansheather Feb 26, 2025
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
6 changes: 3 additions & 3 deletions net/dns/manager_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ func setTailscaleHosts(prevHostsFile []byte, hosts []*HostEntry) ([]byte, error)
b := bytes.ReplaceAll(prevHostsFile, []byte("\r\n"), []byte("\n"))
sc := bufio.NewScanner(bytes.NewReader(b))
const (
header = "# TailscaleHostsSectionStart"
footer = "# TailscaleHostsSectionEnd"
header = "# CoderHostsSectionStart"
footer = "# CoderHostsSectionEnd"
)
var comments = []string{
"# This section contains MagicDNS entries for Tailscale.",
"# This section contains DNS entries for Coder workspaces.",
"# Do not edit this section manually.",
}
var out bytes.Buffer
Expand Down
4 changes: 3 additions & 1 deletion net/dns/nrpt_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ const (
// This is the legacy rule ID that previous versions used when we supported
// only a single rule. Now that we support multiple rules are required, we
// generate their GUIDs and store them under the Tailscale registry key.
nrptSingleRuleID = `{5abe529b-675b-4486-8459-25a634dacc23}`
//
// Coder: this value was changed to avoid messing with Tailscale.
nrptSingleRuleID = `{09040707-2be9-491d-9d7b-62a454e774d2}`

// This is the name of the registry value we use to save Rule IDs under
// the Tailscale registry key.
Expand Down
4 changes: 2 additions & 2 deletions util/winutil/winutil_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
)

const (
regBase = `SOFTWARE\Tailscale IPN`
regPolicyBase = `SOFTWARE\Policies\Tailscale`
regBase = `SOFTWARE\Coder VPN`
regPolicyBase = `SOFTWARE\Policies\Coder`
)

// ErrNoShell is returned when the shell process is not found.
Expand Down
Loading