TheArchive/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2024-12-24 16:57:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename a couple of things and move a PutBytes so it happens sooner

Browse Source
This commit is contained in:
Arceliar 2019-07-27 18:23:55 -05:00
parent 9e118884d4
commit b66bea813b
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

@ -143,9 +143,9 @@ func (c *Conn) Read(b []byte) (int, error) {
if !ok { if !ok {
return 0, ConnError{errors.New("session closed"), false, false, true, 0} return 0, ConnError{errors.New("session closed"), false, false, true, 0}
} }
defer util.PutBytes(p.Payload)
var err error var err error
workerFunc := func() { sessionFunc := func() {
defer util.PutBytes(p.Payload)
// If the nonce is bad then drop the packet and return an error // 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}
@ -165,7 +165,7 @@ func (c *Conn) Read(b []byte) (int, error) {
sinfo.time = time.Now() sinfo.time = time.Now()
sinfo.bytesRecvd += uint64(len(bs)) sinfo.bytesRecvd += uint64(len(bs))
} }
sinfo.doFunc(workerFunc) sinfo.doFunc(sessionFunc)
// Something went wrong in the session worker so abort // Something went wrong in the session worker so abort
if err != nil { if err != nil {
if ce, ok := err.(*ConnError); ok && ce.Temporary() { if ce, ok := err.(*ConnError); ok && ce.Temporary() {
@ -187,7 +187,7 @@ func (c *Conn) Write(b []byte) (bytesWritten int, err error) {
sinfo := c.session sinfo := c.session
var packet []byte var packet []byte
written := len(b) written := len(b)
workerFunc := func() { sessionFunc := func() {
// Does the packet exceed the permitted size for the session? // Does the packet exceed the permitted size for the session?
if uint16(len(b)) > sinfo.getMTU() { if uint16(len(b)) > sinfo.getMTU() {
written, err = 0, ConnError{errors.New("packet too big"), true, false, false, int(sinfo.getMTU())} written, err = 0, ConnError{errors.New("packet too big"), true, false, false, int(sinfo.getMTU())}
@ -234,7 +234,7 @@ func (c *Conn) Write(b []byte) (bytesWritten int, err error) {
default: // Don't do anything, to keep traffic throttled default: // Don't do anything, to keep traffic throttled
} }
} }
sinfo.doFunc(workerFunc) sinfo.doFunc(sessionFunc)
// Give the packet to the router // Give the packet to the router
if written > 0 { if written > 0 {
sinfo.core.router.out(packet) sinfo.core.router.out(packet)