mesh: add missing parentheses, track upper transport pdu len

This commit is contained in:
Matthias Ringwald 2020-04-03 11:10:46 +02:00
parent 16f259db21
commit 96a83bdb1f
2 changed files with 3 additions and 1 deletions

View File

@ -661,7 +661,7 @@ mesh_upper_transport_pdu_t * mesh_access_message_finalize(mesh_upper_transport_b
// upgrade to segmented if needed
if (upper_pdu->pdu_header.pdu_type == MESH_PDU_TYPE_UPPER_UNSEGMENTED_ACCESS) {
if ((upper_pdu->flags & MESH_TRANSPORT_FLAG_TRANSMIC_64 != 0 ) || (upper_pdu->len > 11)){
if (((upper_pdu->flags & MESH_TRANSPORT_FLAG_TRANSMIC_64) != 0) || (upper_pdu->len > 11)){
upper_pdu->pdu_header.pdu_type = MESH_PDU_TYPE_UPPER_SEGMENTED_ACCESS;
}
}

View File

@ -1221,6 +1221,8 @@ void mesh_upper_transport_message_add_data(mesh_upper_transport_builder_t * buil
if (builder->pdu == NULL) return;
builder->pdu->len += data_len;
uint16_t bytes_current_segment = 0;
if (builder->segment){
bytes_current_segment = MESH_NETWORK_PAYLOAD_MAX - builder->segment->len;