udptun: fixed a bug in nat mapping. #91

This commit is contained in:
nadoo committed 2019-03-12 23:32:23 +08:00
1 parent 4ece9ece25
commit 47406ce4ce
9 files changed
+84 -65

No files matched your search

+14 -14
View File
@@ -12,23 +12,23 @@ import (
"github.com/nadoo/glider/proxy"
)
// UDPTun struct
// UDPTun is a base udptun struct.
type UDPTun struct {
dialer proxy.Dialer
addr string
raddr string
taddr string // tunnel addr
uaddr *net.UDPAddr // tunnel addr
}
func init() {
proxy.RegisterServer("udptun", NewUDPTunServer)
}
// NewUDPTun returns a UDPTun proxy
// NewUDPTun returns a UDPTun proxy.
func NewUDPTun(s string, dialer proxy.Dialer) (*UDPTun, error) {
u, err := url.Parse(s)
if err != nil {
log.F("parse err: %s", err)
log.F("[udptun] parse err: %s", err)
return nil, err
}
@@ -38,18 +38,19 @@ func NewUDPTun(s string, dialer proxy.Dialer) (*UDPTun, error) {
p := &UDPTun{
dialer: dialer,
addr: d[0],
raddr: d[1],
taddr: d[1],
}
return p, nil
p.uaddr, err = net.ResolveUDPAddr("udp", p.taddr)
return p, err
}
// NewUDPTunServer returns a udp tunnel server
// NewUDPTunServer returns a udp tunnel server.
func NewUDPTunServer(s string, dialer proxy.Dialer) (proxy.Server, error) {
return NewUDPTun(s, dialer)
}
// ListenAndServe .
// ListenAndServe listen and serves on the given address.
func (s *UDPTun) ListenAndServe() {
c, err := net.ListenPacket("udp", s.addr)
if err != nil {
@@ -71,12 +72,11 @@ func (s *UDPTun) ListenAndServe() {
}
var pc net.PacketConn
var writeAddr net.Addr
v, ok := nm.Load(raddr.String())
if !ok && v == nil {
pc, writeAddr, err = s.dialer.DialUDP("udp", s.raddr)
pc, _, err = s.dialer.DialUDP("udp", s.taddr)
if err != nil {
log.F("[udptun] remote dial error: %v", err)
continue
@@ -94,18 +94,18 @@ func (s *UDPTun) ListenAndServe() {
pc = v.(net.PacketConn)
}
_, err = pc.WriteTo(buf[:n], writeAddr)
_, err = pc.WriteTo(buf[:n], s.uaddr)
if err != nil {
log.F("[udptun] remote write error: %v", err)
continue
}
log.F("[udptun] %s <-> %s", raddr, s.raddr)
log.F("[udptun] %s <-> %s", raddr, s.taddr)
}
}
// Serve .
// Serve serves a net.Conn, can not be called directly.
func (s *UDPTun) Serve(c net.Conn) {
log.F("[udptun] func Serve: can not be called directly")
}