udptun: optimize code

This commit is contained in:
nadoo 2018-01-17 22:44:04 +08:00
parent e1e8908ae2
commit 9ac6db498e

View File

@ -1,7 +1,9 @@
package main package main
import ( import (
"encoding/hex"
"net" "net"
"time"
) )
// UDPTun struct // UDPTun struct
@ -35,6 +37,7 @@ func (s *UDPTun) ListenAndServe() {
logf("proxy-udptun listening UDP on %s", s.addr) logf("proxy-udptun listening UDP on %s", s.addr)
buf := make([]byte, udpBufSize) buf := make([]byte, udpBufSize)
for { for {
n, clientAddr, err := c.ReadFrom(buf) n, clientAddr, err := c.ReadFrom(buf)
if err != nil { if err != nil {
@ -42,29 +45,41 @@ func (s *UDPTun) ListenAndServe() {
continue continue
} }
rc, wt, err := s.sDialer.DialUDP("udp", s.raddr) logf("ClientAddr: %s", clientAddr)
if err != nil { logf("ReadFrom:\n%s", hex.Dump(buf[:n]))
logf("proxy-udptun failed to connect to server %v: %v", s.raddr, err)
continue
}
n, err = rc.WriteTo(buf[:n], wt) go func() {
if err != nil { rc, wt, err := s.sDialer.DialUDP("udp", s.raddr)
logf("proxy-udptun rc.Write error: %v", err) if err != nil {
continue logf("proxy-udptun failed to connect to server %v: %v", s.raddr, err)
} return
}
buf = make([]byte, udpBufSize) logf("WriteTo")
n, _, err = rc.ReadFrom(buf) n, err = rc.WriteTo(buf[:n], wt)
if err != nil { if err != nil {
logf("proxy-udptun rc.Read error: %v", err) logf("proxy-udptun rc.Write error: %v", err)
continue return
} }
rc.Close()
// logf("rc resp: \n%s", hex.Dump(buf[:n])) logf("ReadFrom")
rcBuf := make([]byte, udpBufSize)
rc.SetReadDeadline(time.Now().Add(time.Minute))
n, _, err = rc.ReadFrom(rcBuf)
if err != nil {
logf("proxy-udptun rc.Read error: %v", err)
return
}
rc.Close()
// logf("rc resp: \n%s", hex.Dump(buf[:n]))
logf("c.WriteTo")
c.WriteTo(rcBuf[:n], clientAddr)
logf("proxy-udptun %s <-> %s", clientAddr, s.raddr)
}()
c.WriteTo(buf[:n], clientAddr)
logf("proxy-udptun %s <-> %s", clientAddr, s.raddr)
} }
} }