From d77d5f9800fa6a9dddc29ad01180f62f22e88c2d Mon Sep 17 00:00:00 2001
From: idk <problemsolver@openmailbox.org>
Date: Wed, 26 Dec 2018 13:17:21 -0500
Subject: [PATCH] Conns aren't being saved

---
 conn/conn.go     | 8 ++++----
 socks/manager.go | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/conn/conn.go b/conn/conn.go
index 547796e..a42bfaf 100644
--- a/conn/conn.go
+++ b/conn/conn.go
@@ -99,19 +99,19 @@ func NewConn(sam sam3.SAM, addr, path string, opts []string) (Conn, error) {
 	c.name = t32.Base32() + ".i2pkeys"
 	c.I2PKeys, err = c.Keys()
 	if err != nil {
-		return nil, err
+		return Conn{}, err
 	}
 	c.StreamSession, err = c.SAM.NewStreamSession(c.I2PKeys.Addr().Base32()[0:10]+"-"+RandTunName(), c.I2PKeys, opts)
 	if err != nil {
-		return nil, err
+		return Conn{}, err
 	}
 	i2paddr, err := c.SAM.Lookup(addr)
 	if err != nil {
-		return nil, err
+		return Conn{}, err
 	}
 	c.SAMConn, err = c.StreamSession.DialI2P(i2paddr)
 	if err != nil {
-		return nil, err
+		return Conn{}, err
 	}
 	return c, nil
 }
diff --git a/socks/manager.go b/socks/manager.go
index 02a7bbd..79d9151 100644
--- a/socks/manager.go
+++ b/socks/manager.go
@@ -33,7 +33,11 @@ func (m Manager) Serve() error {
 	if err != nil {
 		return err
 	}
-	if err := server.ListenAndServe("tcp", m.host+":"+m.port); err != nil {
+	var listen net.Listener
+	if err := net.Listen("tcp", m.host+":"+m.port); err != nil {
+		return err
+	}
+	if err := server.ListenAndServe(listen); err != nil {
 		return err
 	}
 	return nil