mirror of
				https://github.com/tailscale/tailscale.git
				synced 2025-10-31 13:05:22 +00:00 
			
		
		
		
	 3485e4bf5a
			
		
	
	3485e4bf5a
	
	
	
		
			
			PeerPresentFlags was added in5ffb2668efbut wasn't plumbed through to the RunConnectionLoop. Rather than add yet another parameter (as IP:port was added earlier), pass in the raw PeerPresentMessage and PeerGoneMessage struct values, which are the same things, plus two fields: PeerGoneReasonType for gone and the PeerPresentFlags from5ffb2668ef. Updates tailscale/corp#17816 Change-Id: Ib19d9f95353651ada90656071fc3656cf58b7987 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
		
			
				
	
	
		
			77 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			77 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright (c) Tailscale Inc & AUTHORS
 | |
| // SPDX-License-Identifier: BSD-3-Clause
 | |
| 
 | |
| package main
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"errors"
 | |
| 	"fmt"
 | |
| 	"log"
 | |
| 	"net"
 | |
| 	"strings"
 | |
| 	"time"
 | |
| 
 | |
| 	"tailscale.com/derp"
 | |
| 	"tailscale.com/derp/derphttp"
 | |
| 	"tailscale.com/net/netmon"
 | |
| 	"tailscale.com/types/logger"
 | |
| )
 | |
| 
 | |
| func startMesh(s *derp.Server) error {
 | |
| 	if *meshWith == "" {
 | |
| 		return nil
 | |
| 	}
 | |
| 	if !s.HasMeshKey() {
 | |
| 		return errors.New("--mesh-with requires --mesh-psk-file")
 | |
| 	}
 | |
| 	for _, host := range strings.Split(*meshWith, ",") {
 | |
| 		if err := startMeshWithHost(s, host); err != nil {
 | |
| 			return err
 | |
| 		}
 | |
| 	}
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func startMeshWithHost(s *derp.Server, host string) error {
 | |
| 	logf := logger.WithPrefix(log.Printf, fmt.Sprintf("mesh(%q): ", host))
 | |
| 	netMon := netmon.NewStatic() // good enough for cmd/derper; no need for netns fanciness
 | |
| 	c, err := derphttp.NewClient(s.PrivateKey(), "https://"+host+"/derp", logf, netMon)
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 	c.MeshKey = s.MeshKey()
 | |
| 	c.WatchConnectionChanges = true
 | |
| 
 | |
| 	// For meshed peers within a region, connect via VPC addresses.
 | |
| 	c.SetURLDialer(func(ctx context.Context, network, addr string) (net.Conn, error) {
 | |
| 		host, port, err := net.SplitHostPort(addr)
 | |
| 		if err != nil {
 | |
| 			return nil, err
 | |
| 		}
 | |
| 		var d net.Dialer
 | |
| 		var r net.Resolver
 | |
| 		if base, ok := strings.CutSuffix(host, ".tailscale.com"); ok && port == "443" {
 | |
| 			subCtx, cancel := context.WithTimeout(ctx, 2*time.Second)
 | |
| 			defer cancel()
 | |
| 			vpcHost := base + "-vpc.tailscale.com"
 | |
| 			ips, _ := r.LookupIP(subCtx, "ip", vpcHost)
 | |
| 			if len(ips) > 0 {
 | |
| 				vpcAddr := net.JoinHostPort(ips[0].String(), port)
 | |
| 				c, err := d.DialContext(subCtx, network, vpcAddr)
 | |
| 				if err == nil {
 | |
| 					log.Printf("connected to %v (%v) instead of %v", vpcHost, ips[0], base)
 | |
| 					return c, nil
 | |
| 				}
 | |
| 				log.Printf("failed to connect to %v (%v): %v; trying non-VPC route", vpcHost, ips[0], err)
 | |
| 			}
 | |
| 		}
 | |
| 		return d.DialContext(ctx, network, addr)
 | |
| 	})
 | |
| 
 | |
| 	add := func(m derp.PeerPresentMessage) { s.AddPacketForwarder(m.Key, c) }
 | |
| 	remove := func(m derp.PeerGoneMessage) { s.RemovePacketForwarder(m.Peer, c) }
 | |
| 	go c.RunWatchConnectionLoop(context.Background(), s.PublicKey(), logf, add, remove)
 | |
| 	return nil
 | |
| }
 |