don't spam searches for unused connections. todo: timeout old connections somehow

src/tuntap/conn.go

@@ -3,6 +3,7 @@ package tuntap
 import (
 	"errors"
 
+	"github.com/yggdrasil-network/yggdrasil-go/src/address"
 	"github.com/yggdrasil-network/yggdrasil-go/src/util"
 	"github.com/yggdrasil-network/yggdrasil-go/src/yggdrasil"
 )
@@ -10,11 +11,21 @@ import (
 type tunConn struct {
 	tun  *TunAdapter
 	conn *yggdrasil.Conn
+	addr address.Address
+	snet address.Subnet
 	send chan []byte
 	stop chan interface{}
 }
 
 func (s *tunConn) close() {
+	s.tun.mutex.Lock()
+	s._close_nomutex()
+	s.tun.mutex.Unlock()
+}
+
+func (s *tunConn) _close_nomutex() {
+	delete(s.tun.addrToConn, s.addr)
+	delete(s.tun.subnetToConn, s.snet)
 	close(s.stop)
 }
 
@@ -32,6 +43,7 @@ func (s *tunConn) reader() error {
 	b := make([]byte, 65535)
 	for {
 		go func() {
+			// TODO read timeout and close
 			if n, err = s.conn.Read(b); err != nil {
 				s.tun.log.Errorln(s.conn.String(), "TUN/TAP conn read error:", err)
 				return
@@ -72,6 +84,7 @@ func (s *tunConn) writer() error {
 			if !ok {
 				return errors.New("send closed")
 			}
+			// TODO write timeout and close
 			if _, err := s.conn.Write(b); err != nil {
 				s.tun.log.Errorln(s.conn.String(), "TUN/TAP conn write error:", err)
 			}

src/tuntap/tun.go

@@ -236,26 +236,26 @@ func (tun *TunAdapter) wrap(conn *yggdrasil.Conn) (c *tunConn, err error) {
 	}
 	// Get the remote address and subnet of the other side
 	remoteNodeID := conn.RemoteAddr()
-	remoteAddr := address.AddrForNodeID(&remoteNodeID)
-	remoteSubnet := address.SubnetForNodeID(&remoteNodeID)
+	s.addr = *address.AddrForNodeID(&remoteNodeID)
+	s.snet = *address.SubnetForNodeID(&remoteNodeID)
 	// Work out if this is already a destination we already know about
 	tun.mutex.Lock()
 	defer tun.mutex.Unlock()
-	atc, aok := tun.addrToConn[*remoteAddr]
-	stc, sok := tun.subnetToConn[*remoteSubnet]
+	atc, aok := tun.addrToConn[s.addr]
+	stc, sok := tun.subnetToConn[s.snet]
 	// If we know about a connection for this destination already then assume it
 	// is no longer valid and close it
 	if aok {
-		atc.close()
+		atc._close_nomutex()
 		err = errors.New("replaced connection for address")
 	} else if sok {
-		stc.close()
+		stc._close_nomutex()
 		err = errors.New("replaced connection for subnet")
 	}
 	// Save the session wrapper so that we can look it up quickly next time
 	// we receive a packet through the interface for this address
-	tun.addrToConn[*remoteAddr] = &s
-	tun.subnetToConn[*remoteSubnet] = &s
+	tun.addrToConn[s.addr] = &s
+	tun.subnetToConn[s.snet] = &s
 	// Start the connection goroutines
 	go s.reader()
 	go s.writer()