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

somehow this doesn't seem to deadlock or crash from buffer reuse (util.PutBytes), but I have no idea why it was doing that before and not now

Browse Source
This commit is contained in:
Arceliar 2019-04-26 21:49:11 -05:00
parent 15051b0a3c
commit 01ea6d3d80
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/yggdrasil/conn.go
View File

@ -60,7 +60,6 @@ func (c *Conn) String() string {
func (c *Conn) startSearch() { func (c *Conn) startSearch() {
// The searchCompleted callback is given to the search // The searchCompleted callback is given to the search
searchCompleted := func(sinfo *sessionInfo, err error) { searchCompleted := func(sinfo *sessionInfo, err error) {
defer c.searching.Store(false)
// If the search failed for some reason, e.g. it hit a dead end or timed // If the search failed for some reason, e.g. it hit a dead end or timed
// out, then do nothing // out, then do nothing
if err != nil { if err != nil {
@ -77,6 +76,7 @@ func (c *Conn) startSearch() {
}() }()
return return
} }
defer c.searching.Store(false)
// Take the connection mutex // Take the connection mutex
c.mutex.Lock() c.mutex.Lock()
defer c.mutex.Unlock() defer c.mutex.Unlock()
@ -180,6 +180,8 @@ func (c *Conn) Read(b []byte) (int, error) {
} }
// Wait for some traffic to come through from the session // Wait for some traffic to come through from the session
select { select {
case <-timer.C:
return 0, ConnError{errors.New("Timeout"), true, false}
case p, ok := <-sinfo.recv: case p, ok := <-sinfo.recv:
// If the session is closed then do nothing // If the session is closed then do nothing
if !ok { if !ok {
@ -197,10 +199,10 @@ func (c *Conn) Read(b []byte) (int, error) {
} }
// Decrypt the packet // Decrypt the packet
bs, isOK := crypto.BoxOpen(&sinfo.sharedSesKey, p.Payload, &p.Nonce) bs, isOK := crypto.BoxOpen(&sinfo.sharedSesKey, p.Payload, &p.Nonce)
defer util.PutBytes(bs)
// Check if we were unable to decrypt the packet for some reason and // Check if we were unable to decrypt the packet for some reason and
// return an error if we couldn't // return an error if we couldn't
if !isOK { if !isOK {
util.PutBytes(bs)
err = errors.New("packet dropped due to decryption failure") err = errors.New("packet dropped due to decryption failure")
return return
} }
@ -249,9 +251,7 @@ func (c *Conn) Write(b []byte) (bytesWritten int, err error) {
// Is a search already taking place? // Is a search already taking place?
if searching, sok := c.searching.Load().(bool); !sok || (sok && !searching) { if searching, sok := c.searching.Load().(bool); !sok || (sok && !searching) {
// No search was already taking place so start a new one // No search was already taking place so start a new one
c.core.router.doAdmin(func() { c.core.router.doAdmin(c.startSearch)
c.startSearch()
})
} }
// Wait for the search to complete // Wait for the search to complete
select { select {