cwinfo/yggdrasil-go
4
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2025-06-15 16:46:06 +00:00
Code Releases Activity

Fix bug in mask generation for outbound dials, change iface reader mutexes to read-only locks unless RW is needed

Browse Source
This commit is contained in:
Neil Alexander
2019-04-22 11:49:47 +01:00
parent ccf03fd3b6
commit bbd1246f7b
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/tuntap/tun.go
View File

@ -260,9 +260,9 @@ func (tun *TunAdapter) ifaceReader() error {
}
dstNodeID, dstNodeIDMask = dstAddr.GetNodeIDandMask()
// Do we have an active connection for this node ID?
tun.mutex.Lock()
tun.mutex.RLock()
if conn, isIn := tun.conns[*dstNodeID]; isIn {
tun.mutex.Unlock()
tun.mutex.RUnlock()
w, err := conn.Write(bs[:n])
if err != nil {
tun.log.Errorln("TUN/TAP conn write error:", err)
@ -273,14 +273,20 @@ func (tun *TunAdapter) ifaceReader() error {
continue
}
} else {
if conn, err := tun.dialer.DialByNodeIDandMask(dstNodeID, dstNodeIDMask); err == nil {
tun.conns[*dstNodeID] = &conn
tun.mutex.Unlock()
go tun.connReader(&conn)
} else {
tun.mutex.Unlock()
tun.log.Errorln("TUN/TAP dial error:", err)
}
tun.mutex.RUnlock()
func() {
tun.mutex.Lock()
defer tun.mutex.Unlock()
if conn, err := tun.dialer.DialByNodeIDandMask(dstNodeID, dstNodeIDMask); err == nil {
tun.log.Debugln("Opening new session connection")
tun.log.Debugln("Node:", dstNodeID)
tun.log.Debugln("Mask:", dstNodeIDMask)
tun.conns[*dstNodeID] = &conn
go tun.connReader(&conn)
} else {
tun.log.Errorln("TUN/TAP dial error:", err)
}
}()
}
/*if !r.cryptokey.isValidSource(srcAddr, addrlen) {