TheArchive/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2024-11-27 12:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove sessionInfo.doFunc, have the api just use phony.Block instead

Browse Source
This commit is contained in:
Arceliar 2019-08-29 21:59:28 -05:00
parent 1f658cce76
commit 7649ea0f9f
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/yggdrasil/api.go
View File

@ -227,18 +227,7 @@ func (c *Core) GetSessions() []Session {
} }
copy(session.PublicKey[:], sinfo.theirPermPub[:]) copy(session.PublicKey[:], sinfo.theirPermPub[:])
} }
var skip bool phony.Block(sinfo, workerFunc)
func() {
defer func() {
if recover() != nil {
skip = true
}
}()
sinfo.doFunc(workerFunc)
}()
if skip {
continue
}
// TODO? skipped known but timed out sessions? // TODO? skipped known but timed out sessions?
sessions = append(sessions, session) sessions = append(sessions, session)
} }

5
src/yggdrasil/session.go
View File

@ -77,11 +77,6 @@ func (sinfo *sessionInfo) reconfigure() {
// This is where reconfiguration would go, if we had anything to do // This is where reconfiguration would go, if we had anything to do
} }
// TODO remove this, call SyncExec directly
func (sinfo *sessionInfo) doFunc(f func()) {
phony.Block(sinfo, f)
}
// Represents a session ping/pong packet, andincludes information like public keys, a session handle, coords, a timestamp to prevent replays, and the tun/tap MTU. // Represents a session ping/pong packet, andincludes information like public keys, a session handle, coords, a timestamp to prevent replays, and the tun/tap MTU.
type sessionPing struct { type sessionPing struct {
SendPermPub crypto.BoxPubKey // Sender's permanent key SendPermPub crypto.BoxPubKey // Sender's permanent key