black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-25 18:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix naive inbound temporary

Browse source
This commit is contained in:
世界 2022-09-07 12:28:41 +08:00
parent ef013e0639
commit 3b48fa455e
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
inbound/naive.go
View file

@ -20,7 +20,6 @@ import (
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/auth" "github.com/sagernet/sing/common/auth"
"github.com/sagernet/sing/common/buf" "github.com/sagernet/sing/common/buf"
"github.com/sagernet/sing/common/bufio"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
M "github.com/sagernet/sing/common/metadata" M "github.com/sagernet/sing/common/metadata"
N "github.com/sagernet/sing/common/network" N "github.com/sagernet/sing/common/network"
@ -361,7 +360,7 @@ func (c *naiveH1Conn) WriteBuffer(buffer *buf.Buffer) error {
n, err = bufio.Copy(w, c.Conn) n, err = bufio.Copy(w, c.Conn)
} }
return n, wrapHttpError(err) return n, wrapHttpError(err)
}*/ }
func (c *naiveH1Conn) ReadFrom(r io.Reader) (n int64, err error) { func (c *naiveH1Conn) ReadFrom(r io.Reader) (n int64, err error) {
if c.writePadding < kFirstPaddings { if c.writePadding < kFirstPaddings {
@ -371,13 +370,14 @@ func (c *naiveH1Conn) ReadFrom(r io.Reader) (n int64, err error) {
} }
return n, wrapHttpError(err) return n, wrapHttpError(err)
} }
*/
func (c *naiveH1Conn) Upstream() any { func (c *naiveH1Conn) Upstream() any {
return c.Conn return c.Conn
} }
func (c *naiveH1Conn) ReaderReplaceable() bool { func (c *naiveH1Conn) ReaderReplaceable() bool {
return c.readRemaining == kFirstPaddings return c.readPadding == kFirstPaddings
} }
func (c *naiveH1Conn) WriterReplaceable() bool { func (c *naiveH1Conn) WriterReplaceable() bool {
@ -539,7 +539,7 @@ func (c *naiveH2Conn) WriteBuffer(buffer *buf.Buffer) error {
n, err = bufio.Copy(w, c.reader) n, err = bufio.Copy(w, c.reader)
} }
return n, wrapHttpError(err) return n, wrapHttpError(err)
}*/ }
func (c *naiveH2Conn) ReadFrom(r io.Reader) (n int64, err error) { func (c *naiveH2Conn) ReadFrom(r io.Reader) (n int64, err error) {
if c.writePadding < kFirstPaddings { if c.writePadding < kFirstPaddings {
@ -548,7 +548,7 @@ func (c *naiveH2Conn) ReadFrom(r io.Reader) (n int64, err error) {
n, err = bufio.Copy(c.writer, r) n, err = bufio.Copy(c.writer, r)
} }
return n, wrapHttpError(err) return n, wrapHttpError(err)
} }*/
func (c *naiveH2Conn) Close() error { func (c *naiveH2Conn) Close() error {
return common.Close( return common.Close(
@ -586,7 +586,7 @@ func (c *naiveH2Conn) UpstreamWriter() any {
} }
func (c *naiveH2Conn) ReaderReplaceable() bool { func (c *naiveH2Conn) ReaderReplaceable() bool {
return c.readRemaining == kFirstPaddings return c.readPadding == kFirstPaddings
} }
func (c *naiveH2Conn) WriterReplaceable() bool { func (c *naiveH2Conn) WriterReplaceable() bool {