Various tree tweaks, return to 15 minute spanning tree interval + peering timeouts

cmd/pinecone/main.go

@@ -47,12 +47,9 @@ func main() {
 	}
 
 	dialer := net.Dialer{
-		Timeout:   time.Second * 5,
-		KeepAlive: time.Second * 2,
-	}
-	listener := net.ListenConfig{
-		KeepAlive: time.Second * 2,
+		Timeout: time.Second * 5,
 	}
+	listener := net.ListenConfig{}
 
 	pineconeRouter := router.NewRouter(logger, "router", sk, pk, nil)
 	_ = sessions.NewSessions(logger, pineconeRouter)

cmd/pineconeip/main.go

@@ -21,6 +21,10 @@ import (
 	"log"
 	"net"
 	"os"
+	"os/signal"
+	"runtime/pprof"
+	"syscall"
+	"time"
 
 	"net/http"
 	_ "net/http/pprof"
@@ -52,9 +56,15 @@ func main() {
 
 	logger := log.New(os.Stdout, "", 0)
 	if hostPort := os.Getenv("PPROFLISTEN"); hostPort != "" {
-		logger.Println("Starting pprof on", hostPort)
 		go func() {
-			_ = http.ListenAndServe(hostPort, nil)
+			listener, err := net.Listen("tcp", hostPort)
+			if err != nil {
+				panic(err)
+			}
+			logger.Println("Starting pprof on", listener.Addr())
+			if err := http.Serve(listener, nil); err != nil {
+				panic(err)
+			}
 		}()
 	}
 
@@ -72,14 +82,6 @@ func main() {
 		if err := conn.SetNoDelay(true); err != nil {
 			return fmt.Errorf("conn.SetNoDelay: %w", err)
 		}
-		/*
-			if err := conn.SetKeepAlive(true); err != nil {
-				return fmt.Errorf("conn.SetKeepAlive: %w", err)
-			}
-			if err := conn.SetKeepAlivePeriod(time.Second); err != nil {
-				return fmt.Errorf("conn.SetKeepAlivePeriod: %w", err)
-			}
-		*/
 		if err := conn.SetLinger(0); err != nil {
 			return fmt.Errorf("conn.SetLinger: %w", err)
 		}
@@ -133,5 +135,27 @@ func main() {
 		}
 	}()
 
-	select {}
+	sigs := make(chan os.Signal, 1)
+	signal.Notify(sigs, syscall.SIGUSR1)
+	for {
+		switch <-sigs {
+		case syscall.SIGUSR1:
+			fn := fmt.Sprintf("/tmp/profile.%d", os.Getpid())
+			logger.Println("Requested profile:", fn)
+			fp, err := os.Create(fn)
+			if err != nil {
+				logger.Println("Failed to create profile:", err)
+				return
+			}
+			defer fp.Close()
+			if err := pprof.StartCPUProfile(fp); err != nil {
+				logger.Println("Failed to start profiling:", err)
+				return
+			}
+			time.AfterFunc(time.Second*10, func() {
+				pprof.StopCPUProfile()
+				logger.Println("Profile written:", fn)
+			})
+		}
+	}
 }

cmd/pineconesim/page.html

@@ -125,7 +125,7 @@ <h4>Node Summary</h4>
                     </tr>
                     {{range .Nodes}}
                     {{if not .IsExternal}}<tr>
-                        <td>{{.Name}}</td>
+                        <td><a href="?view=snek&pk={{.Key}}">{{.Name}}</a></td>
                         <td><code>{{.Port}}</code></td>
                         <td><code>{{.Coords}}</code></td>
                         <td><a href="?view=snek&pk={{.Root}}"><code>{{.Root}}</code></a></td>
@@ -208,7 +208,7 @@ <h4>Peers</h4>
                     </tr>
                     {{range .NodeInfo.Peers}}
                     <tr>
-                        <td><code>{{.Name}}</code></td>
+                        <td><code><a href="?view=snek&pk={{.PublicKey}}">{{.Name}}</a></code></td>
                         <td><code><a href="?view=snek&pk={{.PublicKey}}">{{.PublicKey}}</a></code></td>
                         <td><code>{{.Port}}</code></td>
                         <td><code><a href="?view=snek&pk={{.RootPublicKey}}">{{.RootPublicKey}}</a></code></td>

cmd/pineconesim/simulator/interface.go

@@ -23,6 +23,8 @@ import (
 )
 
 func (sim *Simulator) LookupCoords(target string) (types.SwitchPorts, error) {
+	sim.nodesMutex.RLock()
+	defer sim.nodesMutex.RUnlock()
 	node, ok := sim.nodes[target]
 	if !ok {
 		return nil, fmt.Errorf("node %q not known", target)
@@ -31,6 +33,8 @@ func (sim *Simulator) LookupCoords(target string) (types.SwitchPorts, error) {
 }
 
 func (sim *Simulator) LookupNodeID(target types.SwitchPorts) (string, error) {
+	sim.nodesMutex.RLock()
+	defer sim.nodesMutex.RUnlock()
 	for id, n := range sim.nodes {
 		if n.Coords().EqualTo(target) {
 			return id, nil
@@ -40,6 +44,8 @@ func (sim *Simulator) LookupNodeID(target types.SwitchPorts) (string, error) {
 }
 
 func (sim *Simulator) LookupPublicKey(target types.PublicKey) (string, error) {
+	sim.nodesMutex.RLock()
+	defer sim.nodesMutex.RUnlock()
 	for id, n := range sim.nodes {
 		if n.PublicKey().EqualTo(target) {
 			return id, nil

cmd/pineconesim/simulator/nodes.go

@@ -67,6 +67,9 @@ func (sim *Simulator) CreateNode(t string) error {
 			if err := c.SetNoDelay(true); err != nil {
 				panic(err)
 			}
+			if err := c.SetLinger(0); err != nil {
+				panic(err)
+			}
 			if _, err = n.AuthenticatedConnect(c, "sim", router.PeerTypeRemote); err != nil {
 				continue
 			}

multicast/multicast.go

@@ -65,15 +65,14 @@ func NewMulticast(
 	}
 	m.tcpLC = net.ListenConfig{
 		Control:   m.tcpOptions,
-		KeepAlive: time.Second,
+		KeepAlive: time.Second * 3,
 	}
 	m.udpLC = net.ListenConfig{
 		Control: m.udpOptions,
 	}
 	m.dialer = net.Dialer{
-		Control:   m.tcpOptions,
-		Timeout:   time.Second * 5,
-		KeepAlive: time.Second,
+		Control: m.tcpOptions,
+		//	Timeout: time.Second * 5,
 	}
 	return m
 }
@@ -163,6 +162,7 @@ func (m *Multicast) accept(listener net.Listener) {
 
 		if _, err := m.r.AuthenticatedConnect(conn, tcpaddr.Zone, router.PeerTypeMulticast); err != nil {
 			//m.log.Println("m.s.AuthenticatedConnect:", err)
+			_ = conn.Close()
 			continue
 		}
 	}
@@ -309,6 +309,7 @@ func (m *Multicast) listen(intf *multicastInterface, conn net.PacketConn, srcadd
 
 		if _, err := m.r.AuthenticatedConnect(peer, udpaddr.Zone, router.PeerTypeMulticast); err != nil {
 			m.log.Println("m.s.AuthenticatedConnect:", err)
+			_ = peer.Close()
 			continue
 		}
 	}

multicast/platform_darwin.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build darwin
 // +build darwin
 
 package multicast

router/dht.go

@@ -31,7 +31,7 @@ import (
 type dhtEntry interface {
 	PublicKey() types.PublicKey
 	Coordinates() types.SwitchPorts
-	SeenRecently() bool
+	Alive() bool
 }
 
 type dht struct {
@@ -59,7 +59,7 @@ func (d *dht) table() []dhtEntry {
 
 	results := make([]dhtEntry, 0, len(d.sorted))
 	for _, n := range d.sorted {
-		if n.SeenRecently() {
+		if n.Alive() {
 			results = append(results, n)
 		}
 	}

router/nexthop.go

@@ -31,7 +31,9 @@ func (p *Peer) getNextHops(frame *types.Frame, from types.SwitchPortID) types.Sw
 	switch frame.Type {
 	case types.TypeSTP:
 		if from != 0 {
-			p.r.handleAnnouncement(p, frame)
+			if err := p.r.handleAnnouncement(p, frame); err != nil {
+				p.r.log.Println("Failed to handle announcement:", err)
+			}
 		}
 
 	case types.TypeVirtualSnakeBootstrap:

router/nexthop_greedy.go

@@ -58,12 +58,14 @@ func (r *Router) getGreedyRoutedNextHop(from *Peer, rx *types.Frame) types.Switc
 		peerCoords := p.Coordinates()
 		peerDist := int64(peerCoords.DistanceTo(rx.Destination))
 		switch {
-		case peerDist == 0:
-			return []types.SwitchPortID{p.port}
-		case rx.Destination.EqualTo(peerCoords):
+		case peerDist == 0 || rx.Destination.EqualTo(peerCoords):
+			// The peer is the actual destination.
 			return []types.SwitchPortID{p.port}
+
 		case peerDist < bestDist:
+			// The peer is closer to the destination.
 			bestPeer, bestDist = p.port, peerDist
+
 		default:
 		}
 	}

router/nexthop_source.go

@@ -51,7 +51,7 @@ func (r *Router) getSourceRoutedNextHop(from *Peer, rx *types.Frame) types.Switc
 		return nil
 	}
 
-	if peer := r.ports[to]; !peer.started.Load() || !peer.alive.Load() {
+	if peer := r.ports[to]; !peer.started.Load() || !peer.Alive() {
 		// Don't try to send packets to a port that has nothing
 		// connected to it or isn't alive.
 		return nil