chore: reset tunName in macos when it isn't startWith "utun"
This commit is contained in:
parent
527fc2790b
commit
1a1e3345f4
1 changed files with 21 additions and 1 deletions
|
@ -67,6 +67,26 @@ func CalculateInterfaceName(name string) (tunName string) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func checkTunName(tunName string) (ok bool) {
|
||||||
|
defer func() {
|
||||||
|
if !ok {
|
||||||
|
log.Warnln("[TUN] Unsupported tunName(%s) in %s, force regenerate by ourselves.", tunName, runtime.GOOS)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
if runtime.GOOS == "darwin" {
|
||||||
|
if len(tunName) <= 4 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if tunName[:4] == "utun" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if _, parseErr := strconv.ParseInt(tunName[4:], 10, 16); parseErr != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
func New(options LC.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter, additions ...inbound.Addition) (l *Listener, err error) {
|
func New(options LC.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapter, additions ...inbound.Addition) (l *Listener, err error) {
|
||||||
if len(additions) == 0 {
|
if len(additions) == 0 {
|
||||||
additions = []inbound.Addition{
|
additions = []inbound.Addition{
|
||||||
|
@ -75,7 +95,7 @@ func New(options LC.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- C.PacketAdapte
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
tunName := options.Device
|
tunName := options.Device
|
||||||
if tunName == "" {
|
if tunName == "" || !checkTunName(tunName) {
|
||||||
tunName = CalculateInterfaceName(InterfaceName)
|
tunName = CalculateInterfaceName(InterfaceName)
|
||||||
options.Device = tunName
|
options.Device = tunName
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue