Skip to content

Protect transportWrite with writeMutex #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomthuneby merged 1 commit into from
Jul 15, 2025
Merged

Protect transportWrite with writeMutex #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions include/Hdlcpp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,8 @@ class Hdlcpp {

int writeFrame(TransportAddress address, Frame frame, uint8_t sequenceNumber, ConstContainer data)
{
std::lock_guard<std::mutex> writeLock(writeFrameMutex);

int result;

if ((result = encode(address, frame, sequenceNumber, data, { writeBuffer })) < 0)
Expand Down Expand Up @@ -550,7 +552,11 @@ class Hdlcpp {
static constexpr uint8_t FlagSequence = 0x7e;
static constexpr uint8_t ControlEscape = 0x7d;

// Whenever writeMutex and writeFrameMutex both needs to be locked from the
// same thread, writeMutex must be locked first.
std::mutex writeMutex;
std::mutex writeFrameMutex;

TransportRead transportRead;
TransportWrite transportWrite;
Buffer<uint8_t> readBuffer;
Expand Down