Osmocom Open Build Service

osmo-pcu.spec Changed

commit_11627ffaae4975f03e7290138cd93737b29d6181.txt Added

commit_40a297f3b0c8e1670d46a4974750dd3335bc7885.txt Deleted

osmo-pcu_1.2.0.118.40a2.dsc -> osmo-pcu_1.2.0.124.1162.dsc Changed

osmo-pcu_1.2.0.118.40a2.tar.xz/.tarball-version -> osmo-pcu_1.2.0.124.1162.tar.xz/.tarball-version Changed

osmo-pcu_1.2.0.118.40a2.tar.xz/debian/changelog -> osmo-pcu_1.2.0.124.1162.tar.xz/debian/changelog Changed

osmo-pcu_1.2.0.118.40a2.tar.xz/src/gprs_ms.c -> osmo-pcu_1.2.0.124.1162.tar.xz/src/gprs_ms.c Changed

osmo-pcu_1.2.0.118.40a2.tar.xz/src/gprs_ms.h -> osmo-pcu_1.2.0.124.1162.tar.xz/src/gprs_ms.h Changed

@@ -157,11 +157,30 @@
 	return &ms->llc_queue;
 }
 
+/* Function used in code where a ul_tbf related event occurs and hence its state
+ * changes, which in turn may change the entire MS state (eg becoming reachable
+ * over PCH or PACCH) and the caller may want to know if it is a good time to
+ * assign a DL TBF (and whether we have DL data to send) */
 static inline bool ms_need_dl_tbf(struct GprsMs *ms)
 {
-	if (ms_dl_tbf(ms) != NULL &&
-	    tbf_state((const struct gprs_rlcmac_tbf *)ms_dl_tbf(ms)) != TBF_ST_WAIT_RELEASE)
-		return false;
+	struct gprs_rlcmac_dl_tbf *dl_tbf = ms_dl_tbf(ms);
+	if (dl_tbf) {
+		switch (tbf_state(dl_tbf_as_tbf(dl_tbf))) {
+		case TBF_ST_NEW:
+		case TBF_ST_ASSIGN:
+		case TBF_ST_FLOW:
+		case TBF_ST_FINISHED:
+		case TBF_ST_WAIT_RELEASE:
+			return false; /* TBF in use, hence no need for new DL TBF */
+		case TBF_ST_WAIT_REUSE_TFI:
+		case TBF_ST_RELEASING:
+			/* TBF cannot be used to send further data, a new one
+			 * may be needed, check below */
+			break;
+		default:
+			OSMO_ASSERT(0);
+		}
+	}
 
 	return llc_queue_size(ms_llc_queue(ms)) > 0;
 }

osmo-pcu_1.2.0.118.40a2.tar.xz/src/tbf_dl.cpp -> osmo-pcu_1.2.0.124.1162.tar.xz/src/tbf_dl.cpp Changed

osmo-pcu_1.2.0.118.40a2.tar.xz/src/tbf_dl_fsm.c -> osmo-pcu_1.2.0.124.1162.tar.xz/src/tbf_dl_fsm.c Changed

@@ -260,8 +260,10 @@
 static void st_wait_release_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)
 {
 	struct tbf_dl_fsm_ctx *ctx = (struct tbf_dl_fsm_ctx *)fi->priv;
+	struct GprsMs *ms = tbf_ms(ctx->tbf);
 
-	/* T3192 is running on the MS and has also been armed by this FSM now.
+	/* This state was entered because FinalACK was received; now T3192 is
+	 * running on the MS and has also been armed by this FSM.
 	 * During that time, it is possible to reach the MS over PACCH to assign
 	 * new DL TBF.
 	 * Upon T3192 expiration, FSM will transition to TBF_ST_WAIT_REUSE_TFI
@@ -270,6 +272,12 @@
 	 */
 
 	mod_ass_type(ctx, GPRS_RLCMAC_FLAG_CCCH, false);
+
+	/* check for LLC PDU in the LLC Queue */
+	if (llc_queue_size(ms_llc_queue(ms)) > 0) {
+		/* we have more data so we will re-use this tbf */
+		ms_new_dl_tbf_assigned_on_pacch(ms, ctx->tbf);
+	}
 }
 
 static void st_wait_release(struct osmo_fsm_inst *fi, uint32_t event, void *data)
@@ -278,6 +286,11 @@
 	case TBF_EV_FINAL_ACK_RECVD:
 		/* ignore, duplicate ACK, we already know about since we left ST_FINISHED */
 		break;
+	case TBF_EV_DL_ACKNACK_MISS:
+		/* ignore, miss for retransmitted ACK, but a previous one was
+		 * already ACKED since we left ST_FINISHED. This happens due to
+		 * fn-advance scheduling several DL blocks in advance. */
+		break;
 	default:
 		OSMO_ASSERT(0);
 	}
@@ -312,6 +325,11 @@
 	case TBF_EV_FINAL_ACK_RECVD:
 		/* ignore, duplicate ACK, we already know about since we left ST_FINISHED */
 		break;
+	case TBF_EV_DL_ACKNACK_MISS:
+		/* ignore, miss for retransmitted ACK, but a previous one was
+		 * already ACKED since we left ST_FINISHED. This happens due to
+		 * fn-advance scheduling several DL blocks in advance. */
+		break;
 	default:
 		OSMO_ASSERT(0);
 	}
@@ -442,6 +460,7 @@
 	},
 	TBF_ST_WAIT_RELEASE = {
 		.in_event_mask =
+			X(TBF_EV_DL_ACKNACK_MISS) |
 			X(TBF_EV_FINAL_ACK_RECVD) |
 			X(TBF_EV_MAX_N3105),
 		.out_state_mask =
@@ -453,6 +472,7 @@
 	},
 	TBF_ST_WAIT_REUSE_TFI = {
 		.in_event_mask =
+			X(TBF_EV_DL_ACKNACK_MISS) |
 			X(TBF_EV_FINAL_ACK_RECVD),
 		.out_state_mask =
 			X(TBF_ST_RELEASING),

osmo-pcu_1.2.0.118.40a2.tar.xz/src/tbf_ul.cpp -> osmo-pcu_1.2.0.124.1162.tar.xz/src/tbf_ul.cpp Changed

osmo-pcu_1.2.0.118.40a2.tar.xz/src/tbf_ul_fsm.c -> osmo-pcu_1.2.0.124.1162.tar.xz/src/tbf_ul_fsm.c Changed

@@ -89,7 +89,7 @@
 	switch (event) {
 	case TBF_EV_ASSIGN_ADD_CCCH:
 		mod_ass_type(ctx, GPRS_RLCMAC_FLAG_CCCH, true);
-		tbf_ul_fsm_state_chg(fi, TBF_ST_FLOW);
+		tbf_ul_fsm_state_chg(fi, TBF_ST_ASSIGN);
 		ul_tbf_contention_resolution_start(ctx->ul_tbf);
 		break;
 	case TBF_EV_ASSIGN_ADD_PACCH:
@@ -126,6 +126,22 @@
 			  "Starting timer T3168 UL TBF Ass (PACCH) with %u sec. %u microsec\n",
 			  sec, micro);
 		osmo_timer_schedule(&fi->timer, sec, micro);
+	} else if (ctx->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH)) {
+		/* Wait a bit for the AGCH ImmAssPktUlAss sent BSC->BTS to
+		 * arrive at the MS, and for the MS to jump and starting
+		 * listening on USFs in the assigned PDCH.
+		 * Ideally we would first wait for TBF_EV_ASSIGN_PCUIF_CNF to
+		 * account for queueing time, but that's only sent for data on PCH
+		 * so far, while ImmAss for UL TBF is sent on AGCH.
+		 */
+		fi->T = -2002;
+		val = osmo_tdef_get(the_pcu->T_defs, fi->T, OSMO_TDEF_MS, -1);
+		sec = val / 1000;
+		micro = (val % 1000) * 1000;
+		LOGPTBFUL(ctx->ul_tbf, LOGL_DEBUG,
+			  "Starting timer X2002 assignment (AGCH) with %u sec. %u microsec\n",
+			  sec, micro);
+		osmo_timer_schedule(&fi->timer, sec, micro);
 	}
 }
 
@@ -152,6 +168,10 @@
 		}
 		tbf_ul_fsm_state_chg(fi, TBF_ST_FLOW);
 		break;
+	case TBF_EV_ASSIGN_READY_CCCH:
+		/* change state to FLOW, so scheduler will start requesting USF */
+		tbf_ul_fsm_state_chg(fi, TBF_ST_FLOW);
+		break;
 	default:
 		OSMO_ASSERT(0);
 	}
@@ -259,6 +279,9 @@
 {
 	struct tbf_ul_fsm_ctx *ctx = (struct tbf_ul_fsm_ctx *)fi->priv;
 	switch (fi->T) {
+	case -2002:
+		osmo_fsm_inst_dispatch(fi, TBF_EV_ASSIGN_READY_CCCH, NULL);
+		break;
 	case 3168:
 		LOGPTBFUL(ctx->ul_tbf, LOGL_NOTICE, "Releasing due to UL TBF PACCH assignment timeout\n");
 		/* fall-through */
@@ -286,7 +309,8 @@
 		.in_event_mask =
 			X(TBF_EV_ASSIGN_ADD_CCCH) |
 			X(TBF_EV_ASSIGN_ADD_PACCH) |
-			X(TBF_EV_ASSIGN_ACK_PACCH),
+			X(TBF_EV_ASSIGN_ACK_PACCH) |
+			X(TBF_EV_ASSIGN_READY_CCCH),
 		.out_state_mask =
 			X(TBF_ST_FLOW) |
 			X(TBF_ST_FINISHED),

osmo-pcu_1.2.0.118.40a2.tar.xz/tests/tbf/TbfTest.cpp -> osmo-pcu_1.2.0.124.1162.tar.xz/tests/tbf/TbfTest.cpp Changed

osmo-pcu_1.2.0.118.40a2.tar.xz/tests/tbf/TbfTest.err -> osmo-pcu_1.2.0.124.1162.tar.xz/tests/tbf/TbfTest.err Changed

@@ -2271,11 +2271,15 @@
 MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 2 (bts_rcv_rach,tbf)
 UL_TBF(UL:TFI-0-0-0:G){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-0:G){NEW} set ass. type CCCH prev CCCH:0, PACCH:0
-UL_TBF(UL:TFI-0-0-0:G){NEW}: state_chg to FLOW
-TBF(UL:TFI-0-0-0:G){FLOW} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
+UL_TBF(UL:TFI-0-0-0:G){NEW}: state_chg to ASSIGN
+TBF(UL:TFI-0-0-0:G){ASSIGN} Starting timer X2002 assignment (AGCH) with 0 sec. 0 microsec
+TBF(UL:TFI-0-0-0:G){ASSIGN} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
 MS(TA-220:MSCLS-0-0:UL): - bts_rcv_rach: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7
 Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=0 USF=0
+UL_TBF(UL:TFI-0-0-0:G){ASSIGN}: Timeout of X2002
+UL_TBF(UL:TFI-0-0-0:G){ASSIGN}: Received Event ASSIGN_READY_CCCH
+UL_TBF(UL:TFI-0-0-0:G){ASSIGN}: state_chg to FLOW
 PDCH(bts=0,trx=0,ts=7) Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184
 PDCH(bts=0,trx=0,ts=7) FN=2654167 Rx UL DATA from unexpected TBF(UL:TFI-0-0-0:G){FLOW}
 TBF(UL:TFI-0-0-0:G){FLOW} UL DATA TFI=0 received (V(Q)=0 .. V(R)=0)
@@ -2337,11 +2341,15 @@
 MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 2 (bts_rcv_rach,tbf)
 UL_TBF(UL:TFI-0-0-0:G){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-0:G){NEW} set ass. type CCCH prev CCCH:0, PACCH:0
-UL_TBF(UL:TFI-0-0-0:G){NEW}: state_chg to FLOW
-TBF(UL:TFI-0-0-0:G){FLOW} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
+UL_TBF(UL:TFI-0-0-0:G){NEW}: state_chg to ASSIGN
+TBF(UL:TFI-0-0-0:G){ASSIGN} Starting timer X2002 assignment (AGCH) with 0 sec. 0 microsec
+TBF(UL:TFI-0-0-0:G){ASSIGN} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
 MS(TA-220:MSCLS-0-0:UL): - bts_rcv_rach: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7
 Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=0 USF=0
+UL_TBF(UL:TFI-0-0-0:G){ASSIGN}: Timeout of X2002
+UL_TBF(UL:TFI-0-0-0:G){ASSIGN}: Received Event ASSIGN_READY_CCCH
+UL_TBF(UL:TFI-0-0-0:G){ASSIGN}: state_chg to FLOW
 PDCH(bts=0,trx=0,ts=7) Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184
 PDCH(bts=0,trx=0,ts=7) FN=2654167 Rx UL DATA from unexpected TBF(UL:TFI-0-0-0:G){FLOW}
 TBF(UL:TFI-0-0-0:G){FLOW} UL DATA TFI=0 received (V(Q)=0 .. V(R)=0)
@@ -3225,11 +3233,15 @@
 MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 2 (bts_rcv_rach,tbf)
 UL_TBF(UL:TFI-0-0-0:G){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-0:G){NEW} set ass. type CCCH prev CCCH:0, PACCH:0
-UL_TBF(UL:TFI-0-0-0:G){NEW}: state_chg to FLOW
-TBF(UL:TFI-0-0-0:G){FLOW} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654283
+UL_TBF(UL:TFI-0-0-0:G){NEW}: state_chg to ASSIGN
+TBF(UL:TFI-0-0-0:G){ASSIGN} Starting timer X2002 assignment (AGCH) with 0 sec. 0 microsec
+TBF(UL:TFI-0-0-0:G){ASSIGN} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654283
 MS(TA-220:MSCLS-0-0:UL): - bts_rcv_rach: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7
 Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=0 USF=0
+UL_TBF(UL:TFI-0-0-0:G){ASSIGN}: Timeout of X2002
+UL_TBF(UL:TFI-0-0-0:G){ASSIGN}: Received Event ASSIGN_READY_CCCH
+UL_TBF(UL:TFI-0-0-0:G){ASSIGN}: state_chg to FLOW
 PDCH(bts=0,trx=0,ts=7) Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184
 PDCH(bts=0,trx=0,ts=7) FN=2654275 Rx UL DATA from unexpected TBF(UL:TFI-0-0-0:G){FLOW}
 TBF(UL:TFI-0-0-0:G){FLOW} UL DATA TFI=0 received (V(Q)=0 .. V(R)=0)
@@ -9317,8 +9329,9 @@
 MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 2 (bts_rcv_rach,tbf)
 UL_TBF(UL:TFI-0-0-0:G){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-0:G){NEW} set ass. type CCCH prev CCCH:0, PACCH:0
-UL_TBF(UL:TFI-0-0-0:G){NEW}: state_chg to FLOW
-TBF(UL:TFI-0-0-0:G){FLOW} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
+UL_TBF(UL:TFI-0-0-0:G){NEW}: state_chg to ASSIGN
+TBF(UL:TFI-0-0-0:G){ASSIGN} Starting timer X2002 assignment (AGCH) with 0 sec. 200000 microsec
+TBF(UL:TFI-0-0-0:G){ASSIGN} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
 MS(TA-220:MSCLS-0-0:UL): - bts_rcv_rach: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7
 Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=0 USF=0
@@ -9348,8 +9361,9 @@
 MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 2 (bts_rcv_rach,tbf)
 UL_TBF(UL:TFI-0-0-1:G){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-1:G){NEW} set ass. type CCCH prev CCCH:0, PACCH:0
-UL_TBF(UL:TFI-0-0-1:G){NEW}: state_chg to FLOW
-TBF(UL:TFI-0-0-1:G){FLOW} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
+UL_TBF(UL:TFI-0-0-1:G){NEW}: state_chg to ASSIGN
+TBF(UL:TFI-0-0-1:G){ASSIGN} Starting timer X2002 assignment (AGCH) with 0 sec. 200000 microsec
+TBF(UL:TFI-0-0-1:G){ASSIGN} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
 MS(TA-220:MSCLS-0-0:UL): - bts_rcv_rach: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7
 Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=1 USF=1
@@ -9379,8 +9393,9 @@
 MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 2 (bts_rcv_rach,tbf)
 UL_TBF(UL:TFI-0-0-2:G){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-2:G){NEW} set ass. type CCCH prev CCCH:0, PACCH:0
-UL_TBF(UL:TFI-0-0-2:G){NEW}: state_chg to FLOW
-TBF(UL:TFI-0-0-2:G){FLOW} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
+UL_TBF(UL:TFI-0-0-2:G){NEW}: state_chg to ASSIGN
+TBF(UL:TFI-0-0-2:G){ASSIGN} Starting timer X2002 assignment (AGCH) with 0 sec. 200000 microsec
+TBF(UL:TFI-0-0-2:G){ASSIGN} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
 MS(TA-220:MSCLS-0-0:UL): - bts_rcv_rach: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7
 Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=2 USF=2
@@ -9410,8 +9425,9 @@
 MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 2 (bts_rcv_rach,tbf)
 UL_TBF(UL:TFI-0-0-3:G){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-3:G){NEW} set ass. type CCCH prev CCCH:0, PACCH:0
-UL_TBF(UL:TFI-0-0-3:G){NEW}: state_chg to FLOW
-TBF(UL:TFI-0-0-3:G){FLOW} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
+UL_TBF(UL:TFI-0-0-3:G){NEW}: state_chg to ASSIGN
+TBF(UL:TFI-0-0-3:G){ASSIGN} Starting timer X2002 assignment (AGCH) with 0 sec. 200000 microsec
+TBF(UL:TFI-0-0-3:G){ASSIGN} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
 MS(TA-220:MSCLS-0-0:UL): - bts_rcv_rach: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7
 Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=3 USF=3
@@ -9441,8 +9457,9 @@
 MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 2 (bts_rcv_rach,tbf)
 UL_TBF(UL:TFI-0-0-4:G){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-4:G){NEW} set ass. type CCCH prev CCCH:0, PACCH:0
-UL_TBF(UL:TFI-0-0-4:G){NEW}: state_chg to FLOW
-TBF(UL:TFI-0-0-4:G){FLOW} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
+UL_TBF(UL:TFI-0-0-4:G){NEW}: state_chg to ASSIGN
+TBF(UL:TFI-0-0-4:G){ASSIGN} Starting timer X2002 assignment (AGCH) with 0 sec. 200000 microsec
+TBF(UL:TFI-0-0-4:G){ASSIGN} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
 MS(TA-220:MSCLS-0-0:UL): - bts_rcv_rach: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7
 Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=4 USF=4
@@ -9472,8 +9489,9 @@
 MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 2 (bts_rcv_rach,tbf)
 UL_TBF(UL:TFI-0-0-5:G){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-5:G){NEW} set ass. type CCCH prev CCCH:0, PACCH:0
-UL_TBF(UL:TFI-0-0-5:G){NEW}: state_chg to FLOW
-TBF(UL:TFI-0-0-5:G){FLOW} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
+UL_TBF(UL:TFI-0-0-5:G){NEW}: state_chg to ASSIGN
+TBF(UL:TFI-0-0-5:G){ASSIGN} Starting timer X2002 assignment (AGCH) with 0 sec. 200000 microsec
+TBF(UL:TFI-0-0-5:G){ASSIGN} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
 MS(TA-220:MSCLS-0-0:UL): - bts_rcv_rach: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7
 Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=5 USF=5
@@ -9503,8 +9521,9 @@
 MS(TA-220:MSCLS-0-0:UL): + tbf: now used by 2 (bts_rcv_rach,tbf)
 UL_TBF(UL:TFI-0-0-6:G){NEW}: Received Event ASSIGN_ADD_CCCH
 TBF(UL:TFI-0-0-6:G){NEW} set ass. type CCCH prev CCCH:0, PACCH:0
-UL_TBF(UL:TFI-0-0-6:G){NEW}: state_chg to FLOW
-TBF(UL:TFI-0-0-6:G){FLOW} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
+UL_TBF(UL:TFI-0-0-6:G){NEW}: state_chg to ASSIGN
+TBF(UL:TFI-0-0-6:G){ASSIGN} Starting timer X2002 assignment (AGCH) with 0 sec. 200000 microsec
+TBF(UL:TFI-0-0-6:G){ASSIGN} Starting timer T3141 Contention resolution (UL-TBF, CCCH) with 10 sec. 0 microsec, cur_fn=2654167
 MS(TA-220:MSCLS-0-0:UL): - bts_rcv_rach: now used by 1 (tbf)
 Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7
 Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=6 USF=6
@@ -9527,25 +9546,25 @@
 MS(TA-220:MSCLS-0-0) Destroying MS object
 Tx Immediate Assignment Reject on AGCH
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-6:G){FLOW}
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-6:G){ASSIGN}
 MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-5:G){FLOW}
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-5:G){ASSIGN}
 MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-4:G){FLOW}
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-4:G){ASSIGN}
 MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-3:G){FLOW}
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-3:G){ASSIGN}
 MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-2:G){FLOW}
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-2:G){ASSIGN}
 MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-1:G){FLOW}
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-1:G){ASSIGN}
 MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 MS(TA-7:MSCLS-0-0:UL) Destroying MS object
-MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-0:G){FLOW}
+MS(TA-7:MSCLS-0-0:UL) Detaching TBF: TBF(UL:TFI-0-0-0:G){ASSIGN}
 MS(TA-7:MSCLS-0-0): - tbf: now used by 0 (-)
 === end test_immediate_assign_rej_multi_block ===
 === start test_immediate_assign_rej_single_block ===

osmo-pcu_1.2.0.118.40a2.tar.xz/tests/types/TypesTest.err -> osmo-pcu_1.2.0.124.1162.tar.xz/tests/types/TypesTest.err Changed

Changes of Revision 105