chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: tor may fail to start in some situations

Browse Source
This commit is contained in:
yaotthaha 2023-05-07 19:08:02 +08:00
parent e02317a348
commit 488be14329
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
outbound/tor.go
View File

@ -6,6 +6,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
"sync/atomic"
"github.com/sagernet/sing-box/adapter" "github.com/sagernet/sing-box/adapter"
"github.com/sagernet/sing-box/common/dialer" "github.com/sagernet/sing-box/common/dialer"
@ -35,6 +36,8 @@ type Tor struct {
events chan control.Event events chan control.Event
instance *tor.Tor instance *tor.Tor
socksClient *socks.Client socksClient *socks.Client
isReady atomic.Bool
} }
func NewTor(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.TorOutboundOptions) (*Tor, error) { func NewTor(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.TorOutboundOptions) (*Tor, error) {
@ -142,21 +145,32 @@ func (t *Tor) start() error {
} }
} }
} }
err = torInstance.EnableNetwork(t.ctx, true)
go t.bootWait()
return nil
}
func (t *Tor) bootWait() {
err := t.instance.EnableNetwork(t.ctx, true)
if err != nil { if err != nil {
return err t.logger.Error("enable tor network fail: ", err.Error())
return
} }
info, err := torInstance.Control.GetInfo("net/listeners/socks") info, err := t.instance.Control.GetInfo("net/listeners/socks")
if err != nil { if err != nil {
return err t.logger.Error("get tor socks proxy address fail: ", err.Error())
return
} }
if len(info) != 1 || info[0].Key != "net/listeners/socks" { if len(info) != 1 || info[0].Key != "net/listeners/socks" {
return E.New("get socks proxy address") t.logger.Error("get socks proxy address")
return
} }
t.logger.Trace("obtained tor socks5 address ", info[0].Val) t.logger.Trace("obtained tor socks5 address ", info[0].Val)
// TODO: set password for tor socks5 server if supported // TODO: set password for tor socks5 server if supported
t.socksClient = socks.NewClient(N.SystemDialer, M.ParseSocksaddr(info[0].Val), socks.Version5, "", "") t.socksClient = socks.NewClient(N.SystemDialer, M.ParseSocksaddr(info[0].Val), socks.Version5, "", "")
return nil t.isReady.Store(true)
t.logger.Info("tor is ready")
} }
func (t *Tor) recvLoop() { func (t *Tor) recvLoop() {
@ -196,6 +210,9 @@ func (t *Tor) Close() error {
func (t *Tor) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) { func (t *Tor) DialContext(ctx context.Context, network string, destination M.Socksaddr) (net.Conn, error) {
t.logger.InfoContext(ctx, "outbound connection to ", destination) t.logger.InfoContext(ctx, "outbound connection to ", destination)
if !t.isReady.Load() {
return nil, E.New("tor is not ready")
}
return t.socksClient.DialContext(ctx, network, destination) return t.socksClient.DialContext(ctx, network, destination)
} }