doesnm/eeProxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move SAM back

Browse source
This commit is contained in:
idk 2018-12-26 01:24:05 -05:00
parent 3c7fc231c8
commit 316de2df0f
No known key found for this signature in database
GPG key ID: D75C03B39B5E14E1
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
socks/manager.go
View file

@ -18,6 +18,7 @@ import (
type Manager struct {
resolver.Resolver
socks5.Config
*sam3.SAM
conns []*conn.Conn
datadir string
host string
@ -50,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.samhost, m.samport, addr, m.datadir, m.samopts)
newconn, err := conn.NewConn(*m.SAM, addr, m.datadir, m.samopts)
if err != nil {
return nil, err
}
@ -97,6 +98,11 @@ func NewManagerFromOptions(opts ...func(*Manager) error) (*Manager, error) {
}
}
log.Println("preparing SAM-multiplexing SOCKS proxy on", m.host, m.port, "->", m.samhost, m.samport)
var err error
m.SAM, err = sam3.NewSAM(m.samhost + ":" + m.samport)
if err != nil {
return nil, err
}
if r, err := resolver.NewResolver(m.samhost, m.samport); err == nil {
m.Config = socks5.Config{
Resolver: r,