diff options
-rw-r--r-- | src/encoding.cpp | 3 | ||||
-rw-r--r-- | tests/tbf/TbfTest.cpp | 3 | ||||
-rw-r--r-- | tests/tbf/TbfTest.err | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/encoding.cpp b/src/encoding.cpp index 63049ac..41e0d10 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -575,7 +575,8 @@ static void write_packet_ack_nack_desc_egprs( eow = false; urbb_len = rest_bits - 9; /* TODO: use compression (see above) */ - } + } else + urbb_len = num_blocks; if (urbb_len + crbb_len == rest_bits) len = -1; diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 8ec1dcc..5e40abc 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -753,9 +753,8 @@ static gprs_rlcmac_ul_tbf *puan_urbb_len_issue(BTS *the_bts, msg1 = ul_tbf->create_ul_ack(*fn, ts_no); - /* TODO: Need to modify the assert */ OSMO_ASSERT(!strcmp(osmo_hexdump(msg1->data, msg1->data_len), - "40 24 01 3f 3e 24 46 68 90 87 b0 06 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b " + "40 24 01 3f 3e 24 46 68 90 88 b0 06 8b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b " )); return ul_tbf; diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index c3a7f20..452f1c1 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -6307,8 +6307,8 @@ TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS): Got MCS-3 RLC data block: CV TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS): data_length=37, data=00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - Raising V(R) to 5 Encoding Ack/Nack for TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) (final=0) - - EGPRS URBB, len = 0, SSN = 3, ESN_CRBB = 2, SNS = 2048, WS = 64, V(Q) = 2, V(R) = 5, BOW, EOW -Uplink Ack/Nack bit count 98, max 184, message = 40 24 01 3f 3e 24 46 68 90 87 b0 06 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b + - EGPRS URBB, len = 2, SSN = 3, ESN_CRBB = 2, SNS = 2048, WS = 64, V(Q) = 2, V(R) = 5, BOW, EOW +Uplink Ack/Nack bit count 100, max 184, message = 40 24 01 3f 3e 24 46 68 90 88 b0 06 8b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b Got 'TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)', TA=7 Got MS: TLLI = 0xf1223344, TA = 7 ********** TBF starts here ********** |