SagerNet/sing-shadowsocks
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-shadowsocks.git synced 2025-04-03 20:07:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve none client

Browse source
This commit is contained in:
世界 2022-05-30 11:26:06 +08:00
parent 9fbb103c01
commit 1a554a61f3
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
3 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

40
none.go
View file

@ -60,9 +60,6 @@ type noneConn struct {
}
func (c *noneConn) clientHandshake() error {
c.access.Lock()
defer c.access.Unlock()
err := M.SocksaddrSerializer.WriteAddrPort(c.Conn, c.destination)
if err != nil {
return err
@ -71,37 +68,38 @@ func (c *noneConn) clientHandshake() error {
return nil
}
// TODO: add write buffer support
func (c *noneConn) Write(b []byte) (n int, err error) {
if c.handshake {
return c.Conn.Write(b)
}
c.access.Lock()
if c.handshake {
c.access.Unlock()
return c.Conn.Write(b)
}
err = M.SocksaddrSerializer.WriteAddrPort(c.Conn, c.destination)
if err != nil {
return
}
c.handshake = true
c.access.Unlock()
return c.Conn.Write(b)
}
func (c *noneConn) ReadFrom(r io.Reader) (n int64, err error) {
if !c.handshake {
c.access.Lock()
if !c.handshake {
c.access.Unlock()
return bufio.ReadFrom0(c, r)
}
c.access.Unlock()
func (c *noneConn) WriteBuffer(buffer *buf.Buffer) error {
defer buffer.Release()
if c.handshake {
return common.Error(c.Conn.Write(buffer.Bytes()))
}
return c.Conn.(io.ReaderFrom).ReadFrom(r)
header := buf.With(buffer.ExtendHeader(M.SocksaddrSerializer.AddrPortLen(c.destination)))
err := M.SocksaddrSerializer.WriteAddrPort(header, c.destination)
if err != nil {
return err
}
c.handshake = true
return common.Error(c.Conn.Write(buffer.Bytes()))
}
func (c *noneConn) ReadFrom(r io.Reader) (n int64, err error) {
if c.handshake {
return bufio.ReadFrom0(c, r)
}
return bufio.Copy(c.Conn, r)
}
func (c *noneConn) WriteTo(w io.Writer) (n int64, err error) {