Merge branch 'develop' of https://github.com/yggdrasil-network/yggdrasil-go into switch

src/config/config.go

@@ -16,7 +16,6 @@ type NodeConfig struct {
 	AdminListen                 string                 `comment:"Listen address for admin connections. Default is to listen for local\nconnections either on TCP/9001 or a UNIX socket depending on your\nplatform. Use this value for yggdrasilctl -endpoint=X. To disable\nthe admin socket, use the value \"none\" instead."`
 	Peers                       []string               `comment:"List of connection strings for static peers in URI format, e.g.\ntcp://a.b.c.d:e or socks://a.b.c.d:e/f.g.h.i:j."`
 	InterfacePeers              map[string][]string    `comment:"List of connection strings for static peers in URI format, arranged\nby source interface, e.g. { \"eth0\": [ tcp://a.b.c.d:e ] }. Note that\nSOCKS peerings will NOT be affected by this option and should go in\nthe \"Peers\" section instead."`
-	ReadTimeout                 int32                  `comment:"Read timeout for connections, specified in milliseconds. If less\nthan 6000 and not negative, 6000 (the default) is used. If negative,\nreads won't time out."`
 	AllowedEncryptionPublicKeys []string               `comment:"List of peer encryption public keys to allow or incoming TCP\nconnections from. If left empty/undefined then all connections\nwill be allowed by default."`
 	EncryptionPublicKey         string                 `comment:"Your public encryption key. Your peers may ask you for this to put\ninto their AllowedEncryptionPublicKeys configuration."`
 	EncryptionPrivateKey        string                 `comment:"Your private encryption key. DO NOT share this with anyone!"`

src/yggdrasil/switch.go

@@ -415,6 +415,7 @@ func (t *switchTable) unlockedHandleMsg(msg *switchMsg, fromPort switchPort, rep
 	// Update the matrix of peer "faster" thresholds
 	if reprocessing {
 		sender.faster = oldSender.faster
+		sender.time = oldSender.time
 	} else {
 		sender.faster = make(map[switchPort]uint64, len(oldSender.faster))
 		for port, peer := range t.data.peers {

src/yggdrasil/tcp.go

@@ -36,7 +36,6 @@ type tcpInterface struct {
 	reconfigure chan chan error
 	serv        net.Listener
 	stop        chan bool
-	timeout     time.Duration
 	addr        string
 	mutex       sync.Mutex // Protecting the below
 	calls       map[string]struct{}
@@ -106,13 +105,8 @@ func (iface *tcpInterface) listen() error {
 
 	iface.core.configMutex.RLock()
 	iface.addr = iface.core.config.Listen
-	iface.timeout = time.Duration(iface.core.config.ReadTimeout) * time.Millisecond
 	iface.core.configMutex.RUnlock()
 
-	if iface.timeout >= 0 && iface.timeout < default_timeout {
-		iface.timeout = default_timeout
-	}
-
 	ctx := context.Background()
 	lc := net.ListenConfig{
 		Control: iface.tcpContext,