From 6922bcd929d584bbb04b0f0fb190698c6e99f6de Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Tue, 7 Jun 2016 14:07:05 +0200 Subject: [PATCH] tbf_dl: correct tbf name in log message for moving a DL TBF It makes no sense to call functions on null pointer object. Use the name of the old tbf. Change-Id: I93b8c07a0b2de40a11e94fd6c212897cbe3b50ef Reviewed-on: https://gerrit.osmocom.org/212 Tested-by: Jenkins Builder Reviewed-by: Holger Freyther --- src/tbf_dl.cpp | 2 +- tests/tbf/TbfTest.err | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 59316763..9dd4bfc0 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -214,7 +214,7 @@ int gprs_rlcmac_dl_tbf::handle(struct gprs_rlcmac_bts *bts, LOGP(DRLCMAC, LOGL_NOTICE, "%s IMSI %s: " "moving DL TBF to new MS object\n", - dl_tbf->name(), imsi); + ms_old->dl_tbf()->name(), imsi); dl_tbf = ms_old->dl_tbf(); /* Move the DL TBF to the new MS */ dl_tbf->set_ms(ms); diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 9bea2fd1..4e83ce21 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -1868,7 +1868,7 @@ TBF(TFI=1 TLLI=0xf5667788 DIR=UL STATE=FLOW): data_length=20, data=00 00 00 00 0 - No gaps in received block, last block: BSN=0 CV=15 Old MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 0 There is a new MS object for the same MS: (0xf1223344, '0011223344') -> (0xf5667788, '') -(no TBF) IMSI 0011223344: moving DL TBF to new MS object +TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) IMSI 0011223344: moving DL TBF to new MS object Detaching TBF from MS object, TLLI = 0xf1223344, TBF = TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Attaching TBF to MS object, TLLI = 0xf5667788, TBF = TBF(TFI=0 TLLI=0xf5667788 DIR=DL STATE=FINISHED) Modifying MS object, TLLI = 0xf5667788, IMSI '' -> '0011223344'