TheArchive/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2024-11-27 12:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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 {
if c.Tor.Enabled {
tor, _ := proxy.SOCKS5("tcp", c.Tor.SocksAddr, nil, proxy.Direct) tor, _ := proxy.SOCKS5("tcp", c.Tor.SocksAddr, nil, proxy.Direct)
return &muxedDialer{ return &muxedDialer{
conf: c, conf: c,
tor: tor, tor: tor,
direct: proxy.Direct, direct: proxy.Direct,
} }
} else {
return proxy.Direct
}
} }