Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpinet] WebSocket: serializer bugfixes (#6264)

Browse Source
This commit is contained in:
Peter Johnson
2024-01-20 00:38:56 -08:00
committed by GitHub
parent 57aa8ca0dd
commit 98c0827236
2 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wpinet/src/main/native/cpp/WebSocketSerializer.h
View File

@@ -157,8 +157,8 @@ std::span<const WebSocket::Frame> TrySendFrames(
SmallVector<int, 32> frameOffs;
int numBytes = 0;
while (frameIt != frameEnd) {
frameOffs.emplace_back(numBytes);
numBytes += sendFrames.AddFrame(*frameIt++, server);
frameOffs.emplace_back(numBytes);
if ((server && (numBytes >= 65536 || frameOffs.size() > 32)) ||
(!server && numBytes >= 8192)) {
// don't waste too much memory or effort on header generation or masking
@@ -200,15 +200,15 @@ std::span<const WebSocket::Frame> TrySendFrames(
// figure out what the last (partially) frame sent actually was
auto offIt = frameOffs.begin();
auto offEnd = frameOffs.end();
bool isFin = true;
while (offIt != offEnd && *offIt < sentBytes) {
++offIt;
isFin = (frameStart->opcode & WebSocket::kFlagFin) != 0;
++frameStart;
}
bool isFin = (frameStart->opcode & WebSocket::kFlagFin) != 0;
if (offIt != offEnd && *offIt == sentBytes && isFin) {
// we finished at a normal FIN frame boundary; no need for a Write()
++frameStart;
SmallVector<uv::Buffer, 4> bufs;
for (auto it = frames.begin(); it != frameStart; ++it) {
bufs.append(it->data.begin(), it->data.end());
@@ -239,12 +239,13 @@ std::span<const WebSocket::Frame> TrySendFrames(
}
// continue through the last buffer of the last partial frame
while (bufIt != bufEnd && offIt != offEnd && pos < *offIt) {
pos += bufIt->len;
writeBufs.emplace_back(*bufIt++);
}
if (offIt != offEnd) {
while (bufIt != bufEnd && pos < *offIt) {
pos += bufIt->len;
writeBufs.emplace_back(*bufIt++);
}
++offIt;
++frameStart;
}
// move allocated buffers into request
@@ -258,7 +259,7 @@ std::span<const WebSocket::Frame> TrySendFrames(
while (frameStart != frameEnd && !isFin) {
if (offIt != offEnd) {
// we already generated the wire buffers for this frame, use them
while (pos < *offIt && bufIt != bufEnd) {
while (bufIt != bufEnd && pos < *offIt) {
pos += bufIt->len;
continuePos += bufIt->len;
req->m_frames.m_bufs.emplace_back(*bufIt++);