TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-05-03 22:21:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: gofmt all

Browse Source 
Well, goimports actually (which adds the normal import grouping order we do)

Change-Id: I0ce1b1c03185f3741aad67c14a7ec91a838de389
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2022-04-29 12:57:52 -07:00 committed by Brad Fitzpatrick
parent deb56f276e
commit 6bed781259
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/tailscale/cli/cli_test.go
View File

@ -664,11 +664,11 @@ func TestPrefsFromUpArgs(t *testing.T) {
goos: "linux", goos: "linux",
args: upArgsT{ args: upArgsT{
advertiseRoutes: "fd7a:115c:a1e0:b1a::bb:10.0.0.0/112", advertiseRoutes: "fd7a:115c:a1e0:b1a::bb:10.0.0.0/112",
netfilterMode: "off", netfilterMode: "off",
}, },
want: &ipn.Prefs{ want: &ipn.Prefs{
WantRunning: true, WantRunning: true,
NoSNAT: true, NoSNAT: true,
AdvertiseRoutes: []netaddr.IPPrefix{ AdvertiseRoutes: []netaddr.IPPrefix{
netaddr.MustParseIPPrefix("fd7a:115c:a1e0:b1a::bb:10.0.0.0/112"), netaddr.MustParseIPPrefix("fd7a:115c:a1e0:b1a::bb:10.0.0.0/112"),
}, },
@ -679,7 +679,7 @@ func TestPrefsFromUpArgs(t *testing.T) {
goos: "linux", goos: "linux",
args: upArgsT{ args: upArgsT{
advertiseRoutes: "fd7a:115c:a1e0:b1a::/64", advertiseRoutes: "fd7a:115c:a1e0:b1a::/64",
netfilterMode: "off", netfilterMode: "off",
}, },
wantErr: "fd7a:115c:a1e0:b1a::/64 4-in-6 prefix must be at least a /96", wantErr: "fd7a:115c:a1e0:b1a::/64 4-in-6 prefix must be at least a /96",
}, },
@ -688,7 +688,7 @@ func TestPrefsFromUpArgs(t *testing.T) {
goos: "linux", goos: "linux",
args: upArgsT{ args: upArgsT{
advertiseRoutes: "fd7a:115c:a1e0:b1a:1234:5678::/112", advertiseRoutes: "fd7a:115c:a1e0:b1a:1234:5678::/112",
netfilterMode: "off", netfilterMode: "off",
}, },
wantErr: "route fd7a:115c:a1e0:b1a:1234:5678::/112 contains invalid site ID 12345678; must be 0xff or less", wantErr: "route fd7a:115c:a1e0:b1a:1234:5678::/112 contains invalid site ID 12345678; must be 0xff or less",
}, },

2
cmd/tailscale/cli/file.go
View File

@ -428,7 +428,7 @@ func runFileGetOneBatch(ctx context.Context, dir string) []error {
if len(errs) > 100 { if len(errs) > 100 {
// Likely, everything is broken. // Likely, everything is broken.
// Don't try to receive any more files in this batch. // Don't try to receive any more files in this batch.
errs = append(errs, fmt.Errorf("too many errors in runFileGetOneBatch(). %d files unexamined", len(wfs) - i)) errs = append(errs, fmt.Errorf("too many errors in runFileGetOneBatch(). %d files unexamined", len(wfs)-i))
break break
} }
writtenFile, size, err := receiveFile(ctx, wf, dir) writtenFile, size, err := receiveFile(ctx, wf, dir)

1
cmd/tailscaled/ssh.go
View File

@ -9,4 +9,3 @@ package main
// Force registration of tailssh with LocalBackend. // Force registration of tailssh with LocalBackend.
import _ "tailscale.com/ssh/tailssh" import _ "tailscale.com/ssh/tailssh"

2
net/netcheck/netcheck.go
View File

@ -1044,7 +1044,7 @@ func (c *Client) measureHTTPSLatency(ctx context.Context, reg *tailcfg.DERPRegio
} }
hc := &http.Client{Transport: tr} hc := &http.Client{Transport: tr}
req, err := http.NewRequestWithContext(ctx, "GET", "https://" + node.HostName + "/derp/latency-check", nil) req, err := http.NewRequestWithContext(ctx, "GET", "https://"+node.HostName+"/derp/latency-check", nil)
if err != nil { if err != nil {
return 0, ip, err return 0, ip, err
} }

3
wgengine/winnet/winnet_windows.go
View File

@ -6,9 +6,10 @@ package winnet
import ( import (
"fmt" "fmt"
"github.com/go-ole/go-ole"
"syscall" "syscall"
"unsafe" "unsafe"
"github.com/go-ole/go-ole"
) )
func (v *INetworkConnection) GetAdapterId() (string, error) { func (v *INetworkConnection) GetAdapterId() (string, error) {