Compare commits

...

3 Commits

Author SHA1 Message Date
风扇滑翔翼
b5e3b5bb83 Refactor Test_maxUpload logic 2025-08-14 10:07:29 +00:00
风扇滑翔翼
2654aa5c7b refine 2025-08-14 09:41:13 +00:00
风扇滑翔翼
1258dca3ff Return writed
From annoying request
2025-08-14 09:39:21 +00:00
2 changed files with 14 additions and 18 deletions

View File

@@ -490,16 +490,15 @@ func (w uploadWriter) Write(b []byte) (int, error) {
*/ */
buffer := buf.MultiBufferContainer{} buffer := buf.MultiBufferContainer{}
n, err := buffer.Write(b) common.Must2(buffer.Write(b))
if err != nil {
return 0, err
}
var writed int
for _, buff := range buffer.MultiBuffer { for _, buff := range buffer.MultiBuffer {
err := w.WriteMultiBuffer(buf.MultiBuffer{buff}) err := w.WriteMultiBuffer(buf.MultiBuffer{buff})
if err != nil { if err != nil {
return 0, err return writed, err
} }
writed += int(buff.Len())
} }
return n, nil return writed, nil
} }

View File

@@ -1,6 +1,7 @@
package splithttp_test package splithttp_test
import ( import (
"bytes"
"context" "context"
"crypto/rand" "crypto/rand"
"fmt" "fmt"
@@ -421,18 +422,12 @@ func Test_maxUpload(t *testing.T) {
}, },
} }
var uploadSize int uploadReceived := make([]byte, 10001)
listen, err := ListenXH(context.Background(), net.LocalHostIP, listenPort, streamSettings, func(conn stat.Connection) { listen, err := ListenXH(context.Background(), net.LocalHostIP, listenPort, streamSettings, func(conn stat.Connection) {
go func(c stat.Connection) { go func(c stat.Connection) {
defer c.Close() defer c.Close()
var b [10240]byte
c.SetReadDeadline(time.Now().Add(2 * time.Second)) c.SetReadDeadline(time.Now().Add(2 * time.Second))
n, err := c.Read(b[:]) io.ReadFull(c, uploadReceived)
if err != nil {
return
}
uploadSize = n
common.Must2(c.Write([]byte("Response"))) common.Must2(c.Write([]byte("Response")))
}(conn) }(conn)
@@ -441,10 +436,12 @@ func Test_maxUpload(t *testing.T) {
ctx := context.Background() ctx := context.Background()
conn, err := Dial(ctx, net.TCPDestination(net.DomainAddress("localhost"), listenPort), streamSettings) conn, err := Dial(ctx, net.TCPDestination(net.DomainAddress("localhost"), listenPort), streamSettings)
common.Must(err)
// send a slightly too large upload // send a slightly too large upload
var upload [10001]byte upload := make([]byte, 10001)
_, err = conn.Write(upload[:]) rand.Read(upload)
_, err = conn.Write(upload)
common.Must(err) common.Must(err)
var b [10240]byte var b [10240]byte
@@ -455,8 +452,8 @@ func Test_maxUpload(t *testing.T) {
} }
common.Must(conn.Close()) common.Must(conn.Close())
if uploadSize > 10000 || uploadSize == 0 { if !bytes.Equal(upload, uploadReceived) {
t.Error("incorrect upload size: ", uploadSize) t.Error("incorrect upload", upload, uploadReceived)
} }
common.Must(listen.Close()) common.Must(listen.Close())