history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feature: support customizing bind-address when allow-lan is true (#255)

Browse Source
This commit is contained in:
Siji
2019-08-08 13:45:07 +08:00
committed by Dreamacro
parent 288afd1308
commit 5829c3d5be
5 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
proxy/listener.go
View File

@ -11,7 +11,8 @@ import (
)
var (
allowLan = false
allowLan = false
bindAddress = "*"
socksListener *socks.SockListener
socksUDPListener *socks.SockUDPListener
@ -34,12 +35,20 @@ func AllowLan() bool {
return allowLan
}
func BindAddress() string {
return bindAddress
}
func SetAllowLan(al bool) {
allowLan = al
}
func SetBindAddress(host string) {
bindAddress = host
}
func ReCreateHTTP(port int) error {
addr := genAddr(port, allowLan)
addr := genAddr(bindAddress, port, allowLan)
if httpListener != nil {
if httpListener.Address() == addr {
@ -63,7 +72,7 @@ func ReCreateHTTP(port int) error {
}
func ReCreateSocks(port int) error {
addr := genAddr(port, allowLan)
addr := genAddr(bindAddress, port, allowLan)
if socksListener != nil {
if socksListener.Address() == addr {
@ -83,12 +92,10 @@ func ReCreateSocks(port int) error {
return err
}
return reCreateSocksUDP(port)
return reCreateSocksUDP(addr)
}
func reCreateSocksUDP(port int) error {
addr := genAddr(port, allowLan)
func reCreateSocksUDP(addr string) error {
if socksUDPListener != nil {
if socksUDPListener.Address() == addr {
return nil
@ -97,10 +104,6 @@ func reCreateSocksUDP(port int) error {
socksUDPListener = nil
}
if portIsZero(addr) {
return nil
}
var err error
socksUDPListener, err = socks.NewSocksUDPProxy(addr)
if err != nil {
@ -111,7 +114,7 @@ func reCreateSocksUDP(port int) error {
}
func ReCreateRedir(port int) error {
addr := genAddr(port, allowLan)
addr := genAddr(bindAddress, port, allowLan)
if redirListener != nil {
if redirListener.Address() == addr {
@ -167,9 +170,14 @@ func portIsZero(addr string) bool {
return false
}
func genAddr(port int, allowLan bool) string {
func genAddr(host string, port int, allowLan bool) string {
if allowLan {
return fmt.Sprintf(":%d", port)
if host == "*" {
return fmt.Sprintf(":%d", port)
} else {
return fmt.Sprintf("%s:%d", host, port)
}
}
return fmt.Sprintf("127.0.0.1:%d", port)
}