general: add a forwarder struct and changed proxies to use it

This commit is contained in:
nadoo committed 2018-08-10 19:03:30 +08:00
1 parent 2fcef7b00c
commit 0da05ecedd
34 files changed
+1806 -1474

No files matched your search

+5 -5
View File
@@ -15,7 +15,7 @@ type Server interface {
}
// ServerCreator is a function to create proxy servers.
type ServerCreator func(s string, dialer Dialer) (Server, error)
type ServerCreator func(s string, f *Forwarder) (Server, error)
var (
serverMap = make(map[string]ServerCreator)
@@ -27,7 +27,7 @@ func RegisterServer(name string, c ServerCreator) {
}
// ServerFromURL calls the registered creator to create proxy servers.
func ServerFromURL(s string, dialer Dialer) (Server, error) {
func ServerFromURL(s string, f *Forwarder) (Server, error) {
if !strings.Contains(s, "://") {
s = "mixed://" + s
}
@@ -38,13 +38,13 @@ func ServerFromURL(s string, dialer Dialer) (Server, error) {
return nil, err
}
if dialer == nil {
dialer = Direct
if f == nil {
f = NewForwarder(Direct)
}
c, ok := serverMap[strings.ToLower(u.Scheme)]
if ok {
return c(s, dialer)
return c(s, f)
}
return nil, errors.New("unknown scheme '" + u.Scheme + "'")