tsnet: add Start method to allow connecting to the tailnet without

Maisem Ali · maisem · commit dd45bba76b3a · 2022-01-03T11:56:54.000-08:00
requiring a call to Dial/Listen.

Signed-off-by: Maisem Ali &lt;maisem@tailscale.com&gt;
diff --git a/tsnet/tsnet.go b/tsnet/tsnet.go
@@ -67,8 +67,9 @@ type Server struct {
 }
 
 // Dial connects to the address on the tailnet.
+// It will start the server if it has not been started yet.
 func (s *Server) Dial(ctx context.Context, network, address string) (net.Conn, error) {
-	if err := s.init(); err != nil {
+	if err := s.Start(); err != nil {
 		return nil, err
 	}
 	return s.dialer.UserDial(ctx, network, address)
@@ -80,7 +81,9 @@ func (s *Server) doInit() {
 	}
 }
 
-func (s *Server) init() error {
+// Start connects the server to the tailnet.
+// Optional: any calls to Dial/Listen will also call Start.
+func (s *Server) Start() error {
 	s.initOnce.Do(s.doInit)
 	return s.initErr
 }
@@ -232,13 +235,14 @@ func (s *Server) forwardTCP(c net.Conn, port uint16) {
 }
 
 // Listen announces only on the Tailscale network.
+// It will start the server if it has not been started yet.
 func (s *Server) Listen(network, addr string) (net.Listener, error) {
 	host, port, err := net.SplitHostPort(addr)
 	if err != nil {
 		return nil, fmt.Errorf("tsnet: %w", err)
 	}
 
-	if err := s.init(); err != nil {
+	if err := s.Start(); err != nil {
 		return nil, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,9 @@ type Server struct {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`// Dial connects to the address on the tailnet.`
	`70`	`+// It will start the server if it has not been started yet.`
`70`	`71`	`func (s *Server) Dial(ctx context.Context, network, address string) (net.Conn, error) {`
`71`		`- if err := s.init(); err != nil {`
	`72`	`+ if err := s.Start(); err != nil {`
`72`	`73`	`return nil, err`
`73`	`74`	`}`
`74`	`75`	`return s.dialer.UserDial(ctx, network, address)`
`@@ -80,7 +81,9 @@ func (s *Server) doInit() {`
`80`	`81`	`}`
`81`	`82`	`}`
`82`	`83`
`83`		`-func (s *Server) init() error {`
	`84`	`+// Start connects the server to the tailnet.`
	`85`	`+// Optional: any calls to Dial/Listen will also call Start.`
	`86`	`+func (s *Server) Start() error {`
`84`	`87`	`s.initOnce.Do(s.doInit)`
`85`	`88`	`return s.initErr`
`86`	`89`	`}`
`@@ -232,13 +235,14 @@ func (s *Server) forwardTCP(c net.Conn, port uint16) {`
`232`	`235`	`}`
`233`	`236`
`234`	`237`	`// Listen announces only on the Tailscale network.`
	`238`	`+// It will start the server if it has not been started yet.`
`235`	`239`	`func (s *Server) Listen(network, addr string) (net.Listener, error) {`
`236`	`240`	`host, port, err := net.SplitHostPort(addr)`
`237`	`241`	`if err != nil {`
`238`	`242`	`return nil, fmt.Errorf("tsnet: %w", err)`
`239`	`243`	`}`
`240`	`244`
`241`		`- if err := s.init(); err != nil {`
	`245`	`+ if err := s.Start(); err != nil {`
`242`	`246`	`return nil, err`
`243`	`247`	`}`
`244`	`248`