cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-30 00:51:36 +00:00
Code Releases Activity

reduce time spent with a mutex held in sessionInfo.recvWorker

Browse Source
This commit is contained in:
Arceliar 2019-08-03 22:47:10 -05:00
parent 099bd3ae1e
commit b9987b4fdc
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/yggdrasil/session.go
View File

@ -449,31 +449,38 @@ func (sinfo *sessionInfo) recvWorker() {
case p := <-sinfo.fromRouter: case p := <-sinfo.fromRouter:
var bs []byte var bs []byte
var err error var err error
var k crypto.BoxSharedKey
sessionFunc := func() { sessionFunc := func() {
defer util.PutBytes(p.Payload)
// If the nonce is bad then drop the packet and return an error
if !sinfo.nonceIsOK(&p.Nonce) { if !sinfo.nonceIsOK(&p.Nonce) {
err = ConnError{errors.New("packet dropped due to invalid nonce"), false, true, false, 0} err = ConnError{errors.New("packet dropped due to invalid nonce"), false, true, false, 0}
return return
} }
// Decrypt the packet k = sinfo.sharedSesKey
}
sinfo.doFunc(sessionFunc)
if err != nil {
util.PutBytes(p.Payload)
continue
}
var isOK bool var isOK bool
bs, isOK = crypto.BoxOpen(&sinfo.sharedSesKey, p.Payload, &p.Nonce) bs, isOK = crypto.BoxOpen(&k, p.Payload, &p.Nonce)
// Check if we were unable to decrypt the packet for some reason and
// return an error if we couldn't
if !isOK { if !isOK {
err = ConnError{errors.New("packet dropped due to decryption failure"), false, true, false, 0} util.PutBytes(bs)
continue
}
sessionFunc = func() {
if k != sinfo.sharedSesKey || !sinfo.nonceIsOK(&p.Nonce) {
// The session updated in the mean time, so return an error
err = ConnError{errors.New("session updated during crypto operation"), false, true, false, 0}
return return
} }
// Update the session
sinfo.updateNonce(&p.Nonce) sinfo.updateNonce(&p.Nonce)
sinfo.time = time.Now() sinfo.time = time.Now()
sinfo.bytesRecvd += uint64(len(bs)) sinfo.bytesRecvd += uint64(len(bs))
} }
sinfo.doFunc(sessionFunc) sinfo.doFunc(sessionFunc)
if len(bs) > 0 {
if err != nil { if err != nil {
// Bad packet, drop it // Not sure what else to do with this packet, I guess just drop it
util.PutBytes(bs) util.PutBytes(bs)
} else { } else {
// Pass the packet to the buffer for Conn.Read // Pass the packet to the buffer for Conn.Read
@ -482,7 +489,6 @@ func (sinfo *sessionInfo) recvWorker() {
} }
} }
} }
}
func (sinfo *sessionInfo) sendWorker() { func (sinfo *sessionInfo) sendWorker() {
// TODO move info that this worker needs here, send updates via a channel // TODO move info that this worker needs here, send updates via a channel