Make most packets to avoid confusion

_dht/chord/chord.go

@@ -9,8 +9,8 @@ import (
 	"github.com/armon/go-chord"
 
 	"github.com/telehash/gogotelehash/e3x"
-	"github.com/telehash/gogotelehash/hashname"
-	"github.com/telehash/gogotelehash/lob"
+	"github.com/telehash/gogotelehash/internal/hashname"
+	"github.com/telehash/gogotelehash/internal/lob"
 	"github.com/telehash/gogotelehash/modules/mesh"
 )
 

_dht/chord/stream.go

@@ -5,7 +5,7 @@ import (
 	"io"
 
 	"github.com/telehash/gogotelehash/e3x"
-	"github.com/telehash/gogotelehash/lob"
+	"github.com/telehash/gogotelehash/internal/lob"
 )
 
 type stream struct {

_dht/kademlia/kademlia.go

@@ -1,8 +1,8 @@
 package kademlia
 
 import (
-	"github.com/telehash/gogotelehash/hashname"
-	"github.com/telehash/gogotelehash/lob"
+	"github.com/telehash/gogotelehash/internal/hashname"
+	"github.com/telehash/gogotelehash/internal/lob"
 	"sync"
 	"time"
 

api.go

@@ -1,17 +1,17 @@
-package gogotelehash
+package telehash
 
 import (
 	"encoding/json"
 	"net"
 	"time"
 
 	"github.com/telehash/gogotelehash/e3x"
-	"github.com/telehash/gogotelehash/hashname"
-	"github.com/telehash/gogotelehash/lob"
+	"github.com/telehash/gogotelehash/internal/hashname"
+	"github.com/telehash/gogotelehash/internal/lob"
 	"github.com/telehash/gogotelehash/transports"
 
-	// "github.com/telehash/gogotelehash/modules/bridge"
-	"github.com/telehash/gogotelehash/modules/paths"
+	"github.com/telehash/gogotelehash/internal/modules/bridge"
+	"github.com/telehash/gogotelehash/internal/modules/paths"
 )
 
 type (
@@ -26,20 +26,16 @@ type (
 	Packet         lob.Packet
 )
 
-// func Bridge() EndpointOption {
-// 	return EndpointOption(bridge.Module())
-// }
-
-func Paths() EndpointOption {
-	return EndpointOption(paths.Module())
-}
-
 func Transport(config transports.Config) EndpointOption {
 	return EndpointOption(e3x.Transport(config))
 }
 
 func Open(options ...EndpointOption) (*Endpoint, error) {
-	innerOptions := make([]e3x.EndpointOption, len(options))
+	innerOptions := make([]e3x.EndpointOption, len(options)+10)
+
+	innerOptions = append(innerOptions, paths.Module())
+	innerOptions = append(innerOptions, bridge.Module(bridge.Config{}))
+
 	for i, option := range options {
 		innerOptions[i] = e3x.EndpointOption(option)
 	}
@@ -196,3 +192,7 @@ func (i *Identity) Identify(e *e3x.Endpoint) (*e3x.Identity, error) {
 func (p *Packet) Header() *lob.Header {
 	return (*lob.Packet)(p).Header()
 }
+
+func (p *Packet) Free() {
+	(*lob.Packet)(p).Free()
+}

e3x/channel.go

@@ -11,9 +11,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/telehash/gogotelehash/hashname"
+	"github.com/telehash/gogotelehash/internal/hashname"
+	"github.com/telehash/gogotelehash/internal/lob"
 	"github.com/telehash/gogotelehash/internal/util/tracer"
-	"github.com/telehash/gogotelehash/lob"
 )
 
 var (

e3x/channel_test.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/telehash/gogotelehash/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 
+	"github.com/telehash/gogotelehash/internal/lob"
 	"github.com/telehash/gogotelehash/internal/util/logs"
-	"github.com/telehash/gogotelehash/lob"
 	"github.com/telehash/gogotelehash/transports/inproc"
 	"github.com/telehash/gogotelehash/transports/mux"
 	"github.com/telehash/gogotelehash/transports/udp"

e3x/cipherset/cipher_set.go

@@ -4,7 +4,7 @@ import (
 	"crypto/sha256"
 	"errors"
 
-	"github.com/telehash/gogotelehash/lob"
+	"github.com/telehash/gogotelehash/internal/lob"
 )
 
 var (

e3x/cipherset/cs1a/cs1a_cipher.go

@@ -16,8 +16,8 @@ import (
 	"github.com/telehash/gogotelehash/e3x/cipherset/cs1a/eccp"
 	"github.com/telehash/gogotelehash/e3x/cipherset/cs1a/ecdh"
 	"github.com/telehash/gogotelehash/e3x/cipherset/cs1a/secp160r1"
+	"github.com/telehash/gogotelehash/internal/lob"
 	"github.com/telehash/gogotelehash/internal/util/bufpool"
-	"github.com/telehash/gogotelehash/lob"
 )
 
 var (

e3x/cipherset/cs3a/cs3a_cipher.go

@@ -13,9 +13,9 @@ import (
 	"github.com/telehash/gogotelehash/Godeps/_workspace/src/golang.org/x/crypto/poly1305"
 
 	"github.com/telehash/gogotelehash/e3x/cipherset"
+	"github.com/telehash/gogotelehash/internal/lob"
 	"github.com/telehash/gogotelehash/internal/util/base32util"
 	"github.com/telehash/gogotelehash/internal/util/bufpool"
-	"github.com/telehash/gogotelehash/lob"
 )
 
 var (

e3x/cipherset/map.go

@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"errors"
 
+	"github.com/telehash/gogotelehash/internal/lob"
 	"github.com/telehash/gogotelehash/internal/util/base32util"
-	"github.com/telehash/gogotelehash/lob"
 )
 
 var ErrInvalidKeys = errors.New("chipherset: invalid keys")

e3x/cipherset/tests/testing.go

@@ -7,7 +7,7 @@ import (
 	"github.com/telehash/gogotelehash/Godeps/_workspace/src/github.com/stretchr/testify/suite"
 
 	"github.com/telehash/gogotelehash/e3x/cipherset"
-	"github.com/telehash/gogotelehash/lob"
+	"github.com/telehash/gogotelehash/internal/lob"
 )
 
 type cipherTestSuite struct {

e3x/endpoint.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	"github.com/telehash/gogotelehash/e3x/cipherset"
-	"github.com/telehash/gogotelehash/hashname"
+	"github.com/telehash/gogotelehash/internal/hashname"
 	"github.com/telehash/gogotelehash/internal/util/bufpool"
 	"github.com/telehash/gogotelehash/internal/util/logs"
 	"github.com/telehash/gogotelehash/internal/util/tracer"

e3x/exchange.go

@@ -10,11 +10,11 @@ import (
 	"time"
 
 	"github.com/telehash/gogotelehash/e3x/cipherset"
-	"github.com/telehash/gogotelehash/hashname"
+	"github.com/telehash/gogotelehash/internal/hashname"
+	"github.com/telehash/gogotelehash/internal/lob"
 	"github.com/telehash/gogotelehash/internal/util/bufpool"
 	"github.com/telehash/gogotelehash/internal/util/logs"
 	"github.com/telehash/gogotelehash/internal/util/tracer"
-	"github.com/telehash/gogotelehash/lob"
 	"github.com/telehash/gogotelehash/transports"
 )
 

e3x/identifier.go

@@ -3,7 +3,7 @@ package e3x
 import (
 	"errors"
 
-	"github.com/telehash/gogotelehash/hashname"
+	"github.com/telehash/gogotelehash/internal/hashname"
 )
 
 var ErrUnidentifiable = errors.New("unidentifiable identity")

e3x/identity.go

@@ -6,7 +6,7 @@ import (
 	"net"
 
 	"github.com/telehash/gogotelehash/e3x/cipherset"
-	"github.com/telehash/gogotelehash/hashname"
+	"github.com/telehash/gogotelehash/internal/hashname"
 	"github.com/telehash/gogotelehash/transports"
 )
 

e3x/util_test.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/telehash/gogotelehash/Godeps/_workspace/src/github.com/stretchr/testify/mock"
 
+	"github.com/telehash/gogotelehash/internal/lob"
 	"github.com/telehash/gogotelehash/internal/util/tracer"
-	"github.com/telehash/gogotelehash/lob"
 )
 
 type MockExchange struct {

lob/header_coder.go → internal/lob/header_coder.go

@@ -218,7 +218,7 @@ func parseUint32(p []byte) (uint32, []byte, bool) {
 
 	for idx, r := range p {
 		if '0' <= r && r <= '9' {
-			n = (n * 10) + (uint32(r) - '0')
+			n = n*10 + (uint32(r) - '0')
 			continue
 		}
 

modules/bridge/bridge.go → internal/modules/bridge/bridge.go

@@ -1,14 +1,14 @@
 package bridge
 
 import (
-	"github.com/telehash/gogotelehash/internal/util/bufpool"
 	"io"
 	"sync"
 	"time"
 
 	"github.com/telehash/gogotelehash/e3x"
 	"github.com/telehash/gogotelehash/e3x/cipherset"
-	"github.com/telehash/gogotelehash/hashname"
+	"github.com/telehash/gogotelehash/internal/hashname"
+	"github.com/telehash/gogotelehash/internal/util/bufpool"
 	"github.com/telehash/gogotelehash/internal/util/logs"
 )
 

modules/bridge/bridge_test.go → internal/modules/bridge/bridge_test.go

@@ -3,13 +3,12 @@ package bridge
 import (
 	"net"
 	"testing"
-	// "time"
 
 	"github.com/telehash/gogotelehash/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 
 	"github.com/telehash/gogotelehash/e3x"
+	"github.com/telehash/gogotelehash/internal/lob"
 	"github.com/telehash/gogotelehash/internal/util/logs"
-	"github.com/telehash/gogotelehash/lob"
 	"github.com/telehash/gogotelehash/transports"
 	"github.com/telehash/gogotelehash/transports/fw"
 	"github.com/telehash/gogotelehash/transports/udp"

modules/bridge/channel_connect.go → internal/modules/bridge/channel_connect.go

@@ -5,10 +5,10 @@ import (
 
 	"github.com/telehash/gogotelehash/e3x"
 	"github.com/telehash/gogotelehash/e3x/cipherset"
-	"github.com/telehash/gogotelehash/hashname"
+	"github.com/telehash/gogotelehash/internal/hashname"
+	"github.com/telehash/gogotelehash/internal/lob"
 	"github.com/telehash/gogotelehash/internal/util/bufpool"
 	"github.com/telehash/gogotelehash/internal/util/logs"
-	"github.com/telehash/gogotelehash/lob"
 )
 
 var mainLog = logs.Module("peers")

modules/bridge/channel_peer.go → internal/modules/bridge/channel_peer.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/telehash/gogotelehash/e3x"
 	"github.com/telehash/gogotelehash/e3x/cipherset"
-	"github.com/telehash/gogotelehash/hashname"
+	"github.com/telehash/gogotelehash/internal/hashname"
+	"github.com/telehash/gogotelehash/internal/lob"
 	"github.com/telehash/gogotelehash/internal/util/bufpool"
-	"github.com/telehash/gogotelehash/lob"
 )
 
 func (mod *module) peerVia(router *e3x.Exchange, to hashname.H, body *bufpool.Buffer) error {

modules/bridge/net_addr.go → internal/modules/bridge/net_addr.go

@@ -6,7 +6,7 @@ import (
 	"net"
 
 	"github.com/telehash/gogotelehash/e3x"
-	"github.com/telehash/gogotelehash/hashname"
+	"github.com/telehash/gogotelehash/internal/hashname"
 	"github.com/telehash/gogotelehash/transports"
 )
 

modules/bridge/net_connection.go → internal/modules/bridge/net_connection.go

@@ -1,15 +1,15 @@
 package bridge
 
 import (
-	"github.com/telehash/gogotelehash/internal/util/bufpool"
 	"io"
 	"net"
 	"sync"
 	"time"
 
 	"github.com/telehash/gogotelehash/e3x"
-	"github.com/telehash/gogotelehash/hashname"
-	"github.com/telehash/gogotelehash/lob"
+	"github.com/telehash/gogotelehash/internal/hashname"
+	"github.com/telehash/gogotelehash/internal/lob"
+	"github.com/telehash/gogotelehash/internal/util/bufpool"
 	"github.com/telehash/gogotelehash/transports/transportsutil"
 )
 

modules/paths/module.go → internal/modules/paths/module.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/telehash/gogotelehash/e3x"
-	"github.com/telehash/gogotelehash/lob"
+	"github.com/telehash/gogotelehash/internal/lob"
 	"github.com/telehash/gogotelehash/transports"
 )
 

internal/util/logs/default.go

@@ -3,7 +3,7 @@ package logs
 import (
 	"os"
 
-	"github.com/telehash/gogotelehash/hashname"
+	"github.com/telehash/gogotelehash/internal/hashname"
 )
 
 var defaultLogger = New(os.Stdout)

internal/util/logs/log.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/telehash/gogotelehash/hashname"
+	"github.com/telehash/gogotelehash/internal/hashname"
 )
 
 var disabledMods = map[string]bool{}

modules/thtp/round_tripper.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/telehash/gogotelehash/e3x"
-	"github.com/telehash/gogotelehash/hashname"
+	"github.com/telehash/gogotelehash/internal/hashname"
 )
 
 var (

tools/th-keygen/main.go

@@ -10,7 +10,7 @@ import (
 
 	_ "github.com/telehash/gogotelehash/e3x"
 	"github.com/telehash/gogotelehash/e3x/cipherset"
-	"github.com/telehash/gogotelehash/hashname"
+	"github.com/telehash/gogotelehash/internal/hashname"
 )
 
 const usage = `Telehash key generation tool.

tools/th-test/main.go

@@ -142,7 +142,7 @@ type Context struct {
 	Out  io.Writer
 }
 
-func (c *Context) WriteIdentity(e *gogotelehash.Endpoint) {
+func (c *Context) WriteIdentity(e *telehash.Endpoint) {
 	if c.dir == "" {
 		if _, err := os.Stat("/shared"); err == nil {
 			c.dir = "/shared"
@@ -170,7 +170,7 @@ func (c *Context) WriteIdentity(e *gogotelehash.Endpoint) {
 	}
 }
 
-func (c *Context) ReadIdentity(role string) *gogotelehash.Identity {
+func (c *Context) ReadIdentity(role string) *telehash.Identity {
 
 	if c.dir == "" {
 		if _, err := os.Stat("/shared"); err == nil {
@@ -186,7 +186,7 @@ func (c *Context) ReadIdentity(role string) *gogotelehash.Identity {
 		os.Exit(1)
 	}
 
-	var ident *gogotelehash.Identity
+	var ident *telehash.Identity
 	err = json.Unmarshal(data, &ident)
 	if err != nil {
 		fmt.Printf("error: %s\n", err)