1
0
mirror of https://github.com/juanfont/headscale.git synced 2024-12-20 19:09:07 +01:00

Fix lint error

This commit is contained in:
Kristoffer Dalby 2021-10-30 14:29:03 +00:00
parent 6aacada852
commit 434fac52b7
3 changed files with 9 additions and 7 deletions

4
app.go
View File

@ -355,9 +355,7 @@ func (h *Headscale) Serve() error {
h.cfg.UnixSocket, h.cfg.UnixSocket,
[]grpc.DialOption{ []grpc.DialOption{
grpc.WithInsecure(), grpc.WithInsecure(),
grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) { grpc.WithContextDialer(GrpcSocketDialer),
return net.DialTimeout("unix", addr, timeout)
}),
}..., }...,
) )
if err != nil { if err != nil {

View File

@ -5,7 +5,6 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"net"
"net/url" "net/url"
"os" "os"
"path/filepath" "path/filepath"
@ -310,9 +309,7 @@ func getHeadscaleGRPCClient() (apiV1.HeadscaleServiceClient, *grpc.ClientConn) {
grpcOptions = append( grpcOptions = append(
grpcOptions, grpcOptions,
grpc.WithInsecure(), grpc.WithInsecure(),
grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) { grpc.WithContextDialer(headscale.GrpcSocketDialer),
return net.DialTimeout("unix", addr, timeout)
}),
) )
} else { } else {
// If we are not connecting to a local server, require an API key for authentication // If we are not connecting to a local server, require an API key for authentication

View File

@ -6,10 +6,12 @@
package headscale package headscale
import ( import (
"context"
"crypto/rand" "crypto/rand"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"net"
"strings" "strings"
"golang.org/x/crypto/nacl/box" "golang.org/x/crypto/nacl/box"
@ -156,3 +158,8 @@ func tailNodesToString(nodes []*tailcfg.Node) string {
func tailMapResponseToString(resp tailcfg.MapResponse) string { func tailMapResponseToString(resp tailcfg.MapResponse) string {
return fmt.Sprintf("{ Node: %s, Peers: %s }", resp.Node.Name, tailNodesToString(resp.Peers)) return fmt.Sprintf("{ Node: %s, Peers: %s }", resp.Node.Name, tailNodesToString(resp.Peers))
} }
func GrpcSocketDialer(ctx context.Context, addr string) (net.Conn, error) {
var d net.Dialer
return d.DialContext(ctx, "unix", addr)
}