mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
config: better naming and some minor optimizations
This commit is contained in:
1 parent
2d71facf9b
commit
72a2782395
9 files changed
+63
-62
No files matched your search
@@ -2,8 +2,6 @@ package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
stdlog "log"
|
||||
"net"
|
||||
"os"
|
||||
"os/signal"
|
||||
@@ -36,34 +34,27 @@ import (
|
||||
_ "github.com/nadoo/glider/proxy/ws"
|
||||
)
|
||||
|
||||
var version = "0.11.0"
|
||||
var (
|
||||
version = "0.11.0"
|
||||
config = parseConfig()
|
||||
)
|
||||
|
||||
func main() {
|
||||
// read configs
|
||||
confInit()
|
||||
|
||||
// setup a log func
|
||||
if conf.Verbose {
|
||||
log.F = func(f string, v ...interface{}) {
|
||||
stdlog.Output(2, fmt.Sprintf(f, v...))
|
||||
}
|
||||
}
|
||||
|
||||
// global rule proxy
|
||||
pxy := rule.NewProxy(conf.Forward, &conf.StrategyConfig, conf.rules)
|
||||
pxy := rule.NewProxy(config.Forward, &config.StrategyConfig, config.rules)
|
||||
|
||||
// ipset manager
|
||||
ipsetM, _ := ipset.NewManager(conf.rules)
|
||||
ipsetM, _ := ipset.NewManager(config.rules)
|
||||
|
||||
// check and setup dns server
|
||||
if conf.DNS != "" {
|
||||
d, err := dns.NewServer(conf.DNS, pxy, &conf.DNSConfig)
|
||||
if config.DNS != "" {
|
||||
d, err := dns.NewServer(config.DNS, pxy, &config.DNSConfig)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
// rule
|
||||
for _, r := range conf.rules {
|
||||
// rules
|
||||
for _, r := range config.rules {
|
||||
for _, domain := range r.Domain {
|
||||
if len(r.DNSServers) > 0 {
|
||||
d.SetServers(domain, r.DNSServers)
|
||||
@@ -71,15 +62,6 @@ func main() {
|
||||
}
|
||||
}
|
||||
|
||||
// custom resolver
|
||||
net.DefaultResolver = &net.Resolver{
|
||||
PreferGo: true,
|
||||
Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
|
||||
d := net.Dialer{Timeout: time.Second * 3}
|
||||
return d.DialContext(ctx, "udp", conf.DNS)
|
||||
},
|
||||
}
|
||||
|
||||
// add a handler to update proxy rules when a domain resolved
|
||||
d.AddHandler(pxy.AddDomainIP)
|
||||
if ipsetM != nil {
|
||||
@@ -87,13 +69,22 @@ func main() {
|
||||
}
|
||||
|
||||
d.Start()
|
||||
|
||||
// custom resolver
|
||||
net.DefaultResolver = &net.Resolver{
|
||||
PreferGo: true,
|
||||
Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
|
||||
d := net.Dialer{Timeout: time.Second * 3}
|
||||
return d.DialContext(ctx, "udp", config.DNS)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// enable checkers
|
||||
pxy.Check()
|
||||
|
||||
// Proxy Servers
|
||||
for _, listen := range conf.Listen {
|
||||
for _, listen := range config.Listen {
|
||||
local, err := proxy.ServerFromURL(listen, pxy)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
|
||||
Reference in new issue
Block a user