TheArchive/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2024-11-30 13:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Catch a nil pointer when sending a session packet to a conn, this shouldn't happen but it's caused multiple crashes in conn.recvMsg"

Browse Source 
This reverts commit be35675d0f.
This commit is contained in:
Neil Alexander 2019-09-18 20:26:06 +01:00
parent be35675d0f
commit 0a12e4b1c1
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/yggdrasil/session.go
View File

@ -470,14 +470,7 @@ func (sinfo *sessionInfo) _recvPacket(p *wire_trafficPacket) {
callback := func() { callback := func() {
util.PutBytes(p.Payload) util.PutBytes(p.Payload)
if !isOK || k != sinfo.sharedSesKey || !sinfo._nonceIsOK(&p.Nonce) { if !isOK || k != sinfo.sharedSesKey || !sinfo._nonceIsOK(&p.Nonce) {
// Either we failed to decrypt, or the session was updated, or we // Either we failed to decrypt, or the session was updated, or we received this packet in the mean time
// received this packet in the mean time
util.PutBytes(bs)
return
}
if sinfo.conn == nil {
// There's no connection associated with this session for some reason
// TODO: Figure out why this happens sometimes, it shouldn't
util.PutBytes(bs) util.PutBytes(bs)
return return
} }