Merge remote-tracking branch 'pro-plus/plus-pro' into Feature
# Conflicts: # .github/workflows/Alpha.yml # .github/workflows/codeql-analysis.yml # .github/workflows/docker.yml # .github/workflows/linter.yml # .github/workflows/stale.yml # Makefile # README.md # adapter/outbound/vless.go # component/dialer/dialer.go # component/geodata/geodata.go # component/geodata/router/condition.go # config/config.go # config/initial.go # constant/metadata.go # constant/path.go # constant/rule.go # constant/rule_extra.go # dns/filters.go # go.mod # go.sum # hub/executor/executor.go # hub/route/configs.go # listener/listener.go # listener/tun/dev/dev.go # listener/tun/dev/dev_darwin.go # listener/tun/dev/dev_linux.go # listener/tun/dev/dev_windows.go # listener/tun/dev/dev_windows_extra.go # listener/tun/dev/wintun/dll_windows.go # listener/tun/dev/wintun/session_windows.go # listener/tun/ipstack/gvisor/tun.go # listener/tun/ipstack/gvisor/tundns.go # listener/tun/ipstack/stack_adapter.go # listener/tun/ipstack/system/tun.go # listener/tun/tun_adapter.go # main.go # rule/base.go # rule/common/process.go # rule/geoip.go # rule/parser.go # rule/port.go # test/go.mod # test/go.sum # test/vless_test.go # transport/vless/xtls.go # tunnel/tunnel.go
This commit is contained in:
@ -79,15 +79,7 @@ func patchConfigs(w http.ResponseWriter, r *http.Request) {
|
||||
P.ReCreateMixed(pointerOrDefault(general.MixedPort, ports.MixedPort), tcpIn, udpIn)
|
||||
|
||||
if general.Tun != nil {
|
||||
err := P.ReCreateTun(*general.Tun, tcpIn, udpIn)
|
||||
if err == nil {
|
||||
log.Infoln("Recreate tun success.")
|
||||
} else {
|
||||
log.Errorln("Recreate tun failed: %s", err.Error())
|
||||
render.Status(r, http.StatusBadRequest)
|
||||
render.JSON(w, r, newError(err.Error()))
|
||||
return
|
||||
}
|
||||
P.ReCreateTun(*general.Tun, tcpIn, udpIn)
|
||||
}
|
||||
|
||||
if general.Mode != nil {
|
||||
|
Reference in New Issue
Block a user