include tagsetid into msgid

This commit is contained in:
orignal 2024-07-25 15:05:00 -04:00
parent e0ac8a7298
commit d7ff459f12

View File

@ -333,8 +333,9 @@ namespace garlic
auto offset1 = offset; auto offset1 = offset;
for (auto i = 0; i < numAcks; i++) for (auto i = 0; i < numAcks; i++)
{ {
offset1 += 2; // tagsetid uint32_t tagsetid = bufbe16toh (buf + offset1); offset1 += 2; // tagsetid
MessageConfirmed (bufbe16toh (buf + offset1)); offset1 += 2; // N uint16_t n = bufbe16toh (buf + offset1); offset1 += 2; // N
MessageConfirmed ((tagsetid << 16) + n); // msgid
} }
break; break;
} }
@ -877,7 +878,7 @@ namespace garlic
{ {
// ack request // ack request
SetLeaseSetUpdateStatus (eLeaseSetSubmitted); SetLeaseSetUpdateStatus (eLeaseSetSubmitted);
SetLeaseSetUpdateMsgID (m_SendTagset->GetNextIndex ()); SetLeaseSetUpdateMsgID ((m_SendTagset->GetTagSetID () << 16) + m_SendTagset->GetNextIndex ()); // (tagsetid << 16) + N
SetLeaseSetSubmissionTime (ts); SetLeaseSetSubmissionTime (ts);
payloadLen += 4; payloadLen += 4;
} }