Skip to content

Fix strict ordering of sequence number in requests sent out #316

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

Open
martinhaefner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix strict ordering of sequence number in requests sent out #316

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
9 changes: 7 additions & 2 deletions src/client/binary_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,8 @@ class BinaryClient
const SymmetricAlgorithmHeader algorithmHeader = CreateAlgorithmHeader();
hdr.AddSize(RawSize(algorithmHeader));

std::unique_lock<std::mutex> send_lock(send_mutex);

const SequenceHeader sequence = CreateSequenceHeader();
hdr.AddSize(RawSize(sequence));

Expand Down Expand Up @@ -868,7 +870,7 @@ class BinaryClient
std::unique_lock<std::mutex> lock(Mutex);
Callbacks.insert(std::make_pair(request.Header.RequestHandle, responseCallback));
lock.unlock();

LOG_DEBUG(Logger, "binary_client | send: id: {} handle: {}, UtcTime: {}", ToString(request.TypeId, true), request.Header.RequestHandle, request.Header.UtcTime);

Send(request);
Expand Down Expand Up @@ -903,11 +905,12 @@ class BinaryClient
const SymmetricAlgorithmHeader algorithmHeader = CreateAlgorithmHeader();
hdr.AddSize(RawSize(algorithmHeader));

std::unique_lock<std::mutex> send_lock(send_mutex);

const SequenceHeader sequence = CreateSequenceHeader();
hdr.AddSize(RawSize(sequence));
hdr.AddSize(RawSize(request));

std::unique_lock<std::mutex> send_lock(send_mutex);
Stream << hdr << algorithmHeader << sequence << request << flush;
}

Expand Down Expand Up @@ -1124,6 +1127,8 @@ void BinaryClient::Send<OpenSecureChannelRequest>(OpenSecureChannelRequest reque
hdr.AddSize(RawSize(algorithmHeader));
hdr.AddSize(RawSize(request));

std::unique_lock<std::mutex> send_lock(send_mutex);

const SequenceHeader sequence = CreateSequenceHeader();
hdr.AddSize(RawSize(sequence));
Stream << hdr << algorithmHeader << sequence << request << flush;
Expand Down