better tunnel names

This commit is contained in:
idk 2018-12-26 13:08:46 -05:00
parent b7d72fec44
commit 064f09c624
No known key found for this signature in database
GPG key ID: D75C03B39B5E14E1
2 changed files with 4 additions and 4 deletions

View file

@ -90,7 +90,7 @@ func (m Conn) Cleanup() error {
return nil return nil
} }
func NewConn(sam sam3.SAM, addr, path string, opts []string) (*Conn, error) { func NewConn(sam sam3.SAM, addr, path string, opts []string) (Conn, error) {
var c Conn var c Conn
var err error var err error
c.SAM = &sam c.SAM = &sam
@ -113,7 +113,7 @@ func NewConn(sam sam3.SAM, addr, path string, opts []string) (*Conn, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &c, nil return c, nil
} }
// RandTunName generates a random tunnel names to avoid collisions // RandTunName generates a random tunnel names to avoid collisions

View file

@ -19,7 +19,7 @@ type Manager struct {
resolver.Resolver resolver.Resolver
socks5.Config socks5.Config
*sam3.SAM *sam3.SAM
conns []*conn.Conn conns []conn.Conn
datadir string datadir string
host string host string
port string port string
@ -57,7 +57,7 @@ func (m Manager) DialI2P(ctx context.Context, addr string) (*sam3.SAMConn, error
} }
m.conns = append(m.conns, newconn) m.conns = append(m.conns, newconn)
log.Println("Generated destination for address:", i2paddr.Base32(), "at position", len(m.conns)-1) log.Println("Generated destination for address:", i2paddr.Base32(), "at position", len(m.conns)-1)
return m.conns[len(m.conns)-1].SAMConn, nil return &m.conns[len(m.conns)-1].SAMConn, nil
} }
func (m Manager) Dial(ctx context.Context, network, addr string) (net.Conn, error) { func (m Manager) Dial(ctx context.Context, network, addr string) (net.Conn, error) {