root/gost_software
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve ssu data transport

Browse Source
This commit is contained in:
ginuerzh 2019-12-18 10:27:52 +08:00
parent 68f27a15d9
commit 3cb301dea5
1 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ss.go
View File

@ -455,25 +455,26 @@ func (h *shadowUDPdHandler) Handle(conn net.Conn) {
func (h *shadowUDPdHandler) transportUDP(sc net.Conn, cc net.PacketConn) error { func (h *shadowUDPdHandler) transportUDP(sc net.Conn, cc net.PacketConn) error {
errc := make(chan error, 1) errc := make(chan error, 1)
go func() { go func() {
for { for {
b := mPool.Get().([]byte) er := func() (err error) {
defer mPool.Put(b) b := lPool.Get().([]byte)
defer lPool.Put(b)
b[0] = 0 b[0] = 0
b[1] = 0 b[1] = 0
b[2] = 0 b[2] = 0
n, err := sc.Read(b[3:]) // add rsv and frag fields to make it the standard SOCKS5 UDP datagram // add rsv and frag fields to make it the standard SOCKS5 UDP datagram
n, err := sc.Read(b[3:])
if err != nil { if err != nil {
// log.Logf("[ssu] %s - %s : %s", sc.RemoteAddr(), sc.LocalAddr(), err) // log.Logf("[ssu] %s - %s : %s", sc.RemoteAddr(), sc.LocalAddr(), err)
errc <- err
return return
} }
dgram, err := gosocks5.ReadUDPDatagram(bytes.NewReader(b[:n+3])) dgram, err := gosocks5.ReadUDPDatagram(bytes.NewReader(b[:n+3]))
if err != nil { if err != nil {
log.Logf("[ssu] %s - %s : %s", sc.RemoteAddr(), sc.LocalAddr(), err) log.Logf("[ssu] %s - %s : %s", sc.RemoteAddr(), sc.LocalAddr(), err)
errc <- err
return return
} }
if Debug { if Debug {
@ -481,15 +482,18 @@ func (h *shadowUDPdHandler) transportUDP(sc net.Conn, cc net.PacketConn) error {
} }
addr, err := net.ResolveUDPAddr("udp", dgram.Header.Addr.String()) addr, err := net.ResolveUDPAddr("udp", dgram.Header.Addr.String())
if err != nil { if err != nil {
errc <- err
return return
} }
if h.options.Bypass.Contains(addr.String()) { if h.options.Bypass.Contains(addr.String()) {
log.Log("[ssu] bypass", addr) log.Log("[ssu] bypass", addr)
continue // bypass return // bypass
} }
if _, err := cc.WriteTo(dgram.Data, addr); err != nil { _, err = cc.WriteTo(dgram.Data, addr)
errc <- err return
}()
if er != nil {
errc <- er
return return
} }
} }
@ -497,12 +501,12 @@ func (h *shadowUDPdHandler) transportUDP(sc net.Conn, cc net.PacketConn) error {
go func() { go func() {
for { for {
b := mPool.Get().([]byte) er := func() (err error) {
defer mPool.Put(b) b := lPool.Get().([]byte)
defer lPool.Put(b)
n, addr, err := cc.ReadFrom(b) n, addr, err := cc.ReadFrom(b)
if err != nil { if err != nil {
errc <- err
return return
} }
if Debug { if Debug {
@ -510,17 +514,21 @@ func (h *shadowUDPdHandler) transportUDP(sc net.Conn, cc net.PacketConn) error {
} }
if h.options.Bypass.Contains(addr.String()) { if h.options.Bypass.Contains(addr.String()) {
log.Log("[ssu] bypass", addr) log.Log("[ssu] bypass", addr)
continue // bypass return // bypass
} }
dgram := gosocks5.NewUDPDatagram(gosocks5.NewUDPHeader(0, 0, toSocksAddr(addr)), b[:n]) dgram := gosocks5.NewUDPDatagram(gosocks5.NewUDPHeader(0, 0, toSocksAddr(addr)), b[:n])
buf := bytes.Buffer{} buf := bytes.Buffer{}
dgram.Write(&buf) dgram.Write(&buf)
if buf.Len() < 10 { if buf.Len() < 10 {
log.Logf("[ssu] %s <- %s : invalid udp datagram", sc.RemoteAddr(), addr) log.Logf("[ssu] %s <- %s : invalid udp datagram", sc.RemoteAddr(), addr)
continue return // ignore invalid datagram
} }
if _, err := sc.Write(buf.Bytes()[3:]); err != nil { _, err = sc.Write(buf.Bytes()[3:])
errc <- err return
}()
if er != nil {
errc <- er
return return
} }
} }