From 2b349b5d33050f6484c375e545ecb9f05a6be961 Mon Sep 17 00:00:00 2001 From: Jacob Erlbeck Date: Tue, 18 Aug 2015 11:55:03 +0200 Subject: ms: Move MS information merging to GprsMS Currently the merging of the meta information (MS class, IMSI) takes place in gprs_rlcmac_tbf::merge_and_clear_ms(). This makes it difficult to merge the internal state and does not directly relate to TBFs anyway. This commit moves this into a new method GprsMs::merge_old_ms. Sponsored-by: On-Waves ehf --- tests/tbf/TbfTest.err | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/tbf') diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 3524522..57fd22d 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -462,14 +462,13 @@ The MS object cannot fully confirm an unexpected TLLI: 0xf1000002, partly confir Modifying MS object, TLLI = 0xf1000001, IMSI '' -> '001001000000001' Modifying MS object, TLLI = 0xf1000001, IMSI '001001000000001' -> '001001000000002' TBF(TFI=1 TLLI=0xf1000002 DIR=DL STATE=FLOW) the IMSI '001001000000002' was already assigned to another MS object: TLLI = 0xf1000001, that IMSI will be removed -Modifying MS object, TLLI = 0xf1000002, IMSI '' -> '001001000000002' -Modifying MS object, TLLI = 0xf1000001, IMSI '001001000000002' -> '' TBF(TFI=0 TLLI=0xf1000001 DIR=DL STATE=FLOW) free TBF(TFI=0 TLLI=0xf1000001 DIR=DL STATE=FLOW) Software error: Pending downlink assignment. This may not happen, because the assignment message never gets transmitted. Please be sure not to free in this state. PLEASE FIX! PDCH(TS 4, TRX 0): Detaching TBF(TFI=0 TLLI=0xf1000001 DIR=DL STATE=FLOW), 1 TBFs, USFs = 00, TFIs = 00000002. Detaching TBF from MS object, TLLI = 0xf1000001, TBF = TBF(TFI=0 TLLI=0xf1000001 DIR=DL STATE=FLOW) ********** TBF ends here ********** -Clearing MS object, TLLI: 0xf1000001, IMSI: '' +Modifying MS object, TLLI = 0xf1000002, IMSI '' -> '001001000000002' +Clearing MS object, TLLI: 0xf1000001, IMSI: '001001000000002' Destroying MS object, TLLI = 0x00000000 TBF(TFI=1 TLLI=0xf1000002 DIR=DL STATE=FLOW) free TBF(TFI=1 TLLI=0xf1000002 DIR=DL STATE=FLOW) Software error: Pending downlink assignment. This may not happen, because the assignment message never gets transmitted. Please be sure not to free in this state. PLEASE FIX! -- cgit v1.2.3