Merge remote-tracking branch 'origin/master' into clients-patch

This commit is contained in:
kevin 2022-12-04 21:05:33 +08:00
commit 4608ced961
10 changed files with 98 additions and 38 deletions

View file

@ -70,7 +70,7 @@ func BuildClientConfig(client model.Client, server model.Server, setting model.G
}
forwardMark := ""
if setting.ForwardMark != "" && setting.ForwardMark != DefaultForwardMark {
if setting.ForwardMark != "" {
forwardMark = fmt.Sprintf("FwMark = %s\n", setting.ForwardMark)
}