lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-18 07:17:32 -05:00
Code Issues Releases Wiki Activity

skip empty payload in ray

Browse Source
This commit is contained in:
Darien Raymond 2016-12-27 00:44:11 +01:00
parent 38e4cad8d1
commit f7379bc1c3
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
transport/ray/direct.go
View File

@ -70,6 +70,10 @@ func (v *Stream) Read() (*buf.Buffer, error) {
} }
func (v *Stream) Write(data *buf.Buffer) (err error) { func (v *Stream) Write(data *buf.Buffer) (err error) {
if data.IsEmpty() {
return
}
select { select {
case <-v.destClose: case <-v.destClose:
return io.ErrClosedPipe return io.ErrClosedPipe

12
transport/ray/direct_test.go
View File

@ -13,7 +13,9 @@ func TestStreamIO(t *testing.T) {
assert := assert.On(t) assert := assert.On(t)
stream := NewStream() stream := NewStream()
assert.Error(stream.Write(buf.New())).IsNil() b1 := buf.New()
b1.AppendBytes('a')
assert.Error(stream.Write(b1)).IsNil()
_, err := stream.Read() _, err := stream.Read()
assert.Error(err).IsNil() assert.Error(err).IsNil()
@ -22,7 +24,9 @@ func TestStreamIO(t *testing.T) {
_, err = stream.Read() _, err = stream.Read()
assert.Error(err).Equals(io.EOF) assert.Error(err).Equals(io.EOF)
err = stream.Write(buf.New()) b2 := buf.New()
b2.AppendBytes('b')
err = stream.Write(b2)
assert.Error(err).Equals(io.ErrClosedPipe) assert.Error(err).Equals(io.ErrClosedPipe)
} }
@ -30,7 +34,9 @@ func TestStreamClose(t *testing.T) {
assert := assert.On(t) assert := assert.On(t)
stream := NewStream() stream := NewStream()
assert.Error(stream.Write(buf.New())).IsNil() b1 := buf.New()
b1.AppendBytes('a')
assert.Error(stream.Write(b1)).IsNil()
stream.Close() stream.Close()