[L] Change in osmo-pcu[master]: ms: Log detaching tbf log line in proper place - gerrit-log

21 Apr 2023

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32359 )
(
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: ms: Log detaching tbf log line in proper place
......................................................................
ms: Log detaching tbf log line in proper place
It is interesting to log that a tbf is being detached *before* it
actually happens, so that the reader can see which TBF is being
detached.
Change-Id: I2008beb9ab8f97f7ea5ed7b45cfb3f23dfe7b27f
---
M src/gprs_ms.c
M tests/app_info/AppInfoTest.err
M tests/ms/MsTest.err
M tests/tbf/TbfTest.err
M tests/ulc/PdchUlcTest.err
5 files changed, 145 insertions(+), 132 deletions(-)
Approvals:
  fixeria: Looks good to me, approved
  Jenkins Builder: Verified

diff --git a/src/gprs_ms.c b/src/gprs_ms.c
index da50426..6c345fb 100644
--- a/src/gprs_ms.c
+++ b/src/gprs_ms.c
@@ -423,6 +423,9 @@
    if (!ms_tbf_is_attached(ms, tbf))
    	return;
+	LOGPMS(ms, DRLCMAC, LOGL_INFO, "Detaching TBF: %s\n",
+	       tbf_name(tbf));
+
    if (tbf == ul_tbf_as_tbf(ms->ul_tbf)) {
    	ms->ul_tbf = NULL;
    } else if (tbf == dl_tbf_as_tbf(ms->dl_tbf)) {
@@ -433,9 +436,6 @@
    	llist_del(tbf_ms_list(tbf));
    }
-	LOGPMS(ms, DRLCMAC, LOGL_INFO, "Detaching TBF: %s\n",
-	       tbf_name(tbf));
-
    if (!ms->dl_tbf && !ms->ul_tbf) {
    	ms_set_reserved_slots(ms, NULL, 0, 0);
    	ms->first_common_ts = NULL;
diff --git a/tests/app_info/AppInfoTest.err b/tests/app_info/AppInfoTest.err
index e8c8acf..3303ee8 100644
--- a/tests/app_info/AppInfoTest.err
+++ b/tests/app_info/AppInfoTest.err
@@ -64,10 +64,10 @@
 PDCH(bts=0,trx=0,ts=5) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 2 TBFs, USFs = 00, TFIs = 00000003.
 PDCH(bts=0,trx=0,ts=6) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 2 TBFs, USFs = 00, TFIs = 00000003.
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TA-220:MSCLS-10-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
+MS(TA-220:MSCLS-10-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
 MS(TA-220:MSCLS-10-11) Destroying MS object
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000002.
 PDCH(bts=0,trx=0,ts=5) Detaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000002.
 PDCH(bts=0,trx=0,ts=6) Detaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000002.
-MS(TA-220:MSCLS-12-13) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS)
+MS(TA-220:MSCLS-12-13:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS)
 MS(TA-220:MSCLS-12-13) Destroying MS object
diff --git a/tests/ms/MsTest.err b/tests/ms/MsTest.err
index 3f2f520..247e8bb 100644
--- a/tests/ms/MsTest.err
+++ b/tests/ms/MsTest.err
@@ -6,8 +6,8 @@
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL) Attaching DL TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Destroying MS object
 Creating MS object
 Modifying MS object, UL TLLI: 0xffffffff -> 0xffeeddbb, not yet confirmed
@@ -17,8 +17,8 @@
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL) Attaching DL TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Destroying MS object
 Creating MS object
 The MS object cannot fully confirm an unexpected TLLI: 0xffeeddbb, partly confirmed
@@ -31,9 +31,9 @@
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Attaching UL TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL): - ms_attach_ul_tbf: now used by 0 (-)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Destroying MS object
 Creating MS object
 Modifying MS object, UL TLLI: 0xffffffff -> 0xff001111, not yet confirmed
@@ -61,12 +61,12 @@
 MS(IMSI-001001987654321:TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:STATE-NEW:GPRS:IMSI-001001987654321:TLLI-0xffeeddbb)
 MS(IMSI-001001987654321:TLLI-0xffeeddbb:TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
 MS(IMSI-001001987654321:TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
-MS(IMSI-001001987654321:TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Detaching TBF: TBF(UL:STATE-NEW:GPRS:IMSI-001001987654321:TLLI-0xffeeddbb)
+MS(IMSI-001001987654321:TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:IMSI-001001987654321:TLLI-0xffeeddbb)
 MS(IMSI-001001987654321:TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Destroying MS object
 MS(IMSI-001001987654322:TLLI-0xffeeddbc:TA-220:MSCLS-0-0) Attaching UL TBF: TBF(UL:STATE-NEW:GPRS:IMSI-001001987654322:TLLI-0xffeeddbc)
 MS(IMSI-001001987654322:TLLI-0xffeeddbc:TA-220:MSCLS-0-0): + ms_attach_ul_tbf: now used by 1 (ms_attach_ul_tbf)
 MS(IMSI-001001987654322:TLLI-0xffeeddbc:TA-220:MSCLS-0-0:UL): - ms_attach_ul_tbf: now used by 0 (-)
-MS(IMSI-001001987654322:TLLI-0xffeeddbc:TA-220:MSCLS-0-0) Detaching TBF: TBF(UL:STATE-NEW:GPRS:IMSI-001001987654322:TLLI-0xffeeddbc)
+MS(IMSI-001001987654322:TLLI-0xffeeddbc:TA-220:MSCLS-0-0:UL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:IMSI-001001987654322:TLLI-0xffeeddbc)
 MS(IMSI-001001987654322:TLLI-0xffeeddbc:TA-220:MSCLS-0-0) Destroying MS object
 Creating MS object
 Modifying MS object, UL TLLI: 0xffffffff -> 0xffeeddbb, not yet confirmed
@@ -76,8 +76,8 @@
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL) Attaching DL TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL): - ms_attach_dl_tbf: now used by 0 (-)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:UL:DL) Detaching TBF: TBF(UL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): + release_timer: now used by 1 (release_timer)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Release timer expired
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): - release_timer: now used by 0 (-)
@@ -88,7 +88,7 @@
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0): + ms_attach_dl_tbf: now used by 1 (ms_attach_dl_tbf)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
 MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Destroying MS object
-MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
+MS(TLLI-0xffeeddbb:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xffeeddbb)
 Creating MS object
 The MS object cannot fully confirm an unexpected TLLI: 0xdeadbeef, partly confirmed
 Creating MS object
@@ -98,4 +98,4 @@
 MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0:DL): - ms_attach_dl_tbf: now used by 0 (-)
 MS(TLLI-0xdeadbeef:TA-220:MSCLS-0-0) Destroying MS object
 MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0:DL) Destroying MS object
-MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xdeadbef0)
+MS(TLLI-0xdeadbef0:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:STATE-NEW:GPRS:TLLI-0xdeadbef0)
diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err
index c65377a..689b9fc 100644
--- a/tests/tbf/TbfTest.err
+++ b/tests/tbf/TbfTest.err
@@ -53,8 +53,8 @@
 Modifying MS object, TLLI = 0x00004232, TA 4 -> 6
 === end test_tbf_tlli_update ===
 MS(TLLI-0x00004232:TA-6:MSCLS-0-0:UL:DL) Destroying MS object
-MS(TLLI-0x00004232:TA-6:MSCLS-0-0:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0x00004232)
-MS(TLLI-0x00004232:TA-6:MSCLS-0-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0x00004232)
+MS(TLLI-0x00004232:TA-6:MSCLS-0-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0x00004232)
+MS(TLLI-0x00004232:TA-6:MSCLS-0-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:TLLI-0x00004232)
 === start test_tbf_final_ack ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
 Creating MS object
@@ -167,7 +167,7 @@
 DL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){WAIT_ACK}: Deallocated
 TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000002.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc){ASSIGN}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NONE}: Deallocated
@@ -280,7 +280,7 @@
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL): + test_tbf_final_ack: now used by 1 (test_tbf_final_ack)
 TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc), 2 TBFs, USFs = 00, TFIs = 00000003.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc){ASSIGN}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NONE}: Deallocated
@@ -561,7 +561,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:GPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-45-0) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){WAIT_RELEASE}: Deallocated
@@ -649,7 +649,7 @@
 MS(TLLI-0xf1000002:TA-0:MSCLS-45-0:DL) Merge MS: MS(IMSI-001001000000002:TLLI-0xf1000001:TA-0:MSCLS-45-0:DL)
 TBF(DL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000001) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000001), 2 TBFs, USFs = 00, TFIs = 00000003.
-MS(IMSI-001001000000002:TLLI-0xf1000001:TA-0:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000001)
+MS(IMSI-001001000000002:TLLI-0xf1000001:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000001)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000001){FLOW}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000001){NONE}: Deallocated
@@ -660,7 +660,7 @@
 MS(TA-0:MSCLS-45-0) Destroying MS object
 TBF(DL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000002) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000002), 1 TBFs, USFs = 00, TFIs = 00000002.
-MS(IMSI-001001000000002:TLLI-0xf1000002:TA-0:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000002)
+MS(IMSI-001001000000002:TLLI-0xf1000002:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000002)
 MS(IMSI-001001000000002:TLLI-0xf1000002:TA-0:MSCLS-45-0) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-001001000000002:TLLI-0xf1000002){FLOW}: Deallocated
@@ -1713,69 +1713,69 @@
 === end test_tbf_exhaustion ===
 MS(IMSI-001001000000032:TLLI-0xc0000020:TA-220:MSCLS-45-0) Destroying MS object
 MS(IMSI-001001000000031:TLLI-0xc000001f:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000031:TLLI-0xc000001f:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-31:STATE-ASSIGN:GPRS:IMSI-001001000000031:TLLI-0xc000001f)
+MS(IMSI-001001000000031:TLLI-0xc000001f:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-31:STATE-ASSIGN:GPRS:IMSI-001001000000031:TLLI-0xc000001f)
 MS(IMSI-001001000000030:TLLI-0xc000001e:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000030:TLLI-0xc000001e:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-30:STATE-ASSIGN:GPRS:IMSI-001001000000030:TLLI-0xc000001e)
+MS(IMSI-001001000000030:TLLI-0xc000001e:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-30:STATE-ASSIGN:GPRS:IMSI-001001000000030:TLLI-0xc000001e)
 MS(IMSI-001001000000029:TLLI-0xc000001d:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000029:TLLI-0xc000001d:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-29:STATE-ASSIGN:GPRS:IMSI-001001000000029:TLLI-0xc000001d)
+MS(IMSI-001001000000029:TLLI-0xc000001d:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-29:STATE-ASSIGN:GPRS:IMSI-001001000000029:TLLI-0xc000001d)
 MS(IMSI-001001000000028:TLLI-0xc000001c:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000028:TLLI-0xc000001c:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-28:STATE-ASSIGN:GPRS:IMSI-001001000000028:TLLI-0xc000001c)
+MS(IMSI-001001000000028:TLLI-0xc000001c:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-28:STATE-ASSIGN:GPRS:IMSI-001001000000028:TLLI-0xc000001c)
 MS(IMSI-001001000000027:TLLI-0xc000001b:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000027:TLLI-0xc000001b:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-27:STATE-ASSIGN:GPRS:IMSI-001001000000027:TLLI-0xc000001b)
+MS(IMSI-001001000000027:TLLI-0xc000001b:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-27:STATE-ASSIGN:GPRS:IMSI-001001000000027:TLLI-0xc000001b)
 MS(IMSI-001001000000026:TLLI-0xc000001a:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000026:TLLI-0xc000001a:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-26:STATE-ASSIGN:GPRS:IMSI-001001000000026:TLLI-0xc000001a)
+MS(IMSI-001001000000026:TLLI-0xc000001a:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-26:STATE-ASSIGN:GPRS:IMSI-001001000000026:TLLI-0xc000001a)
 MS(IMSI-001001000000025:TLLI-0xc0000019:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000025:TLLI-0xc0000019:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-25:STATE-ASSIGN:GPRS:IMSI-001001000000025:TLLI-0xc0000019)
+MS(IMSI-001001000000025:TLLI-0xc0000019:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-25:STATE-ASSIGN:GPRS:IMSI-001001000000025:TLLI-0xc0000019)
 MS(IMSI-001001000000024:TLLI-0xc0000018:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000024:TLLI-0xc0000018:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-24:STATE-ASSIGN:GPRS:IMSI-001001000000024:TLLI-0xc0000018)
+MS(IMSI-001001000000024:TLLI-0xc0000018:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-24:STATE-ASSIGN:GPRS:IMSI-001001000000024:TLLI-0xc0000018)
 MS(IMSI-001001000000023:TLLI-0xc0000017:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000023:TLLI-0xc0000017:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-23:STATE-ASSIGN:GPRS:IMSI-001001000000023:TLLI-0xc0000017)
+MS(IMSI-001001000000023:TLLI-0xc0000017:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-23:STATE-ASSIGN:GPRS:IMSI-001001000000023:TLLI-0xc0000017)
 MS(IMSI-001001000000022:TLLI-0xc0000016:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000022:TLLI-0xc0000016:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-22:STATE-ASSIGN:GPRS:IMSI-001001000000022:TLLI-0xc0000016)
+MS(IMSI-001001000000022:TLLI-0xc0000016:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-22:STATE-ASSIGN:GPRS:IMSI-001001000000022:TLLI-0xc0000016)
 MS(IMSI-001001000000021:TLLI-0xc0000015:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000021:TLLI-0xc0000015:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-21:STATE-ASSIGN:GPRS:IMSI-001001000000021:TLLI-0xc0000015)
+MS(IMSI-001001000000021:TLLI-0xc0000015:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-21:STATE-ASSIGN:GPRS:IMSI-001001000000021:TLLI-0xc0000015)
 MS(IMSI-001001000000020:TLLI-0xc0000014:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000020:TLLI-0xc0000014:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-20:STATE-ASSIGN:GPRS:IMSI-001001000000020:TLLI-0xc0000014)
+MS(IMSI-001001000000020:TLLI-0xc0000014:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-20:STATE-ASSIGN:GPRS:IMSI-001001000000020:TLLI-0xc0000014)
 MS(IMSI-001001000000019:TLLI-0xc0000013:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000019:TLLI-0xc0000013:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-19:STATE-ASSIGN:GPRS:IMSI-001001000000019:TLLI-0xc0000013)
+MS(IMSI-001001000000019:TLLI-0xc0000013:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-19:STATE-ASSIGN:GPRS:IMSI-001001000000019:TLLI-0xc0000013)
 MS(IMSI-001001000000018:TLLI-0xc0000012:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000018:TLLI-0xc0000012:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-18:STATE-ASSIGN:GPRS:IMSI-001001000000018:TLLI-0xc0000012)
+MS(IMSI-001001000000018:TLLI-0xc0000012:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-18:STATE-ASSIGN:GPRS:IMSI-001001000000018:TLLI-0xc0000012)
 MS(IMSI-001001000000017:TLLI-0xc0000011:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000017:TLLI-0xc0000011:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-17:STATE-ASSIGN:GPRS:IMSI-001001000000017:TLLI-0xc0000011)
+MS(IMSI-001001000000017:TLLI-0xc0000011:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-17:STATE-ASSIGN:GPRS:IMSI-001001000000017:TLLI-0xc0000011)
 MS(IMSI-001001000000016:TLLI-0xc0000010:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000016:TLLI-0xc0000010:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-16:STATE-ASSIGN:GPRS:IMSI-001001000000016:TLLI-0xc0000010)
+MS(IMSI-001001000000016:TLLI-0xc0000010:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-16:STATE-ASSIGN:GPRS:IMSI-001001000000016:TLLI-0xc0000010)
 MS(IMSI-001001000000015:TLLI-0xc000000f:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000015:TLLI-0xc000000f:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-15:STATE-ASSIGN:GPRS:IMSI-001001000000015:TLLI-0xc000000f)
+MS(IMSI-001001000000015:TLLI-0xc000000f:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-15:STATE-ASSIGN:GPRS:IMSI-001001000000015:TLLI-0xc000000f)
 MS(IMSI-001001000000014:TLLI-0xc000000e:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000014:TLLI-0xc000000e:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-14:STATE-ASSIGN:GPRS:IMSI-001001000000014:TLLI-0xc000000e)
+MS(IMSI-001001000000014:TLLI-0xc000000e:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-14:STATE-ASSIGN:GPRS:IMSI-001001000000014:TLLI-0xc000000e)
 MS(IMSI-001001000000013:TLLI-0xc000000d:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000013:TLLI-0xc000000d:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-13:STATE-ASSIGN:GPRS:IMSI-001001000000013:TLLI-0xc000000d)
+MS(IMSI-001001000000013:TLLI-0xc000000d:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-13:STATE-ASSIGN:GPRS:IMSI-001001000000013:TLLI-0xc000000d)
 MS(IMSI-001001000000012:TLLI-0xc000000c:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000012:TLLI-0xc000000c:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-12:STATE-ASSIGN:GPRS:IMSI-001001000000012:TLLI-0xc000000c)
+MS(IMSI-001001000000012:TLLI-0xc000000c:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-12:STATE-ASSIGN:GPRS:IMSI-001001000000012:TLLI-0xc000000c)
 MS(IMSI-001001000000011:TLLI-0xc000000b:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000011:TLLI-0xc000000b:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-11:STATE-ASSIGN:GPRS:IMSI-001001000000011:TLLI-0xc000000b)
+MS(IMSI-001001000000011:TLLI-0xc000000b:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-11:STATE-ASSIGN:GPRS:IMSI-001001000000011:TLLI-0xc000000b)
 MS(IMSI-001001000000010:TLLI-0xc000000a:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000010:TLLI-0xc000000a:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-10:STATE-ASSIGN:GPRS:IMSI-001001000000010:TLLI-0xc000000a)
+MS(IMSI-001001000000010:TLLI-0xc000000a:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-10:STATE-ASSIGN:GPRS:IMSI-001001000000010:TLLI-0xc000000a)
 MS(IMSI-001001000000009:TLLI-0xc0000009:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000009:TLLI-0xc0000009:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-9:STATE-ASSIGN:GPRS:IMSI-001001000000009:TLLI-0xc0000009)
+MS(IMSI-001001000000009:TLLI-0xc0000009:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-9:STATE-ASSIGN:GPRS:IMSI-001001000000009:TLLI-0xc0000009)
 MS(IMSI-001001000000008:TLLI-0xc0000008:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000008:TLLI-0xc0000008:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-8:STATE-ASSIGN:GPRS:IMSI-001001000000008:TLLI-0xc0000008)
+MS(IMSI-001001000000008:TLLI-0xc0000008:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-8:STATE-ASSIGN:GPRS:IMSI-001001000000008:TLLI-0xc0000008)
 MS(IMSI-001001000000007:TLLI-0xc0000007:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000007:TLLI-0xc0000007:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-7:STATE-ASSIGN:GPRS:IMSI-001001000000007:TLLI-0xc0000007)
+MS(IMSI-001001000000007:TLLI-0xc0000007:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-7:STATE-ASSIGN:GPRS:IMSI-001001000000007:TLLI-0xc0000007)
 MS(IMSI-001001000000006:TLLI-0xc0000006:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000006:TLLI-0xc0000006:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-6:STATE-ASSIGN:GPRS:IMSI-001001000000006:TLLI-0xc0000006)
+MS(IMSI-001001000000006:TLLI-0xc0000006:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-6:STATE-ASSIGN:GPRS:IMSI-001001000000006:TLLI-0xc0000006)
 MS(IMSI-001001000000005:TLLI-0xc0000005:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000005:TLLI-0xc0000005:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-5:STATE-ASSIGN:GPRS:IMSI-001001000000005:TLLI-0xc0000005)
+MS(IMSI-001001000000005:TLLI-0xc0000005:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-5:STATE-ASSIGN:GPRS:IMSI-001001000000005:TLLI-0xc0000005)
 MS(IMSI-001001000000004:TLLI-0xc0000004:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000004:TLLI-0xc0000004:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-4:STATE-ASSIGN:GPRS:IMSI-001001000000004:TLLI-0xc0000004)
+MS(IMSI-001001000000004:TLLI-0xc0000004:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-4:STATE-ASSIGN:GPRS:IMSI-001001000000004:TLLI-0xc0000004)
 MS(IMSI-001001000000003:TLLI-0xc0000003:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000003:TLLI-0xc0000003:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-3:STATE-ASSIGN:GPRS:IMSI-001001000000003:TLLI-0xc0000003)
+MS(IMSI-001001000000003:TLLI-0xc0000003:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-3:STATE-ASSIGN:GPRS:IMSI-001001000000003:TLLI-0xc0000003)
 MS(IMSI-001001000000002:TLLI-0xc0000002:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000002:TLLI-0xc0000002:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-2:STATE-ASSIGN:GPRS:IMSI-001001000000002:TLLI-0xc0000002)
+MS(IMSI-001001000000002:TLLI-0xc0000002:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-2:STATE-ASSIGN:GPRS:IMSI-001001000000002:TLLI-0xc0000002)
 MS(IMSI-001001000000001:TLLI-0xc0000001:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000001:TLLI-0xc0000001:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xc0000001)
+MS(IMSI-001001000000001:TLLI-0xc0000001:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xc0000001)
 MS(IMSI-001001000000000:TLLI-0xc0000000:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000000000:TLLI-0xc0000000:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000000000:TLLI-0xc0000000)
+MS(IMSI-001001000000000:TLLI-0xc0000000:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000000000:TLLI-0xc0000000)
 === start test_tbf_dl_llc_loss ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
 Creating MS object
@@ -1814,7 +1814,7 @@
 MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0:DL) appending 19 bytes to DL LLC queue
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000123456:TLLI-0xc0123456) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000123456:TLLI-0xc0123456), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000123456:TLLI-0xc0123456)
+MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000123456:TLLI-0xc0123456)
 MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0) Schedule MS release in 10 secs
 MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0): + release_timer: now used by 1 (release_timer)
 ********** DL-TBF ends here **********
@@ -1896,7 +1896,7 @@
 MSG = 1f 01 04 4d 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 
 === end test_tbf_dl_llc_loss ===
 MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-001001000123456:TLLI-0xc0123456)
+MS(IMSI-001001000123456:TLLI-0xc0123456:TA-0:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-001001000123456:TLLI-0xc0123456)
 === start test_tbf_single_phase ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
 Found first unallocated TRX=0 TFI=0
@@ -1960,7 +1960,7 @@
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:UL) appending 4 bytes to DL LLC queue
 === end test_tbf_single_phase ===
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344)
 === start test_tbf_single_phase2 ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
 Found first unallocated TRX=0 TFI=0
@@ -2041,7 +2041,7 @@
 TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344) [UPLINK] END
 TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344) free
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344), 1 TBFs, USFs = 01, TFIs = 00000001.
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344)
 ********** UL-TBF ends here **********
 UL_ACK_TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
 UL_TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344){FINISHED}: Deallocated
@@ -2077,7 +2077,7 @@
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:DL): - st_finished: now used by 0 (-)
 === end test_tbf_single_phase2 ===
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:DL) Destroying MS object
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-0-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
 === start test_tbf_two_phase ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
 MS requests Uplink resource on CCCH/RACH: ra=0x73 (8 bit) Fn=2654167 qta=31
@@ -2186,8 +2186,8 @@
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: state_chg to ASSIGN
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Destroying MS object
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
 === end test_tbf_two_phase ===
 === start test_tbf_ra_update_rach ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -2462,7 +2462,7 @@
 MS(TLLI-0xf5667788:TA-7:MSCLS-1-0:UL) Merge MS: MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL)
 TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) free
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344), 2 TBFs, USFs = 03, TFIs = 00000003.
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
 ********** UL-TBF ends here **********
 UL_ACK_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
 UL_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){FLOW}: Deallocated
@@ -2502,10 +2502,10 @@
 TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf5667788) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
 New MS: TLLI = 0xf5667788, TA = 7, IMSI = 0011223344, LLC = 1
 MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:UL:DL) Destroying MS object
-MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(UL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf5667788)
-MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf5667788)
+MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-1:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf5667788)
+MS(IMSI-0011223344:TLLI-0xf5667788:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf5667788)
 MS(TA-7:MSCLS-1-0:DL) Destroying MS object
-MS(TA-7:MSCLS-1-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FINISHED:GPRS)
+MS(TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FINISHED:GPRS)
 === end test_tbf_ra_update_rach ===
 === start test_tbf_dl_flow_and_rach_two_phase ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -2619,7 +2619,7 @@
 Old MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 2
 TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) free
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344), 1 TBFs, USFs = 01, TFIs = 00000001.
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
 ********** UL-TBF ends here **********
 UL_ACK_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
 UL_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){FLOW}: Deallocated
@@ -2639,7 +2639,7 @@
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344) Got PACKET RESOURCE REQ while DL-TBF pending, killing it
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344) free
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){ASSIGN}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
@@ -2731,8 +2731,8 @@
 TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) No gaps in received block, last block: BSN=0 CV=15
 New MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 2
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Destroying MS object
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
 === end test_tbf_dl_flow_and_rach_two_phase ===
 === start test_tbf_dl_flow_and_rach_single_phase ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -2846,7 +2846,7 @@
 Old MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 2
 TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344) free
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344), 1 TBFs, USFs = 01, TFIs = 00000001.
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344)
 ********** UL-TBF ends here **********
 UL_ACK_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
 UL_TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS:IMSI-0011223344:TLLI-0xf1223344){FLOW}: Deallocated
@@ -2897,7 +2897,7 @@
 Modifying MS object, TLLI = 0xf1223344, MS class 0 -> 1
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344) free
 PDCH(bts=0,trx=0,ts=7) Detaching TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344), 1 TBFs, USFs = 01, TFIs = 00000001.
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-0011223344:TLLI-0xf1223344)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){ASSIGN}: Deallocated
 UL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-0011223344:TLLI-0xf1223344){NONE}: Deallocated
@@ -2921,7 +2921,7 @@
 UL_ACK_TBF(UL:TFI-0-0-0:STATE-NEW:GPRS){NONE}: state_chg to SCHED_UL_ACK
 New MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 2
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL) Destroying MS object
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344)
 === end test_tbf_dl_flow_and_rach_single_phase ===
 === start test_tbf_dl_reuse ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -4022,8 +4022,8 @@
 TBF(DL:TFI-0-0-1:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344) Scheduled Ack/Nack polling on FN=2654461, TS=7
 TBF(DL:TFI-0-0-1:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344) msg block (BSN 10, CS-1): 0f 03 14 4d 43 20 50 41 43 4b 45 54 20 30 39 20 28 54 42 46 20 32 29 
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Destroying MS object
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-RELEASING:GPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-RELEASING:GPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-0:DL) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-FINISHED:GPRS:IMSI-0011223344:TLLI-0xf1223344)
 === end test_tbf_dl_reuse ===
 === start test_tbf_gprs_egprs ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
@@ -4061,7 +4061,7 @@
  - TRX=0 (0) TS=4 TA=220
 === end test_tbf_gprs_egprs ===
 MS(IMSI-001001123456789:TLLI-0xc0006789:TA-220:MSCLS-45-0:DL) Destroying MS object
-MS(IMSI-001001123456789:TLLI-0xc0006789:TA-220:MSCLS-45-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001123456789:TLLI-0xc0006789)
+MS(IMSI-001001123456789:TLLI-0xc0006789:TA-220:MSCLS-45-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001123456789:TLLI-0xc0006789)
 === start test_tbf_ws ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
 PDCH(bts=0,trx=0,ts=2) PDCH state: disabled => enabled
@@ -4105,7 +4105,7 @@
 PDCH(bts=0,trx=0,ts=3) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:GPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:GPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 PDCH(bts=0,trx=0,ts=5) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:GPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TA-220:MSCLS-12-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS)
+MS(TA-220:MSCLS-12-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:GPRS)
 MS(TA-220:MSCLS-12-0) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:GPRS){NEW}: Deallocated
@@ -4153,7 +4153,7 @@
 PDCH(bts=0,trx=0,ts=3) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 PDCH(bts=0,trx=0,ts=5) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TA-220:MSCLS-12-12) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
+MS(TA-220:MSCLS-12-12:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
 MS(TA-220:MSCLS-12-12) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){NEW}: Deallocated
@@ -4276,8 +4276,8 @@
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: state_chg to ASSIGN
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Destroying MS object
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
 === end test_tbf_egprs_two_phase ===
 === start test_tbf_egprs_two_phase_spb ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -4518,8 +4518,8 @@
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: state_chg to ASSIGN
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Destroying MS object
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
 === end test_tbf_egprs_two_phase_spb ===
 === start test_tbf_egprs_dl ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
@@ -4830,7 +4830,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -5092,7 +5092,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -5314,7 +5314,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -5520,7 +5520,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -5710,7 +5710,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -5876,7 +5876,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6051,7 +6051,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6217,7 +6217,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6372,7 +6372,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6448,7 +6448,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6520,7 +6520,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6592,7 +6592,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6689,7 +6689,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6785,7 +6785,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6881,7 +6881,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -6977,7 +6977,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -7059,7 +7059,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -7138,7 +7138,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -7217,7 +7217,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -7303,7 +7303,7 @@
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) starting timer T3193 with 0 sec. 100000 microsec
 TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-WAIT_RELEASE:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){WAIT_RELEASE}: Deallocated
@@ -7449,8 +7449,8 @@
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: state_chg to ASSIGN
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Destroying MS object
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
 === end test_tbf_puan_urbb_len ===
 === start test_tbf_update_ws ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
@@ -7517,7 +7517,7 @@
 PDCH(bts=0,trx=0,ts=3) Detaching TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
 PDCH(bts=0,trx=0,ts=5) Detaching TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TA-220:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS)
+MS(TA-220:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS)
 MS(TA-220:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){ASSIGN}: Deallocated
@@ -7652,8 +7652,8 @@
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS:IMSI-0011223344:TLLI-0xf1223344){NEW}: state_chg to ASSIGN
 TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344) Starting timer X2001 [assignment (PACCH)] with 2 sec. 0 microsec
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Destroying MS object
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
 === end test_tbf_li_decoding ===
 === start test_tbf_epdan_out_of_rx_window ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
@@ -7703,7 +7703,7 @@
 TBF(DL:TFI-0-0-0:STATE-FLOW:EGPRS:TLLI-0xffeeddcc) V(B): (V(A)=1186)"NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNAAANAAAAAAAAAAAAAAAAAAAAAAAAAA"(V(S)-1=1287)  A=Acked N=Nacked U=Unacked X=Resend-Unacked I=Invalid
 TBF(DL:TFI-0-0-0:STATE-FLOW:EGPRS:TLLI-0xffeeddcc) free
 PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-0:STATE-FLOW:EGPRS:TLLI-0xffeeddcc), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FLOW:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FLOW:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Destroying MS object
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){FLOW}: Deallocated
@@ -7950,19 +7950,19 @@
 Tx Immediate Assignment Reject on AGCH
 MS(TA-220:MSCLS-0-0) Destroying MS object
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0) Detaching TBF: TBF(UL:TFI-0-0-6:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-6:STATE-FLOW:GPRS)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0) Detaching TBF: TBF(UL:TFI-0-0-5:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-5:STATE-FLOW:GPRS)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0) Detaching TBF: TBF(UL:TFI-0-0-4:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-4:STATE-FLOW:GPRS)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0) Detaching TBF: TBF(UL:TFI-0-0-3:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-3:STATE-FLOW:GPRS)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0) Detaching TBF: TBF(UL:TFI-0-0-2:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-2:STATE-FLOW:GPRS)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0) Detaching TBF: TBF(UL:TFI-0-0-1:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-1:STATE-FLOW:GPRS)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS)
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:GPRS)
 === end test_immediate_assign_rej_multi_block ===
 === start test_immediate_assign_rej_single_block ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -9248,8 +9248,8 @@
 Got MS: TLLI = 0xf1223344, TA = 7
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) appending 256 bytes to DL LLC queue
 MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Destroying MS object
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
-MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-FLOW:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
+MS(IMSI-0011223344:TLLI-0xf1223344:TA-7:MSCLS-1-1:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:EGPRS:IMSI-0011223344:TLLI-0xf1223344)
 === end test_tbf_egprs_two_phase_puan ===
 === start test_packet_access_rej_epdan ===
 PDCH(bts=0,trx=0,ts=4) PDCH state: disabled => enabled
@@ -9299,7 +9299,7 @@
 UL_ASS_TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS){SEND_ASS_REJ}: state_chg to NONE
 packet reject: 40 84 7f f7 6e e6 7e ab 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
 MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Destroying MS object
-MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FLOW:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-0:MSCLS-11-11:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-FLOW:EGPRS:TLLI-0xffeeddcc)
 === end test_packet_access_rej_epdan ===
 === start test_packet_access_rej_prr ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -9808,21 +9808,21 @@
 UL_ASS_TBF(UL:TFI-0-0-0:STATE-NEW:EGPRS:TLLI-0xffeeddcc){SEND_ASS}: state_chg to WAIT_ACK
 PDCH(bts=0,trx=0,ts=7) FN=2654218 Scheduling control message at RTS for TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddd3:TA-7:MSCLS-11-11:UL) Destroying MS object
-MS(TLLI-0xffeeddd3:TA-7:MSCLS-11-11) Detaching TBF: TBF(UL:TFI-0-0--1:STATE-ASSIGN:GPRS:TLLI-0xffeeddd3)
+MS(TLLI-0xffeeddd3:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0--1:STATE-ASSIGN:GPRS:TLLI-0xffeeddd3)
 MS(TLLI-0xffeeddd2:TA-7:MSCLS-11-11:UL) Destroying MS object
-MS(TLLI-0xffeeddd2:TA-7:MSCLS-11-11) Detaching TBF: TBF(UL:TFI-0-0-6:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd2)
+MS(TLLI-0xffeeddd2:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-6:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd2)
 MS(TLLI-0xffeeddd1:TA-7:MSCLS-11-11:UL) Destroying MS object
-MS(TLLI-0xffeeddd1:TA-7:MSCLS-11-11) Detaching TBF: TBF(UL:TFI-0-0-5:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd1)
+MS(TLLI-0xffeeddd1:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-5:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd1)
 MS(TLLI-0xffeeddd0:TA-7:MSCLS-11-11:UL) Destroying MS object
-MS(TLLI-0xffeeddd0:TA-7:MSCLS-11-11) Detaching TBF: TBF(UL:TFI-0-0-4:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd0)
+MS(TLLI-0xffeeddd0:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-4:STATE-ASSIGN:EGPRS:TLLI-0xffeeddd0)
 MS(TLLI-0xffeeddcf:TA-7:MSCLS-11-11:UL) Destroying MS object
-MS(TLLI-0xffeeddcf:TA-7:MSCLS-11-11) Detaching TBF: TBF(UL:TFI-0-0-3:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcf)
+MS(TLLI-0xffeeddcf:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-3:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcf)
 MS(TLLI-0xffeeddce:TA-7:MSCLS-11-11:UL) Destroying MS object
-MS(TLLI-0xffeeddce:TA-7:MSCLS-11-11) Detaching TBF: TBF(UL:TFI-0-0-2:STATE-ASSIGN:EGPRS:TLLI-0xffeeddce)
+MS(TLLI-0xffeeddce:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-2:STATE-ASSIGN:EGPRS:TLLI-0xffeeddce)
 MS(TLLI-0xffeeddcd:TA-7:MSCLS-11-11:UL) Destroying MS object
-MS(TLLI-0xffeeddcd:TA-7:MSCLS-11-11) Detaching TBF: TBF(UL:TFI-0-0-1:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcd)
+MS(TLLI-0xffeeddcd:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-1:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcd)
 MS(TLLI-0xffeeddcc:TA-7:MSCLS-11-11:UL) Destroying MS object
-MS(TLLI-0xffeeddcc:TA-7:MSCLS-11-11) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-7:MSCLS-11-11:UL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-ASSIGN:EGPRS:TLLI-0xffeeddcc)
 === end test_packet_access_rej_prr ===
 === start test_packet_access_rej_prr_no_other_tbfs ===
 PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled
@@ -9848,7 +9848,7 @@
 PDCH(bts=0,trx=0,ts=7) FN=2654218 Scheduling control message at RTS for TBF(UL:TFI-0-0--1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc)
 UL_ASS_TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NONE}: Timeout of X2000
 TBF(UL:TFI-0-0--1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc) free
-MS(TLLI-0xffeeddcc:TA-220:MSCLS-0-0) Detaching TBF: TBF(UL:TFI-0-0--1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc)
+MS(TLLI-0xffeeddcc:TA-220:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0--1:STATE-ASSIGN:GPRS:TLLI-0xffeeddcc)
 MS(TLLI-0xffeeddcc:TA-220:MSCLS-0-0) Destroying MS object
 ********** UL-TBF ends here **********
 UL_ACK_TBF(UL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0xffeeddcc){NONE}: Deallocated
@@ -9937,7 +9937,7 @@
 Modifying MS object, TLLI = 0xecc1f953, MS class 0 -> 11
 TBF(DL:TFI-0-1-0:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953) free
 PDCH(bts=0,trx=1,ts=5) Detaching TBF(DL:TFI-0-1-0:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953), 1 TBFs, USFs = 00, TFIs = 00000001.
-MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0) Detaching TBF: TBF(DL:TFI-0-1-0:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953)
+MS(IMSI-001001000000001:TLLI-0xa3c2f953:TA-220:MSCLS-11-0:DL) Detaching TBF: TBF(DL:TFI-0-1-0:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953)
 ********** DL-TBF ends here **********
 DL_TBF(DL:TFI-0-1-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953){ASSIGN}: Deallocated
 UL_ASS_TBF(DL:TFI-0-1-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xa3c2f953){NONE}: Deallocated
@@ -9988,5 +9988,5 @@
 PDCH(bts=0,trx=0,ts=2) FN=0 Scheduling control message at RTS for TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xecc1f953)
 === end test_ms_merge_dl_tbf_different_trx ===
 MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0:UL:DL) Destroying MS object
-MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xecc1f953)
-MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xecc1f953)
+MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0:UL:DL) Detaching TBF: TBF(UL:TFI-0-0-0:STATE-NEW:GPRS:IMSI-001001000000001:TLLI-0xecc1f953)
+MS(IMSI-001001000000001:TLLI-0xecc1f953:TA-220:MSCLS-11-0:DL) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-ASSIGN:GPRS:IMSI-001001000000001:TLLI-0xecc1f953)
diff --git a/tests/ulc/PdchUlcTest.err b/tests/ulc/PdchUlcTest.err
index b402517..2995b69 100644
--- a/tests/ulc/PdchUlcTest.err
+++ b/tests/ulc/PdchUlcTest.err
@@ -75,7 +75,7 @@
 PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=39 is still reserved!
 PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=39, reason=UL_ASS): TBF(DL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0x12345678)
 MS(TLLI-0x12345678:TA-220:MSCLS-0-0:DL) Destroying MS object
-MS(TLLI-0x12345678:TA-220:MSCLS-0-0) Detaching TBF: TBF(DL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0x12345678)
+MS(TLLI-0x12345678:TA-220:MSCLS-0-0:DL) Detaching TBF: TBF(DL:TFI-0-0--1:STATE-NEW:GPRS:TLLI-0x12345678)
 PDCH(bts=0,trx=0,ts=0) PDCH state: disabled => enabled
 PDCH(bts=0,trx=0,ts=0) Reserving FN 104 for type SBA
 PDCH(bts=0,trx=0,ts=0) Reserving FN 117 for type SBA
-- 
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32359
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I2008beb9ab8f97f7ea5ed7b45cfb3f23dfe7b27f
Gerrit-Change-Number: 32359
Gerrit-PatchSet: 3
Gerrit-Owner: pespin pespin@sysmocom.de
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria vyanitskiy@sysmocom.de
Gerrit-Reviewer: pespin pespin@sysmocom.de
Gerrit-MessageType: merged



    