xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed: race condition in update config

Browse source
This commit is contained in:
gVisor bot 2018-06-15 00:49:52 +08:00
parent 6f879b189f
commit d92b20438e
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tunnel/tunnel.go
View file

@ -24,6 +24,7 @@ type Tunnel struct {
proxys map[string]C.Proxy proxys map[string]C.Proxy
observable *observable.Observable observable *observable.Observable
logCh chan interface{} logCh chan interface{}
configLock *sync.RWMutex
} }
func (t *Tunnel) Add(req C.ServerAdapter) { func (t *Tunnel) Add(req C.ServerAdapter) {
@ -31,6 +32,9 @@ func (t *Tunnel) Add(req C.ServerAdapter) {
} }
func (t *Tunnel) UpdateConfig() (err error) { func (t *Tunnel) UpdateConfig() (err error) {
t.configLock.Lock()
defer t.configLock.Unlock()
cfg, err := C.GetConfig() cfg, err := C.GetConfig()
if err != nil { if err != nil {
return return
@ -113,6 +117,9 @@ func (t *Tunnel) handleConn(localConn C.ServerAdapter) {
} }
func (t *Tunnel) match(addr *C.Addr) C.Proxy { func (t *Tunnel) match(addr *C.Addr) C.Proxy {
t.configLock.RLock()
defer t.configLock.RUnlock()
for _, rule := range t.rules { for _, rule := range t.rules {
if rule.IsMatch(addr) { if rule.IsMatch(addr) {
a, ok := t.proxys[rule.Adapter()] a, ok := t.proxys[rule.Adapter()]
@ -134,6 +141,7 @@ func newTunnel() *Tunnel {
proxys: make(map[string]C.Proxy), proxys: make(map[string]C.Proxy),
observable: observable.NewObservable(logCh), observable: observable.NewObservable(logCh),
logCh: logCh, logCh: logCh,
configLock: &sync.RWMutex{},
} }
go tunnel.process() go tunnel.process()
go tunnel.subscribeLogs() go tunnel.subscribeLogs()