From b7d72fec44606360881b7dfb14b8e016ced47c2c Mon Sep 17 00:00:00 2001
From: idk <problemsolver@openmailbox.org>
Date: Wed, 26 Dec 2018 12:54:27 -0500
Subject: [PATCH] better tunnel names

---
 conn/conn.go | 4 ++--
 main.go      | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/conn/conn.go b/conn/conn.go
index f98204c..705901b 100644
--- a/conn/conn.go
+++ b/conn/conn.go
@@ -101,7 +101,7 @@ func NewConn(sam sam3.SAM, addr, path string, opts []string) (*Conn, error) {
 	if err != nil {
 		return nil, err
 	}
-	c.StreamSession, err = c.SAM.NewStreamSession(c.I2PKeys.Addr().Base32()[0:10]+RandTunName(), c.I2PKeys, opts)
+	c.StreamSession, err = c.SAM.NewStreamSession(c.I2PKeys.Addr().Base32()[0:10]+"-"+RandTunName(), c.I2PKeys, opts)
 	if err != nil {
 		return nil, err
 	}
@@ -118,7 +118,7 @@ func NewConn(sam sam3.SAM, addr, path string, opts []string) (*Conn, error) {
 
 // RandTunName generates a random tunnel names to avoid collisions
 func RandTunName() string {
-	b := make([]byte, 12)
+	b := make([]byte, 4)
 	for i := range b {
 		b[i] = "abcdefghijklmnopqrstuvwxyz"[rand.Intn(len("abcdefghijklmnopqrstuvwxyz"))]
 	}
diff --git a/main.go b/main.go
index ff8296c..45da3b2 100644
--- a/main.go
+++ b/main.go
@@ -149,9 +149,8 @@ func main() {
 		go func() {
 			for sig := range c {
 				if sig == os.Interrupt {
-					if err := tunsocks.Cleanup(); err != nil {
-						panic(err)
-					}
+					tunsocks.Cleanup()
+					panic(err)
 				}
 			}
 		}()