Skip to content

Commit 7938a4b

Browse files
committed
std: fix tautology in stream read
1 parent 34f62c0 commit 7938a4b

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

std/utils/io/stream_read.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,19 @@ func ReadTlvStream(
1313
onFrame func([]byte) bool,
1414
ignoreError func(error) bool,
1515
) error {
16-
recvBuf := make([]byte, ndn.MaxNDNPacketSize*32)
16+
recvBuf := make([]byte, ndn.MaxNDNPacketSize*8)
1717
recvOff := 0
1818
tlvOff := 0
1919

2020
for {
21+
// If less than one packet space remains in buffer, shift to beginning
22+
if len(recvBuf)-recvOff < ndn.MaxNDNPacketSize {
23+
copy(recvBuf, recvBuf[tlvOff:recvOff])
24+
recvOff -= tlvOff
25+
tlvOff = 0
26+
}
27+
28+
// Read multiple packets at once
2129
readSize, err := reader.Read(recvBuf[recvOff:])
2230
recvOff += readSize
2331
if err != nil {
@@ -63,12 +71,5 @@ func ReadTlvStream(
6371
break
6472
}
6573
}
66-
67-
// If less than one packet space remains in buffer, shift to beginning
68-
if recvOff-tlvOff < ndn.MaxNDNPacketSize {
69-
copy(recvBuf, recvBuf[tlvOff:recvOff])
70-
recvOff -= tlvOff
71-
tlvOff = 0
72-
}
7374
}
7475
}

0 commit comments

Comments
 (0)