lynxis lazus has submitted this change and it was merged. Change subject: tbf.cpp: use new tlli instead of old tlli ......................................................................
tbf.cpp: use new tlli instead of old tlli The old tlli might be 0x00000000. Change-Id: I2fd6fec022506e203d05e91c36ccd9e020ff816c --- M src/tbf.cpp M tests/tbf/TbfTest.err 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified Holger Freyther: Looks good to me, approved diff --git a/src/tbf.cpp b/src/tbf.cpp index 820131c..99ad30a 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -1311,7 +1311,7 @@ if (dl_tbf && dl_tbf->ms() != ms()) { LOGP(DRLCMACUL, LOGL_NOTICE, "Got RACH from " "TLLI=0x%08x while %s still exists. " - "Killing pending DL TBF\n", tlli(), + "Killing pending DL TBF\n", new_tlli, tbf_name(dl_tbf)); tbf_free(dl_tbf); dl_tbf = NULL; @@ -1319,7 +1319,7 @@ if (ul_tbf && ul_tbf->ms() != ms()) { LOGP(DRLCMACUL, LOGL_NOTICE, "Got RACH from " "TLLI=0x%08x while %s still exists. " - "Killing pending UL TBF\n", tlli(), + "Killing pending UL TBF\n", new_tlli, tbf_name(ul_tbf)); tbf_free(ul_tbf); ul_tbf = NULL; diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 3412bde..2002379 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -2184,7 +2184,7 @@ - BSN 0 storing in window (0..63) TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=FLOW): data_length=20, data=f1 22 33 44 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 Decoded premier TLLI=0x00000000 of UL DATA TFI=0. -Got RACH from TLLI=0x00000000 while TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) still exists. Killing pending DL TBF +Got RACH from TLLI=0xf1223344 while TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) still exists. Killing pending DL TBF TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) changes state from ASSIGN to RELEASING TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING) free TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=RELEASING) stopping timer 0. -- To view, visit https://gerrit.osmocom.org/1663 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2fd6fec022506e203d05e91c36ccd9e020ff816c Gerrit-PatchSet: 3 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lyn...@fe80.eu> Gerrit-Reviewer: Holger Freyther <hol...@freyther.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr <nhofm...@sysmocom.de> Gerrit-Reviewer: lynxis lazus <lyn...@fe80.eu>