mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
proxy: drop tcptun and udptun, use tcp and udp instead
This commit is contained in:
1 parent
adfb2fb9b4
commit
c9f3c20bc1
15 files changed
+49
-267
No files matched your search
+11
-2
@@ -48,16 +48,26 @@ func ForwarderFromURL(s, intface string, dialTimeout, relayTimeout time.Duration
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var addrs []string
|
||||
for _, url := range strings.Split(ss[0], ",") {
|
||||
d, err = proxy.DialerFromURL(url, d)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
cnt := len(addrs)
|
||||
if cnt == 0 ||
|
||||
(cnt > 0 && d.Addr() != addrs[cnt-1]) {
|
||||
addrs = append(addrs, d.Addr())
|
||||
}
|
||||
}
|
||||
|
||||
f.Dialer = d
|
||||
f.addr = d.Addr()
|
||||
|
||||
if len(addrs) > 0 {
|
||||
f.addr = strings.Join(addrs, ",")
|
||||
}
|
||||
|
||||
// set forwarder to disabled by default
|
||||
f.Disable()
|
||||
|
||||
@@ -70,7 +80,6 @@ func DirectForwarder(intface string, dialTimeout, relayTimeout time.Duration) *F
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
return &Forwarder{Dialer: d, addr: d.Addr()}
|
||||
}
|
||||
|
||||
@@ -93,6 +102,7 @@ func (f *Forwarder) parseOption(option string) error {
|
||||
}
|
||||
|
||||
// Addr returns the forwarder's addr.
|
||||
// NOTE: addr returns for chained dialers: dialer1Addr,dialer2Addr,...
|
||||
func (f *Forwarder) Addr() string {
|
||||
return f.addr
|
||||
}
|
||||
@@ -103,7 +113,6 @@ func (f *Forwarder) Dial(network, addr string) (c net.Conn, err error) {
|
||||
if err != nil {
|
||||
f.IncFailures()
|
||||
}
|
||||
|
||||
return c, err
|
||||
}
|
||||
|
||||
|
||||
+6
-3
@@ -102,8 +102,10 @@ func (p *FwdrGroup) Dial(network, addr string) (net.Conn, proxy.Dialer, error) {
|
||||
}
|
||||
|
||||
// DialUDP connects to the given address.
|
||||
func (p *FwdrGroup) DialUDP(network, addr string) (pc net.PacketConn, writeTo net.Addr, err error) {
|
||||
return p.NextDialer(addr).DialUDP(network, addr)
|
||||
func (p *FwdrGroup) DialUDP(network, addr string) (pc net.PacketConn, dialer proxy.UDPDialer, writeTo net.Addr, err error) {
|
||||
nd := p.NextDialer(addr)
|
||||
pc, wt, err := nd.DialUDP(network, addr)
|
||||
return pc, nd, wt, err
|
||||
}
|
||||
|
||||
// NextDialer returns the next dialer.
|
||||
@@ -244,6 +246,7 @@ func (p *FwdrGroup) check(fwdr *Forwarder, checker Checker) {
|
||||
if errors.Is(err, proxy.ErrNotSupported) {
|
||||
fwdr.SetMaxFailures(0)
|
||||
log.F("[check] %s(%d), %s, stop checking", fwdr.Addr(), fwdr.Priority(), err)
|
||||
fwdr.Enable()
|
||||
break
|
||||
}
|
||||
|
||||
@@ -258,9 +261,9 @@ func (p *FwdrGroup) check(fwdr *Forwarder, checker Checker) {
|
||||
}
|
||||
|
||||
wait = 1
|
||||
fwdr.Enable()
|
||||
fwdr.SetLatency(int64(elapsed))
|
||||
log.F("[check] %s(%d), SUCCESS. elapsed: %s", fwdr.Addr(), fwdr.Priority(), elapsed)
|
||||
fwdr.Enable()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -61,7 +61,7 @@ func (p *Proxy) Dial(network, addr string) (net.Conn, proxy.Dialer, error) {
|
||||
}
|
||||
|
||||
// DialUDP connects to the given address via the proxy.
|
||||
func (p *Proxy) DialUDP(network, addr string) (pc net.PacketConn, writeTo net.Addr, err error) {
|
||||
func (p *Proxy) DialUDP(network, addr string) (pc net.PacketConn, dialer proxy.UDPDialer, writeTo net.Addr, err error) {
|
||||
return p.findDialer(addr).DialUDP(network, addr)
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user