Add per-session read/write workers, work in progress, they still unfortunately need to take a mutex for safety

src/yggdrasil/conn.go

@@ -137,7 +137,6 @@ func (c *Conn) Read(b []byte) (int, error) {
 	sinfo := c.session
 	cancel := c.getDeadlineCancellation(&c.readDeadline)
 	defer cancel.Cancel(nil)
-	var bs []byte
 	for {
 		// Wait for some traffic to come through from the session
 		select {
@@ -147,54 +146,25 @@ func (c *Conn) Read(b []byte) (int, error) {
 			} else {
 				return 0, ConnError{errors.New("session closed"), false, false, true, 0}
 			}
-		case p, ok := <-sinfo.recv:
-			// If the session is closed then do nothing
-			if !ok {
-				return 0, ConnError{errors.New("session closed"), false, false, true, 0}
-			}
+		case bs := <-sinfo.recv:
 			var err error
-			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) {
-					err = ConnError{errors.New("packet dropped due to invalid nonce"), false, true, false, 0}
-					return
-				}
-				// Decrypt the packet
-				var isOK bool
-				bs, isOK = crypto.BoxOpen(&sinfo.sharedSesKey, 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 {
-					err = ConnError{errors.New("packet dropped due to decryption failure"), false, true, false, 0}
-					return
-				}
-				// Update the session
-				sinfo.updateNonce(&p.Nonce)
-				sinfo.time = time.Now()
-				sinfo.bytesRecvd += uint64(len(bs))
-			}
-			sinfo.doFunc(sessionFunc)
-			// Something went wrong in the session worker so abort
-			if err != nil {
-				if ce, ok := err.(*ConnError); ok && ce.Temporary() {
-					continue
-				}
-				return 0, err
+			n := len(bs)
+			if len(bs) > len(b) {
+				n = len(b)
+				err = ConnError{errors.New("read buffer too small for entire packet"), false, true, false, 0}
 			}
 			// Copy results to the output slice and clean up
 			copy(b, bs)
 			util.PutBytes(bs)
 			// If we've reached this point then everything went to plan, return the
 			// number of bytes we populated back into the given slice
-			return len(bs), nil
+			return n, err
 		}
 	}
 }
 
 func (c *Conn) Write(b []byte) (bytesWritten int, err error) {
 	sinfo := c.session
-	var packet []byte
 	written := len(b)
 	sessionFunc := func() {
 		// Does the packet exceed the permitted size for the session?
@@ -202,18 +172,6 @@ func (c *Conn) Write(b []byte) (bytesWritten int, err error) {
 			written, err = 0, ConnError{errors.New("packet too big"), true, false, false, int(sinfo.getMTU())}
 			return
 		}
-		// Encrypt the packet
-		payload, nonce := crypto.BoxSeal(&sinfo.sharedSesKey, b, &sinfo.myNonce)
-		defer util.PutBytes(payload)
-		// Construct the wire packet to send to the router
-		p := wire_trafficPacket{
-			Coords:  sinfo.coords,
-			Handle:  sinfo.theirHandle,
-			Nonce:   *nonce,
-			Payload: payload,
-		}
-		packet = p.encode()
-		sinfo.bytesSent += uint64(len(b))
 		// The rest of this work is session keep-alive traffic
 		doSearch := func() {
 			routerWork := func() {
@@ -244,11 +202,10 @@ func (c *Conn) Write(b []byte) (bytesWritten int, err error) {
 		}
 	}
 	sinfo.doFunc(sessionFunc)
-	// Give the packet to the router
 	if written > 0 {
-		sinfo.core.router.out(packet)
+		bs := append(util.GetBytes(), b...)
+		sinfo.send <- bs
 	}
-	// Finally return the number of bytes we wrote
 	return written, err
 }