forwarder: add the ability to specify local ip. #48

This commit is contained in:
nadoo committed 2018-08-15 00:54:17 +08:00
1 parent 205b4efac7
commit 39ccbc5adf
7 files changed
+44 -28

No files matched your search

+1 -1
View File
@@ -45,7 +45,7 @@ func DialerFromURL(s string, dialer Dialer) (Dialer, error) {
}
if dialer == nil {
dialer = Direct
dialer = Default
}
c, ok := dialerMap[strings.ToLower(u.Scheme)]
+25 -10
View File
@@ -6,20 +6,33 @@ import (
"github.com/nadoo/glider/common/log"
)
// direct proxy
type direct struct{}
// Direct proxy
var Direct = &direct{}
type Direct struct {
*net.Dialer
}
func (d *direct) Addr() string { return "DIRECT" }
// Default dialer
var Default = &Direct{Dialer: &net.Dialer{}}
func (d *direct) Dial(network, addr string) (net.Conn, error) {
// NewDirect returns a Direct dialer
func NewDirect(localip string) *Direct {
d := &net.Dialer{LocalAddr: &net.TCPAddr{
IP: net.ParseIP(localip),
Port: 0,
}}
return &Direct{Dialer: d}
}
// Addr returns forwarder's address
func (d *Direct) Addr() string { return "DIRECT" }
// Dial connects to the address addr on the network net
func (d *Direct) Dial(network, addr string) (net.Conn, error) {
if network == "uot" {
network = "udp"
}
c, err := net.Dial(network, addr)
c, err := d.Dialer.Dial(network, addr)
if err != nil {
return nil, err
}
@@ -31,8 +44,9 @@ func (d *direct) Dial(network, addr string) (net.Conn, error) {
return c, err
}
func (d *direct) DialUDP(network, addr string) (net.PacketConn, net.Addr, error) {
pc, err := net.ListenPacket(network, "")
// DialUDP connects to the given address
func (d *Direct) DialUDP(network, addr string) (net.PacketConn, net.Addr, error) {
pc, err := net.ListenPacket(network, d.Dialer.LocalAddr.String())
if err != nil {
log.F("ListenPacket error: %s", err)
return nil, nil, err
@@ -42,4 +56,5 @@ func (d *direct) DialUDP(network, addr string) (net.PacketConn, net.Addr, error)
return pc, uAddr, err
}
func (d *direct) NextDialer(dstAddr string) Dialer { return d }
// NextDialer returns the next dialer
func (d *Direct) NextDialer(dstAddr string) Dialer { return d }
+12 -10
View File
@@ -19,12 +19,19 @@ type Forwarder struct {
failures uint32
MaxFailures uint32 //maxfailures to set to Disabled
latency int64
localip string // local ip address
}
// ForwarderFromURL parses `forward=` command value and returns a new forwarder
func ForwarderFromURL(s string) (f *Forwarder, err error) {
f = &Forwarder{}
ss := strings.Split(s, "#")
var d Dialer
if len(ss) > 1 {
err = f.parseOption(ss[1])
}
var d Dialer = NewDirect(f.localip)
for _, url := range strings.Split(ss[0], ",") {
d, err = DialerFromURL(url, d)
if err != nil {
@@ -32,19 +39,12 @@ func ForwarderFromURL(s string) (f *Forwarder, err error) {
}
}
f = NewForwarder(d)
if len(ss) > 1 {
err = f.parseOption(ss[1])
}
f.Dialer = d
f.addr = d.Addr()
return f, err
}
// NewForwarder returns a new forwarder
func NewForwarder(dialer Dialer) *Forwarder {
return &Forwarder{Dialer: dialer, addr: dialer.Addr()}
}
func (f *Forwarder) parseOption(option string) error {
query, err := url.ParseQuery(option)
if err != nil {
@@ -58,6 +58,8 @@ func (f *Forwarder) parseOption(option string) error {
}
f.Priority = int(priority)
f.localip = query.Get("localip")
return err
}
+1 -1
View File
@@ -39,7 +39,7 @@ func ServerFromURL(s string, dialer Dialer) (Server, error) {
}
if dialer == nil {
dialer = Direct
dialer = Default
}
c, ok := serverMap[strings.ToLower(u.Scheme)]