yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-11-04 11:15:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

manual merge

Browse source
This commit is contained in:
Arceliar 2018-03-03 11:07:08 -06:00
commit 0578a9f273
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/yggdrasil/router.go
View file

@ -170,11 +170,7 @@ func (r *router) sendPacket(bs []byte) {
// Don't continue - drop the packet // Don't continue - drop the packet
return return
} }
select { sinfo.send <- bs
case sinfo.send <- bs:
default:
util_putBytes(bs)
}
} }
} }
@ -225,11 +221,7 @@ func (r *router) handleTraffic(packet []byte) {
return return
} }
//go func () { sinfo.recv<-&p }() //go func () { sinfo.recv<-&p }()
select { sinfo.recv <- &p
case sinfo.recv <- &p:
default:
util_putBytes(p.payload)
}
} }
func (r *router) handleProto(packet []byte) { func (r *router) handleProto(packet []byte) {

2
yggdrasil.go
View file

@ -173,7 +173,7 @@ func (n *node) listen() {
saddr := addr.String() saddr := addr.String()
//if _, isIn := n.peers[saddr]; isIn { continue } //if _, isIn := n.peers[saddr]; isIn { continue }
//n.peers[saddr] = struct{}{} //n.peers[saddr] = struct{}{}
n.core.DEBUG_addTCPConn(saddr) // FIXME? can result in 2 connections per peer n.core.DEBUG_addTCPConn(saddr)
//fmt.Println("DEBUG:", "added multicast peer:", saddr) //fmt.Println("DEBUG:", "added multicast peer:", saddr)
} }
} }