From ee9930813dc1ac40ed9c1c1f206128f9e884ed06 Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Wed, 1 Jun 2022 18:25:24 -0400
Subject: [PATCH] fixes primary tunnel test

---
 primary.go             |  5 +++++
 primary_stream_test.go | 32 ++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/primary.go b/primary.go
index 957c943..97cbe0f 100644
--- a/primary.go
+++ b/primary.go
@@ -97,6 +97,7 @@ func (sam *PrimarySession) DialTCP(network string, laddr, raddr net.Addr) (net.C
 			return nil, err
 		}
 		sam.stsess[network+raddr.String()[0:4]] = ts
+		ts, _ = sam.stsess[network+raddr.String()[0:4]]
 	}
 	return ts.Dial(network, raddr.String())
 }
@@ -110,6 +111,7 @@ func (sam *PrimarySession) DialTCPI2P(network string, laddr, raddr string) (net.
 			return nil, err
 		}
 		sam.stsess[network+raddr[0:4]] = ts
+		ts, _ = sam.stsess[network+raddr[0:4]]
 	}
 	return ts.Dial(network, raddr)
 }
@@ -124,6 +126,7 @@ func (sam *PrimarySession) DialUDP(network string, laddr, raddr net.Addr) (net.P
 			return nil, err
 		}
 		sam.dgsess[network+raddr.String()[0:4]] = ds
+		ds, _ = sam.dgsess[network+raddr.String()[0:4]]
 	}
 	return ds.Dial(network, raddr.String())
 }
@@ -137,6 +140,7 @@ func (sam *PrimarySession) DialUDPI2P(network, laddr, raddr string) (*DatagramSe
 			return nil, err
 		}
 		sam.dgsess[network+raddr[0:4]] = ds
+		ds, _ = sam.dgsess[network+raddr[0:4]]
 	}
 	return ds.Dial(network, raddr)
 }
@@ -237,6 +241,7 @@ func (sam *PrimarySession) newGenericSubSessionWithSignatureAndPorts(style, id,
 		return nil, err
 	}
 	text := string(buf[:n])
+	//log.Println("SAM:", text)
 	if strings.HasPrefix(text, session_ADDOK) {
 		//if sam.keys.String() != text[len(session_ADDOK):len(text)-1] {
 		//conn.Close()
diff --git a/primary_stream_test.go b/primary_stream_test.go
index 1d91f49..4af62db 100644
--- a/primary_stream_test.go
+++ b/primary_stream_test.go
@@ -108,17 +108,20 @@ func Test_PrimaryStreamingServerClient(t *testing.T) {
 		if !(<-w) {
 			return
 		}
-		/*sam2, err := NewSAM(yoursam)
-		if err != nil {
-			c <- false
-			return
-		}
-		defer sam2.Close()
-		keys, err := sam2.NewKeys()
-		if err != nil {
-			c <- false
-			return
-		}*/
+		/*
+		   sam2, err := NewSAM(yoursam)
+		   if err != nil {
+		   	c <- false
+		   	return
+		   }
+		   defer sam2.Close()
+		   keys, err := sam2.NewKeys()
+		   if err != nil {
+		   	c <- false
+		   	return
+		   }
+		*/
+
 		fmt.Println("\tClient: Creating tunnel")
 		ss2, err := sam.NewStreamSubSession("primaryExampleClientTun")
 		if err != nil {
@@ -239,7 +242,7 @@ func ExamplePrimaryStreamListener() {
 			return
 		}
 		defer sam.Close()
-		ss, err = sam.NewStreamSubSessionWithPorts("PrimaryListenerServerTunnel2", "3", "4")
+		ss, err = sam.NewStreamSubSession("PrimaryListenerServerTunnel2")
 		if err != nil {
 			fmt.Println(err.Error())
 			return
@@ -251,7 +254,7 @@ func ExamplePrimaryStreamListener() {
 			return
 		}
 		defer l.Close()
-		//fmt.Println("Serving on primary listener")
+		//fmt.Println("Serving on primary listener", l.Addr().String())
 		if err := http.Serve(l, &exitHandler{}); err != nil {
 			fmt.Println(err.Error())
 		}
@@ -279,6 +282,7 @@ func ExamplePrimaryStreamListener() {
 			Dial: sc.Dial,
 		},
 	}
+	//resp, err := client.Get("http://" + "idk.i2p") //ss.Addr().Base32())
 	resp, err := client.Get("http://" + ss.Addr().Base32())
 	if err != nil {
 		fmt.Println(err.Error())
@@ -293,7 +297,7 @@ func ExamplePrimaryStreamListener() {
 	fmt.Println("Got response: " + string(r))
 
 	// Output:
-	// Hello world!
+	// Got response: Hello world!
 }
 
 type exitHandler struct {