TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-21 06:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: fix vet warnings

Browse Source
This commit is contained in:
Brad Fitzpatrick 2020-07-16 08:39:38 -07:00
parent d74c9aa95b
commit 10ac066013
6 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/derper/derper.go
View File

@ -185,7 +185,7 @@ func main() {
} }
httpsrv.TLSConfig = certManager.TLSConfig() httpsrv.TLSConfig = certManager.TLSConfig()
go func() { go func() {
err := http.ListenAndServe(":80", certManager.HTTPHandler(tsweb.Port80Handler{mux})) err := http.ListenAndServe(":80", certManager.HTTPHandler(tsweb.Port80Handler{Main: mux}))
if err != nil { if err != nil {
if err != http.ErrServerClosed { if err != http.ErrServerClosed {
log.Fatal(err) log.Fatal(err)

4
cmd/tailscale/cli/up.go
View File

@ -97,9 +97,9 @@ func parseIPOrCIDR(s string) (wgcfg.CIDR, bool) {
return wgcfg.CIDR{}, false return wgcfg.CIDR{}, false
} }
if ip.Is4() { if ip.Is4() {
return wgcfg.CIDR{ip, 32}, true return wgcfg.CIDR{IP: ip, Mask: 32}, true
} else { } else {
return wgcfg.CIDR{ip, 128}, true return wgcfg.CIDR{IP: ip, Mask: 128}, true
} }
} }

6
net/netcheck/netcheck.go
View File

@ -1157,7 +1157,7 @@ func (c *Client) nodeAddr(ctx context.Context, n *tailcfg.DERPNode, proto probeP
if proto == probeIPv6 && ip.Is4() { if proto == probeIPv6 && ip.Is4() {
return nil return nil
} }
return netaddr.IPPort{ip, uint16(port)}.UDPAddr() return netaddr.IPPort{IP: ip, Port: uint16(port)}.UDPAddr()
} }
switch proto { switch proto {
@ -1167,7 +1167,7 @@ func (c *Client) nodeAddr(ctx context.Context, n *tailcfg.DERPNode, proto probeP
if !ip.Is4() { if !ip.Is4() {
return nil return nil
} }
return netaddr.IPPort{ip, uint16(port)}.UDPAddr() return netaddr.IPPort{IP: ip, Port: uint16(port)}.UDPAddr()
} }
case probeIPv6: case probeIPv6:
if n.IPv6 != "" { if n.IPv6 != "" {
@ -1175,7 +1175,7 @@ func (c *Client) nodeAddr(ctx context.Context, n *tailcfg.DERPNode, proto probeP
if !ip.Is6() { if !ip.Is6() {
return nil return nil
} }
return netaddr.IPPort{ip, uint16(port)}.UDPAddr() return netaddr.IPPort{IP: ip, Port: uint16(port)}.UDPAddr()
} }
default: default:
return nil return nil

2
wgengine/magicsock/magicsock.go
View File

@ -2828,7 +2828,7 @@ func (de *discoEndpoint) Addrs() []wgcfg.Endpoint {
if err != nil { if err != nil {
panic(err) panic(err)
} }
return []wgcfg.Endpoint{{host, uint16(port)}} return []wgcfg.Endpoint{{Host: host, Port: uint16(port)}}
} }
func (de *discoEndpoint) ClearSrc() {} func (de *discoEndpoint) ClearSrc() {}

4
wgengine/packet/packet_test.go
View File

@ -206,9 +206,11 @@ func TestParsedPacket(t *testing.T) {
}) })
} }
var sink string
allocs := testing.AllocsPerRun(1000, func() { allocs := testing.AllocsPerRun(1000, func() {
tests[0].qdecode.String() sink = tests[0].qdecode.String()
}) })
_ = sink
if allocs != 1 { if allocs != 1 {
t.Errorf("allocs = %v; want 1", allocs) t.Errorf("allocs = %v; want 1", allocs)
} }

13
wgengine/tstun/tun_test.go
View File

@ -29,17 +29,24 @@ func udp(src, dst packet.IP, sport, dport uint16) []byte {
return packet.Generate(header, []byte("udp_payload")) return packet.Generate(header, []byte("udp_payload"))
} }
func filterNet(ip, mask packet.IP) filter.Net {
return filter.Net{IP: ip, Mask: mask}
}
func nets(ips []packet.IP) []filter.Net { func nets(ips []packet.IP) []filter.Net {
out := make([]filter.Net, 0, len(ips)) out := make([]filter.Net, 0, len(ips))
for _, ip := range ips { for _, ip := range ips {
out = append(out, filter.Net{ip, filter.Netmask(32)}) out = append(out, filterNet(ip, filter.Netmask(32)))
} }
return out return out
} }
func ippr(ip packet.IP, start, end uint16) []filter.NetPortRange { func ippr(ip packet.IP, start, end uint16) []filter.NetPortRange {
return []filter.NetPortRange{ return []filter.NetPortRange{
filter.NetPortRange{filter.Net{ip, filter.Netmask(32)}, filter.PortRange{start, end}}, filter.NetPortRange{
Net: filterNet(ip, filter.Netmask(32)),
Ports: filter.PortRange{First: start, Last: end},
},
} }
} }
@ -49,7 +56,7 @@ func setfilter(logf logger.Logf, tun *TUN) {
{Srcs: nets([]packet.IP{0x01020304}), Dsts: ippr(0x05060708, 98, 98)}, {Srcs: nets([]packet.IP{0x01020304}), Dsts: ippr(0x05060708, 98, 98)},
} }
localNets := []filter.Net{ localNets := []filter.Net{
{packet.IP(0x01020304), filter.Netmask(16)}, filterNet(packet.IP(0x01020304), filter.Netmask(16)),
} }
tun.SetFilter(filter.New(matches, localNets, nil, logf)) tun.SetFilter(filter.New(matches, localNets, nil, logf))
} }