From 49533844d6cfca28fdedfe8046ce7deeac40c257 Mon Sep 17 00:00:00 2001
From: idk <problemsolver@openmailbox.org>
Date: Thu, 28 Feb 2019 14:22:28 -0500
Subject: [PATCH] incorporate cryptix-debug without the counter

---
 accept.go           |  2 +-
 client.go           |  2 +-
 debian/copyright    |  4 ++++
 example/httpTest.go |  4 ++--
 go.sum              |  1 +
 options_test.go     | 12 ++++++------
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/accept.go b/accept.go
index cf9a2a3..9af8ee2 100644
--- a/accept.go
+++ b/accept.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/cryptix/go/debug"
+	"github.com/eyedeekay/gosam/debug"
 )
 
 // Accept creates a new Client and accepts a connection on it
diff --git a/client.go b/client.go
index 871ef38..53fe4ee 100644
--- a/client.go
+++ b/client.go
@@ -7,7 +7,7 @@ import (
 	"math/rand"
 	"net"
 
-	"github.com/cryptix/go/debug"
+	"github.com/eyedeekay/gosam/debug"
 )
 
 // A Client represents a single Connection to the SAM bridge
diff --git a/debian/copyright b/debian/copyright
index e4ef11c..cb88ca3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,10 @@ Copyright: 2014 cryptix
 Copyright: 2018 idk
 License: GPL-2.0
 
+Files: debug
+Copyright: 2014 cryptix
+LICENSE: MIT
+
 Files: debian/*
 Copyright: 2019 idk <hankhill19580@gmail.com>
 License: GPL-2.0
diff --git a/example/httpTest.go b/example/httpTest.go
index bd8c890..7a9d5b3 100644
--- a/example/httpTest.go
+++ b/example/httpTest.go
@@ -6,12 +6,12 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/cryptix/goSam"
+	"github.com/eyedeekay/gosam"
 )
 
 func main() {
 	//In order to enable debugging, pass the SetDebug(true) option.
-    //sam, err := goSam.NewClientFromOptions(SetDebug(true))
+	//sam, err := goSam.NewClientFromOptions(SetDebug(true))
 
 	// create a default sam client
 	sam, err := goSam.NewDefaultClient()
diff --git a/go.sum b/go.sum
index 026478e..01fe03f 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,6 @@
 github.com/cryptix/go v1.3.1 h1:I9opbROgEpldI0PwkMku0UY2DLFYgelZd9u0uaxmMgY=
 github.com/cryptix/go v1.3.1/go.mod h1:mFQotm9rTzptzvNjJM+1vSIDa/rVOVqMu0889GIXg70=
+github.com/eyedeekay/gosam v0.1.0 h1:rVhFSVgSNzPbkduxlqIz3+1z+g1EYkt3YCCHJE/rMb0=
 github.com/go-kit/kit v0.6.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-stack/stack v1.7.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
diff --git a/options_test.go b/options_test.go
index 2450e28..01fb6ff 100644
--- a/options_test.go
+++ b/options_test.go
@@ -43,7 +43,7 @@ func TestOptionAddrString(t *testing.T) {
 	} else {
 		t.Log(result)
 	}
-	client.CreateStreamSession("")
+	client.CreateStreamSession(client.NewID(), "")
 	if err := client.Close(); err != nil {
 		t.Fatalf("client.Close() Error: %q\n", err)
 	}
@@ -59,7 +59,7 @@ func TestOptionAddrStringLh(t *testing.T) {
 	} else {
 		t.Log(result)
 	}
-	client.CreateStreamSession("")
+	client.CreateStreamSession(client.NewID(), "")
 	if err := client.Close(); err != nil {
 		t.Fatalf("client.Close() Error: %q\n", err)
 	}
@@ -75,7 +75,7 @@ func TestOptionAddrSlice(t *testing.T) {
 	} else {
 		t.Log(result)
 	}
-	client.CreateStreamSession("")
+	client.CreateStreamSession(client.NewID(), "")
 	if err := client.Close(); err != nil {
 		t.Fatalf("client.Close() Error: %q\n", err)
 	}
@@ -91,7 +91,7 @@ func TestOptionAddrMixedSlice(t *testing.T) {
 	} else {
 		t.Log(result)
 	}
-	client.CreateStreamSession("")
+	client.CreateStreamSession(client.NewID(), "")
 	if err := client.Close(); err != nil {
 		t.Fatalf("client.Close() Error: %q\n", err)
 	}
@@ -126,7 +126,7 @@ func TestOptionHost(t *testing.T) {
 	} else {
 		t.Log(result)
 	}
-	client.CreateStreamSession("")
+	client.CreateStreamSession(client.NewID(), "")
 	if err := client.Close(); err != nil {
 		t.Fatalf("client.Close() Error: %q\n", err)
 	}
@@ -161,7 +161,7 @@ func TestOptionPortInt(t *testing.T) {
 	} else {
 		t.Log(result)
 	}
-	client.CreateStreamSession("")
+	client.CreateStreamSession(client.NewID(), "")
 	if err := client.Close(); err != nil {
 		t.Fatalf("client.Close() Error: %q\n", err)
 	}