BitMaster/hola-proxy
1
0
Fork 0
mirror of https://github.com/Snawoot/hola-proxy.git synced 2026-04-12 01:48:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use proxy stack for list modes

Browse Source
This commit is contained in:
Vladislav Yarmak
2021-03-23 23:58:28 +02:00
parent 910f76065f
commit 1f44e7548d
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
main.go
View File

@@ -101,13 +101,6 @@ func run() int {
return 0
}
if args.list_countries {
return print_countries(args.timeout)
}
if args.list_proxies {
return print_proxies(args.country, args.proxy_type, args.limit, args.timeout)
}
logWriter := NewLogWriter(os.Stderr)
defer logWriter.Close()
@@ -120,13 +113,6 @@ func run() int {
proxyLogger := NewCondLogger(log.New(logWriter, "PROXY : ",
log.LstdFlags|log.Lshortfile),
args.verbosity)
mainLogger.Info("hola-proxy client version %s is starting...", version)
mainLogger.Info("Constructing fallback DNS upstream...")
resolver, err := NewResolver(args.resolver, args.timeout)
if err != nil {
mainLogger.Critical("Unable to instantiate DNS resolver: %v", err)
return 6
}
var dialer ContextDialer = &net.Dialer{
Timeout: 30 * time.Second,
@@ -149,6 +135,21 @@ func run() int {
UpdateHolaDialer(dialer)
}
if args.list_countries {
return print_countries(args.timeout)
}
if args.list_proxies {
return print_proxies(args.country, args.proxy_type, args.limit, args.timeout)
}
mainLogger.Info("hola-proxy client version %s is starting...", version)
mainLogger.Info("Constructing fallback DNS upstream...")
resolver, err := NewResolver(args.resolver, args.timeout)
if err != nil {
mainLogger.Critical("Unable to instantiate DNS resolver: %v", err)
return 6
}
mainLogger.Info("Initializing configuration provider...")
auth, tunnels, err := CredService(args.rotate, args.timeout, args.country, args.proxy_type, credLogger)
if err != nil {