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

Fix: add lock for inbound proxy recreate

Browse source
This commit is contained in:
Dreamacro 2020-06-07 17:56:21 +08:00
parent 48cff50a4c
commit ecac8eb8e5
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
proxy/listener.go
View file

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"net" "net"
"strconv" "strconv"
"sync"
"github.com/Dreamacro/clash/log" "github.com/Dreamacro/clash/log"
"github.com/Dreamacro/clash/proxy/http" "github.com/Dreamacro/clash/proxy/http"
@ -23,6 +24,13 @@ var (
redirUDPListener *redir.RedirUDPListener redirUDPListener *redir.RedirUDPListener
mixedListener *mixed.MixedListener mixedListener *mixed.MixedListener
mixedUDPLister *socks.SockUDPListener mixedUDPLister *socks.SockUDPListener
// lock for recreate function
socksMux sync.Mutex
httpMux sync.Mutex
redirMux sync.Mutex
mixedMux sync.Mutex
tunMux sync.Mutex
) )
type listener interface { type listener interface {
@ -54,6 +62,9 @@ func SetBindAddress(host string) {
} }
func ReCreateHTTP(port int) error { func ReCreateHTTP(port int) error {
httpMux.Lock()
defer httpMux.Unlock()
addr := genAddr(bindAddress, port, allowLan) addr := genAddr(bindAddress, port, allowLan)
if httpListener != nil { if httpListener != nil {
@ -78,6 +89,9 @@ func ReCreateHTTP(port int) error {
} }
func ReCreateSocks(port int) error { func ReCreateSocks(port int) error {
socksMux.Lock()
defer socksMux.Unlock()
addr := genAddr(bindAddress, port, allowLan) addr := genAddr(bindAddress, port, allowLan)
shouldTCPIgnore := false shouldTCPIgnore := false
@ -127,6 +141,9 @@ func ReCreateSocks(port int) error {
} }
func ReCreateRedir(port int) error { func ReCreateRedir(port int) error {
redirMux.Lock()
defer redirMux.Unlock()
addr := genAddr(bindAddress, port, allowLan) addr := genAddr(bindAddress, port, allowLan)
if redirListener != nil { if redirListener != nil {
@ -164,6 +181,9 @@ func ReCreateRedir(port int) error {
} }
func ReCreateMixed(port int) error { func ReCreateMixed(port int) error {
mixedMux.Lock()
defer mixedMux.Unlock()
addr := genAddr(bindAddress, port, allowLan) addr := genAddr(bindAddress, port, allowLan)
shouldTCPIgnore := false shouldTCPIgnore := false