unix, udp: fixed nat issue (#194)

This commit is contained in:
nadoo committed 2020-12-03 23:47:26 +08:00
1 parent 539f604e37
commit 10b7f2d5e6
6 files changed
+47 -37

No files matched your search

+18 -13
View File
@@ -71,21 +71,19 @@ func (s *UDP) ListenAndServe() {
continue
}
var raddr net.Addr
var pc net.PacketConn
var dialer proxy.UDPDialer
var session *natEntry
v, ok := nm.Load(lraddr.String())
if !ok && v == nil {
// we know we are creating an udp tunnel, so the dial addr is meaningless,
// we use lraddr here to help the unix client to identify the source socket.
pc, dialer, raddr, err = s.proxy.DialUDP("udp", lraddr.String())
pc, _, raddr, err := s.proxy.DialUDP("udp", lraddr.String())
if err != nil {
log.F("[udp] remote dial error: %v", err)
continue
}
nm.Store(lraddr.String(), pc)
session = newNatEntry(pc, raddr)
nm.Store(lraddr.String(), session)
go func(c, pc net.PacketConn, lraddr net.Addr) {
proxy.RelayUDP(c, lraddr, pc, 2*time.Minute)
@@ -93,23 +91,30 @@ func (s *UDP) ListenAndServe() {
nm.Delete(lraddr.String())
}(c, pc, lraddr)
log.F("[udp] %s <-> %s", lraddr, raddr)
} else {
pc = v.(net.PacketConn)
session = v.(*natEntry)
}
_, err = pc.WriteTo(buf[:n], raddr)
_, err = session.WriteTo(buf[:n], session.raddr)
if err != nil {
log.F("[udp] remote write error: %v", err)
log.F("[udp] remote write error: %v, raddr: %s", err, session.raddr)
continue
}
if dialer != nil {
log.F("[udp] %s <-> %s", lraddr, dialer.Addr())
}
}
}
type natEntry struct {
net.PacketConn
raddr net.Addr
}
func newNatEntry(pc net.PacketConn, raddr net.Addr) *natEntry {
return &natEntry{PacketConn: pc, raddr: raddr}
}
// Serve serves a connection.
func (s *UDP) Serve(c net.Conn) {
log.F("[udp] func Serve: can not be called directly")