yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-11-04 03:05:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

* only enable tor proxy dialer when tor is enabled

Browse source 
* add docstrings
This commit is contained in:
Jeff Becker 2018-04-25 10:06:13 -04:00
parent c16e354a44
commit de69860e9b
No known key found for this signature in database
GPG key ID: F357B3B42F6F9B05
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/yggdrasil/dial.go
View file

@ -11,17 +11,20 @@ import (
type Dialer = proxy.Dialer type Dialer = proxy.Dialer
// muxedDialer implements proxy.Dialer (aka Dialer)
type muxedDialer struct { type muxedDialer struct {
conf config.NetConfig conf config.NetConfig
tor Dialer tor Dialer
direct Dialer direct Dialer
} }
// wrappedConn implements net.Conn
type wrappedConn struct { type wrappedConn struct {
c net.Conn c net.Conn
raddr net.Addr raddr net.Addr
} }
// wrappedAddr implements net.Addr
type wrappedAddr struct { type wrappedAddr struct {
network string network string
addr string addr string
@ -89,11 +92,16 @@ func (d *muxedDialer) Dial(network, addr string) (net.Conn, error) {
} }
} }
// NewDialer creates a Dialer from a NetConfig
func NewDialer(c config.NetConfig) Dialer { func NewDialer(c config.NetConfig) Dialer {
tor, _ := proxy.SOCKS5("tcp", c.Tor.SocksAddr, nil, proxy.Direct) if c.Tor.Enabled {
return &muxedDialer{ tor, _ := proxy.SOCKS5("tcp", c.Tor.SocksAddr, nil, proxy.Direct)
conf: c, return &muxedDialer{
tor: tor, conf: c,
direct: proxy.Direct, tor: tor,
direct: proxy.Direct,
}
} else {
return proxy.Direct
} }
} }