mirror of
https://github.com/tailscale/tailscale.git
synced 2025-12-01 09:32:08 +00:00
all: use new LocalAPI client package location
It was moved in f57fa3cbc3.
Updates tailscale/corp#22748
Change-Id: I19f965e6bded1d4c919310aa5b864f2de0cd6220
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
committed by
Brad Fitzpatrick
parent
8ecce0e98d
commit
05ac21ebe4
@@ -32,6 +32,7 @@ import (
|
||||
|
||||
"github.com/miekg/dns"
|
||||
"go4.org/mem"
|
||||
"tailscale.com/client/local"
|
||||
"tailscale.com/client/tailscale"
|
||||
"tailscale.com/clientupdate"
|
||||
"tailscale.com/cmd/testwrapper/flakytest"
|
||||
@@ -755,11 +756,11 @@ func TestClientSideJailing(t *testing.T) {
|
||||
defer ln.Close()
|
||||
port := uint16(ln.Addr().(*net.TCPAddr).Port)
|
||||
|
||||
lc1 := &tailscale.LocalClient{
|
||||
lc1 := &local.Client{
|
||||
Socket: n1.sockFile,
|
||||
UseSocketOnly: true,
|
||||
}
|
||||
lc2 := &tailscale.LocalClient{
|
||||
lc2 := &local.Client{
|
||||
Socket: n2.sockFile,
|
||||
UseSocketOnly: true,
|
||||
}
|
||||
@@ -789,7 +790,7 @@ func TestClientSideJailing(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
testDial := func(t *testing.T, lc *tailscale.LocalClient, ip netip.Addr, port uint16, shouldFail bool) {
|
||||
testDial := func(t *testing.T, lc *local.Client, ip netip.Addr, port uint16, shouldFail bool) {
|
||||
t.Helper()
|
||||
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
|
||||
defer cancel()
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
// transitive deps when we run "go install tailscaled" in a child
|
||||
// process and can cache a prior success when a dependency changes.
|
||||
_ "tailscale.com/chirp"
|
||||
_ "tailscale.com/client/tailscale"
|
||||
_ "tailscale.com/client/local"
|
||||
_ "tailscale.com/cmd/tailscaled/childproc"
|
||||
_ "tailscale.com/control/controlclient"
|
||||
_ "tailscale.com/derp/derphttp"
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
// transitive deps when we run "go install tailscaled" in a child
|
||||
// process and can cache a prior success when a dependency changes.
|
||||
_ "tailscale.com/chirp"
|
||||
_ "tailscale.com/client/tailscale"
|
||||
_ "tailscale.com/client/local"
|
||||
_ "tailscale.com/cmd/tailscaled/childproc"
|
||||
_ "tailscale.com/control/controlclient"
|
||||
_ "tailscale.com/derp/derphttp"
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
// transitive deps when we run "go install tailscaled" in a child
|
||||
// process and can cache a prior success when a dependency changes.
|
||||
_ "tailscale.com/chirp"
|
||||
_ "tailscale.com/client/tailscale"
|
||||
_ "tailscale.com/client/local"
|
||||
_ "tailscale.com/cmd/tailscaled/childproc"
|
||||
_ "tailscale.com/control/controlclient"
|
||||
_ "tailscale.com/derp/derphttp"
|
||||
|
||||
@@ -11,7 +11,7 @@ import (
|
||||
// transitive deps when we run "go install tailscaled" in a child
|
||||
// process and can cache a prior success when a dependency changes.
|
||||
_ "tailscale.com/chirp"
|
||||
_ "tailscale.com/client/tailscale"
|
||||
_ "tailscale.com/client/local"
|
||||
_ "tailscale.com/cmd/tailscaled/childproc"
|
||||
_ "tailscale.com/control/controlclient"
|
||||
_ "tailscale.com/derp/derphttp"
|
||||
|
||||
@@ -18,7 +18,7 @@ import (
|
||||
_ "golang.org/x/sys/windows/svc/mgr"
|
||||
_ "golang.zx2c4.com/wintun"
|
||||
_ "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
|
||||
_ "tailscale.com/client/tailscale"
|
||||
_ "tailscale.com/client/local"
|
||||
_ "tailscale.com/cmd/tailscaled/childproc"
|
||||
_ "tailscale.com/control/controlclient"
|
||||
_ "tailscale.com/derp/derphttp"
|
||||
|
||||
@@ -50,7 +50,7 @@ import (
|
||||
"gvisor.dev/gvisor/pkg/tcpip/transport/icmp"
|
||||
"gvisor.dev/gvisor/pkg/tcpip/transport/tcp"
|
||||
"gvisor.dev/gvisor/pkg/waiter"
|
||||
"tailscale.com/client/tailscale"
|
||||
"tailscale.com/client/local"
|
||||
"tailscale.com/derp"
|
||||
"tailscale.com/derp/derphttp"
|
||||
"tailscale.com/net/netutil"
|
||||
@@ -2123,7 +2123,7 @@ func (s *Server) takeAgentConnOne(n *node) (_ *agentConn, ok bool) {
|
||||
}
|
||||
|
||||
type NodeAgentClient struct {
|
||||
*tailscale.LocalClient
|
||||
*local.Client
|
||||
HTTPClient *http.Client
|
||||
}
|
||||
|
||||
@@ -2148,7 +2148,7 @@ func (s *Server) NodeAgentDialer(n *Node) DialFunc {
|
||||
func (s *Server) NodeAgentClient(n *Node) *NodeAgentClient {
|
||||
d := s.NodeAgentDialer(n)
|
||||
return &NodeAgentClient{
|
||||
LocalClient: &tailscale.LocalClient{
|
||||
Client: &local.Client{
|
||||
UseSocketOnly: true,
|
||||
OmitAuth: true,
|
||||
Dial: d,
|
||||
|
||||
Reference in New Issue
Block a user