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

chore:merge & adjust code

Browse Source
This commit is contained in:
Meta
2022-04-12 20:20:04 +08:00
parent 173e10abe6
commit ce96ac35fb
4 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
hub/executor/executor.go
View File

@ -3,6 +3,7 @@ package executor
import (
"fmt"
"net"
"net/netip"
"os"
"runtime"
"strconv"
@ -89,16 +90,6 @@ func ApplyConfig(cfg *config.Config, force bool) {
log.SetLevel(cfg.General.LogLevel)
}
func updateSniffer(sniffer *config.Sniffer) {
if sniffer.Enable {
var err error
SNI.Dispatcher, err = SNI.NewSnifferDispatcher(sniffer.Sniffers, sniffer.Force)
if err != nil {
log.Errorln("Init Sniffer failed, err:%v", err)
}
}
}
func GetGeneral() *config.General {
ports := P.GetPorts()
var authenticator []string
@ -181,7 +172,7 @@ func updateDNS(c *config.DNS, t *config.Tun) {
}
}
func updateHosts(tree *trie.DomainTrie) {
func updateHosts(tree *trie.DomainTrie[netip.Addr]) {
resolver.DefaultHosts = tree
}
@ -229,6 +220,17 @@ func updateTun(tun *config.Tun, dns *config.DNS) {
P.ReCreateTun(tun, dns, tunnel.TCPIn(), tunnel.UDPIn())
}
func updateSniffer(sniffer *config.Sniffer) {
if sniffer.Enable {
var err error
SNI.Dispatcher, err = SNI.NewSnifferDispatcher(sniffer.Sniffers, sniffer.Force)
if err != nil {
log.Warnln("initial sniffer failed, err:%v", err)
}
log.Infoln("Sniffer is loaded and working")
}
}
func updateGeneral(general *config.General, force bool) {
log.SetLevel(general.LogLevel)
tunnel.SetMode(general.Mode)