diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-08-18 11:55:03 +0200 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-08-18 11:55:03 +0200 |
| commit | 2b349b5d33050f6484c375e545ecb9f05a6be961 (patch) | |
| tree | b7969962b60bc2b0dd27f2c56e3dd8501ddb792b /tests | |
| parent | ebebad1c92e8bcbe28780b4d5ee2ac32091089ff (diff) | |
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tbf/TbfTest.err | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 35245222..57fd22dc 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! |