mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-03 20:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: handle the case where MsgID == 0

Browse source
This commit is contained in:
Toby 2022-12-08 19:43:59 +00:00
parent 392cde1120
commit c29eba1416
2 changed files with 45 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/cs/frag.go
View file

@ -41,7 +41,7 @@ func (d *defragger) Feed(m udpMessage) *udpMessage {
// wtf is this?
return nil
}
if m.MsgID != d.msgID {
if m.MsgID != d.msgID || m.FragCount != uint8(len(d.frags)) {
// new message, clear previous state
d.msgID = m.MsgID
d.frags = make([]*udpMessage, m.FragCount)

44
core/cs/frag_test.go
View file

@ -196,6 +196,50 @@ func Test_defragger_Feed(t *testing.T) {
Data: []byte("hello"),
},
},
{
"frag 0 - 1/2",
args{
udpMessage{
SessionID: 123,
HostLen: 4,
Host: "test",
Port: 123,
MsgID: 0,
FragID: 0,
FragCount: 2,
DataLen: 5,
Data: []byte("ilove"),
},
},
nil,
},
{
"frag 0 - 2/2",
args{
udpMessage{
SessionID: 123,
HostLen: 4,
Host: "test",
Port: 123,
MsgID: 0,
FragID: 1,
FragCount: 2,
DataLen: 6,
Data: []byte("nobody"),
},
},
&udpMessage{
SessionID: 123,
HostLen: 4,
Host: "test",
Port: 123,
MsgID: 0,
FragID: 0,
FragCount: 1,
DataLen: 11,
Data: []byte("ilovenobody"),
},
},
{
"frag 1 - 1/3",
args{