fix: RESTful API empty tun device name

This commit is contained in:
gVisor bot 2022-11-03 18:04:22 +08:00
parent 0fdcd0f5d4
commit 54434df43f
2 changed files with 4 additions and 3 deletions

View file

@ -363,7 +363,7 @@ func ReCreateTun(tunConf *config.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *
return
}
tunLister, err = sing_tun.New(*tunConf, tcpIn, udpIn)
tunLister, err = sing_tun.New(tunConf, tcpIn, udpIn)
}
func ReCreateRedirToTun(ifaceNames []string) {

View file

@ -65,10 +65,11 @@ func CalculateInterfaceName(name string) (tunName string) {
return
}
func New(options config.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) (l *Listener, err error) {
func New(options *config.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) (l *Listener, err error) {
tunName := options.Device
if tunName == "" {
tunName = CalculateInterfaceName(InterfaceName)
options.Device = tunName
}
tunMTU := options.MTU
if tunMTU == 0 {
@ -121,7 +122,7 @@ func New(options config.Tun, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.P
}
l = &Listener{
closed: false,
options: options,
options: *options,
handler: handler,
}
defer func() {