mirror of
https://github.com/nadoo/glider.git
synced 2025-02-23 17:35:40 +08:00
direct: optimized local ip logic
This commit is contained in:
parent
c9e9ebd287
commit
edd5964a1e
@ -217,7 +217,7 @@ Available forward strategies:
|
|||||||
|
|
||||||
Forwarder option scheme: FORWARD_URL#OPTIONS
|
Forwarder option scheme: FORWARD_URL#OPTIONS
|
||||||
priority: set the priority of that forwarder, default:0
|
priority: set the priority of that forwarder, default:0
|
||||||
interface: set local interface or ip address used to connect remote forwarder
|
interface: set local interface or ip address used to connect remote server
|
||||||
-
|
-
|
||||||
Examples:
|
Examples:
|
||||||
socks5://1.1.1.1:1080#priority=100
|
socks5://1.1.1.1:1080#priority=100
|
||||||
|
3
conf.go
3
conf.go
@ -193,10 +193,13 @@ func usage() {
|
|||||||
|
|
||||||
fmt.Fprintf(os.Stderr, "Forwarder option scheme: FORWARD_URL#OPTIONS\n")
|
fmt.Fprintf(os.Stderr, "Forwarder option scheme: FORWARD_URL#OPTIONS\n")
|
||||||
fmt.Fprintf(os.Stderr, " priority: set the priority of that forwarder, default:0\n")
|
fmt.Fprintf(os.Stderr, " priority: set the priority of that forwarder, default:0\n")
|
||||||
|
fmt.Fprintf(os.Stderr, " interface: set local interface or ip address used to connect remote server\n")
|
||||||
fmt.Fprintf(os.Stderr, " -\n")
|
fmt.Fprintf(os.Stderr, " -\n")
|
||||||
fmt.Fprintf(os.Stderr, " Examples:\n")
|
fmt.Fprintf(os.Stderr, " Examples:\n")
|
||||||
fmt.Fprintf(os.Stderr, " socks5://1.1.1.1:1080#priority=100\n")
|
fmt.Fprintf(os.Stderr, " socks5://1.1.1.1:1080#priority=100\n")
|
||||||
fmt.Fprintf(os.Stderr, " vmess://[security:]uuid@host:port?alterID=num#priority=200\n")
|
fmt.Fprintf(os.Stderr, " vmess://[security:]uuid@host:port?alterID=num#priority=200\n")
|
||||||
|
fmt.Fprintf(os.Stderr, " vmess://[security:]uuid@host:port?alterID=num#priority=200&interface=192.168.1.99\n")
|
||||||
|
fmt.Fprintf(os.Stderr, " vmess://[security:]uuid@host:port?alterID=num#priority=200&interface=eth0\n")
|
||||||
fmt.Fprintf(os.Stderr, "\n")
|
fmt.Fprintf(os.Stderr, "\n")
|
||||||
|
|
||||||
fmt.Fprintf(os.Stderr, "Config file format(see `"+app+".conf.example` as an example):\n")
|
fmt.Fprintf(os.Stderr, "Config file format(see `"+app+".conf.example` as an example):\n")
|
||||||
|
@ -8,7 +8,7 @@ import (
|
|||||||
|
|
||||||
// Direct proxy
|
// Direct proxy
|
||||||
type Direct struct {
|
type Direct struct {
|
||||||
iface *net.Interface
|
iface *net.Interface // interface specified by user
|
||||||
ip net.IP
|
ip net.IP
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -39,30 +39,36 @@ func (d *Direct) Addr() string { return "DIRECT" }
|
|||||||
|
|
||||||
// Dial connects to the address addr on the network net
|
// Dial connects to the address addr on the network net
|
||||||
func (d *Direct) Dial(network, addr string) (c net.Conn, err error) {
|
func (d *Direct) Dial(network, addr string) (c net.Conn, err error) {
|
||||||
for _, ip := range d.LocalIPs() {
|
c, err = dial(network, addr, d.ip)
|
||||||
c, err = d.dial(network, addr, ip)
|
if err == nil {
|
||||||
// log.F("dial %s using ip: %s", addr, ip)
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, ip := range d.IFaceIPs() {
|
||||||
|
c, err = dial(network, addr, ip)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
|
d.ip = ip
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Direct) dial(network, addr string, localIP net.IP) (net.Conn, error) {
|
func dial(network, addr string, localIP net.IP) (net.Conn, error) {
|
||||||
if network == "uot" {
|
if network == "uot" {
|
||||||
network = "udp"
|
network = "udp"
|
||||||
}
|
}
|
||||||
|
|
||||||
var localAddr net.Addr
|
var la net.Addr
|
||||||
switch network {
|
switch network {
|
||||||
case "tcp":
|
case "tcp":
|
||||||
localAddr = &net.TCPAddr{IP: localIP}
|
la = &net.TCPAddr{IP: localIP}
|
||||||
case "udp":
|
case "udp":
|
||||||
localAddr = &net.UDPAddr{IP: localIP}
|
la = &net.UDPAddr{IP: localIP}
|
||||||
}
|
}
|
||||||
|
|
||||||
dialer := &net.Dialer{LocalAddr: localAddr}
|
dialer := &net.Dialer{LocalAddr: la}
|
||||||
c, err := dialer.Dial(network, addr)
|
c, err := dialer.Dial(network, addr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -78,7 +84,12 @@ func (d *Direct) dial(network, addr string, localIP net.IP) (net.Conn, error) {
|
|||||||
// DialUDP connects to the given address
|
// DialUDP connects to the given address
|
||||||
func (d *Direct) DialUDP(network, addr string) (net.PacketConn, net.Addr, error) {
|
func (d *Direct) DialUDP(network, addr string) (net.PacketConn, net.Addr, error) {
|
||||||
// TODO: support specifying local interface
|
// TODO: support specifying local interface
|
||||||
pc, err := net.ListenPacket(network, "")
|
la := ""
|
||||||
|
if d.ip != nil {
|
||||||
|
la = d.ip.String() + ":0"
|
||||||
|
}
|
||||||
|
|
||||||
|
pc, err := net.ListenPacket(network, la)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.F("ListenPacket error: %s", err)
|
log.F("ListenPacket error: %s", err)
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
@ -91,18 +102,8 @@ func (d *Direct) DialUDP(network, addr string) (net.PacketConn, net.Addr, error)
|
|||||||
// NextDialer returns the next dialer
|
// NextDialer returns the next dialer
|
||||||
func (d *Direct) NextDialer(dstAddr string) Dialer { return d }
|
func (d *Direct) NextDialer(dstAddr string) Dialer { return d }
|
||||||
|
|
||||||
// LocalIPs returns ip addresses according to the specified interface
|
// IFaceIPs returns ip addresses according to the specified interface
|
||||||
func (d *Direct) LocalIPs() (ips []net.IP) {
|
func (d *Direct) IFaceIPs() (ips []net.IP) {
|
||||||
if d.ip != nil {
|
|
||||||
ips = []net.IP{d.ip}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if d.iface == nil {
|
|
||||||
ips = []net.IP{nil}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
ipnets, err := d.iface.Addrs()
|
ipnets, err := d.iface.Addrs()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user