From b2f4f2e1b66cef8008e002d1e253d55c5275b186 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri, 19 Apr 2019 00:07:26 +0100
Subject: [PATCH] Update errors, update Write

---
 cmd/yggdrasil/main.go    |  3 ++-
 src/yggdrasil/api.go     | 10 +++++-----
 src/yggdrasil/session.go |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go
index 36866b3f..8a810bc5 100644
--- a/cmd/yggdrasil/main.go
+++ b/cmd/yggdrasil/main.go
@@ -271,7 +271,8 @@ func main() {
 	// Some stuff
 	go func() {
 		time.Sleep(time.Second * 2)
-		session, err := n.core.Dial("nodeid", "babd4e4bccb216f77bb723c1b034b63a652060aabfe9506b51f687183e9b0fd13f438876f5a3ab21cac9c8101eb88e2613fe2a8b0724add09d7ef5a72146c31f")
+		//session, err := n.core.Dial("nodeid", "babd4e4bccb216f77bb723c1b034b63a652060aabfe9506b51f687183e9b0fd13f438876f5a3ab21cac9c8101eb88e2613fe2a8b0724add09d7ef5a72146c31f")
+		session, err := n.core.Dial("nodeid", "9890e135604e8aa6039a909e40c629824d852042a70e51957d5b9d700195663d50552e8e869af132b4617d76f8ef00314d94cce23aa8d6b051b3b952a32a4966")
 		logger.Println(session, err)
 		b := []byte{1, 2, 3, 4, 5}
 		for {
diff --git a/src/yggdrasil/api.go b/src/yggdrasil/api.go
index 0b38525b..41ef8c06 100644
--- a/src/yggdrasil/api.go
+++ b/src/yggdrasil/api.go
@@ -100,17 +100,17 @@ func (c *Conn) startSearch() {
 
 func (c *Conn) Read(b []byte) (int, error) {
 	if c.session == nil {
-		return 0, errors.New("invalid session")
+		return 0, errors.New("session not open")
 	}
 	p := <-c.session.recv
 	defer util.PutBytes(p.Payload)
 	if !c.session.nonceIsOK(&p.Nonce) {
-		return 0, errors.New("invalid nonce")
+		return 0, errors.New("packet dropped due to invalid nonce")
 	}
 	bs, isOK := crypto.BoxOpen(&c.session.sharedSesKey, p.Payload, &p.Nonce)
 	if !isOK {
 		util.PutBytes(bs)
-		return 0, errors.New("failed to decrypt")
+		return 0, errors.New("packet dropped due to decryption failure")
 	}
 	b = b[:0]
 	b = append(b, bs...)
@@ -125,7 +125,7 @@ func (c *Conn) Write(b []byte) (int, error) {
 		c.core.router.doAdmin(func() {
 			c.startSearch()
 		})
-		return 0, errors.New("invalid session")
+		return 0, errors.New("session not open")
 	}
 	defer util.PutBytes(b)
 	if !c.session.init {
@@ -146,7 +146,7 @@ func (c *Conn) Write(b []byte) (int, error) {
 	packet := p.encode()
 	c.session.bytesSent += uint64(len(b))
 	c.session.send <- packet
-	//c.session.core.router.out(packet)
+	c.session.core.router.out(packet)
 	return len(b), nil
 }
 
diff --git a/src/yggdrasil/session.go b/src/yggdrasil/session.go
index fd3a985b..4c896f2a 100644
--- a/src/yggdrasil/session.go
+++ b/src/yggdrasil/session.go
@@ -523,7 +523,7 @@ func (ss *sessions) resetInits() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-
+/*
 // This is for a per-session worker.
 // It handles calling the relatively expensive crypto operations.
 // It's also responsible for checking nonces and dropping out-of-date/duplicate packets, or else calling the function to update nonces if the packet is OK.