From 0561651085f007759899b1feafe5bd53a9c8a222 Mon Sep 17 00:00:00 2001 From: idk Date: Wed, 26 Dec 2018 00:23:20 -0500 Subject: [PATCH] dialer stuff --- conn/conn.go | 4 ++-- socks/manager.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conn/conn.go b/conn/conn.go index 42abc5d..0cd936b 100644 --- a/conn/conn.go +++ b/conn/conn.go @@ -87,10 +87,10 @@ func (m Conn) Cleanup() error { 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 err error - c.SAM = sam + c.SAM = &sam c.path = path t32, err := sam3.NewI2PAddrFromString(addr) c.name = t32.Base32() + ".i2pkeys" diff --git a/socks/manager.go b/socks/manager.go index ef851f9..fd2890e 100644 --- a/socks/manager.go +++ b/socks/manager.go @@ -10,7 +10,7 @@ import ( import ( "github.com/eyedeekay/eeproxy/conn" "github.com/eyedeekay/eeproxy/resolve" - //"github.com/eyedeekay/eeproxy/rewriter" + "github.com/eyedeekay/eeproxy/rewriter" "github.com/eyedeekay/go-socks5" "github.com/eyedeekay/sam3" ) @@ -51,7 +51,7 @@ func (m Manager) DialI2P(ctx context.Context, addr string) (*sam3.SAMConn, error } } log.Println("Creating a new connection in connection tree.", m.datadir) - newconn, err := conn.NewConn(m.SAM, addr, m.datadir, m.samopts) + newconn, err := conn.NewConn(*m.SAM, addr, m.datadir, m.samopts) if err != nil { return nil, err } @@ -107,7 +107,7 @@ func NewManagerFromOptions(opts ...func(*Manager) error) (*Manager, error) { m.Config = socks5.Config{ Resolver: r, Dial: m.Dial, - //Rewriter: rewriter.NewRewriter(), + Rewriter: rewriter.NewRewriter(), } return &m, nil }