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

fix: RESTful api missing TunConf.device

Browse source 
In commit 54fee7b, due to failure to take into account that
not all required parameters of `sing_tun.server.New` have
default values provided by `LC.Tun`, the name of the tun device
cannot be obtained when `TunConf.device` is not explicitly
configured. This commit fixed the issue.
This commit is contained in:
YanceyChiew 2023-09-02 01:14:26 +08:00 committed by Larvan2
parent a366e9a4b5
commit 9feb4d6668
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hub/executor/executor.go
View file

@ -134,7 +134,7 @@ func GetGeneral() *config.General {
RedirPort: ports.RedirPort, RedirPort: ports.RedirPort,
TProxyPort: ports.TProxyPort, TProxyPort: ports.TProxyPort,
MixedPort: ports.MixedPort, MixedPort: ports.MixedPort,
Tun: listener.LastTunConf, Tun: listener.GetTunConf(),
TuicServer: listener.GetTuicConf(), TuicServer: listener.GetTuicConf(),
ShadowSocksConfig: ports.ShadowSocksConfig, ShadowSocksConfig: ports.ShadowSocksConfig,
VmessConfig: ports.VmessConfig, VmessConfig: ports.VmessConfig,

4
listener/listener.go
View file

@ -84,9 +84,7 @@ type Ports struct {
func GetTunConf() LC.Tun { func GetTunConf() LC.Tun {
if tunLister == nil { if tunLister == nil {
return LC.Tun{ return LastTunConf
Enable: false,
}
} }
return tunLister.Config() return tunLister.Config()
} }