general: move proxy to separate package

This commit is contained in:
nadoo committed 2018-06-26 16:15:48 +08:00
1 parent 3e09aa9ce0
commit fbbae71314
35 files changed
+1127 -932

No files matched your search

+18 -8
View File
@@ -1,24 +1,27 @@
package main
import (
"log"
stdlog "log"
"os"
"os/signal"
"strings"
"syscall"
"github.com/nadoo/glider/common/log"
"github.com/nadoo/glider/proxy"
)
// VERSION .
const VERSION = "0.5.2"
const VERSION = "0.6.0"
func dialerFromConf() Dialer {
func dialerFromConf() proxy.Dialer {
// global forwarders in xx.conf
var fwdrs []Dialer
var fwdrs []proxy.Dialer
for _, chain := range conf.Forward {
var fwdr Dialer
var fwdr proxy.Dialer
var err error
for _, url := range strings.Split(chain, ",") {
fwdr, err = DialerFromURL(url, fwdr)
fwdr, err = proxy.DialerFromURL(url, fwdr)
if err != nil {
log.Fatal(err)
}
@@ -32,10 +35,17 @@ func dialerFromConf() Dialer {
func main() {
confInit()
log.F = func(f string, v ...interface{}) {
if conf.Verbose {
stdlog.Printf(f, v...)
}
}
sDialer := NewRuleDialer(conf.rules, dialerFromConf())
for _, listen := range conf.Listen {
local, err := ServerFromURL(listen, sDialer)
local, err := proxy.ServerFromURL(listen, sDialer)
if err != nil {
log.Fatal(err)
}
@@ -45,7 +55,7 @@ func main() {
ipsetM, err := NewIPSetManager(conf.IPSet, conf.rules)
if err != nil {
logf("create ipset manager error: %s", err)
log.F("create ipset manager error: %s", err)
}
if conf.DNS != "" {