GuanM/hysteria-dev
1
0
Fork 0
mirror of https://github.com/cmz0228/hysteria-dev.git synced 2025-09-21 07:26:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: rework resolver support

Browse Source
This commit is contained in:
Toby
2022-08-06 19:58:05 -07:00
parent a2ab9e0425
commit 3f0953ffdd
8 changed files with 213 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/client.go
View File

@@ -35,7 +35,12 @@ func client(config *clientConfig) {
logrus.WithField("config", config.String()).Info("Client configuration loaded")
// Resolver
if len(config.Resolver) > 0 {
setResolver(config.Resolver)
err := setResolver(config.Resolver)
if err != nil {
logrus.WithFields(logrus.Fields{
"error": err,
}).Fatal("Failed to set resolver")
}
}
// TLS
tlsConfig := &tls.Config{
@@ -100,15 +105,13 @@ func client(config *clientConfig) {
}
// Resolve preference
if len(config.ResolvePreference) > 0 {
pref, excl, err := transport.ResolvePreferenceFromString(config.ResolvePreference)
pref, err := transport.ResolvePreferenceFromString(config.ResolvePreference)
if err != nil {
logrus.WithFields(logrus.Fields{
"error": err,
}).Fatal("Failed to parse the resolve preference")
}
transport.DefaultClientTransport.PrefEnabled = true
transport.DefaultClientTransport.PrefIPv6 = pref
transport.DefaultClientTransport.PrefExclusive = excl
transport.DefaultClientTransport.ResolvePreference = pref
}
// ACL
var aclEngine *acl.Engine