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

Fix none readfrom

Browse source
This commit is contained in:
世界 2022-06-06 10:03:23 +08:00
parent 1e22882ea8
commit b941e76915
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
none.go
View file

@ -92,7 +92,7 @@ func (c *noneConn) WriteBuffer(buffer *buf.Buffer) error {
} }
func (c *noneConn) ReadFrom(r io.Reader) (n int64, err error) { func (c *noneConn) ReadFrom(r io.Reader) (n int64, err error) {
if c.handshake { if !c.handshake {
return bufio.ReadFrom0(c, r) return bufio.ReadFrom0(c, r)
} }
return bufio.Copy(c.Conn, r) return bufio.Copy(c.Conn, r)
@ -106,6 +106,18 @@ func (c *noneConn) RemoteAddr() net.Addr {
return c.destination.TCPAddr() return c.destination.TCPAddr()
} }
func (c *noneConn) Upstream() any {
return c.Conn
}
func (c *noneConn) ReaderReplaceable() bool {
return true
}
func (c *noneConn) WriterReplaceable() bool {
return c.handshake
}
type nonePacketConn struct { type nonePacketConn struct {
net.Conn net.Conn
} }

8
shadowaead/aead.go
View file

@ -362,14 +362,6 @@ type BufferedWriter struct {
index int index int
} }
func (w *BufferedWriter) UpstreamWriter() io.Writer {
return w.upstream
}
func (w *BufferedWriter) WriterReplaceable() bool {
return w.index == 0
}
func (w *BufferedWriter) Write(p []byte) (n int, err error) { func (w *BufferedWriter) Write(p []byte) (n int, err error) {
var index int var index int
for { for {