tolerate FROM_PORT and TO_PORT on datagrams

go fmt
use more retainable configs
2019-04-29 17:04:13 -04:00 · 2019-04-29 16:17:24 -04:00 · 2019-04-29 16:16:24 -04:00 · 2019-04-29 11:47:38 -04:00 · 2019-04-29 11:10:25 -04:00 · 2019-04-20 14:53:50 -04:00
31 changed files with 452 additions and 2848 deletions
--- a/.nojekyll
+++ b/.nojekyll
--- a/29
+++ b/29
@@ -1,29 +0,0 @@
-
-USER_GH=eyedeekay
-VERSION=0.33.6
-packagename=sam3
-
-echo:
-	@echo "type make version to do release $(VERSION)"
-
-version:
-	github-release release -s $(GITHUB_TOKEN) -u $(USER_GH) -r $(packagename) -t v$(VERSION) -d "version $(VERSION)"
-
-del:
-	github-release delete -s $(GITHUB_TOKEN) -u $(USER_GH) -r $(packagename) -t v$(VERSION)
-
-tar:
-	tar --exclude .git \
-		--exclude .go \
-		--exclude bin \
-		-cJvf ../$(packagename)_$(VERSION).orig.tar.xz .
-
-copier:
-	echo '#! /usr/bin/env sh' > deb/copy.sh
-	echo 'for f in $$(ls); do scp $$f/*.deb user@192.168.99.106:~/DEBIAN_PKGS/$$f/main/; done' >> deb/copy.sh
-
-fmt:
-	find . -name '*.go' -exec gofmt -w -s {} \;
-
-upload-linux:
-	github-release upload -R -u $(USER_GH) -r "$(packagename)" -t $(VERSION) -l `sha256sum ` -n "$(packagename)" -f "$(packagename)"
--- a/README.md
+++ b/README.md
@@ -1,19 +1,5 @@
 # README #

-## !!IMPORTANT!!
-
-In the next version, I'll be moving the `i2pkeys` directory to it's own repository
-so I can avoid import cycle headaches. Please migrate to the new `i2pkeys` repository
-before upgrading your sam3 dependencies. You can probably do this by running:
-
-```sh
-find . -name '*.go' -exec sed -i 's|github.com/eyedeekay/sam3/i2pkeys|github.com/eyedeekay/i2pkeys|g' {} \;
-```
-
-STATUS: This project is maintained. I will respond to issues, pull requests, and feature requests within a few days.
-
-# README #
-
 go library for the I2P [SAMv3.0](https://geti2p.net/en/docs/api/samv3) bridge, used to build anonymous/pseudonymous end-to-end encrypted sockets.

 This library is much better than ccondom (that use BOB), much more stable and much easier to maintain.
@@ -37,7 +23,7 @@ This library is much better than ccondom (that use BOB), much more stable and mu

 **Does not work:**

-* Stream Forwarding
+* Everything works! :D
 * Probably needs some real-world testing

 ## Documentation ##
@@ -52,17 +38,16 @@ This library is much better than ccondom (that use BOB), much more stable and mu
 package main

 import (
-	"github.com/eyedeekay/sam3"
-	"github.com/eyedeekay/sam3/i2pkeys"
+	"github.com/majestrate/i2p-tools/sam3"
 	"fmt"
 )

 const yoursam = "127.0.0.1:7656" // sam bridge

-func client(server i2pkeys.I2PAddr) {
-	sam, _ := sam3.NewSAM(yoursam)
+func client(server I2PAddr) {
+	sam, _ := NewSAM(yoursam)
 	keys, _ := sam.NewKeys()
-	stream, _ := sam.NewStreamSession("clientTun", keys, sam3.Options_Small)
+	stream, _ := sam.NewStreamSession("clientTun", keys, Options_Small)
 	fmt.Println("Client: Connecting to " + server.Base32())
 	conn, _ := stream.DialI2P(server)
 	conn.Write([]byte("Hello world!"))
@@ -72,9 +57,9 @@ func client(server i2pkeys.I2PAddr) {
 func main() {
 	sam, _ := NewSAM(yoursam)
 	keys, _ := sam.NewKeys()
-	stream, _ := sam.NewStreamSession("serverTun", keys, sam3.Options_Medium)
-	listener, _ := stream.Listen()
 	go client(keys.Addr())
+	stream, _ := sam.NewStreamSession("serverTun", keys, Options_Medium)
+	listener, _ := stream.Listen()
 	conn, _ := listener.Accept()
 	buf := make([]byte, 4096)
 	n, _ := conn.Read(buf)
@@ -93,7 +78,7 @@ Error handling was omitted in the above code for readability.

 ## Testing ##

-* `go test -tags=nettest` runs the whole suite (takes 90+ sec to perform!)
+* `go test` runs the whole suite (takes 90+ sec to perform!)
 * `go test -short` runs the shorter variant, does not connect to anything

 ## License ##
@@ -103,6 +88,4 @@ Public domain.
 ## Author ##

 * Kalle Vedin `kalle.vedin@fripost.org`
-* Unknown Name (majestrate)
-* idk
-* qiwenmin
+* Unknown Name (majestrate)
--- a/SAMConn.go
+++ b/SAMConn.go
@@ -3,19 +3,16 @@ package sam3
 import (
 	"net"
 	"time"
-
-	"github.com/eyedeekay/i2pkeys"
 )

-/*
 import (
-	. "github.com/eyedeekay/i2pkeys"
+	. "github.com/eyedeekay/sam3/i2pkeys"
 )
-*/
+
 // Implements net.Conn
 type SAMConn struct {
-	laddr i2pkeys.I2PAddr
-	raddr i2pkeys.I2PAddr
+	laddr I2PAddr
+	raddr I2PAddr
 	conn  net.Conn
 }

@@ -41,7 +38,7 @@ func (sc *SAMConn) LocalAddr() net.Addr {
 }

 // Implements net.Conn
-func (sc *SAMConn) localAddr() i2pkeys.I2PAddr {
+func (sc *SAMConn) localAddr() I2PAddr {
 	return sc.laddr
 }

@@ -50,7 +47,7 @@ func (sc *SAMConn) RemoteAddr() net.Addr {
 }

 // Implements net.Conn
-func (sc *SAMConn) remoteAddr() i2pkeys.I2PAddr {
+func (sc *SAMConn) remoteAddr() I2PAddr {
 	return sc.raddr
 }

--- a/config.go
+++ b/config.go
@@ -2,301 +2,15 @@ package sam3

 import (
 	"fmt"
-	"math/rand"
 	"net"
 	"strconv"
-	"strings"
-
-	"github.com/eyedeekay/i2pkeys"
 )

-// I2PConfig is a struct which manages I2P configuration options
-type I2PConfig struct {
-	SamHost string
-	SamPort string
-	TunName string
+import (
+	. "github.com/eyedeekay/sam3/i2pkeys"
+)

-	SamMin string
-	SamMax string
-
-	Fromport string
-	Toport   string
-
-	Style   string
-	TunType string
-
-	DestinationKeys i2pkeys.I2PKeys
-
-	SigType                   string
-	EncryptLeaseSet           string
-	LeaseSetKey               string
-	LeaseSetPrivateKey        string
-	LeaseSetPrivateSigningKey string
-	LeaseSetKeys              i2pkeys.I2PKeys
-	InAllowZeroHop            string
-	OutAllowZeroHop           string
-	InLength                  string
-	OutLength                 string
-	InQuantity                string
-	OutQuantity               string
-	InVariance                string
-	OutVariance               string
-	InBackupQuantity          string
-	OutBackupQuantity         string
-	FastRecieve               string
-	UseCompression            string
-	MessageReliability        string
-	CloseIdle                 string
-	CloseIdleTime             string
-	ReduceIdle                string
-	ReduceIdleTime            string
-	ReduceIdleQuantity        string
-	//Streaming Library options
-	AccessListType string
-	AccessList     []string
-}
-
-func (f *I2PConfig) Sam() string {
-	host := "127.0.0.1"
-	port := "7656"
-	if f.SamHost != "" {
-		host = f.SamHost
-	}
-	if f.SamPort != "" {
-		port = f.SamPort
-	}
-	return host + ":" + port
-}
-
-func (f *I2PConfig) SetSAMAddress(addr string) {
-	hp := strings.Split(addr, ":")
-	if len(hp) == 1 {
-		f.SamHost = hp[0]
-	} else if len(hp) == 2 {
-		f.SamPort = hp[1]
-		f.SamHost = hp[0]
-	}
-	f.SamPort = "7656"
-	f.SamHost = "127.0.0.1"
-}
-
-func (f *I2PConfig) ID() string {
-	if f.TunName == "" {
-		b := make([]byte, 12)
-		for i := range b {
-			b[i] = "abcdefghijklmnopqrstuvwxyz"[rand.Intn(len("abcdefghijklmnopqrstuvwxyz"))]
-		}
-		f.TunName = string(b)
-	}
-	return " ID=" + f.TunName + " "
-}
-
-func (f *I2PConfig) Leasesetsettings() (string, string, string) {
-	var r, s, t string
-	if f.LeaseSetKey != "" {
-		r = " i2cp.leaseSetKey=" + f.LeaseSetKey + " "
-	}
-	if f.LeaseSetPrivateKey != "" {
-		s = " i2cp.leaseSetPrivateKey=" + f.LeaseSetPrivateKey + " "
-	}
-	if f.LeaseSetPrivateSigningKey != "" {
-		t = " i2cp.leaseSetPrivateSigningKey=" + f.LeaseSetPrivateSigningKey + " "
-	}
-	return r, s, t
-}
-
-func (f *I2PConfig) FromPort() string {
-	if f.samMax() < 3.1 {
-		return ""
-	}
-	if f.Fromport != "0" {
-		return " FROM_PORT=" + f.Fromport + " "
-	}
-	return ""
-}
-
-func (f *I2PConfig) ToPort() string {
-	if f.samMax() < 3.1 {
-		return ""
-	}
-	if f.Toport != "0" {
-		return " TO_PORT=" + f.Toport + " "
-	}
-	return ""
-}
-
-func (f *I2PConfig) SessionStyle() string {
-	if f.Style != "" {
-		return " STYLE=" + f.Style + " "
-	}
-	return " STYLE=STREAM "
-}
-
-func (f *I2PConfig) samMax() float64 {
-	i, err := strconv.Atoi(f.SamMax)
-	if err != nil {
-		return 3.1
-	}
-	return float64(i)
-}
-
-func (f *I2PConfig) MinSAM() string {
-	if f.SamMin == "" {
-		return "3.0"
-	}
-	return f.SamMin
-}
-
-func (f *I2PConfig) MaxSAM() string {
-	if f.SamMax == "" {
-		return "3.1"
-	}
-	return f.SamMax
-}
-
-func (f *I2PConfig) DestinationKey() string {
-	if &f.DestinationKeys != nil {
-		return " DESTINATION=" + f.DestinationKeys.String() + " "
-	}
-	return " DESTINATION=TRANSIENT "
-}
-
-func (f *I2PConfig) SignatureType() string {
-	if f.samMax() < 3.1 {
-		return ""
-	}
-	if f.SigType != "" {
-		return " SIGNATURE_TYPE=" + f.SigType + " "
-	}
-	return ""
-}
-
-func (f *I2PConfig) EncryptLease() string {
-	if f.EncryptLeaseSet == "true" {
-		return " i2cp.encryptLeaseSet=true "
-	}
-	return ""
-}
-
-func (f *I2PConfig) Reliability() string {
-	if f.MessageReliability != "" {
-		return " i2cp.messageReliability=" + f.MessageReliability + " "
-	}
-	return ""
-}
-
-func (f *I2PConfig) Reduce() string {
-	if f.ReduceIdle == "true" {
-		return "i2cp.reduceOnIdle=" + f.ReduceIdle + "i2cp.reduceIdleTime=" + f.ReduceIdleTime + "i2cp.reduceQuantity=" + f.ReduceIdleQuantity
-	}
-	return ""
-}
-
-func (f *I2PConfig) Close() string {
-	if f.CloseIdle == "true" {
-		return "i2cp.closeOnIdle=" + f.CloseIdle + "i2cp.closeIdleTime=" + f.CloseIdleTime
-	}
-	return ""
-}
-
-func (f *I2PConfig) DoZero() string {
-	r := ""
-	if f.InAllowZeroHop == "true" {
-		r += " inbound.allowZeroHop=" + f.InAllowZeroHop + " "
-	}
-	if f.OutAllowZeroHop == "true" {
-		r += " outbound.allowZeroHop= " + f.OutAllowZeroHop + " "
-	}
-	if f.FastRecieve == "true" {
-		r += " " + f.FastRecieve + " "
-	}
-	return r
-}
-func (f *I2PConfig) Print() []string {
-	lsk, lspk, lspsk := f.Leasesetsettings()
-	return []string{
-		//f.targetForPort443(),
-		"inbound.length=" + f.InLength,
-		"outbound.length=" + f.OutLength,
-		"inbound.lengthVariance=" + f.InVariance,
-		"outbound.lengthVariance=" + f.OutVariance,
-		"inbound.backupQuantity=" + f.InBackupQuantity,
-		"outbound.backupQuantity=" + f.OutBackupQuantity,
-		"inbound.quantity=" + f.InQuantity,
-		"outbound.quantity=" + f.OutQuantity,
-		f.DoZero(),
-		//"i2cp.fastRecieve=" + f.FastRecieve,
-		"i2cp.gzip=" + f.UseCompression,
-		f.Reduce(),
-		f.Close(),
-		f.Reliability(),
-		f.EncryptLease(),
-		lsk, lspk, lspsk,
-		f.Accesslisttype(),
-		f.Accesslist(),
-	}
-}
-
-func (f *I2PConfig) Accesslisttype() string {
-	if f.AccessListType == "whitelist" {
-		return "i2cp.enableAccessList=true"
-	} else if f.AccessListType == "blacklist" {
-		return "i2cp.enableBlackList=true"
-	} else if f.AccessListType == "none" {
-		return ""
-	}
-	return ""
-}
-
-func (f *I2PConfig) Accesslist() string {
-	if f.AccessListType != "" && len(f.AccessList) > 0 {
-		r := ""
-		for _, s := range f.AccessList {
-			r += s + ","
-		}
-		return "i2cp.accessList=" + strings.TrimSuffix(r, ",")
-	}
-	return ""
-}
-
-func NewConfig(opts ...func(*I2PConfig) error) (*I2PConfig, error) {
-	var config I2PConfig
-	config.SamHost = "127.0.0.1"
-	config.SamPort = "7656"
-	config.SamMin = "3.0"
-	config.SamMax = "3.2"
-	config.TunName = ""
-	config.TunType = "server"
-	config.Style = "STREAM"
-	config.InLength = "3"
-	config.OutLength = "3"
-	config.InQuantity = "2"
-	config.OutQuantity = "2"
-	config.InVariance = "1"
-	config.OutVariance = "1"
-	config.InBackupQuantity = "3"
-	config.OutBackupQuantity = "3"
-	config.InAllowZeroHop = "false"
-	config.OutAllowZeroHop = "false"
-	config.EncryptLeaseSet = "false"
-	config.LeaseSetKey = ""
-	config.LeaseSetPrivateKey = ""
-	config.LeaseSetPrivateSigningKey = ""
-	config.FastRecieve = "false"
-	config.UseCompression = "true"
-	config.ReduceIdle = "false"
-	config.ReduceIdleTime = "15"
-	config.ReduceIdleQuantity = "4"
-	config.CloseIdle = "false"
-	config.CloseIdleTime = "300000"
-	config.MessageReliability = "none"
-	for _, o := range opts {
-		if err := o(&config); err != nil {
-			return nil, err
-		}
-	}
-	return &config, nil
-}
+// sam config

 // options map
 type Options map[string]string
@@ -324,7 +38,7 @@ func (cfg *Config) StreamSession() (session *StreamSession, err error) {
 	s, err = NewSAM(cfg.Addr)
 	if err == nil {
 		// ensure keys exist
-		var keys i2pkeys.I2PKeys
+		var keys I2PKeys
 		keys, err = s.EnsureKeyfile(cfg.Keyfile)
 		if err == nil {
 			// create session
@@ -341,13 +55,13 @@ func (cfg *Config) DatagramSession() (session *DatagramSession, err error) {
 	s, err = NewSAM(cfg.Addr)
 	if err == nil {
 		// ensure keys exist
-		var keys i2pkeys.I2PKeys
+		var keys I2PKeys
 		keys, err = s.EnsureKeyfile(cfg.Keyfile)
 		if err == nil {
 			// determine udp port
 			var portstr string
 			_, portstr, err = net.SplitHostPort(cfg.Addr)
-			if IgnorePortError(err) == nil {
+			if err == nil {
 				var port int
 				port, err = strconv.Atoi(portstr)
 				if err == nil && port > 0 {
--- a/datagram.go
+++ b/datagram.go
@@ -6,8 +6,10 @@ import (
 	"net"
 	"strconv"
 	"time"
+)

-	"github.com/eyedeekay/i2pkeys"
+import (
+	. "github.com/eyedeekay/sam3/i2pkeys"
 )

 // The DatagramSession implements net.PacketConn. It works almost like ordinary
@@ -15,25 +17,24 @@ import (
 // also end-to-end encrypted, signed and includes replay-protection. And they
 // are also built to be surveillance-resistant (yey!).
 type DatagramSession struct {
-	samAddr    string           // address to the sam bridge (ipv4:port)
-	id         string           // tunnel name
-	conn       net.Conn         // connection to sam bridge
-	udpconn    *net.UDPConn     // used to deliver datagrams
-	keys       i2pkeys.I2PKeys  // i2p destination keys
-	rUDPAddr   *net.UDPAddr     // the SAM bridge UDP-port
-	remoteAddr *i2pkeys.I2PAddr // optional remote I2P address
+	samAddr  string       // address to the sam bridge (ipv4:port)
+	id       string       // tunnel name
+	conn     net.Conn     // connection to sam bridge
+	udpconn  *net.UDPConn // used to deliver datagrams
+	keys     I2PKeys      // i2p destination keys
+	rUDPAddr *net.UDPAddr // the SAM bridge UDP-port
 }

 // Creates a new datagram session. udpPort is the UDP port SAM is listening on,
 // and if you set it to zero, it will use SAMs standard UDP port.
-func (s *SAM) NewDatagramSession(id string, keys i2pkeys.I2PKeys, options []string, udpPort int) (*DatagramSession, error) {
+func (s *SAM) NewDatagramSession(id string, keys I2PKeys, options []string, udpPort int) (*DatagramSession, error) {
 	if udpPort > 65335 || udpPort < 0 {
 		return nil, errors.New("udpPort needs to be in the intervall 0-65335")
 	}
 	if udpPort == 0 {
 		udpPort = 7655
 	}
-	lhost, _, err := SplitHostPort(s.conn.LocalAddr().String())
+	lhost, _, err := net.SplitHostPort(s.Conn.LocalAddr().String())
 	if err != nil {
 		s.Close()
 		return nil, err
@@ -46,7 +47,7 @@ func (s *SAM) NewDatagramSession(id string, keys i2pkeys.I2PKeys, options []stri
 	if err != nil {
 		return nil, err
 	}
-	rhost, _, err := SplitHostPort(s.conn.RemoteAddr().String())
+	rhost, _, err := net.SplitHostPort(s.Conn.RemoteAddr().String())
 	if err != nil {
 		s.Close()
 		return nil, err
@@ -56,52 +57,17 @@ func (s *SAM) NewDatagramSession(id string, keys i2pkeys.I2PKeys, options []stri
 		return nil, err
 	}
 	_, lport, err := net.SplitHostPort(udpconn.LocalAddr().String())
-	if err != nil {
-		s.Close()
-		return nil, err
-	}
 	conn, err := s.newGenericSession("DATAGRAM", id, keys, options, []string{"PORT=" + lport})
 	if err != nil {
 		return nil, err
 	}
-	return &DatagramSession{s.address, id, conn, udpconn, keys, rUDPAddr, nil}, nil
+	return &DatagramSession{s.Config.I2PConfig.Sam(), id, conn, udpconn, keys, rUDPAddr}, nil
 }

 func (s *DatagramSession) B32() string {
 	return s.keys.Addr().Base32()
 }

-func (s *DatagramSession) Dial(net string, addr string) (*DatagramSession, error) {
-	netaddr, err := s.Lookup(addr)
-	if err != nil {
-		return nil, err
-	}
-	return s.DialI2PRemote(net, netaddr)
-}
-
-func (s *DatagramSession) DialRemote(net, addr string) (net.PacketConn, error) {
-	netaddr, err := s.Lookup(addr)
-	if err != nil {
-		return nil, err
-	}
-	return s.DialI2PRemote(net, netaddr)
-}
-
-func (s *DatagramSession) DialI2PRemote(net string, addr net.Addr) (*DatagramSession, error) {
-	switch addr.(type) {
-	case *i2pkeys.I2PAddr:
-		s.remoteAddr = addr.(*i2pkeys.I2PAddr)
-	case i2pkeys.I2PAddr:
-		i2paddr := addr.(i2pkeys.I2PAddr)
-		s.remoteAddr = &i2paddr
-	}
-	return s, nil
-}
-
-func (s *DatagramSession) RemoteAddr() net.Addr {
-	return s.remoteAddr
-}
-
 // Reads one datagram sent to the destination of the DatagramSession. Returns
 // the number of bytes read, from what address it was sent, or an error.
 // implements net.PacketConn
@@ -114,20 +80,20 @@ func (s *DatagramSession) ReadFrom(b []byte) (n int, addr net.Addr, err error) {
 		var saddr *net.UDPAddr
 		n, saddr, err = s.udpconn.ReadFromUDP(buf)
 		if err != nil {
-			return 0, i2pkeys.I2PAddr(""), err
+			return 0, I2PAddr(""), err
 		}
 		if bytes.Equal(saddr.IP, s.rUDPAddr.IP) {
 			continue
 		}
 		break
 	}
-	i := bytes.IndexByte(buf, byte('\n'))
+	i := bytes.IndexByte(buf, byte(' '))
 	if i > 4096 || i > n {
-		return 0, i2pkeys.I2PAddr(""), errors.New("Could not parse incomming message remote address.")
+		return 0, I2PAddr(""), errors.New("Could not parse incomming message remote address.")
 	}
-	raddr, err := i2pkeys.NewI2PAddrFromString(string(buf[:i]))
+	raddr, err := NewI2PAddrFromString(string(buf[:i]))
 	if err != nil {
-		return 0, i2pkeys.I2PAddr(""), errors.New("Could not parse incomming message remote address: " + err.Error())
+		return 0, I2PAddr(""), errors.New("Could not parse incomming message remote address: " + string(buf[:i]) + err.Error())
 	}
 	// shift out the incomming address to contain only the data received
 	if (n - i + 1) > len(b) {
@@ -139,29 +105,16 @@ func (s *DatagramSession) ReadFrom(b []byte) (n int, addr net.Addr, err error) {
 	}
 }

-func (s *DatagramSession) Accept() (net.Conn, error) {
-	return s, nil
-}
-
-func (s *DatagramSession) Read(b []byte) (n int, err error) {
-	rint, _, rerr := s.ReadFrom(b)
-	return rint, rerr
-}
-
 // Sends one signed datagram to the destination specified. At the time of
 // writing, maximum size is 31 kilobyte, but this may change in the future.
 // Implements net.PacketConn.
 func (s *DatagramSession) WriteTo(b []byte, addr net.Addr) (n int, err error) {
-	header := []byte("3.1 " + s.id + " " + addr.String() + "\n")
+	header := []byte("3.0 " + s.id + " " + addr.String() + "\n")
 	msg := append(header, b...)
 	n, err = s.udpconn.WriteToUDP(msg, s.rUDPAddr)
 	return n, err
 }

-func (s *DatagramSession) Write(b []byte) (int, error) {
-	return s.WriteTo(b, s.remoteAddr)
-}
-
 // Closes the DatagramSession. Implements net.PacketConn
 func (s *DatagramSession) Close() error {
 	err := s.conn.Close()
@@ -173,7 +126,7 @@ func (s *DatagramSession) Close() error {
 }

 // Returns the I2P destination of the DatagramSession.
-func (s *DatagramSession) LocalI2PAddr() i2pkeys.I2PAddr {
+func (s *DatagramSession) LocalI2PAddr() I2PAddr {
 	return s.keys.Addr()
 }

@@ -182,10 +135,6 @@ func (s *DatagramSession) LocalAddr() net.Addr {
 	return s.LocalI2PAddr()
 }

-func (s *DatagramSession) Addr() net.Addr {
-	return s.LocalI2PAddr()
-}
-
 func (s *DatagramSession) Lookup(name string) (a net.Addr, err error) {
 	var sam *SAM
 	sam, err = NewSAM(s.samAddr)
@@ -212,7 +161,3 @@ func (s *DatagramSession) SetReadDeadline(t time.Time) error {
 func (s *DatagramSession) SetWriteDeadline(t time.Time) error {
 	return s.udpconn.SetWriteDeadline(t)
 }
-
-func (s *DatagramSession) SetWriteBuffer(bytes int) error {
-	return s.udpconn.SetWriteBuffer(bytes)
-}
--- a/datagram_test.go
+++ b/datagram_test.go
@@ -1,8 +1,9 @@
+// +build nettest
+
 package sam3

 import (
 	"fmt"
-	"log"
 	"testing"
 	"time"
 )
@@ -26,7 +27,7 @@ func Test_DatagramServerClient(t *testing.T) {
 	}
 	//	fmt.Println("\tServer: My address: " + keys.Addr().Base32())
 	fmt.Println("\tServer: Creating tunnel")
-	ds, err := sam.NewDatagramSession("DGserverTun", keys, []string{"inbound.length=0", "outbound.length=0", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"}, 0)
+	ds, err := sam.NewDatagramSession("DGserverTun", keys, []string{"inbound.length=1", "outbound.length=1", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"}, 0)
 	if err != nil {
 		fmt.Println("Server: Failed to create tunnel: " + err.Error())
 		t.Fail()
@@ -46,14 +47,14 @@ func Test_DatagramServerClient(t *testing.T) {
 			return
 		}
 		fmt.Println("\tClient: Creating tunnel")
-		ds2, err := sam2.NewDatagramSession("DGclientTun", keys, []string{"inbound.length=0", "outbound.length=0", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"}, 0)
+		ds2, err := sam2.NewDatagramSession("DGclientTun", keys, []string{"inbound.length=1", "outbound.length=1", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"}, 0)
 		if err != nil {
 			c <- false
 			return
 		}
 		defer ds2.Close()
-		//		fmt.Println("\tClient: Servers address: " + ds.LocalAddr().Base32())
-		//		fmt.Println("\tClient: Clients address: " + ds2.LocalAddr().Base32())
+		fmt.Println("\tClient: Servers address: " + ds.B32())
+		fmt.Println("\tClient: Clients address: " + ds2.B32())
 		fmt.Println("\tClient: Tries to send datagram to server")
 		for {
 			select {
@@ -123,58 +124,6 @@ func ExampleDatagramSession() {
 		fmt.Println(err.Error())
 		return
 	}
-	log.Println("Got message: '" + string(buf[:n]) + "'")
-	fmt.Println("Got message: " + string(buf[:n]))
-
-	return
-	// Output:
-	//Got message: Hello myself!
-}
-
-func ExampleMiniDatagramSession() {
-	// Creates a new DatagramSession, which behaves just like a net.PacketConn.
-
-	const samBridge = "127.0.0.1:7656"
-
-	sam, err := NewSAM(samBridge)
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	keys, err := sam.NewKeys()
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	myself := keys.Addr()
-
-	// See the example Option_* variables.
-	dg, err := sam.NewDatagramSession("MINIDGTUN", keys, Options_Small, 0)
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	someone, err := sam.Lookup("zzz.i2p")
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	err = dg.SetWriteBuffer(14 * 1024)
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-
-	dg.WriteTo([]byte("Hello stranger!"), someone)
-	dg.WriteTo([]byte("Hello myself!"), myself)
-
-	buf := make([]byte, 31*1024)
-	n, _, err := dg.ReadFrom(buf)
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	log.Println("Got message: '" + string(buf[:n]) + "'")
 	fmt.Println("Got message: " + string(buf[:n]))

 	return
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,56 +1,3 @@
-golang-github-eyedeekay-sam3 (0.3.2.32) unreleased; urgency=medium
-
-  [ idk ]
-  * Include "Convenience Functions" in /helper
-
- -- idk <hankhill19580@gmail.com>  Sun, 22 Nov 2020 12:49:13 -0500
-
-golang-github-eyedeekay-sam3 (0.3.2.31) unreleased; urgency=medium
-
-  [ idk ]
-  * Incorporate address fix from qiwenmin
-  * Shortcut for saving keys to text file
-
- -- idk <hankhill19580@gmail.com>  Sun, 18 Oct 2020 1:01:03 -0500
-
-golang-github-eyedeekay-sam3 (0.3.2.3) unreleased; urgency=medium
-
-  [ idk ]
-  * Purge ramp, re-release
-
- -- idk <hankhill19580@gmail.com>  Mon, 22 Jun 2020 17:55:03 -0500
-
-golang-github-eyedeekay-sam3 (0.3.2.2) bionic; urgency=medium
-
-  [ idk ]
-  * Purge ramp
-
- -- idk <hankhill19580@gmail.com>  Sat, 7 Dec 2019 22:05:34 -0500
-
-
-golang-github-eyedeekay-sam3 (0.3.2.1) bionic; urgency=medium
-
-  [ idk ]
-  * Add support for 44-character destination hashes.
-
- -- idk <hankhill19580@gmail.com>  Sat, 7 Dec 2019 17:30:30 -0500
-
-
-golang-github-eyedeekay-sam3 (0.3.2.01) bionic; urgency=medium
-
-  [ idk ]
-  * completely remove the old i2pkeys version and replace it with the new one.
-
- -- idk <hankhill19580@gmail.com>  Sat, 25 May 2019 14:38:11 -0500
-
-golang-github-eyedeekay-sam3 (0.3.2.0) bionic; urgency=medium
-
-  [ idk ]
-  * Bug fixes, create stable branch
-  * Move i2pkeys
-
- -- idk <hankhill19580@gmail.com>  Sat, 18 May 2019 18:32:51 -0500
-
 golang-github-eyedeekay-sam3 (0.0~git20190223.af5a3f3) bionic; urgency=medium

  [ idk ]
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
 Uploaders: idk <hankhill19580@gmail.com>
 Build-Depends: debhelper (>= 11),
               dh-golang,
-               git,
-               golang-any | golang-go,
+               golang-any
 Standards-Version: 4.2.1
 Homepage: https://github.com/eyedeekay/sam3
 Vcs-Browser: https://github.com/eyedeekay/sam3
@@ -16,8 +15,7 @@ Testsuite: autopkgtest-pkg-go

 Package: golang-github-eyedeekay-sam3-dev
 Architecture: all
-Depends: ${misc:Depends},
-    i2p | i2pd
+Depends: ${misc:Depends}, (i2p | i2pd)
 Description: Go library for the I2P SAMv3.0 bridge,
 used to build anonymous/pseudonymous end-to-end encrypted sockets.
 README go library for the I2P SAMv3.0
--- a/debian/files
+++ b/debian/files
@@ -1 +0,0 @@
-golang-github-eyedeekay-sam3_0.3.2.32_source.buildinfo devel optional
--- a/emit-options.go
+++ b/emit-options.go
@@ -1,369 +0,0 @@
-package sam3
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-//Option is a SAMEmit Option
-type Option func(*SAMEmit) error
-
-//SetType sets the type of the forwarder server
-func SetType(s string) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if s == "STREAM" {
-			c.Style = s
-			return nil
-		} else if s == "DATAGRAM" {
-			c.Style = s
-			return nil
-		} else if s == "RAW" {
-			c.Style = s
-			return nil
-		}
-		return fmt.Errorf("Invalid session STYLE=%s, must be STREAM, DATAGRAM, or RAW", s)
-	}
-}
-
-// SetSAMAddress sets the SAM address all-at-once
-func SetSAMAddress(s string) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		sp := strings.Split(s, ":")
-		if len(sp) > 2 {
-			return fmt.Errorf("Invalid address string: %s", sp)
-		}
-		if len(sp) == 2 {
-			c.I2PConfig.SamPort = sp[1]
-		}
-		c.I2PConfig.SamHost = sp[0]
-		return nil
-	}
-}
-
-//SetSAMHost sets the host of the SAMEmit's SAM bridge
-func SetSAMHost(s string) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		c.I2PConfig.SamHost = s
-		return nil
-	}
-}
-
-//SetSAMPort sets the port of the SAMEmit's SAM bridge using a string
-func SetSAMPort(s string) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		port, err := strconv.Atoi(s)
-		if err != nil {
-			return fmt.Errorf("Invalid SAM Port %s; non-number", s)
-		}
-		if port < 65536 && port > -1 {
-			c.I2PConfig.SamPort = s
-			return nil
-		}
-		return fmt.Errorf("Invalid port")
-	}
-}
-
-//SetName sets the host of the SAMEmit's SAM bridge
-func SetName(s string) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		c.I2PConfig.TunName = s
-		return nil
-	}
-}
-
-//SetInLength sets the number of hops inbound
-func SetInLength(u int) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if u < 7 && u >= 0 {
-			c.I2PConfig.InLength = strconv.Itoa(u)
-			return nil
-		}
-		return fmt.Errorf("Invalid inbound tunnel length")
-	}
-}
-
-//SetOutLength sets the number of hops outbound
-func SetOutLength(u int) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if u < 7 && u >= 0 {
-			c.I2PConfig.OutLength = strconv.Itoa(u)
-			return nil
-		}
-		return fmt.Errorf("Invalid outbound tunnel length")
-	}
-}
-
-//SetInVariance sets the variance of a number of hops inbound
-func SetInVariance(i int) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if i < 7 && i > -7 {
-			c.I2PConfig.InVariance = strconv.Itoa(i)
-			return nil
-		}
-		return fmt.Errorf("Invalid inbound tunnel length")
-	}
-}
-
-//SetOutVariance sets the variance of a number of hops outbound
-func SetOutVariance(i int) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if i < 7 && i > -7 {
-			c.I2PConfig.OutVariance = strconv.Itoa(i)
-			return nil
-		}
-		return fmt.Errorf("Invalid outbound tunnel variance")
-	}
-}
-
-//SetInQuantity sets the inbound tunnel quantity
-func SetInQuantity(u int) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if u <= 16 && u > 0 {
-			c.I2PConfig.InQuantity = strconv.Itoa(u)
-			return nil
-		}
-		return fmt.Errorf("Invalid inbound tunnel quantity")
-	}
-}
-
-//SetOutQuantity sets the outbound tunnel quantity
-func SetOutQuantity(u int) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if u <= 16 && u > 0 {
-			c.I2PConfig.OutQuantity = strconv.Itoa(u)
-			return nil
-		}
-		return fmt.Errorf("Invalid outbound tunnel quantity")
-	}
-}
-
-//SetInBackups sets the inbound tunnel backups
-func SetInBackups(u int) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if u < 6 && u >= 0 {
-			c.I2PConfig.InBackupQuantity = strconv.Itoa(u)
-			return nil
-		}
-		return fmt.Errorf("Invalid inbound tunnel backup quantity")
-	}
-}
-
-//SetOutBackups sets the inbound tunnel backups
-func SetOutBackups(u int) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if u < 6 && u >= 0 {
-			c.I2PConfig.OutBackupQuantity = strconv.Itoa(u)
-			return nil
-		}
-		return fmt.Errorf("Invalid outbound tunnel backup quantity")
-	}
-}
-
-//SetEncrypt tells the router to use an encrypted leaseset
-func SetEncrypt(b bool) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if b {
-			c.I2PConfig.EncryptLeaseSet = "true"
-			return nil
-		}
-		c.I2PConfig.EncryptLeaseSet = "false"
-		return nil
-	}
-}
-
-//SetLeaseSetKey sets the host of the SAMEmit's SAM bridge
-func SetLeaseSetKey(s string) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		c.I2PConfig.LeaseSetKey = s
-		return nil
-	}
-}
-
-//SetLeaseSetPrivateKey sets the host of the SAMEmit's SAM bridge
-func SetLeaseSetPrivateKey(s string) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		c.I2PConfig.LeaseSetPrivateKey = s
-		return nil
-	}
-}
-
-//SetLeaseSetPrivateSigningKey sets the host of the SAMEmit's SAM bridge
-func SetLeaseSetPrivateSigningKey(s string) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		c.I2PConfig.LeaseSetPrivateSigningKey = s
-		return nil
-	}
-}
-
-//SetMessageReliability sets the host of the SAMEmit's SAM bridge
-func SetMessageReliability(s string) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		c.I2PConfig.MessageReliability = s
-		return nil
-	}
-}
-
-//SetAllowZeroIn tells the tunnel to accept zero-hop peers
-func SetAllowZeroIn(b bool) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if b {
-			c.I2PConfig.InAllowZeroHop = "true"
-			return nil
-		}
-		c.I2PConfig.InAllowZeroHop = "false"
-		return nil
-	}
-}
-
-//SetAllowZeroOut tells the tunnel to accept zero-hop peers
-func SetAllowZeroOut(b bool) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if b {
-			c.I2PConfig.OutAllowZeroHop = "true"
-			return nil
-		}
-		c.I2PConfig.OutAllowZeroHop = "false"
-		return nil
-	}
-}
-
-//SetCompress tells clients to use compression
-func SetCompress(b bool) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if b {
-			c.I2PConfig.UseCompression = "true"
-			return nil
-		}
-		c.I2PConfig.UseCompression = "false"
-		return nil
-	}
-}
-
-//SetFastRecieve tells clients to use compression
-func SetFastRecieve(b bool) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if b {
-			c.I2PConfig.FastRecieve = "true"
-			return nil
-		}
-		c.I2PConfig.FastRecieve = "false"
-		return nil
-	}
-}
-
-//SetReduceIdle tells the connection to reduce it's tunnels during extended idle time.
-func SetReduceIdle(b bool) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if b {
-			c.I2PConfig.ReduceIdle = "true"
-			return nil
-		}
-		c.I2PConfig.ReduceIdle = "false"
-		return nil
-	}
-}
-
-//SetReduceIdleTime sets the time to wait before reducing tunnels to idle levels
-func SetReduceIdleTime(u int) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		c.I2PConfig.ReduceIdleTime = "300000"
-		if u >= 6 {
-			c.I2PConfig.ReduceIdleTime = strconv.Itoa((u * 60) * 1000)
-			return nil
-		}
-		return fmt.Errorf("Invalid reduce idle timeout(Measured in minutes) %v", u)
-	}
-}
-
-//SetReduceIdleTimeMs sets the time to wait before reducing tunnels to idle levels in milliseconds
-func SetReduceIdleTimeMs(u int) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		c.I2PConfig.ReduceIdleTime = "300000"
-		if u >= 300000 {
-			c.I2PConfig.ReduceIdleTime = strconv.Itoa(u)
-			return nil
-		}
-		return fmt.Errorf("Invalid reduce idle timeout(Measured in milliseconds) %v", u)
-	}
-}
-
-//SetReduceIdleQuantity sets minimum number of tunnels to reduce to during idle time
-func SetReduceIdleQuantity(u int) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if u < 5 {
-			c.I2PConfig.ReduceIdleQuantity = strconv.Itoa(u)
-			return nil
-		}
-		return fmt.Errorf("Invalid reduce tunnel quantity")
-	}
-}
-
-//SetCloseIdle tells the connection to close it's tunnels during extended idle time.
-func SetCloseIdle(b bool) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if b {
-			c.I2PConfig.CloseIdle = "true"
-			return nil
-		}
-		c.I2PConfig.CloseIdle = "false"
-		return nil
-	}
-}
-
-//SetCloseIdleTime sets the time to wait before closing tunnels to idle levels
-func SetCloseIdleTime(u int) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		c.I2PConfig.CloseIdleTime = "300000"
-		if u >= 6 {
-			c.I2PConfig.CloseIdleTime = strconv.Itoa((u * 60) * 1000)
-			return nil
-		}
-		return fmt.Errorf("Invalid close idle timeout(Measured in minutes) %v", u)
-	}
-}
-
-//SetCloseIdleTimeMs sets the time to wait before closing tunnels to idle levels in milliseconds
-func SetCloseIdleTimeMs(u int) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		c.I2PConfig.CloseIdleTime = "300000"
-		if u >= 300000 {
-			c.I2PConfig.CloseIdleTime = strconv.Itoa(u)
-			return nil
-		}
-		return fmt.Errorf("Invalid close idle timeout(Measured in milliseconds) %v", u)
-	}
-}
-
-//SetAccessListType tells the system to treat the AccessList as a whitelist
-func SetAccessListType(s string) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if s == "whitelist" {
-			c.I2PConfig.AccessListType = "whitelist"
-			return nil
-		} else if s == "blacklist" {
-			c.I2PConfig.AccessListType = "blacklist"
-			return nil
-		} else if s == "none" {
-			c.I2PConfig.AccessListType = ""
-			return nil
-		} else if s == "" {
-			c.I2PConfig.AccessListType = ""
-			return nil
-		}
-		return fmt.Errorf("Invalid Access list type(whitelist, blacklist, none)")
-	}
-}
-
-//SetAccessList tells the system to treat the AccessList as a whitelist
-func SetAccessList(s []string) func(*SAMEmit) error {
-	return func(c *SAMEmit) error {
-		if len(s) > 0 {
-			for _, a := range s {
-				c.I2PConfig.AccessList = append(c.I2PConfig.AccessList, a)
-			}
-			return nil
-		}
-		return nil
-	}
-}
--- a/emit.go
+++ b/emit.go
@@ -1,122 +0,0 @@
-package sam3
-
-import (
-	"fmt"
-	"log"
-	"net"
-	"strings"
-)
-
-type SAMEmit struct {
-	I2PConfig
-}
-
-func (e *SAMEmit) OptStr() string {
-	optStr := ""
-	for _, opt := range e.I2PConfig.Print() {
-		optStr += opt + " "
-	}
-	return optStr
-}
-
-func (e *SAMEmit) Hello() string {
-	return fmt.Sprintf("HELLO VERSION MIN=%s MAX=%s \n", e.I2PConfig.MinSAM(), e.I2PConfig.MaxSAM())
-}
-
-func (e *SAMEmit) HelloBytes() []byte {
-	return []byte(e.Hello())
-}
-
-func (e *SAMEmit) GenerateDestination() string {
-	return fmt.Sprintf("DEST GENERATE %s \n", e.I2PConfig.SignatureType())
-}
-
-func (e *SAMEmit) GenerateDestinationBytes() []byte {
-	return []byte(e.GenerateDestination())
-}
-
-func (e *SAMEmit) Lookup(name string) string {
-	return fmt.Sprintf("NAMING LOOKUP NAME=%s \n", name)
-}
-
-func (e *SAMEmit) LookupBytes(name string) []byte {
-	return []byte(e.Lookup(name))
-}
-
-func (e *SAMEmit) Create() string {
-	return fmt.Sprintf(
-		//             //1 2 3 4 5 6 7
-		"SESSION CREATE %s%s%s%s%s%s%s \n",
-		e.I2PConfig.SessionStyle(),   //1
-		e.I2PConfig.FromPort(),       //2
-		e.I2PConfig.ToPort(),         //3
-		e.I2PConfig.ID(),             //4
-		e.I2PConfig.DestinationKey(), // 5
-		e.I2PConfig.SignatureType(),  // 6
-		e.OptStr(),                   // 7
-	)
-}
-
-func (e *SAMEmit) CreateBytes() []byte {
-	log.Println("sam command: " + e.Create())
-	return []byte(e.Create())
-}
-
-func (e *SAMEmit) Connect(dest string) string {
-	return fmt.Sprintf(
-		"STREAM CONNECT ID=%s %s %s DESTINATION=%s \n",
-		e.I2PConfig.ID(),
-		e.I2PConfig.FromPort(),
-		e.I2PConfig.ToPort(),
-		dest,
-	)
-}
-
-func (e *SAMEmit) ConnectBytes(dest string) []byte {
-	return []byte(e.Connect(dest))
-}
-
-func (e *SAMEmit) Accept() string {
-	return fmt.Sprintf(
-		"STREAM ACCEPT ID=%s %s %s",
-		e.I2PConfig.ID(),
-		e.I2PConfig.FromPort(),
-		e.I2PConfig.ToPort(),
-	)
-}
-
-func (e *SAMEmit) AcceptBytes() []byte {
-	return []byte(e.Accept())
-}
-
-func NewEmit(opts ...func(*SAMEmit) error) (*SAMEmit, error) {
-	var emit SAMEmit
-	for _, o := range opts {
-		if err := o(&emit); err != nil {
-			return nil, err
-		}
-	}
-	return &emit, nil
-}
-
-func IgnorePortError(err error) error {
-	if err == nil {
-		return nil
-	}
-	if strings.Contains(err.Error(), "missing port in address") {
-		err = nil
-	}
-	return err
-}
-
-func SplitHostPort(hostport string) (string, string, error) {
-	host, port, err := net.SplitHostPort(hostport)
-	if err != nil {
-		if IgnorePortError(err) == nil {
-			log.Println("host: " + hostport)
-			host = hostport
-			port = "0"
-		}
-	}
-	return host, port, nil
-}
--- a/go.mod
+++ b/go.mod
@@ -1,5 +0,0 @@
-module github.com/eyedeekay/sam3
-
-go 1.12
-
-require github.com/eyedeekay/i2pkeys v0.33.0
--- a/go.sum
+++ b/go.sum
@@ -1,2 +0,0 @@
-github.com/eyedeekay/i2pkeys v0.33.0 h1:5SzUyWxNjV6AvYv/WaI8J4dSgAfv7/WEps6pDLe2YSs=
-github.com/eyedeekay/i2pkeys v0.33.0/go.mod h1:W9KCm9lqZ+Ozwl3dwcgnpPXAML97+I8Jiht7o5A8YBM=
--- a/helper/helper.go
+++ b/helper/helper.go
@@ -1,125 +0,0 @@
-package sam
-
-import (
-	"io/ioutil"
-	"log"
-	"net"
-	"os"
-
-	"github.com/eyedeekay/i2pkeys"
-	"github.com/eyedeekay/sam3"
-)
-
-func NetListener(name, samaddr, keyspath string) (net.Listener, error) {
-	return I2PListener(name, sam3.SAMDefaultAddr(samaddr), keyspath)
-}
-
-// I2PListener is a convenience function which takes a SAM tunnel name, a SAM address and a filename.
-// If the file contains I2P keys, it will create a service using that address. If the file does not
-// exist, keys will be generated and stored in that file.
-func I2PListener(name, samaddr, keyspath string) (*sam3.StreamListener, error) {
-	log.Printf("Starting and registering I2P service, please wait a couple of minutes...")
-	listener, err := I2PStreamSession(name, sam3.SAMDefaultAddr(samaddr), keyspath)
-
-	if keyspath != "" {
-		err = ioutil.WriteFile(keyspath+".i2p.public.txt", []byte(listener.Keys().Addr().Base32()), 0644)
-		if err != nil {
-			log.Fatalf("error storing I2P base32 address in adjacent text file, %s", err)
-		}
-	}
-	log.Printf("Listening on: %s", listener.Addr().Base32())
-	return listener.Listen()
-}
-
-// I2PStreamSession is a convenience function which returns a sam3.StreamSession instead
-// of a sam3.StreamListener. It also takes care of setting a persisitent key on behalf
-// of the user.
-func I2PStreamSession(name, samaddr, keyspath string) (*sam3.StreamSession, error) {
-	log.Printf("Starting and registering I2P session...")
-	sam, err := sam3.NewSAM(sam3.SAMDefaultAddr(samaddr))
-	if err != nil {
-		log.Fatalf("error connecting to SAM to %s: %s", sam3.SAMDefaultAddr(samaddr), err)
-	}
-	keys, err := GenerateOrLoadKeys(keyspath, sam)
-	if err != nil {
-		return nil, err
-	}
-	stream, err := sam.NewStreamSession(name, *keys, sam3.Options_Medium)
-	return stream, err
-}
-
-// I2PDataGramsession is a convenience function which returns a sam3.DatagramSession.
-// It also takes care of setting a persisitent key on behalf of the user.
-func I2PDatagramSession(name, samaddr, keyspath string) (*sam3.DatagramSession, error) {
-	log.Printf("Starting and registering I2P session...")
-	sam, err := sam3.NewSAM(sam3.SAMDefaultAddr(samaddr))
-	if err != nil {
-		log.Fatalf("error connecting to SAM to %s: %s", sam3.SAMDefaultAddr(samaddr), err)
-	}
-	keys, err := GenerateOrLoadKeys(keyspath, sam)
-	if err != nil {
-		return nil, err
-	}
-	gram, err := sam.NewDatagramSession(name, *keys, sam3.Options_Medium, 0)
-	return gram, err
-}
-
-// I2PPrimarySession is a convenience function which returns a sam3.PrimarySession.
-// It also takes care of setting a persisitent key on behalf of the user.
-func I2PPrimarySession(name, samaddr, keyspath string) (*sam3.PrimarySession, error) {
-	log.Printf("Starting and registering I2P session...")
-	sam, err := sam3.NewSAM(sam3.SAMDefaultAddr(samaddr))
-	if err != nil {
-		log.Fatalf("error connecting to SAM to %s: %s", sam3.SAMDefaultAddr(samaddr), err)
-	}
-	keys, err := GenerateOrLoadKeys(keyspath, sam)
-	if err != nil {
-		return nil, err
-	}
-	gram, err := sam.NewPrimarySession(name, *keys, sam3.Options_Medium)
-	return gram, err
-}
-
-// GenerateOrLoadKeys is a convenience function which takes a filename and a SAM session.
-// if the SAM session is nil, a new one will be created with the defaults.
-// The keyspath must be the path to a place to store I2P keys. The keyspath will be suffixed with
-// .i2p.private for the private keys, and public.txt for the b32 addresses.
-// If the keyspath.i2p.private file does not exist, keys will be generated and stored in that file.
-// if the keyspath.i2p.private does exist, keys will be loaded from that location and returned
-func GenerateOrLoadKeys(keyspath string, sam *sam3.SAM) (keys *i2pkeys.I2PKeys, err error) {
-	if sam == nil {
-		sam, err = sam3.NewSAM(sam3.SAMDefaultAddr("127.0.0.1:7656"))
-		if err != nil {
-			return nil, err
-		}
-	}
-	if _, err := os.Stat(keyspath + ".i2p.private"); os.IsNotExist(err) {
-		f, err := os.Create(keyspath + ".i2p.private")
-		if err != nil {
-			log.Fatalf("unable to open I2P keyfile for writing: %s", err)
-		}
-		defer f.Close()
-		tkeys, err := sam.NewKeys()
-		if err != nil {
-			log.Fatalf("unable to generate I2P Keys, %s", err)
-		}
-		keys = &tkeys
-		err = i2pkeys.StoreKeysIncompat(*keys, f)
-		if err != nil {
-			log.Fatalf("unable to save newly generated I2P Keys, %s", err)
-		}
-	} else {
-		tkeys, err := i2pkeys.LoadKeys(keyspath + ".i2p.private")
-		if err != nil {
-			log.Fatalf("unable to load I2P Keys: %e", err)
-		}
-		keys = &tkeys
-	}
-	return keys, nil
-}
-
-// GenerateKeys is a shorter version of GenerateOrLoadKeys which generates keys and stores them in a file.
-// it always uses a new default SAM session.
-func GenerateKeys(keyspath string) (keys *i2pkeys.I2PKeys, err error) {
-	return GenerateOrLoadKeys(keyspath, nil)
-}
--- a/i2pkeys/I2PAddr.go
+++ b/i2pkeys/I2PAddr.go
@@ -0,0 +1,188 @@
+package i2pkeys
+
+import (
+	"bytes"
+	"crypto/sha256"
+	"encoding/base32"
+	"encoding/base64"
+	"errors"
+	"io"
+	"strings"
+)
+
+var (
+	i2pB64enc *base64.Encoding = base64.NewEncoding("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-~")
+	i2pB32enc *base32.Encoding = base32.NewEncoding("abcdefghijklmnopqrstuvwxyz234567")
+)
+
+// The public and private keys associated with an I2P destination. I2P hides the
+// details of exactly what this is, so treat them as blobs, but generally: One
+// pair of DSA keys, one pair of ElGamal keys, and sometimes (almost never) also
+// a certificate. String() returns you the full content of I2PKeys and Addr()
+// returns the public keys.
+type I2PKeys struct {
+	addr I2PAddr // only the public key
+	both string  // both public and private keys
+}
+
+// Creates I2PKeys from an I2PAddr and a public/private keypair string (as
+// generated by String().)
+func NewKeys(addr I2PAddr, both string) I2PKeys {
+	return I2PKeys{addr, both}
+}
+
+// load keys from non standard format
+func LoadKeysIncompat(r io.Reader) (k I2PKeys, err error) {
+	var buff bytes.Buffer
+	_, err = io.Copy(&buff, r)
+	if err == nil {
+		parts := strings.Split(buff.String(), "\n")
+		k = I2PKeys{I2PAddr(parts[0]), parts[1]}
+	}
+	return
+}
+
+// store keys in non standard format
+func StoreKeysIncompat(k I2PKeys, w io.Writer) (err error) {
+	_, err = io.WriteString(w, k.addr.Base64()+"\n"+k.both)
+	return
+}
+
+// Returns the public keys of the I2PKeys.
+func (k I2PKeys) Addr() I2PAddr {
+	return k.addr
+}
+
+// Returns the keys (both public and private), in I2Ps base64 format. Use this
+// when you create sessions.
+func (k I2PKeys) String() string {
+	return k.both
+}
+
+// I2PAddr represents an I2P destination, almost equivalent to an IP address.
+// This is the humongously huge base64 representation of such an address, which
+// really is just a pair of public keys and also maybe a certificate. (I2P hides
+// the details of exactly what it is. Read the I2P specifications for more info.)
+type I2PAddr string
+
+// an i2p destination hash, the .b32.i2p address if you will
+type I2PDestHash [32]byte
+
+// create a desthash from a string b32.i2p address
+func DestHashFromString(str string) (dhash I2PDestHash, err error) {
+	if strings.HasSuffix(str, ".b32.i2p") && len(str) == 60 {
+		// valid
+		_, err = i2pB32enc.Decode(dhash[:], []byte(str[:52]+"===="))
+	} else {
+		// invalid
+		err = errors.New("invalid desthash format")
+	}
+	return
+}
+
+// get string representation of i2p dest hash
+func (h I2PDestHash) String() string {
+	b32addr := make([]byte, 56)
+	i2pB32enc.Encode(b32addr, h[:])
+	return string(b32addr[:52]) + ".b32.i2p"
+}
+
+// Returns "I2P"
+func (h *I2PDestHash) Network() string {
+	return "I2P"
+}
+
+// Returns the base64 representation of the I2PAddr
+func (a I2PAddr) Base64() string {
+	return string(a)
+}
+
+// Returns the I2P destination (base64-encoded)
+func (a I2PAddr) String() string {
+	return string(a)
+}
+
+// Returns "I2P"
+func (a I2PAddr) Network() string {
+	return "I2P"
+}
+
+// Creates a new I2P address from a base64-encoded string. Checks if the address
+// addr is in correct format. (If you know for sure it is, use I2PAddr(addr).)
+func NewI2PAddrFromString(addr string) (I2PAddr, error) {
+	if strings.HasSuffix(addr, ".i2p") {
+		if strings.HasSuffix(addr, ".b32.i2p") {
+			return I2PAddr(""), errors.New("cannot convert .b32.i2p to full destination")
+		}
+		// strip off .i2p if it's there
+		addr = addr[:len(addr)-4]
+	}
+	addr = strings.Trim(addr, "\t\n\r\f ")
+	// very basic check
+	if len(addr) > 4096 || len(addr) < 516 {
+		return I2PAddr(""), errors.New("Not an I2P address")
+	}
+	buf := make([]byte, i2pB64enc.DecodedLen(len(addr)))
+	if _, err := i2pB64enc.Decode(buf, []byte(addr)); err != nil {
+		return I2PAddr(""), errors.New("Address is not base64-encoded")
+	}
+	return I2PAddr(addr), nil
+}
+
+func FiveHundredAs() I2PAddr {
+	s := ""
+	for x := 0; x < 517; x++ {
+		s += "A"
+	}
+	r, _ := NewI2PAddrFromString(s)
+	return r
+}
+
+// Creates a new I2P address from a byte array. The inverse of ToBytes().
+func NewI2PAddrFromBytes(addr []byte) (I2PAddr, error) {
+	if len(addr) > 4096 || len(addr) < 384 {
+		return I2PAddr(""), errors.New("Not an I2P address")
+	}
+	buf := make([]byte, i2pB64enc.EncodedLen(len(addr)))
+	i2pB64enc.Encode(buf, addr)
+	return I2PAddr(string(buf)), nil
+}
+
+// Turns an I2P address to a byte array. The inverse of NewI2PAddrFromBytes().
+func (addr I2PAddr) ToBytes() ([]byte, error) {
+	buf := make([]byte, i2pB64enc.DecodedLen(len(addr)))
+	if _, err := i2pB64enc.Decode(buf, []byte(addr)); err != nil {
+		return buf, errors.New("Address is not base64-encoded")
+	}
+	return buf, nil
+}
+
+func (addr I2PAddr) Bytes() []byte {
+	b, _ := addr.ToBytes()
+	return b
+}
+
+// Returns the *.b32.i2p address of the I2P address. It is supposed to be a
+// somewhat human-manageable 64 character long pseudo-domain name equivalent of
+// the 516+ characters long default base64-address (the I2PAddr format). It is
+// not possible to turn the base32-address back into a usable I2PAddr without
+// performing a Lookup(). Lookup only works if you are using the I2PAddr from
+// which the b32 address was generated.
+func (addr I2PAddr) Base32() (str string) {
+	return addr.DestHash().String()
+}
+
+func (addr I2PAddr) DestHash() (h I2PDestHash) {
+	hash := sha256.New()
+	b, _ := addr.ToBytes()
+	hash.Write(b)
+	digest := hash.Sum(nil)
+	copy(h[:], digest)
+	return
+}
+
+// Makes any string into a *.b32.i2p human-readable I2P address. This makes no
+// sense, unless "anything" is an I2P destination of some sort.
+func Base32(anything string) string {
+	return I2PAddr(anything).Base32()
+}
--- a/i2plogo.png
+++ b/i2plogo.png
--- a/index.html
+++ b/index.html
@@ -1,331 +0,0 @@
-<html>
-  <head>
-    <title>
-      README
-    </title>
-    <meta name="author" content="eyedeekay" />
-    <meta name="description" content="sam3" />
-    <meta name="keywords" content="master" />
-    <link rel="stylesheet" type="text/css" href="style.css" />
-    <link rel="stylesheet" type="text/css" href="showhider.css" />
-  </head>
-  <body>
-    <div id="navbar">
-      <a href="#shownav">
-        Show navigation
-      </a>
-      <div id="shownav">
-        <div id="hidenav">
-          <ul>
-            <li>
-              <a href="index.html">
-                index
-              </a>
-            </li>
-          </ul>
-          <br>
-          <a href="#hidenav">
-            Hide Navigation
-          </a>
-        </div>
-      </div>
-    </div>
-    <h1>
-      <a href="#readme" rel="nofollow">
-        <span></span>
-      </a>
-      README
-    </h1>
-    <h2>
-      <a href="#important" rel="nofollow">
-        <span></span>
-      </a>
-      !!IMPORTANT!!
-    </h2>
-    <p>
-      In the next version, I&#39;ll be moving the
-      <code>
-        i2pkeys
-      </code>
-      directory to it&#39;s own repository
-      so I can avoid import cycle headaches. Please migrate to the new
-      <code>
-        i2pkeys
-      </code>
-      repository
-      before upgrading your sam3 dependencies. You can probably do this by running:
-    </p>
-    <div>
-      <pre>find . -name &#39;*.go&#39; -exec sed -i &#39;s|github.com/eyedeekay/sam3/i2pkeys|github.com/eyedeekay/i2pkeys|g&#39; {} \;
-</pre>
-    </div>
-    <p>
-      STATUS: This project is maintained. I will respond to issues, pull requests, and feature requests within a few days.
-    </p>
-    <h1>
-      <a href="#readme" rel="nofollow">
-        <span></span>
-      </a>
-      README
-    </h1>
-    <p>
-      go library for the I2P
-      <a href="https://geti2p.net/en/docs/api/samv3" rel="nofollow">
-        SAMv3.0
-      </a>
-      bridge, used to build anonymous/pseudonymous end-to-end encrypted sockets.
-    </p>
-    <p>
-      This library is much better than ccondom (that use BOB), much more stable and much easier to maintain.
-    </p>
-    <h2>
-      <a href="#support-todo" rel="nofollow">
-        <span></span>
-      </a>
-      Support/TODO
-    </h2>
-    <p>
-      <strong>
-        What works:
-      </strong>
-    </p>
-    <ul>
-      <li>
-        Utils
-        <ul>
-          <li>
-            Resolving domain names to I2P destinations
-          </li>
-          <li>
-            .b32.i2p hashes
-          </li>
-          <li>
-            Generating keys/i2p destinations
-          </li>
-        </ul>
-      </li>
-      <li>
-        Streaming
-        <ul>
-          <li>
-            DialI2P() - Connecting to stuff in I2P
-          </li>
-          <li>
-            Listen()/Accept() - Handling incomming connections
-          </li>
-          <li>
-            Implements net.Conn and net.Listener
-          </li>
-        </ul>
-      </li>
-      <li>
-        Datagrams
-        <ul>
-          <li>
-            Implements net.PacketConn
-          </li>
-        </ul>
-      </li>
-      <li>
-        Raw datagrams
-        <ul>
-          <li>
-            Like datagrams, but without addresses
-          </li>
-        </ul>
-      </li>
-    </ul>
-    <p>
-      <strong>
-        Does not work:
-      </strong>
-    </p>
-    <ul>
-      <li>
-        Stream Forwarding
-      </li>
-      <li>
-        Probably needs some real-world testing
-      </li>
-    </ul>
-    <h2>
-      <a href="#documentation" rel="nofollow">
-        <span></span>
-      </a>
-      Documentation
-    </h2>
-    <ul>
-      <li>
-        Latest version-documentation:
-        <ul>
-          <li>
-            set your GOPATH
-          </li>
-          <li>
-            Enter
-            <code>
-              godoc -http=:8081
-            </code>
-            into your terminal and hit enter.
-          </li>
-          <li>
-            Goto
-            <a href="http://localhost:8081" rel="nofollow">
-              http://localhost:8081
-            </a>
-            , click packages, and navigate to sam3
-          </li>
-        </ul>
-      </li>
-    </ul>
-    <h2>
-      <a href="#examples" rel="nofollow">
-        <span></span>
-      </a>
-      Examples
-    </h2>
-    <div>
-      <pre>package main
-
-import (
-	&#34;github.com/eyedeekay/sam3&#34;
-	&#34;github.com/eyedeekay/sam3/i2pkeys&#34;
-	&#34;fmt&#34;
-)
-
-const yoursam = &#34;127.0.0.1:7656&#34; // sam bridge
-
-func client(server i2pkeys.I2PAddr) {
-	sam, _ := sam3.NewSAM(yoursam)
-	keys, _ := sam.NewKeys()
-	stream, _ := sam.NewStreamSession(&#34;clientTun&#34;, keys, sam3.Options_Small)
-	fmt.Println(&#34;Client: Connecting to &#34; + server.Base32())
-	conn, _ := stream.DialI2P(server)
-	conn.Write([]byte(&#34;Hello world!&#34;))
-	return
-}
-
-func main() {
-	sam, _ := NewSAM(yoursam)
-	keys, _ := sam.NewKeys()
-	stream, _ := sam.NewStreamSession(&#34;serverTun&#34;, keys, sam3.Options_Medium)
-	listener, _ := stream.Listen()
-	go client(keys.Addr())
-	conn, _ := listener.Accept()
-	buf := make([]byte, 4096)
-	n, _ := conn.Read(buf)
-	fmt.Println(&#34;Server received: &#34; + string(buf[:n]))
-}
-</pre>
-    </div>
-    <p>
-      The above will write to the terminal:
-    </p>
-    <div>
-      <pre>Client: Connecting to zjnvfh4hs3et5vtz35ogwzrws26zvwkcad5uo5esecvg4qpk5b4a.b32.i2p
-Server received: Hello world!
-</pre>
-    </div>
-    <p>
-      Error handling was omitted in the above code for readability.
-    </p>
-    <h2>
-      <a href="#testing" rel="nofollow">
-        <span></span>
-      </a>
-      Testing
-    </h2>
-    <ul>
-      <li>
-        <code>
-          go test -tags=nettest
-        </code>
-        runs the whole suite (takes 90+ sec to perform!)
-      </li>
-      <li>
-        <code>
-          go test -short
-        </code>
-        runs the shorter variant, does not connect to anything
-      </li>
-    </ul>
-    <h2>
-      <a href="#license" rel="nofollow">
-        <span></span>
-      </a>
-      License
-    </h2>
-    <p>
-      Public domain.
-    </p>
-    <h2>
-      <a href="#author" rel="nofollow">
-        <span></span>
-      </a>
-      Author
-    </h2>
-    <ul>
-      <li>
-        Kalle Vedin
-        <code>
-          kalle.vedin@fripost.org
-        </code>
-      </li>
-      <li>
-        Unknown Name (majestrate)
-      </li>
-      <li>
-        idk
-      </li>
-      <li>
-        qiwenmin
-      </li>
-    </ul>
-    <div>
-      <a href="#show">
-        Show license
-      </a>
-      <div id="show">
-        <div id="hide">
-          <pre><code>This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
-</code></pre>
-          <a href="#hide">
-            Hide license
-          </a>
-        </div>
-      </div>
-    </div>
-    <div>
-      <iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe>
-    </div>
-    <div>
-      <a href="https://geti2p.net/">
-        <img src="i2plogo.png"></img>
-        I2P
-      </a>
-    </div>
-  </body>
-</html>
--- a/primary.go
+++ b/primary.go
@@ -1,398 +0,0 @@
-package sam3
-
-import (
-	"errors"
-	"fmt"
-	"math/rand"
-	"net"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/eyedeekay/i2pkeys"
-)
-
-const (
-	session_ADDOK = "SESSION STATUS RESULT=OK"
-)
-
-func randport() string {
-	s := rand.NewSource(time.Now().UnixNano())
-	r := rand.New(s)
-	p := r.Intn(55534) + 10000
-	return strconv.Itoa(p)
-}
-
-// Represents a primary session.
-type PrimarySession struct {
-	samAddr  string          // address to the sam bridge (ipv4:port)
-	id       string          // tunnel name
-	conn     net.Conn        // connection to sam
-	keys     i2pkeys.I2PKeys // i2p destination keys
-	Timeout  time.Duration
-	Deadline time.Time
-	sigType  string
-	Config   SAMEmit
-	stsess   map[string]*StreamSession
-	dgsess   map[string]*DatagramSession
-	//	from     string
-	//	to       string
-}
-
-func (ss *PrimarySession) From() string {
-	return "0"
-}
-
-func (ss *PrimarySession) To() string {
-	return "0"
-}
-
-func (ss *PrimarySession) SignatureType() string {
-	return ss.sigType
-}
-
-// Returns the local tunnel name of the I2P tunnel used for the stream session
-func (ss *PrimarySession) ID() string {
-	return ss.id
-}
-
-func (ss *PrimarySession) Close() error {
-	return ss.conn.Close()
-}
-
-// Returns the I2P destination (the address) of the stream session
-func (ss *PrimarySession) Addr() i2pkeys.I2PAddr {
-	return ss.keys.Addr()
-}
-
-func (ss *PrimarySession) LocalAddr() net.Addr {
-	aa := ss.keys.Addr()
-	return &aa
-}
-
-// Returns the keys associated with the stream session
-func (ss *PrimarySession) Keys() i2pkeys.I2PKeys {
-	return ss.keys
-}
-
-func (sam *PrimarySession) Dial(network, addr string) (net.Conn, error) {
-	if network == "udp" || network == "udp4" || network == "udp6" {
-		//return sam.DialUDPI2P(network, network+addr[0:4], addr)
-		return sam.DialUDPI2P(network, network+addr[0:4], addr)
-	}
-	if network == "tcp" || network == "tcp4" || network == "tcp6" {
-		//return sam.DialTCPI2P(network, network+addr[0:4], addr)
-		return sam.DialTCPI2P(network, network+addr[0:4], addr)
-	}
-	return nil, fmt.Errorf("Error: Must specify a valid network type")
-}
-
-// DialTCP implements x/dialer
-func (sam *PrimarySession) DialTCP(network string, laddr, raddr net.Addr) (net.Conn, error) {
-	ts, ok := sam.stsess[network+raddr.String()[0:4]]
-	var err error
-	if !ok {
-		ts, err = sam.NewUniqueStreamSubSession(network + raddr.String()[0:4])
-		if err != nil {
-			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())
-}
-
-func (sam *PrimarySession) DialTCPI2P(network string, laddr, raddr string) (net.Conn, error) {
-	ts, ok := sam.stsess[network+raddr[0:4]]
-	var err error
-	if !ok {
-		ts, err = sam.NewUniqueStreamSubSession(network + laddr)
-		if err != nil {
-			return nil, err
-		}
-		sam.stsess[network+raddr[0:4]] = ts
-		ts, _ = sam.stsess[network+raddr[0:4]]
-	}
-	return ts.Dial(network, raddr)
-}
-
-// DialUDP implements x/dialer
-func (sam *PrimarySession) DialUDP(network string, laddr, raddr net.Addr) (net.PacketConn, error) {
-	ds, ok := sam.dgsess[network+raddr.String()[0:4]]
-	var err error
-	if !ok {
-		ds, err = sam.NewDatagramSubSession(network+raddr.String()[0:4], 0)
-		if err != nil {
-			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())
-}
-
-func (sam *PrimarySession) DialUDPI2P(network, laddr, raddr string) (*DatagramSession, error) {
-	ds, ok := sam.dgsess[network+raddr[0:4]]
-	var err error
-	if !ok {
-		ds, err = sam.NewDatagramSubSession(network+laddr, 0)
-		if err != nil {
-			return nil, err
-		}
-		sam.dgsess[network+raddr[0:4]] = ds
-		ds, _ = sam.dgsess[network+raddr[0:4]]
-	}
-	return ds.Dial(network, raddr)
-}
-
-func (s *PrimarySession) Lookup(name string) (a net.Addr, err error) {
-	var sam *SAM
-	name = strings.Split(name, ":")[0]
-	sam, err = NewSAM(s.samAddr)
-	if err == nil {
-		defer sam.Close()
-		a, err = sam.Lookup(name)
-	}
-	return
-}
-
-func (sam *PrimarySession) Resolve(network, addr string) (net.Addr, error) {
-	return sam.Lookup(addr)
-}
-
-func (sam *PrimarySession) ResolveTCPAddr(network, dest string) (net.Addr, error) {
-	return sam.Lookup(dest)
-}
-
-func (sam *PrimarySession) ResolveUDPAddr(network, dest string) (net.Addr, error) {
-	return sam.Lookup(dest)
-}
-
-// Creates a new PrimarySession with the I2CP- and streaminglib options as
-// specified. See the I2P documentation for a full list of options.
-func (sam *SAM) NewPrimarySession(id string, keys i2pkeys.I2PKeys, options []string) (*PrimarySession, error) {
-	return sam.newPrimarySession(PrimarySessionSwitch, id, keys, options)
-}
-
-func (sam *SAM) newPrimarySession(primarySessionSwitch string, id string, keys i2pkeys.I2PKeys, options []string) (*PrimarySession, error) {
-	conn, err := sam.newGenericSession(primarySessionSwitch, id, keys, options, []string{})
-	if err != nil {
-		return nil, err
-	}
-	ssesss := make(map[string]*StreamSession)
-	dsesss := make(map[string]*DatagramSession)
-	return &PrimarySession{sam.Config.I2PConfig.Sam(), id, conn, keys, time.Duration(600 * time.Second), time.Now(), Sig_NONE, sam.Config, ssesss, dsesss}, nil
-}
-
-// Creates a new PrimarySession with the I2CP- and PRIMARYinglib options as
-// specified. See the I2P documentation for a full list of options.
-func (sam *SAM) NewPrimarySessionWithSignature(id string, keys i2pkeys.I2PKeys, options []string, sigType string) (*PrimarySession, error) {
-	conn, err := sam.newGenericSessionWithSignature(PrimarySessionSwitch, id, keys, sigType, options, []string{})
-	if err != nil {
-		return nil, err
-	}
-	ssesss := make(map[string]*StreamSession)
-	dsesss := make(map[string]*DatagramSession)
-	return &PrimarySession{sam.Config.I2PConfig.Sam(), id, conn, keys, time.Duration(600 * time.Second), time.Now(), sigType, sam.Config, ssesss, dsesss}, nil
-}
-
-// Creates a new session with the style of either "STREAM", "DATAGRAM" or "RAW",
-// for a new I2P tunnel with name id, using the cypher keys specified, with the
-// I2CP/streaminglib-options as specified. Extra arguments can be specified by
-// setting extra to something else than []string{}.
-// This sam3 instance is now a session
-func (sam *PrimarySession) newGenericSubSession(style, id string, extras []string) (net.Conn, error) {
-	return sam.newGenericSubSessionWithSignature(style, id, extras)
-}
-
-func (sam *PrimarySession) newGenericSubSessionWithSignature(style, id string, extras []string) (net.Conn, error) {
-	return sam.newGenericSubSessionWithSignatureAndPorts(style, id, "0", "0", extras)
-}
-
-// Creates a new session with the style of either "STREAM", "DATAGRAM" or "RAW",
-// for a new I2P tunnel with name id, using the cypher keys specified, with the
-// I2CP/streaminglib-options as specified. Extra arguments can be specified by
-// setting extra to something else than []string{}.
-// This sam3 instance is now a session
-func (sam *PrimarySession) newGenericSubSessionWithSignatureAndPorts(style, id, from, to string, extras []string) (net.Conn, error) {
-
-	conn := sam.conn
-	fp := ""
-	tp := ""
-	if from != "0" && from != "" {
-		fp = " FROM_PORT=" + from
-	}
-	if to != "0" && to != "" {
-		tp = " TO_PORT=" + to
-	}
-	scmsg := []byte("SESSION ADD STYLE=" + style + " ID=" + id + fp + tp + " " + strings.Join(extras, " ") + "\n")
-	for m, i := 0, 0; m != len(scmsg); i++ {
-		if i == 15 {
-			conn.Close()
-			return nil, errors.New("writing to SAM failed")
-		}
-		n, err := conn.Write(scmsg[m:])
-		if err != nil {
-			conn.Close()
-			return nil, err
-		}
-		m += n
-	}
-	buf := make([]byte, 4096)
-	n, err := conn.Read(buf)
-	if err != nil {
-		conn.Close()
-		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()
-		//return nil, errors.New("SAMv3 created a tunnel with keys other than the ones we asked it for")
-		//}
-		return conn, nil //&StreamSession{id, conn, keys, nil, sync.RWMutex{}, nil}, nil
-	} else if text == session_DUPLICATE_ID {
-		conn.Close()
-		return nil, errors.New("Duplicate tunnel name")
-	} else if text == session_DUPLICATE_DEST {
-		conn.Close()
-		return nil, errors.New("Duplicate destination")
-	} else if text == session_INVALID_KEY {
-		conn.Close()
-		return nil, errors.New("Invalid key - Primary Session")
-	} else if strings.HasPrefix(text, session_I2P_ERROR) {
-		conn.Close()
-		return nil, errors.New("I2P error " + text[len(session_I2P_ERROR):])
-	} else {
-		conn.Close()
-		return nil, errors.New("Unable to parse SAMv3 reply: " + text)
-	}
-}
-
-// Creates a new StreamSession with the I2CP- and streaminglib options as
-// specified. See the I2P documentation for a full list of options.
-func (sam *PrimarySession) NewStreamSubSession(id string) (*StreamSession, error) {
-	conn, err := sam.newGenericSubSession("STREAM", id, []string{})
-	if err != nil {
-		return nil, err
-	}
-	return &StreamSession{sam.Config.I2PConfig.Sam(), id, conn, sam.keys, time.Duration(600 * time.Second), time.Now(), Sig_NONE, "0", "0"}, nil
-}
-
-// Creates a new StreamSession with the I2CP- and streaminglib options as
-// specified. See the I2P documentation for a full list of options.
-func (sam *PrimarySession) NewUniqueStreamSubSession(id string) (*StreamSession, error) {
-	conn, err := sam.newGenericSubSession("STREAM", id, []string{})
-	if err != nil {
-		return nil, err
-	}
-	return &StreamSession{sam.Config.I2PConfig.Sam(), id, conn, sam.keys, time.Duration(600 * time.Second), time.Now(), Sig_NONE, randport(), randport()}, nil
-}
-
-// Creates a new StreamSession with the I2CP- and streaminglib options as
-// specified. See the I2P documentation for a full list of options.
-func (sam *PrimarySession) NewStreamSubSessionWithPorts(id, from, to string) (*StreamSession, error) {
-	conn, err := sam.newGenericSubSessionWithSignatureAndPorts("STREAM", id, from, to, []string{})
-	if err != nil {
-		return nil, err
-	}
-	return &StreamSession{sam.Config.I2PConfig.Sam(), id, conn, sam.keys, time.Duration(600 * time.Second), time.Now(), Sig_NONE, from, to}, nil
-}
-
-/*
-func (s *PrimarySession) I2PListener(name string) (*StreamListener, error) {
-	listener, err := s.NewStreamSubSession(name)
-	if err != nil {
-		return nil, err
-	}
-	return listener.Listen()
-}
-*/
-
-// Creates a new datagram session. udpPort is the UDP port SAM is listening on,
-// and if you set it to zero, it will use SAMs standard UDP port.
-func (s *PrimarySession) NewDatagramSubSession(id string, udpPort int) (*DatagramSession, error) {
-	if udpPort > 65335 || udpPort < 0 {
-		return nil, errors.New("udpPort needs to be in the intervall 0-65335")
-	}
-	if udpPort == 0 {
-		udpPort = 7655
-	}
-	lhost, _, err := SplitHostPort(s.conn.LocalAddr().String())
-	if err != nil {
-		s.Close()
-		return nil, err
-	}
-	lUDPAddr, err := net.ResolveUDPAddr("udp4", lhost+":0")
-	if err != nil {
-		return nil, err
-	}
-	udpconn, err := net.ListenUDP("udp4", lUDPAddr)
-	if err != nil {
-		return nil, err
-	}
-	rhost, _, err := SplitHostPort(s.conn.RemoteAddr().String())
-	if err != nil {
-		s.Close()
-		return nil, err
-	}
-	rUDPAddr, err := net.ResolveUDPAddr("udp4", rhost+":"+strconv.Itoa(udpPort))
-	if err != nil {
-		return nil, err
-	}
-	_, lport, err := net.SplitHostPort(udpconn.LocalAddr().String())
-	if err != nil {
-		s.Close()
-		return nil, err
-	}
-	conn, err := s.newGenericSubSession("DATAGRAM", id, []string{"PORT=" + lport})
-	if err != nil {
-		return nil, err
-	}
-	return &DatagramSession{s.Config.I2PConfig.Sam(), id, conn, udpconn, s.keys, rUDPAddr, nil}, nil
-}
-
-// Creates a new raw session. udpPort is the UDP port SAM is listening on,
-// and if you set it to zero, it will use SAMs standard UDP port.
-func (s *PrimarySession) NewRawSubSession(id string, udpPort int) (*RawSession, error) {
-	if udpPort > 65335 || udpPort < 0 {
-		return nil, errors.New("udpPort needs to be in the intervall 0-65335")
-	}
-	if udpPort == 0 {
-		udpPort = 7655
-	}
-	lhost, _, err := SplitHostPort(s.conn.LocalAddr().String())
-	if err != nil {
-		s.Close()
-		return nil, err
-	}
-	lUDPAddr, err := net.ResolveUDPAddr("udp4", lhost+":0")
-	if err != nil {
-		return nil, err
-	}
-	udpconn, err := net.ListenUDP("udp4", lUDPAddr)
-	if err != nil {
-		return nil, err
-	}
-	rhost, _, err := SplitHostPort(s.conn.RemoteAddr().String())
-	if err != nil {
-		s.Close()
-		return nil, err
-	}
-	rUDPAddr, err := net.ResolveUDPAddr("udp4", rhost+":"+strconv.Itoa(udpPort))
-	if err != nil {
-		return nil, err
-	}
-	_, lport, err := net.SplitHostPort(udpconn.LocalAddr().String())
-	if err != nil {
-		s.Close()
-		return nil, err
-	}
-	//	conn, err := s.newGenericSubSession("RAW", id, s.keys, options, []string{"PORT=" + lport})
-	conn, err := s.newGenericSubSession("RAW", id, []string{"PORT=" + lport})
-	if err != nil {
-		return nil, err
-	}
-	return &RawSession{s.Config.I2PConfig.Sam(), id, conn, udpconn, s.keys, rUDPAddr}, nil
-}
--- a/primary_datagram_test.go
+++ b/primary_datagram_test.go
@@ -1,149 +0,0 @@
-package sam3
-
-import (
-	"fmt"
-	"log"
-	"testing"
-	"time"
-)
-
-func Test_PrimaryDatagramServerClient(t *testing.T) {
-	if testing.Short() {
-		return
-	}
-
-	fmt.Println("Test_PrimaryDatagramServerClient")
-	earlysam, err := NewSAM(yoursam)
-	if err != nil {
-		t.Fail()
-		return
-	}
-	defer earlysam.Close()
-	keys, err := earlysam.NewKeys()
-	if err != nil {
-		t.Fail()
-		return
-	}
-
-	sam, err := earlysam.NewPrimarySession("PrimaryTunnel", keys, []string{"inbound.length=0", "outbound.length=0", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"})
-	if err != nil {
-		t.Fail()
-		return
-	}
-	defer sam.Close()
-	//	fmt.Println("\tServer: My address: " + keys.Addr().Base32())
-	fmt.Println("\tServer: Creating tunnel")
-	ds, err := sam.NewDatagramSubSession("PrimaryTunnel"+RandString(), 0)
-	if err != nil {
-		fmt.Println("Server: Failed to create tunnel: " + err.Error())
-		t.Fail()
-		return
-	}
-	defer ds.Close()
-	c, w := make(chan bool), make(chan bool)
-	go func(c, w chan (bool)) {
-		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")
-		ds2, err := sam2.NewDatagramSession("PRIMARYClientTunnel", keys, []string{"inbound.length=0", "outbound.length=0", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"}, 0)
-		if err != nil {
-			c <- false
-			return
-		}
-		defer ds2.Close()
-		//		fmt.Println("\tClient: Servers address: " + ds.LocalAddr().Base32())
-		//		fmt.Println("\tClient: Clients address: " + ds2.LocalAddr().Base32())
-		fmt.Println("\tClient: Tries to send primary to server")
-		for {
-			select {
-			default:
-				_, err = ds2.WriteTo([]byte("Hello primary-world! <3 <3 <3 <3 <3 <3"), ds.LocalAddr())
-				if err != nil {
-					fmt.Println("\tClient: Failed to send primary: " + err.Error())
-					c <- false
-					return
-				}
-				time.Sleep(5 * time.Second)
-			case <-w:
-				fmt.Println("\tClient: Sent primary, quitting.")
-				return
-			}
-		}
-		c <- true
-	}(c, w)
-	buf := make([]byte, 512)
-	fmt.Println("\tServer: ReadFrom() waiting...")
-	n, _, err := ds.ReadFrom(buf)
-	w <- true
-	if err != nil {
-		fmt.Println("\tServer: Failed to ReadFrom(): " + err.Error())
-		t.Fail()
-		return
-	}
-	fmt.Println("\tServer: Received primary: " + string(buf[:n]))
-	//	fmt.Println("\tServer: Senders address was: " + saddr.Base32())
-}
-
-func ExamplePrimaryDatagramSession() {
-	// Creates a new PrimarySession, then creates a Datagram subsession on top of it
-
-	const samBridge = "127.0.0.1:7656"
-
-	earlysam, err := NewSAM(samBridge)
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	defer earlysam.Close()
-	keys, err := earlysam.NewKeys()
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	myself := keys.Addr()
-
-	sam, err := earlysam.NewPrimarySession("PrimaryTunnel", keys, []string{"inbound.length=0", "outbound.length=0", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"})
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	defer sam.Close()
-
-	// See the example Option_* variables.
-	dg, err := sam.NewDatagramSubSession("DGTUN"+RandString(), 0)
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	defer dg.Close()
-	someone, err := earlysam.Lookup("zzz.i2p")
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-
-	dg.WriteTo([]byte("Hello stranger!"), someone)
-	dg.WriteTo([]byte("Hello myself!"), myself)
-
-	buf := make([]byte, 31*1024)
-	n, _, err := dg.ReadFrom(buf)
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	log.Println("Got message: '" + string(buf[:n]) + "'")
-	fmt.Println("Got message: " + string(buf[:n]))
-
-	return
-	// Output:
-	//Got message: Hello myself!
-}
--- a/primary_stream_test.go
+++ b/primary_stream_test.go
@@ -1,308 +0,0 @@
-package sam3
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"strings"
-	"testing"
-	"time"
-)
-
-func Test_PrimaryStreamingDial(t *testing.T) {
-	if testing.Short() {
-		return
-	}
-	fmt.Println("Test_PrimaryStreamingDial")
-	earlysam, err := NewSAM(yoursam)
-	if err != nil {
-		t.Fail()
-		return
-	}
-	defer earlysam.Close()
-	keys, err := earlysam.NewKeys()
-	if err != nil {
-		t.Fail()
-		return
-	}
-
-	sam, err := earlysam.NewPrimarySession("PrimaryTunnel", keys, []string{"inbound.length=0", "outbound.length=0", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"})
-	if err != nil {
-		t.Fail()
-		return
-	}
-	defer sam.Close()
-	fmt.Println("\tBuilding tunnel")
-	ss, err := sam.NewStreamSubSession("primaryStreamTunnel")
-	if err != nil {
-		fmt.Println(err.Error())
-		t.Fail()
-		return
-	}
-	defer ss.Close()
-	fmt.Println("\tNotice: This may fail if your I2P node is not well integrated in the I2P network.")
-	fmt.Println("\tLooking up i2p-projekt.i2p")
-	forumAddr, err := earlysam.Lookup("i2p-projekt.i2p")
-	if err != nil {
-		fmt.Println(err.Error())
-		t.Fail()
-		return
-	}
-	fmt.Println("\tDialing i2p-projekt.i2p(", forumAddr.Base32(), forumAddr.DestHash().Hash(), ")")
-	conn, err := ss.DialI2P(forumAddr)
-	if err != nil {
-		fmt.Println(err.Error())
-		t.Fail()
-		return
-	}
-	defer conn.Close()
-	fmt.Println("\tSending HTTP GET /")
-	if _, err := conn.Write([]byte("GET /\n")); err != nil {
-		fmt.Println(err.Error())
-		t.Fail()
-		return
-	}
-	buf := make([]byte, 4096)
-	n, err := conn.Read(buf)
-	if !strings.Contains(strings.ToLower(string(buf[:n])), "http") && !strings.Contains(strings.ToLower(string(buf[:n])), "html") {
-		fmt.Printf("\tProbably failed to StreamSession.DialI2P(i2p-projekt.i2p)? It replied %d bytes, but nothing that looked like http/html", n)
-	} else {
-		fmt.Println("\tRead HTTP/HTML from i2p-projekt.i2p")
-	}
-}
-
-func Test_PrimaryStreamingServerClient(t *testing.T) {
-	if testing.Short() {
-		return
-	}
-
-	fmt.Println("Test_StreamingServerClient")
-	earlysam, err := NewSAM(yoursam)
-	if err != nil {
-		t.Fail()
-		return
-	}
-	defer earlysam.Close()
-	keys, err := earlysam.NewKeys()
-	if err != nil {
-		t.Fail()
-		return
-	}
-
-	sam, err := earlysam.NewPrimarySession("PrimaryServerClientTunnel", keys, []string{"inbound.length=0", "outbound.length=0", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"})
-	if err != nil {
-		t.Fail()
-		return
-	}
-	defer sam.Close()
-	fmt.Println("\tServer: Creating tunnel")
-	ss, err := sam.NewUniqueStreamSubSession("PrimaryServerClientTunnel")
-	if err != nil {
-		return
-	}
-	defer ss.Close()
-	time.Sleep(time.Second * 10)
-	c, w := make(chan bool), make(chan bool)
-	go func(c, w chan (bool)) {
-		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
-		   }
-		*/
-
-		fmt.Println("\tClient: Creating tunnel")
-		ss2, err := sam.NewStreamSubSession("primaryExampleClientTun")
-		if err != nil {
-			c <- false
-			return
-		}
-		defer ss2.Close()
-		fmt.Println("\tClient: Connecting to server")
-		conn, err := ss2.DialI2P(ss.Addr())
-		if err != nil {
-			c <- false
-			return
-		}
-		fmt.Println("\tClient: Connected to tunnel")
-		defer conn.Close()
-		_, err = conn.Write([]byte("Hello world <3 <3 <3 <3 <3 <3"))
-		if err != nil {
-			c <- false
-			return
-		}
-		c <- true
-	}(c, w)
-	l, err := ss.Listen()
-	if err != nil {
-		fmt.Println("ss.Listen(): " + err.Error())
-		t.Fail()
-		w <- false
-		return
-	}
-	defer l.Close()
-	w <- true
-	fmt.Println("\tServer: Accept()ing on tunnel")
-	conn, err := l.Accept()
-	if err != nil {
-		t.Fail()
-		fmt.Println("Failed to Accept(): " + err.Error())
-		return
-	}
-	defer conn.Close()
-	buf := make([]byte, 512)
-	n, err := conn.Read(buf)
-	fmt.Printf("\tClient exited successfully: %t\n", <-c)
-	fmt.Println("\tServer: received from Client: " + string(buf[:n]))
-}
-
-func ExamplePrimaryStreamSession() {
-	// Creates a new StreamingSession, dials to idk.i2p and gets a SAMConn
-	// which behaves just like a normal net.Conn.
-
-	const samBridge = "127.0.0.1:7656"
-
-	earlysam, err := NewSAM(yoursam)
-	if err != nil {
-		log.Fatal(err.Error())
-		return
-	}
-	defer earlysam.Close()
-	keys, err := earlysam.NewKeys()
-	if err != nil {
-		log.Fatal(err.Error())
-		return
-	}
-
-	sam, err := earlysam.NewPrimarySession("PrimaryStreamSessionTunnel", keys, []string{"inbound.length=0", "outbound.length=0", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"})
-	if err != nil {
-		log.Fatal(err.Error())
-		return
-	}
-	defer sam.Close()
-	conn, err := sam.Dial("tcp", "idk.i2p") //someone.Base32())
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	defer conn.Close()
-	fmt.Println("Sending HTTP GET /")
-	if _, err := conn.Write([]byte("GET /\n")); err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	buf := make([]byte, 4096)
-	n, err := conn.Read(buf)
-	if !strings.Contains(strings.ToLower(string(buf[:n])), "http") && !strings.Contains(strings.ToLower(string(buf[:n])), "html") {
-		fmt.Printf("Probably failed to StreamSession.DialI2P(idk.i2p)? It replied %d bytes, but nothing that looked like http/html", n)
-		log.Printf("Probably failed to StreamSession.DialI2P(idk.i2p)? It replied %d bytes, but nothing that looked like http/html", n)
-	} else {
-		fmt.Println("Read HTTP/HTML from idk.i2p")
-		log.Println("Read HTTP/HTML from idk.i2p")
-	}
-	// Output:
-	//Sending HTTP GET /
-	//Read HTTP/HTML from idk.i2p
-}
-
-func ExamplePrimaryStreamListener() {
-	// One server Accept()ing on a StreamListener, and one client that Dials
-	// through I2P to the server. Server writes "Hello world!" through a SAMConn
-	// (which implements net.Conn) and the client prints the message.
-
-	const samBridge = "127.0.0.1:7656"
-
-	var ss *StreamSession
-	go func() {
-		earlysam, err := NewSAM(yoursam)
-		if err != nil {
-			log.Fatal(err.Error())
-			return
-		}
-		defer earlysam.Close()
-		keys, err := earlysam.NewKeys()
-		if err != nil {
-			log.Fatal(err.Error())
-			return
-		}
-		sam, err := earlysam.NewPrimarySession("PrimaryListenerTunnel", keys, []string{"inbound.length=0", "outbound.length=0", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"})
-		if err != nil {
-			log.Fatal(err.Error())
-			return
-		}
-		defer sam.Close()
-		ss, err = sam.NewStreamSubSession("PrimaryListenerServerTunnel2")
-		if err != nil {
-			fmt.Println(err.Error())
-			return
-		}
-		defer ss.Close()
-		l, err := ss.Listen()
-		if err != nil {
-			fmt.Println(err.Error())
-			return
-		}
-		defer l.Close()
-		//fmt.Println("Serving on primary listener", l.Addr().String())
-		if err := http.Serve(l, &exitHandler{}); err != nil {
-			fmt.Println(err.Error())
-		}
-	}()
-	time.Sleep(time.Second * 10)
-	latesam, err := NewSAM(yoursam)
-	if err != nil {
-		log.Fatal(err.Error())
-		return
-	}
-	defer latesam.Close()
-	keys2, err := latesam.NewKeys()
-	if err != nil {
-		log.Fatal(err.Error())
-		return
-	}
-	sc, err := latesam.NewStreamSession("PrimaryListenerClientTunnel2", keys2, []string{"inbound.length=0", "outbound.length=0", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"})
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	defer sc.Close()
-	client := http.Client{
-		Transport: &http.Transport{
-			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())
-		return
-	}
-	defer resp.Body.Close()
-	r, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-	fmt.Println("Got response: " + string(r))
-
-	// Output:
-	// Got response: Hello world!
-}
-
-type exitHandler struct {
-}
-
-func (e *exitHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	w.Write([]byte("Hello world!"))
-}
--- a/raw.go
+++ b/raw.go
@@ -6,8 +6,10 @@ import (
 	"net"
 	"strconv"
 	"time"
+)

-	"github.com/eyedeekay/i2pkeys"
+import (
+	. "github.com/eyedeekay/sam3/i2pkeys"
 )

 // The RawSession provides no authentication of senders, and there is no sender
@@ -17,24 +19,24 @@ import (
 // that is needed. Raw datagrams may be at most 32 kB in size. There is no
 // overhead of authentication, which is the reason to use this..
 type RawSession struct {
-	samAddr  string          // address to the sam bridge (ipv4:port)
-	id       string          // tunnel name
-	conn     net.Conn        // connection to sam bridge
-	udpconn  *net.UDPConn    // used to deliver datagrams
-	keys     i2pkeys.I2PKeys // i2p destination keys
-	rUDPAddr *net.UDPAddr    // the SAM bridge UDP-port
+	samAddr  string       // address to the sam bridge (ipv4:port)
+	id       string       // tunnel name
+	conn     net.Conn     // connection to sam bridge
+	udpconn  *net.UDPConn // used to deliver datagrams
+	keys     I2PKeys      // i2p destination keys
+	rUDPAddr *net.UDPAddr // the SAM bridge UDP-port
 }

 // Creates a new raw session. udpPort is the UDP port SAM is listening on,
 // and if you set it to zero, it will use SAMs standard UDP port.
-func (s *SAM) NewRawSession(id string, keys i2pkeys.I2PKeys, options []string, udpPort int) (*RawSession, error) {
+func (s *SAM) NewRawSession(id string, keys I2PKeys, options []string, udpPort int) (*RawSession, error) {
 	if udpPort > 65335 || udpPort < 0 {
 		return nil, errors.New("udpPort needs to be in the intervall 0-65335")
 	}
 	if udpPort == 0 {
 		udpPort = 7655
 	}
-	lhost, _, err := SplitHostPort(s.conn.LocalAddr().String())
+	lhost, _, err := net.SplitHostPort(s.Conn.LocalAddr().String())
 	if err != nil {
 		s.Close()
 		return nil, err
@@ -47,7 +49,7 @@ func (s *SAM) NewRawSession(id string, keys i2pkeys.I2PKeys, options []string, u
 	if err != nil {
 		return nil, err
 	}
-	rhost, _, err := SplitHostPort(s.conn.RemoteAddr().String())
+	rhost, _, err := net.SplitHostPort(s.Conn.RemoteAddr().String())
 	if err != nil {
 		s.Close()
 		return nil, err
@@ -85,7 +87,7 @@ func (s *RawSession) Read(b []byte) (n int, err error) {

 // Sends one raw datagram to the destination specified. At the time of writing,
 // maximum size is 32 kilobyte, but this may change in the future.
-func (s *RawSession) WriteTo(b []byte, addr i2pkeys.I2PAddr) (n int, err error) {
+func (s *RawSession) WriteTo(b []byte, addr I2PAddr) (n int, err error) {
 	header := []byte("3.0 " + s.id + " " + addr.String() + "\n")
 	msg := append(header, b...)
 	n, err = s.udpconn.WriteToUDP(msg, s.rUDPAddr)
@@ -103,7 +105,7 @@ func (s *RawSession) Close() error {
 }

 // Returns the local I2P destination of the RawSession.
-func (s *RawSession) LocalAddr() i2pkeys.I2PAddr {
+func (s *RawSession) LocalAddr() I2PAddr {
 	return s.keys.Addr()
 }

--- a/resolver.go
+++ b/resolver.go
@@ -5,8 +5,10 @@ import (
 	"bytes"
 	"errors"
 	"strings"
+)

-	"github.com/eyedeekay/i2pkeys"
+import (
+	. "github.com/eyedeekay/sam3/i2pkeys"
 )

 type SAMResolver struct {
@@ -31,19 +33,19 @@ func NewFullSAMResolver(address string) (*SAMResolver, error) {

 // Performs a lookup, probably this order: 1) routers known addresses, cached
 // addresses, 3) by asking peers in the I2P network.
-func (sam *SAMResolver) Resolve(name string) (i2pkeys.I2PAddr, error) {
-	if _, err := sam.conn.Write([]byte("NAMING LOOKUP NAME=" + name + "\r\n")); err != nil {
+func (sam *SAMResolver) Resolve(name string) (I2PAddr, error) {
+	if _, err := sam.Conn.Write([]byte("NAMING LOOKUP NAME=" + name + "\n")); err != nil {
 		sam.Close()
-		return i2pkeys.I2PAddr(""), err
+		return I2PAddr(""), err
 	}
 	buf := make([]byte, 4096)
-	n, err := sam.conn.Read(buf)
+	n, err := sam.Conn.Read(buf)
 	if err != nil {
 		sam.Close()
-		return i2pkeys.I2PAddr(""), err
+		return I2PAddr(""), err
 	}
 	if n <= 13 || !strings.HasPrefix(string(buf[:n]), "NAMING REPLY ") {
-		return i2pkeys.I2PAddr(""), errors.New("Failed to parse.")
+		return I2PAddr(""), errors.New("Failed to parse.")
 	}
 	s := bufio.NewScanner(bytes.NewReader(buf[13:n]))
 	s.Split(bufio.ScanWords)
@@ -51,22 +53,21 @@ func (sam *SAMResolver) Resolve(name string) (i2pkeys.I2PAddr, error) {
 	errStr := ""
 	for s.Scan() {
 		text := s.Text()
-		//log.Println("SAM3", text)
 		if text == "RESULT=OK" {
 			continue
 		} else if text == "RESULT=INVALID_KEY" {
-			errStr += "Invalid key - resolver."
+			errStr += "Invalid key."
 		} else if text == "RESULT=KEY_NOT_FOUND" {
 			errStr += "Unable to resolve " + name
 		} else if text == "NAME="+name {
 			continue
 		} else if strings.HasPrefix(text, "VALUE=") {
-			return i2pkeys.I2PAddr(text[6:]), nil
+			return I2PAddr(text[6:]), nil
 		} else if strings.HasPrefix(text, "MESSAGE=") {
 			errStr += " " + text[8:]
 		} else {
 			continue
 		}
 	}
-	return i2pkeys.I2PAddr(""), errors.New(errStr)
+	return I2PAddr(""), errors.New(errStr)
 }
--- a/sam3.go
+++ b/sam3.go
@@ -6,24 +6,23 @@ import (
 	"bytes"
 	"errors"
 	"io"
-	"math/rand"
 	"net"
 	"os"
 	"strings"
+)

-	"github.com/eyedeekay/i2pkeys"
-
-	. "github.com/eyedeekay/i2pkeys"
+import (
+	"github.com/eyedeekay/ramp/config"
+	. "github.com/eyedeekay/ramp/emit"
+	. "github.com/eyedeekay/sam3/i2pkeys"
 )

 // Used for controlling I2Ps SAMv3.
 type SAM struct {
-	address  string
-	conn     net.Conn
-	resolver *SAMResolver
+	//address  string
+	Conn     net.Conn
+	Resolver *SAMResolver
 	Config   SAMEmit
-	keys     *i2pkeys.I2PKeys
-	sigType  int
 }

 const (
@@ -35,7 +34,7 @@ const (
 )

 const (
-	Sig_NONE                 = "SIGNATURE_TYPE=EdDSA_SHA512_Ed25519"
+	Sig_NONE                 = ""
 	Sig_DSA_SHA1             = "SIGNATURE_TYPE=DSA_SHA1"
 	Sig_ECDSA_SHA256_P256    = "SIGNATURE_TYPE=ECDSA_SHA256_P256"
 	Sig_ECDSA_SHA384_P384    = "SIGNATURE_TYPE=ECDSA_SHA384_P384"
@@ -43,22 +42,13 @@ const (
 	Sig_EdDSA_SHA512_Ed25519 = "SIGNATURE_TYPE=EdDSA_SHA512_Ed25519"
 )

-var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-
-func RandString() string {
-	n := 4
-	b := make([]rune, n)
-	for i := range b {
-		b[i] = letters[rand.Intn(len(letters))]
-	}
-	return string(b)
-}
-
 // Creates a new controller for the I2P routers SAM bridge.
 func NewSAM(address string) (*SAM, error) {
 	var s SAM
 	// TODO: clean this up
-	conn, err := net.Dial("tcp", address)
+	s.Config.I2PConfig.SetSAMAddress(address)
+    s.Config.SamMax = "3.2"
+	conn, err := net.Dial("tcp", s.Config.I2PConfig.Sam())
 	if err != nil {
 		return nil, err
 	}
@@ -73,10 +63,9 @@ func NewSAM(address string) (*SAM, error) {
 		return nil, err
 	}
 	if strings.Contains(string(buf[:n]), "HELLO REPLY RESULT=OK") {
-		s.Config.I2PConfig.SetSAMAddress(address)
-		s.conn = conn
+		s.Conn = conn
 		//s.Config.I2PConfig.DestinationKeys = nil
-		s.resolver, err = NewSAMResolver(&s)
+		s.Resolver, err = NewSAMResolver(&s)
 		if err != nil {
 			return nil, err
 		}
@@ -91,7 +80,7 @@ func NewSAM(address string) (*SAM, error) {
 	}
 }

-func (sam *SAM) Keys() (k *i2pkeys.I2PKeys) {
+func (sam *SAM) Keys() (k *I2PKeys) {
 	//TODO: copy them?
 	k = &sam.Config.I2PConfig.DestinationKeys
 	return
@@ -99,8 +88,8 @@ func (sam *SAM) Keys() (k *i2pkeys.I2PKeys) {

 // read public/private keys from an io.Reader
 func (sam *SAM) ReadKeys(r io.Reader) (err error) {
-	var keys i2pkeys.I2PKeys
-	keys, err = i2pkeys.LoadKeysIncompat(r)
+	var keys I2PKeys
+	keys, err = LoadKeysIncompat(r)
 	if err == nil {
 		sam.Config.I2PConfig.DestinationKeys = keys
 	}
@@ -108,7 +97,7 @@ func (sam *SAM) ReadKeys(r io.Reader) (err error) {
 }

 // if keyfile fname does not exist
-func (sam *SAM) EnsureKeyfile(fname string) (keys i2pkeys.I2PKeys, err error) {
+func (sam *SAM) EnsureKeyfile(fname string) (keys I2PKeys, err error) {
 	if fname == "" {
 		// transient
 		keys, err = sam.NewKeys()
@@ -127,7 +116,7 @@ func (sam *SAM) EnsureKeyfile(fname string) (keys i2pkeys.I2PKeys, err error) {
 				var f io.WriteCloser
 				f, err = os.OpenFile(fname, os.O_WRONLY|os.O_CREATE, 0600)
 				if err == nil {
-					err = i2pkeys.StoreKeysIncompat(keys, f)
+					err = StoreKeysIncompat(keys, f)
 					f.Close()
 				}
 			}
@@ -136,7 +125,7 @@ func (sam *SAM) EnsureKeyfile(fname string) (keys i2pkeys.I2PKeys, err error) {
 			var f *os.File
 			f, err = os.Open(fname)
 			if err == nil {
-				keys, err = i2pkeys.LoadKeysIncompat(f)
+				keys, err = LoadKeysIncompat(f)
 				if err == nil {
 					sam.Config.I2PConfig.DestinationKeys = keys
 				}
@@ -149,18 +138,18 @@ func (sam *SAM) EnsureKeyfile(fname string) (keys i2pkeys.I2PKeys, err error) {
 // Creates the I2P-equivalent of an IP address, that is unique and only the one
 // who has the private keys can send messages from. The public keys are the I2P
 // desination (the address) that anyone can send messages to.
-func (sam *SAM) NewKeys(sigType ...string) (i2pkeys.I2PKeys, error) {
+func (sam *SAM) NewKeys(sigType ...string) (I2PKeys, error) {
 	sigtmp := ""
 	if len(sigType) > 0 {
 		sigtmp = sigType[0]
 	}
-	if _, err := sam.conn.Write([]byte("DEST GENERATE " + sigtmp + "\n")); err != nil {
-		return i2pkeys.I2PKeys{}, err
+	if _, err := sam.Conn.Write([]byte("DEST GENERATE " + sigtmp + "\n")); err != nil {
+		return I2PKeys{}, err
 	}
 	buf := make([]byte, 8192)
-	n, err := sam.conn.Read(buf)
+	n, err := sam.Conn.Read(buf)
 	if err != nil {
-		return i2pkeys.I2PKeys{}, err
+		return I2PKeys{}, err
 	}
 	s := bufio.NewScanner(bytes.NewReader(buf[:n]))
 	s.Split(bufio.ScanWords)
@@ -177,7 +166,7 @@ func (sam *SAM) NewKeys(sigType ...string) (i2pkeys.I2PKeys, error) {
 		} else if strings.HasPrefix(text, "PRIV=") {
 			priv = text[5:]
 		} else {
-			return i2pkeys.I2PKeys{}, errors.New("Failed to parse keys.")
+			return I2PKeys{}, errors.New("Failed to parse keys.")
 		}
 	}
 	return NewKeys(I2PAddr(pub), priv), nil
@@ -185,8 +174,8 @@ func (sam *SAM) NewKeys(sigType ...string) (i2pkeys.I2PKeys, error) {

 // Performs a lookup, probably this order: 1) routers known addresses, cached
 // addresses, 3) by asking peers in the I2P network.
-func (sam *SAM) Lookup(name string) (i2pkeys.I2PAddr, error) {
-	return sam.resolver.Resolve(name)
+func (sam *SAM) Lookup(name string) (I2PAddr, error) {
+	return sam.Resolver.Resolve(name)
 }

 // Creates a new session with the style of either "STREAM", "DATAGRAM" or "RAW",
@@ -194,36 +183,25 @@ func (sam *SAM) Lookup(name string) (i2pkeys.I2PAddr, error) {
 // I2CP/streaminglib-options as specified. Extra arguments can be specified by
 // setting extra to something else than []string{}.
 // This sam3 instance is now a session
-func (sam *SAM) newGenericSession(style, id string, keys i2pkeys.I2PKeys, options []string, extras []string) (net.Conn, error) {
+func (sam *SAM) newGenericSession(style, id string, keys I2PKeys, options []string, extras []string) (net.Conn, error) {
 	return sam.newGenericSessionWithSignature(style, id, keys, Sig_NONE, options, extras)
 }

-func (sam *SAM) newGenericSessionWithSignature(style, id string, keys i2pkeys.I2PKeys, sigType string, options []string, extras []string) (net.Conn, error) {
-	return sam.newGenericSessionWithSignatureAndPorts(style, id, "0", "0", keys, sigType, options, extras)
-}
-
 // Creates a new session with the style of either "STREAM", "DATAGRAM" or "RAW",
 // for a new I2P tunnel with name id, using the cypher keys specified, with the
 // I2CP/streaminglib-options as specified. Extra arguments can be specified by
 // setting extra to something else than []string{}.
 // This sam3 instance is now a session
-func (sam *SAM) newGenericSessionWithSignatureAndPorts(style, id, from, to string, keys i2pkeys.I2PKeys, sigType string, options []string, extras []string) (net.Conn, error) {
+func (sam *SAM) newGenericSessionWithSignature(style, id string, keys I2PKeys, sigType string, options []string, extras []string) (net.Conn, error) {
+	conf, _ := i2pconfig.ConstructEqualsConfig(append(options))
+	sam.Config.I2PConfig = *conf
+	sam.Config.SigType = sigType
+	sam.Config.Style = style
+	sam.Config.DestinationKeys = keys
+	sam.Config.TunName = id

-	optStr := ""
-	for _, opt := range options {
-		optStr += opt + " "
-	}
-
-	conn := sam.conn
-	fp := ""
-	tp := ""
-	if from != "0" {
-		fp = " FROM_PORT=" + from
-	}
-	if to != "0" {
-		tp = " TO_PORT=" + to
-	}
-	scmsg := []byte("SESSION CREATE STYLE=" + style + fp + tp + " ID=" + id + " DESTINATION=" + keys.String() + " " + optStr + strings.Join(extras, " ") + "\n")
+	conn := sam.Conn
+	scmsg := []byte("SESSION CREATE " + sam.Config.SessionStyle() +  sam.Config.ID() + sam.Config.DestinationKey() + sam.Config.SignatureType() + sam.Config.FromPort() + sam.Config.ToPort() + sam.Config.OptStr() + strings.Join(extras, " ") + "\n")
 	for m, i := 0, 0; m != len(scmsg); i++ {
 		if i == 15 {
 			conn.Close()
@@ -257,7 +235,7 @@ func (sam *SAM) newGenericSessionWithSignatureAndPorts(style, id, from, to strin
 		return nil, errors.New("Duplicate destination")
 	} else if text == session_INVALID_KEY {
 		conn.Close()
-		return nil, errors.New("Invalid key - SAM session")
+		return nil, errors.New("Invalid key")
 	} else if strings.HasPrefix(text, session_I2P_ERROR) {
 		conn.Close()
 		return nil, errors.New("I2P error " + text[len(session_I2P_ERROR):])
@@ -269,5 +247,5 @@ func (sam *SAM) newGenericSessionWithSignatureAndPorts(style, id, from, to strin

 // close this sam session
 func (sam *SAM) Close() error {
-	return sam.conn.Close()
+	return sam.Conn.Close()
 }
--- a/sam3_test.go
+++ b/sam3_test.go
@@ -1,3 +1,5 @@
+// +build nettest
+
 package sam3

 import (
--- a/showhider.css
+++ b/showhider.css
@@ -1,10 +0,0 @@
-/* edgar showhider CSS file */
-#show {display:none; }
-#hide {display:block; }
-#show:target {display: block; }
-#hide:target {display: none; }
-
-#shownav {display:none; }
-#hidenav {display:block; }
-#shownav:target {display: block; }
-#hidenav:target {display: none; }
--- a/stream.go
+++ b/stream.go
@@ -6,19 +6,23 @@ import (
 	"context"
 	"errors"
 	"io"
+	"log"
 	"net"
+	"strconv"
 	"strings"
 	"time"
+)

-	"github.com/eyedeekay/i2pkeys"
+import (
+	. "github.com/eyedeekay/sam3/i2pkeys"
 )

 // Represents a streaming session.
 type StreamSession struct {
-	samAddr  string          // address to the sam bridge (ipv4:port)
-	id       string          // tunnel name
-	conn     net.Conn        // connection to sam
-	keys     i2pkeys.I2PKeys // i2p destination keys
+	samAddr  string   // address to the sam bridge (ipv4:port)
+	id       string   // tunnel name
+	conn     net.Conn // connection to sam
+	keys     I2PKeys  // i2p destination keys
 	Timeout  time.Duration
 	Deadline time.Time
 	sigType  string
@@ -26,18 +30,6 @@ type StreamSession struct {
 	to       string
 }

-func (s *StreamSession) SetDeadline(t time.Time) error {
-	return s.conn.SetDeadline(t)
-}
-
-func (s *StreamSession) SetReadDeadline(t time.Time) error {
-	return s.conn.SetReadDeadline(t)
-}
-
-func (s *StreamSession) SetWriteDeadline(t time.Time) error {
-	return s.conn.SetWriteDeadline(t)
-}
-
 func (ss *StreamSession) From() string {
 	return ss.from
 }
@@ -60,22 +52,18 @@ func (ss *StreamSession) Close() error {
 }

 // Returns the I2P destination (the address) of the stream session
-func (ss *StreamSession) Addr() i2pkeys.I2PAddr {
-	return ss.keys.Addr()
-}
-
-func (ss *StreamSession) LocalAddr() net.Addr {
+func (ss *StreamSession) Addr() I2PAddr {
 	return ss.keys.Addr()
 }

 // Returns the keys associated with the stream session
-func (ss *StreamSession) Keys() i2pkeys.I2PKeys {
+func (ss *StreamSession) Keys() I2PKeys {
 	return ss.keys
 }

 // Creates a new StreamSession with the I2CP- and streaminglib options as
 // specified. See the I2P documentation for a full list of options.
-func (sam *SAM) NewStreamSession(id string, keys i2pkeys.I2PKeys, options []string) (*StreamSession, error) {
+func (sam *SAM) NewStreamSession(id string, keys I2PKeys, options []string) (*StreamSession, error) {
 	conn, err := sam.newGenericSession("STREAM", id, keys, options, []string{})
 	if err != nil {
 		return nil, err
@@ -85,7 +73,7 @@ func (sam *SAM) NewStreamSession(id string, keys i2pkeys.I2PKeys, options []stri

 // Creates a new StreamSession with the I2CP- and streaminglib options as
 // specified. See the I2P documentation for a full list of options.
-func (sam *SAM) NewStreamSessionWithSignature(id string, keys i2pkeys.I2PKeys, options []string, sigType string) (*StreamSession, error) {
+func (sam *SAM) NewStreamSessionWithSignature(id string, keys I2PKeys, options []string, sigType string) (*StreamSession, error) {
 	conn, err := sam.newGenericSessionWithSignature("STREAM", id, keys, sigType, options, []string{})
 	if err != nil {
 		return nil, err
@@ -95,23 +83,23 @@ func (sam *SAM) NewStreamSessionWithSignature(id string, keys i2pkeys.I2PKeys, o

 // Creates a new StreamSession with the I2CP- and streaminglib options as
 // specified. See the I2P documentation for a full list of options.
-func (sam *SAM) NewStreamSessionWithSignatureAndPorts(id, from, to string, keys i2pkeys.I2PKeys, options []string, sigType string) (*StreamSession, error) {
-	conn, err := sam.newGenericSessionWithSignatureAndPorts("STREAM", id, from, to, keys, sigType, options, []string{})
+func (sam *SAM) NewStreamSessionWithSignatureAndPorts(id string, keys I2PKeys, options []string, sigType string) (*StreamSession, error) {
+	conn, err := sam.newGenericSessionWithSignature("STREAM", id, keys, sigType, options, []string{})
 	if err != nil {
 		return nil, err
 	}
-	return &StreamSession{sam.Config.I2PConfig.Sam(), id, conn, keys, time.Duration(600 * time.Second), time.Now(), sigType, from, to}, nil
+	return &StreamSession{sam.Config.I2PConfig.Sam(), id, conn, keys, time.Duration(600 * time.Second), time.Now(), sigType, sam.Config.Fromport, sam.Config.Toport}, nil
 }

 // lookup name, convienence function
-func (s *StreamSession) Lookup(name string) (i2pkeys.I2PAddr, error) {
+func (s *StreamSession) Lookup(name string) (I2PAddr, error) {
 	sam, err := NewSAM(s.samAddr)
 	if err == nil {
 		addr, err := sam.Lookup(name)
-		defer sam.Close()
+		sam.Close()
 		return addr, err
 	}
-	return i2pkeys.I2PAddr(""), err
+	return I2PAddr(""), err
 }

 // context-aware dialer, eventually...
@@ -133,7 +121,7 @@ func (s *StreamSession) DialContextI2P(ctx context.Context, n, addr string) (*SA
 		}
 	}

-	i2paddr, err := i2pkeys.NewI2PAddrFromString(addr)
+	i2paddr, err := NewI2PAddrFromString(addr)
 	if err != nil {
 		return nil, err
 	}
@@ -161,7 +149,6 @@ func minNonzeroTime(a, b time.Time) time.Time {
 //   - now+Timeout
 //   - d.Deadline
 //   - the context's deadline
-//
 // Or zero, if none of Timeout, Deadline, or context's deadline is set.
 func (s *StreamSession) deadline(ctx context.Context, now time.Time) (earliest time.Time) {
 	if s.Timeout != 0 { // including negative, for historical reasons
@@ -176,21 +163,17 @@ func (s *StreamSession) deadline(ctx context.Context, now time.Time) (earliest t
 // implement net.Dialer
 func (s *StreamSession) Dial(n, addr string) (c net.Conn, err error) {

-	var i2paddr i2pkeys.I2PAddr
+	var i2paddr I2PAddr
 	var host string
-	host, _, err = SplitHostPort(addr)
-	//log.Println("Dialing:", host)
-	if err = IgnorePortError(err); err == nil {
+	host, _, err = net.SplitHostPort(addr)
+	if err == nil {
 		// check for name
 		if strings.HasSuffix(host, ".b32.i2p") || strings.HasSuffix(host, ".i2p") {
 			// name lookup
 			i2paddr, err = s.Lookup(host)
-			//log.Println("Lookup:", i2paddr, err)
 		} else {
 			// probably a destination
-			i2paddr, err = i2pkeys.NewI2PAddrFromBytes([]byte(host))
-			//i2paddr = i2pkeys.I2PAddr(host)
-			//log.Println("Destination:", i2paddr, err)
+			i2paddr = I2PAddr(host)
 		}
 		if err == nil {
 			return s.DialI2P(i2paddr)
@@ -200,13 +183,14 @@ func (s *StreamSession) Dial(n, addr string) (c net.Conn, err error) {
 }

 // Dials to an I2P destination and returns a SAMConn, which implements a net.Conn.
-func (s *StreamSession) DialI2P(addr i2pkeys.I2PAddr) (*SAMConn, error) {
+func (s *StreamSession) DialI2P(addr I2PAddr) (*SAMConn, error) {
 	sam, err := NewSAM(s.samAddr)
 	if err != nil {
 		return nil, err
 	}
-	conn := sam.conn
-	_, err = conn.Write([]byte("STREAM CONNECT ID=" + s.id + " FROM_PORT=" + s.from + " TO_PORT=" + s.to + " DESTINATION=" + addr.Base64() + " SILENT=false\n"))
+	conn := sam.Conn
+    // + sam.Config.ID()
+	_, err = conn.Write([]byte("STREAM CONNECT ID=" + s.id + sam.Config.FromPort() + sam.Config.ToPort() + " DESTINATION=" + addr.Base64() + " SILENT=false\n"))
 	if err != nil {
 		conn.Close()
 		return nil, err
@@ -235,7 +219,7 @@ func (s *StreamSession) DialI2P(addr i2pkeys.I2PAddr) (*SAMConn, error) {
 			return nil, errors.New("I2P internal error")
 		case "RESULT=INVALID_KEY":
 			conn.Close()
-			return nil, errors.New("Invalid key - Stream Session")
+			return nil, errors.New("Invalid key")
 		case "RESULT=INVALID_ID":
 			conn.Close()
 			return nil, errors.New("Invalid tunnel ID")
@@ -258,3 +242,106 @@ func (s *StreamSession) Listen() (*StreamListener, error) {
 		laddr:   s.keys.Addr(),
 	}, nil
 }
+
+type StreamListener struct {
+	// parent stream session
+	session *StreamSession
+	// our session id
+	id string
+	// our local address for this sam socket
+	laddr I2PAddr
+}
+
+func (l *StreamListener) From() string {
+	return l.session.from
+}
+
+func (l *StreamListener) To() string {
+	return l.session.to
+}
+
+// get our address
+// implements net.Listener
+func (l *StreamListener) Addr() net.Addr {
+	return l.laddr
+}
+
+// implements net.Listener
+func (l *StreamListener) Close() error {
+	return l.session.Close()
+}
+
+// implements net.Listener
+func (l *StreamListener) Accept() (net.Conn, error) {
+	return l.AcceptI2P()
+}
+
+func ExtractPairString(input, value string) string {
+	parts := strings.Split(input, " ")
+	for _, part := range parts {
+		if strings.HasPrefix(part, value) {
+			kv := strings.SplitN(input, "=", 2)
+			if len(kv) == 2 {
+				return kv[1]
+			}
+		}
+	}
+	return ""
+}
+
+func ExtractPairInt(input, value string) int {
+	rv, err := strconv.Atoi(ExtractPairString(input, value))
+	if err != nil {
+		return 0
+	}
+	return rv
+}
+
+func ExtractDest(input string) string {
+	return strings.Split(input, " ")[0]
+}
+
+// accept a new inbound connection
+func (l *StreamListener) AcceptI2P() (*SAMConn, error) {
+	s, err := NewSAM(l.session.samAddr)
+	if err == nil {
+		// we connected to sam
+		// send accept() command
+		_, err = io.WriteString(s.Conn, "STREAM ACCEPT ID="+l.id+" SILENT=false\n")
+		// read reply
+		rd := bufio.NewReader(s.Conn)
+		// read first line
+		line, err := rd.ReadString(10)
+		log.Println(line)
+		if err == nil {
+			if strings.HasPrefix(line, "STREAM STATUS RESULT=OK") {
+				// we gud read destination line
+				destline, err := rd.ReadString(10)
+				log.Println(destline)
+				if err == nil {
+					dest := ExtractDest(destline)
+					l.session.from = ExtractPairString(destline, "FROM_PORT")
+					l.session.to = ExtractPairString(destline, "TO_PORT")
+					// return wrapped connection
+					dest = strings.Trim(dest, "\n")
+					return &SAMConn{
+						laddr: l.laddr,
+						raddr: I2PAddr(dest),
+						conn:  s.Conn,
+					}, nil
+				} else {
+					s.Close()
+					return nil, err
+				}
+			} else {
+				s.Close()
+				return nil, errors.New("invalid sam line: " + line)
+			}
+		} else {
+			s.Close()
+			return nil, err
+		}
+	}
+	s.Close()
+	return nil, err
+}
--- a/streamListener.go
+++ b/streamListener.go
@@ -1,115 +0,0 @@
-package sam3
-
-import (
-	"bufio"
-	"errors"
-	"io"
-	"log"
-	"net"
-	"strconv"
-	"strings"
-
-	"github.com/eyedeekay/i2pkeys"
-)
-
-type StreamListener struct {
-	// parent stream session
-	session *StreamSession
-	// our session id
-	id string
-	// our local address for this sam socket
-	laddr i2pkeys.I2PAddr
-}
-
-func (l *StreamListener) From() string {
-	return l.session.from
-}
-
-func (l *StreamListener) To() string {
-	return l.session.to
-}
-
-// get our address
-// implements net.Listener
-func (l *StreamListener) Addr() net.Addr {
-	return l.laddr
-}
-
-// implements net.Listener
-func (l *StreamListener) Close() error {
-	return l.session.Close()
-}
-
-// implements net.Listener
-func (l *StreamListener) Accept() (net.Conn, error) {
-	return l.AcceptI2P()
-}
-
-func ExtractPairString(input, value string) string {
-	parts := strings.Split(input, " ")
-	for _, part := range parts {
-		if strings.HasPrefix(part, value) {
-			kv := strings.SplitN(input, "=", 2)
-			if len(kv) == 2 {
-				return kv[1]
-			}
-		}
-	}
-	return ""
-}
-
-func ExtractPairInt(input, value string) int {
-	rv, err := strconv.Atoi(ExtractPairString(input, value))
-	if err != nil {
-		return 0
-	}
-	return rv
-}
-
-func ExtractDest(input string) string {
-	return strings.Split(input, " ")[0]
-}
-
-// accept a new inbound connection
-func (l *StreamListener) AcceptI2P() (*SAMConn, error) {
-	s, err := NewSAM(l.session.samAddr)
-	if err == nil {
-		// we connected to sam
-		// send accept() command
-		_, err = io.WriteString(s.conn, "STREAM ACCEPT ID="+l.id+" SILENT=false\n")
-		// read reply
-		rd := bufio.NewReader(s.conn)
-		// read first line
-		line, err := rd.ReadString(10)
-		log.Println(line)
-		if err == nil {
-			if strings.HasPrefix(line, "STREAM STATUS RESULT=OK") {
-				// we gud read destination line
-				destline, err := rd.ReadString(10)
-				if err == nil {
-					dest := ExtractDest(destline)
-					l.session.from = ExtractPairString(destline, "FROM_PORT")
-					l.session.to = ExtractPairString(destline, "TO_PORT")
-					// return wrapped connection
-					dest = strings.Trim(dest, "\n")
-					return &SAMConn{
-						laddr: l.laddr,
-						raddr: i2pkeys.I2PAddr(dest),
-						conn:  s.conn,
-					}, nil
-				} else {
-					s.Close()
-					return nil, err
-				}
-			} else {
-				s.Close()
-				return nil, errors.New("invalid sam line: " + line)
-			}
-		} else {
-			s.Close()
-			return nil, err
-		}
-	}
-	s.Close()
-	return nil, err
-}
--- a/stream_test.go
+++ b/stream_test.go
@@ -1,12 +1,15 @@
+// +build nettest
+
 package sam3

 import (
 	"fmt"
-	"log"
 	"strings"
 	"testing"
+)

-	"github.com/eyedeekay/i2pkeys"
+import (
+	. "github.com/eyedeekay/sam3/i2pkeys"
 )

 func Test_StreamingDial(t *testing.T) {
@@ -28,7 +31,7 @@ func Test_StreamingDial(t *testing.T) {
 		return
 	}
 	fmt.Println("\tBuilding tunnel")
-	ss, err := sam.NewStreamSession("streamTun", keys, []string{"inbound.length=1", "outbound.length=1", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"})
+	ss, err := sam.NewStreamSession("streamTun", keys, []string{"inbound.length=0", "outbound.length=0", "inbound.lengthVariance=0", "outbound.lengthVariance=0", "inbound.quantity=1", "outbound.quantity=1"})
 	if err != nil {
 		fmt.Println(err.Error())
 		t.Fail()
@@ -42,7 +45,7 @@ func Test_StreamingDial(t *testing.T) {
 		t.Fail()
 		return
 	}
-	fmt.Println("\tDialing i2p-projekt.i2p(", forumAddr.Base32(), forumAddr.DestHash().Hash(), ")")
+	fmt.Println("\tDialing i2p-projekt.i2p")
 	conn, err := ss.DialI2P(forumAddr)
 	if err != nil {
 		fmt.Println(err.Error())
@@ -148,7 +151,7 @@ func Test_StreamingServerClient(t *testing.T) {
 }

 func ExampleStreamSession() {
-	// Creates a new StreamingSession, dials to idk.i2p and gets a SAMConn
+	// Creates a new StreamingSession, dials to zzz.i2p and gets a SAMConn
 	// which behaves just like a normal net.Conn.

 	const samBridge = "127.0.0.1:7656"
@@ -170,7 +173,7 @@ func ExampleStreamSession() {
 		fmt.Println(err.Error())
 		return
 	}
-	someone, err := sam.Lookup("idk.i2p")
+	someone, err := sam.Lookup("zzz.i2p")
 	if err != nil {
 		fmt.Println(err.Error())
 		return
@@ -190,17 +193,15 @@ func ExampleStreamSession() {
 	buf := make([]byte, 4096)
 	n, err := conn.Read(buf)
 	if !strings.Contains(strings.ToLower(string(buf[:n])), "http") && !strings.Contains(strings.ToLower(string(buf[:n])), "html") {
-		fmt.Printf("Probably failed to StreamSession.DialI2P(idk.i2p)? It replied %d bytes, but nothing that looked like http/html", n)
-		log.Printf("Probably failed to StreamSession.DialI2P(idk.i2p)? It replied %d bytes, but nothing that looked like http/html", n)
+		fmt.Printf("Probably failed to StreamSession.DialI2P(zzz.i2p)? It replied %d bytes, but nothing that looked like http/html", n)
 	} else {
-		fmt.Println("Read HTTP/HTML from idk.i2p")
-		log.Println("Read HTTP/HTML from idk.i2p")
+		fmt.Println("Read HTTP/HTML from zzz.i2p")
 	}
 	return

 	// Output:
 	//Sending HTTP GET /
-	//Read HTTP/HTML from idk.i2p
+	//Read HTTP/HTML from zzz.i2p
 }

 func ExampleStreamListener() {
@@ -225,7 +226,7 @@ func ExampleStreamListener() {
 	quit := make(chan bool)

 	// Client connecting to the server
-	go func(server i2pkeys.I2PAddr) {
+	go func(server I2PAddr) {
 		csam, err := NewSAM(samBridge)
 		if err != nil {
 			fmt.Println(err.Error())
--- a/style.css
+++ b/style.css
@@ -1,157 +0,0 @@
-/* edgar default CSS file */
-
-body {
-    font-family: "Roboto";
-    font-family: monospace;
-    text-align: justify;
-    background-color: #373636;
-    color: whitesmoke;
-    font-size: 1.15em;
-}
-
-ul {
-    width: 55%;
-    display: block;
-}
-
-ol {
-    width: 55%;
-    display: block;
-}
-
-li {
-    margin-top: 1%;
-}
-
-p {
-    max-width: 90%;
-    margin-top: 1%;
-    margin-left: 3%;
-    margin-right: 3%;
-}
-
-img {
-    float: left;
-    top: 5%;
-    left: 5%;
-    max-width: 60%;
-    display: inline;
-}
-
-.inline {
-    display: inline;
-}
-
-.link-button:focus {
-    outline: none;
-}
-
-.link-button:active {
-    color: red;
-}
-
-code {
-    font-family: monospace;
-    border-radius: 5%;
-    padding: 1%;
-    border-color: darkgray;
-    font-size: .9em;
-}
-
-a {
-    color: #C6D9FE;
-    padding: 1%;
-}
-
-ul li {
-    color: #C6D9FE;
-}
-
-iframe {
-    background: aliceblue;
-    border-radius: 15%;
-    margin: 2%;
-}
-
-.container {
-    width: 36vw;
-    height: 64vh;
-    display: inline-block;
-    margin: 0;
-    padding: 0;
-}
-
-.editor-toolbar a {
-    display: inline-block;
-    text-align: center;
-    text-decoration: none !important;
-    color: whitesmoke !important;
-}
-
-#feed {
-    width: 60vw;
-    height: unset !important;
-    margin: 0;
-    padding: 0;
-    float: right;
-    background-color: #373636;
-    color: whitesmoke;
-    border: #C6D9FE solid 1px;
-}
-
-.thread-post,
-.thread {
-    color: whitesmoke !important;
-    background-color: #373636;
-    border: 1px solid darkgray;
-    font-size: inherit;
-    padding-top: 1%;
-    padding-bottom: 1%;
-}
-
-.thread-post {
-    margin-left: 4%;
-}
-
-input {
-    text-align: center;
-    color: whitesmoke !important;
-    background-color: #373636;
-    border: 1px solid darkgray;
-    font: normal normal normal 14px/1 FontAwesome;
-    font-size: inherit;
-    padding-top: 1%;
-    padding-bottom: 1%;
-}
-
-.thread-hash {
-    text-align: right;
-    color: whitesmoke !important;
-    background-color: #373636;
-    border: 1px solid darkgray;
-    font-size: inherit;
-    padding-top: 1%;
-    padding-bottom: 1%;
-}
-
-.post-body {
-    text-align: left;
-    color: whitesmoke !important;
-    font-size: inherit;
-    padding-top: 1%;
-    padding-bottom: 1%;
-}
-#show {display:none; }
-#hide {display:block; }
-#show:target {display: block; }
-#hide:target {display: none; }
-
-#shownav {display:none; }
-#hidenav {display:block; }
-#shownav:target {display: block; }
-#hidenav:target {display: none; }
-
-#navbar {
-	float: right;
-	width: 10%;
-}
--- a/suggestedOptions.go
+++ b/suggestedOptions.go
@@ -1,11 +1,5 @@
 package sam3

-import (
-	"net"
-	"net/http"
-	"os"
-)
-
 // Examples and suggestions for options when creating sessions.
 var (
 	// Suitable options if you are shuffling A LOT of traffic. If unused, this
@@ -16,30 +10,17 @@ var (
 		"inbound.quantity=6", "outbound.quantity=6"}

 	// Suitable for shuffling a lot of traffic.
-	Options_Large = []string{"inbound.length=3", "outbound.length=3",
+	Options_Fat = []string{"inbound.length=3", "outbound.length=3",
 		"inbound.lengthVariance=1", "outbound.lengthVariance=1",
 		"inbound.backupQuantity=1", "outbound.backupQuantity=1",
 		"inbound.quantity=4", "outbound.quantity=4"}

-	// Suitable for shuffling a lot of traffic quickly with minimum
-	// anonymity. Uses 1 hop and multiple tunnels.
-	Options_Wide = []string{"inbound.length=1", "outbound.length=1",
-		"inbound.lengthVariance=1", "outbound.lengthVariance=1",
-		"inbound.backupQuantity=2", "outbound.backupQuantity=2",
-		"inbound.quantity=3", "outbound.quantity=3"}
-
 	// Suitable for shuffling medium amounts of traffic.
 	Options_Medium = []string{"inbound.length=3", "outbound.length=3",
 		"inbound.lengthVariance=1", "outbound.lengthVariance=1",
 		"inbound.backupQuantity=0", "outbound.backupQuantity=0",
 		"inbound.quantity=2", "outbound.quantity=2"}

-	// Sensible defaults for most people
-	Options_Default = []string{"inbound.length=3", "outbound.length=3",
-		"inbound.lengthVariance=0", "outbound.lengthVariance=0",
-		"inbound.backupQuantity=1", "outbound.backupQuantity=1",
-		"inbound.quantity=1", "outbound.quantity=1"}
-
 	// Suitable only for small dataflows, and very short lasting connections:
 	// You only have one tunnel in each direction, so if any of the nodes
 	// through which any of your two tunnels pass through go offline, there will
@@ -57,51 +38,3 @@ var (
 		"inbound.backupQuantity=0", "outbound.backupQuantity=0",
 		"inbound.quantity=2", "outbound.quantity=2"}
 )
-
-func PrimarySessionString() string {
-	_, err := http.Get("http://127.0.0.1:7070")
-	if err != nil {
-		_, err := http.Get("http://127.0.0.1:7657")
-		if err != nil {
-			return "MASTER"
-		}
-		// at this point we're probably running on Java I2P and thus probably
-		// have a PRIMARY session. Just to be sure, try to make one, check
-		// for errors, then immediately close it.
-		testSam, err := NewSAM(SAMDefaultAddr(""))
-		if err != nil {
-			return "MASTER"
-		}
-		newKeys, err := testSam.NewKeys()
-		if err != nil {
-			return "MASTER"
-		}
-		primarySession, err := testSam.newPrimarySession("PRIMARY", "primaryTestTunnel", newKeys, Options_Small)
-		if err != nil {
-			return "MASTER"
-		}
-		primarySession.Close()
-		return "PRIMARY"
-	}
-	return "MASTER"
-}
-
-var PrimarySessionSwitch string = PrimarySessionString()
-
-func getEnv(key, fallback string) string {
-	value, ok := os.LookupEnv(key)
-	if !ok {
-		return fallback
-	}
-	return value
-}
-
-var SAM_HOST = getEnv("sam_host", "127.0.0.1")
-var SAM_PORT = getEnv("sam_port", "7656")
-
-func SAMDefaultAddr(fallforward string) string {
-	if fallforward == "" {
-		return net.JoinHostPort(SAM_HOST, SAM_PORT)
-	}
-	return fallforward
-}
Author	SHA1	Message	Date
idk	6026a5bc5f	tolerate FROM_PORT and TO_PORT on datagrams	2019-04-29 17:04:13 -04:00
idk	15b139ea53	go fmt	2019-04-29 16:17:24 -04:00
idk	cbcc989bf6	use more retainable configs	2019-04-29 16:16:24 -04:00
idk	9e6b5e1031	further use of ramp	2019-04-29 11:47:38 -04:00
idk	cfcbc666ad	try and reduce some complexity with ramp	2019-04-29 11:10:25 -04:00
idk	d4bff7e8c4	forgot to add moved i2pkeys dir	2019-04-20 14:53:50 -04:00
idk	f34c6f2619	export Conn and Resolver	2019-04-11 18:40:05 -04:00
				`@@ -1 +0,0 @@`
				`golang-github-eyedeekay-sam3_0.3.2.32_source.buildinfo devel optional`