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

[ntcore] Disable WebSocket fragmentation (#6149)

Browse Source 
There seems to be a latent bug in the fragmentation code that we've not
been able to isolate.
This commit is contained in:
Peter Johnson
2024-01-04 12:09:31 -08:00
committed by GitHub
parent f29a7d2e50
commit 0f060afb55
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ntcore/src/main/native/cpp/net/WebSocketConnection.cpp
View File

@@ -54,8 +54,14 @@ void WebSocketConnection::Stream::write_impl(const char* data, size_t len) {
// flush_nonempty() case
m_conn.m_bufs.back().len = len;
if (!m_disableAlloc) {
#ifdef NT_ENABLE_WS_FRAG
m_conn.m_frames.back().opcode &= ~wpi::WebSocket::kFlagFin;
m_conn.StartFrame(wpi::WebSocket::Frame::kFragment);
#else
m_conn.m_bufs.emplace_back(m_conn.AllocBuf());
m_conn.m_bufs.back().len = 0;
++m_conn.m_frames.back().end;
#endif
SetBuffer(m_conn.m_bufs.back().base, kAllocSize);
}
return;
@@ -76,9 +82,15 @@ void WebSocketConnection::Stream::write_impl(const char* data, size_t len) {
len -= amt;
}
if (buf.len >= kAllocSize && (len > 0 || !m_disableAlloc)) {
#ifdef NT_ENABLE_WS_FRAG
// fragment the current frame and start a new one
m_conn.m_frames.back().opcode &= ~wpi::WebSocket::kFlagFin;
m_conn.StartFrame(wpi::WebSocket::Frame::kFragment);
#else
m_conn.m_bufs.emplace_back(m_conn.AllocBuf());
m_conn.m_bufs.back().len = 0;
++m_conn.m_frames.back().end;
#endif
updateBuffer = true;
}
}