history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chore: code style

Browse Source
This commit is contained in:
yaling888
2022-03-05 18:04:04 +08:00
parent 71e002c2ef
commit ba7bcce895
6 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
hub/executor/executor.go
View File

@ -6,7 +6,6 @@ import (
"os"
"runtime"
"strconv"
"strings"
"sync"
"github.com/Dreamacro/clash/adapter"
@ -73,6 +72,8 @@ func ApplyConfig(cfg *config.Config, force bool) {
mux.Lock()
defer mux.Unlock()
log.SetLevel(log.DEBUG)
updateUsers(cfg.Users)
updateProxies(cfg.Proxies, cfg.Providers)
updateRules(cfg.Rules)
@ -82,6 +83,8 @@ func ApplyConfig(cfg *config.Config, force bool) {
updateDNS(cfg.DNS, cfg.General)
updateGeneral(cfg.General, force)
updateExperimental(cfg)
log.SetLevel(cfg.General.LogLevel)
}
func GetGeneral() *config.General {
@ -152,9 +155,7 @@ func updateDNS(c *config.DNS, general *config.General) {
resolver.DefaultResolver = r
resolver.MainResolver = mr
resolver.DefaultHostMapper = m
if general.Tun.Enable && strings.EqualFold(general.Tun.Stack, "system") {
resolver.DefaultLocalServer = dns.NewLocalServer(r, m)
}
resolver.DefaultLocalServer = dns.NewLocalServer(r, m)
dns.ReCreateServer(c.Listen, r, m)
}
@ -172,7 +173,6 @@ func updateRules(rules []C.Rule) {
}
func updateGeneral(general *config.General, force bool) {
log.SetLevel(log.DEBUG)
tunnel.SetMode(general.Mode)
resolver.DisableIPv6 = !general.IPv6
@ -200,7 +200,6 @@ func updateGeneral(general *config.General, force bool) {
iface.FlushCache()
if !force {
log.SetLevel(general.LogLevel)
return
}
@ -219,8 +218,6 @@ func updateGeneral(general *config.General, force bool) {
P.ReCreateTProxy(general.TProxyPort, tcpIn, udpIn)
P.ReCreateMixed(general.MixedPort, tcpIn, udpIn)
P.ReCreateTun(general.Tun, tcpIn, udpIn)
log.SetLevel(general.LogLevel)
}
func updateUsers(users []auth.AuthUser) {
@ -283,7 +280,10 @@ func updateIPTables(dns *config.DNS, general *config.General) {
tproxy.CleanUpTProxyLinuxIPTables()
dialer.DefaultRoutingMark.Store(2158)
if dialer.DefaultRoutingMark.Load() == 0 {
dialer.DefaultRoutingMark.Store(2158)
}
err = tproxy.SetTProxyLinuxIPTables(general.Interface, general.TProxyPort, dnsPort)
if err != nil {
@ -292,8 +292,8 @@ func updateIPTables(dns *config.DNS, general *config.General) {
}
}
func CleanUp() {
P.CleanUp()
func Cleanup() {
P.Cleanup()
if runtime.GOOS == "linux" {
tproxy.CleanUpTProxyLinuxIPTables()

4
hub/hub.go
View File

@ -49,6 +49,6 @@ func Parse(options ...Option) error {
return nil
}
func CleanUp() {
executor.CleanUp()
func Cleanup() {
executor.Cleanup()
}