4
0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2025-07-07 01:04:07 +00:00

update to latest phony, adjust interface use accordingly

This commit is contained in:
Arceliar
2019-08-27 19:43:54 -05:00
parent 4d9c6342a7
commit 3845f81357
14 changed files with 80 additions and 76 deletions

View File

@ -192,7 +192,7 @@ func (t *switchTable) init(core *Core) {
t.updater.Store(&sync.Once{})
t.table.Store(lookupTable{})
t.drop = make(map[crypto.SigPubKey]int64)
<-t.SyncExec(func() {
phony.Block(t, func() {
t.queues.totalMaxSize = SwitchQueueTotalMinSize
t.queues.bufs = make(map[string]switch_buffer)
t.idle = make(map[switchPort]time.Time)
@ -827,7 +827,7 @@ func (t *switchTable) _handleIdle(port switchPort) bool {
}
func (t *switchTable) packetInFrom(from phony.Actor, bytes []byte) {
t.RecvFrom(from, func() {
t.Act(from, func() {
t._packetIn(bytes)
})
}
@ -870,5 +870,5 @@ func (t *switchTable) _idleIn(port switchPort) {
// Passed a function to call.
// This will send the function to t.admin and block until it finishes.
func (t *switchTable) doAdmin(f func()) {
<-t.SyncExec(f)
phony.Block(t, f)
}