This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/24201 ) Change subject: Tx ul ack/nack: Avoid sending invalid/unknown TLLI ...................................................................... Tx ul ack/nack: Avoid sending invalid/unknown TLLI It could happen that if MS sends first UL blocks without TLLI (wrongly, due to being in contention resolution), the submitted UL ACK/NACK would contain an invalid TLLI. Related: OS#1940 Change-Id: Ibae5df6cfbb56f8f8007cb9fec9c29006d673b72 --- M src/encoding.cpp 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/01/24201/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index 2f58759..136532c 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -890,8 +890,12 @@ bitvec_write_field(dest, &wp, mcs_chan_code(tbf->current_cs()), 2); // CHANNEL_CODING_COMMAND write_packet_ack_nack_desc_gprs(dest, wp, window, is_final); - bitvec_write_field(dest, &wp, 1, 1); // 1: have CONTENTION_RESOLUTION_TLLI - bitvec_write_field(dest, &wp, tbf->tlli(), 32); // CONTENTION_RESOLUTION_TLLI + if (tbf->is_tlli_valid()) { + bitvec_write_field(dest, &wp, 1, 1); // 1: have CONTENTION_RESOLUTION_TLLI + bitvec_write_field(dest, &wp, tbf->tlli(), 32); // CONTENTION_RESOLUTION_TLLI + } else { + bitvec_write_field(dest, &wp, 0, 1); // 0: don't have CONTENTION_RESOLUTION_TLLI + } bitvec_write_field(dest, &wp, 0, 1); // 0: don't have Packet Timing Advance bitvec_write_field(dest, &wp, 0, 1); // 0: don't have Power Control Parameters @@ -1072,8 +1076,14 @@ bitvec_write_field(dest, &wp, 1, 1); // PRE_EMPTIVE_TRANSMISSION, TODO: This resembles GPRS, change it? bitvec_write_field(dest, &wp, 0, 1); // 0: no PRR_RETRANSMISSION_REQUEST, TODO: clarify bitvec_write_field(dest, &wp, 0, 1); // 0: no ARAC_RETRANSMISSION_REQUEST, TODO: clarify - bitvec_write_field(dest, &wp, 1, 1); // 1: have CONTENTION_RESOLUTION_TLLI - bitvec_write_field(dest, &wp, tbf->tlli(), 32); // CONTENTION_RESOLUTION_TLLI + + if (tbf->is_tlli_valid()) { + bitvec_write_field(dest, &wp, 1, 1); // 1: have CONTENTION_RESOLUTION_TLLI + bitvec_write_field(dest, &wp, tbf->tlli(), 32); // CONTENTION_RESOLUTION_TLLI + } else { + bitvec_write_field(dest, &wp, 0, 1); // 0: don't have CONTENTION_RESOLUTION_TLLI + } + bitvec_write_field(dest, &wp, 1, 1); // TBF_EST (enabled) bitvec_write_field(dest, &wp, 0, 1); // 0: don't have Packet Timing Advance bitvec_write_field(dest, &wp, 0, 1); // 0: don't have Packet Extended Timing Advance -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/24201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibae5df6cfbb56f8f8007cb9fec9c29006d673b72 Gerrit-Change-Number: 24201 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210511/8140325b/attachment.htm>