Osmocom Open Build Service

osmo-pcu.spec Changed

commit_8757384aec269ec48c558b0f2488e7c83c1d3974.txt Added

commit_d6bb6190d3731d2c0fd620e8ac061bd5bb20b5dc.txt Deleted

osmo-pcu_1.1.0.28.d6bb6.dsc -> osmo-pcu_1.1.0.31.8757.dsc Changed

osmo-pcu_1.1.0.28.d6bb6.tar.xz/.tarball-version -> osmo-pcu_1.1.0.31.8757.tar.xz/.tarball-version Changed

osmo-pcu_1.1.0.28.d6bb6.tar.xz/debian/changelog -> osmo-pcu_1.1.0.31.8757.tar.xz/debian/changelog Changed

osmo-pcu_1.1.0.28.d6bb6.tar.xz/src/gprs_ms.c -> osmo-pcu_1.1.0.31.8757.tar.xz/src/gprs_ms.c Changed

@@ -86,6 +86,21 @@
 	}
 }
 
+static void ms_llc_timer_cb(void *_ms)
+{
+	struct GprsMs *ms = _ms;
+	struct gprs_rlcmac_dl_tbf *dl_tbf = ms_dl_tbf(ms);
+
+	if (!dl_tbf)
+		return;
+	if (tbf_state((const struct gprs_rlcmac_tbf *)dl_tbf) != TBF_ST_FLOW)
+		return;
+
+	LOGPTBFDL((const struct gprs_rlcmac_tbf *)dl_tbf, LOGL_DEBUG, "LLC receive timeout, requesting DL ACK\n");
+
+	tbf_dl_request_dl_ack(dl_tbf);
+}
+
 static int ms_talloc_destructor(struct GprsMs *ms);
 struct GprsMs *ms_alloc(struct gprs_rlcmac_bts *bts, uint32_t tlli)
 {
@@ -113,6 +128,8 @@
 	ms->imsi0 = '\0';
 	osmo_timer_setup(&ms->timer, ms_release_timer_cb, NULL);
 	llc_queue_init(&ms->llc_queue, ms);
+	memset(&ms->llc_timer, 0, sizeof(ms->llc_timer));
+	osmo_timer_setup(&ms->llc_timer, ms_llc_timer_cb, ms);
 
 	ms_set_mode(ms, GPRS);
 
@@ -160,6 +177,7 @@
 	}
 
 	llc_queue_clear(&ms->llc_queue, ms->bts);
+	osmo_timer_del(&ms->llc_timer);
 
 	if (ms->ctrs)
 		rate_ctr_group_free(ms->ctrs);
@@ -996,3 +1014,37 @@
 		return NULL;
 	return data_ctx.msg;
 }
+
+static void ms_start_llc_timer(struct GprsMs *ms)
+{
+	if (the_pcu->vty.llc_idle_ack_csec > 0) {
+		struct timespec tv;
+		csecs_to_timespec(the_pcu->vty.llc_idle_ack_csec, &tv);
+		osmo_timer_schedule(&ms->llc_timer, tv.tv_sec, tv.tv_nsec / 1000);
+	}
+}
+
+int ms_append_llc_dl_data(struct GprsMs *ms, uint16_t pdu_delay_csec, const uint8_t *data, uint16_t len)
+{
+	struct timespec expire_time;
+	struct gprs_rlcmac_dl_tbf *dl_tbf;
+
+	LOGPMS(ms, DTBFDL, LOGL_DEBUG, "appending %u bytes to DL LLC queue\n", len);
+
+	struct msgb *llc_msg = msgb_alloc(len, "llc_pdu_queue");
+	if (!llc_msg)
+		return -ENOMEM;
+
+	llc_queue_calc_pdu_lifetime(ms->bts, pdu_delay_csec, &expire_time);
+	memcpy(msgb_put(llc_msg, len), data, len);
+	llc_queue_enqueue(ms_llc_queue(ms), llc_msg, &expire_time);
+	ms_start_llc_timer(ms);
+
+	dl_tbf = ms_dl_tbf(ms);
+	if (dl_tbf && tbf_state((const struct gprs_rlcmac_tbf *)dl_tbf) == TBF_ST_WAIT_RELEASE) {
+		LOGPTBFDL((const struct gprs_rlcmac_tbf *)dl_tbf, LOGL_DEBUG, "in WAIT RELEASE state (T3193), so reuse TBF\n");
+		tbf_establish_dl_tbf_on_pacch((struct gprs_rlcmac_tbf *)dl_tbf);
+	}
+
+	return 0;
+}

osmo-pcu_1.1.0.28.d6bb6.tar.xz/src/gprs_ms.h -> osmo-pcu_1.1.0.31.8757.tar.xz/src/gprs_ms.h Changed

osmo-pcu_1.1.0.28.d6bb6.tar.xz/src/tbf.cpp -> osmo-pcu_1.1.0.31.8757.tar.xz/src/tbf.cpp Changed

osmo-pcu_1.1.0.28.d6bb6.tar.xz/src/tbf.h -> osmo-pcu_1.1.0.31.8757.tar.xz/src/tbf.h Changed

osmo-pcu_1.1.0.28.d6bb6.tar.xz/src/tbf_dl.cpp -> osmo-pcu_1.1.0.31.8757.tar.xz/src/tbf_dl.cpp Changed

@@ -90,18 +90,6 @@
 	tbf_dl_egprs_ctr_description,
 };
 
-static void llc_timer_cb(void *_tbf)
-{
-	struct gprs_rlcmac_dl_tbf *tbf = (struct gprs_rlcmac_dl_tbf *)_tbf;
-
-	if (tbf->state_is_not(TBF_ST_FLOW))
-		return;
-
-	LOGPTBFDL(tbf, LOGL_DEBUG, "LLC receive timeout, requesting DL ACK\n");
-
-	tbf->request_dl_ack();
-}
-
 gprs_rlcmac_dl_tbf::BandWidth::BandWidth() :
 	dl_bw_octets(0),
 	dl_throughput(0),
@@ -118,7 +106,7 @@
 	return 0;
 }
 
-struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot)
+struct gprs_rlcmac_dl_tbf *dl_tbf_alloc(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot)
 {
 	struct gprs_rlcmac_dl_tbf *tbf;
 	int rc;
@@ -175,7 +163,6 @@
 
 gprs_rlcmac_dl_tbf::~gprs_rlcmac_dl_tbf()
 {
-	osmo_timer_del(&m_llc_timer);
 	if (is_egprs_enabled()) {
 		rate_ctr_group_free(m_dl_egprs_ctrs);
 	} else {
@@ -193,41 +180,6 @@
 	m_dl_gprs_ctrs(NULL),
 	m_dl_egprs_ctrs(NULL)
 {
-	memset(&m_llc_timer, 0, sizeof(m_llc_timer));
-	osmo_timer_setup(&m_llc_timer, llc_timer_cb, this);
-}
-
-void gprs_rlcmac_dl_tbf::start_llc_timer()
-{
-	if (the_pcu->vty.llc_idle_ack_csec > 0) {
-		struct timespec tv;
-		csecs_to_timespec(the_pcu->vty.llc_idle_ack_csec, &tv);
-		osmo_timer_schedule(&m_llc_timer, tv.tv_sec, tv.tv_nsec / 1000);
-	}
-}
-
-int gprs_rlcmac_dl_tbf::append_data(uint16_t pdu_delay_csec,
-				    const uint8_t *data, uint16_t len)
-{
-	struct timespec expire_time;
-
-	LOGPTBFDL(this, LOGL_DEBUG, "appending %u bytes\n", len);
-
-	struct msgb *llc_msg = msgb_alloc(len, "llc_pdu_queue");
-	if (!llc_msg)
-		return -ENOMEM;
-
-	llc_queue_calc_pdu_lifetime(bts, pdu_delay_csec, &expire_time);
-	memcpy(msgb_put(llc_msg, len), data, len);
-	llc_queue_enqueue(llc_queue(), llc_msg, &expire_time);
-	start_llc_timer();
-
-	if (state_is(TBF_ST_WAIT_RELEASE)) {
-		LOGPTBFDL(this, LOGL_DEBUG, "in WAIT RELEASE state (T3193), so reuse TBF\n");
-		establish_dl_tbf_on_pacch();
-	}
-
-	return 0;
 }
 
 static int tbf_new_dl_assignment(struct gprs_rlcmac_bts *bts, GprsMs *ms,
@@ -258,7 +210,7 @@
 	// Create new TBF (any TRX)
 /* FIXME: Copy and paste with alloc_ul_tbf */
 	/* set number of downlink slots according to multislot class */
-	dl_tbf = tbf_alloc_dl_tbf(bts, ms, use_trx, ss);
+	dl_tbf = dl_tbf_alloc(bts, ms, use_trx, ss);
 
 	if (!dl_tbf) {
 		LOGPMS(ms, DTBF, LOGL_NOTICE, "No PDCH resource\n");
@@ -331,16 +283,17 @@
 		ms_set_egprs_ms_class(ms, egprs_ms_class);
 	}
 
+	rc = ms_append_llc_dl_data(ms, delay_csec, data, len);
+	if (rc < 0)
+		return rc;
+
 	dl_tbf = ms_dl_tbf(ms);
 	if (!dl_tbf) {
 		rc = tbf_new_dl_assignment(bts, ms, &dl_tbf);
 		if (rc < 0)
 			return rc;
 	}
-
-	rc = dl_tbf->append_data(delay_csec, data, len);
-
-	return rc;
+	return 0;
 }
 
 bool gprs_rlcmac_dl_tbf::restart_bsn_cycle()
@@ -1115,6 +1068,10 @@
 	m_dl_ack_requested = true;
 }
 
+void tbf_dl_request_dl_ack(struct gprs_rlcmac_dl_tbf *dl_tbf) {
+	dl_tbf->request_dl_ack();
+}
+
 /* Does this DL TBF require to poll the MS for DL ACK/NACK? */
 bool gprs_rlcmac_dl_tbf::need_poll_for_dl_ack_nack() const
 {

osmo-pcu_1.1.0.28.d6bb6.tar.xz/src/tbf_dl.h -> osmo-pcu_1.1.0.31.8757.tar.xz/src/tbf_dl.h Changed

@@ -39,9 +39,6 @@
 	~gprs_rlcmac_dl_tbf();
 	gprs_rlc_window *window();
 
-	int append_data(uint16_t pdu_delay_csec,
-			const uint8_t *data, uint16_t len);
-
 	int rcvd_dl_ack(bool final_ack, unsigned first_bsn, struct bitvec *rbb);
 	struct msgb *create_dl_acked_block(uint32_t fn, uint8_t ts, enum mcs_kind req_mcs_kind = EGPRS);
 	void trigger_ass(struct gprs_rlcmac_tbf *old_tbf);
@@ -100,7 +97,6 @@
 	int rcvd_dl_final_ack();
 	bool dl_window_stalled() const;
 	void reuse_tbf();
-	void start_llc_timer();
 	int analyse_errors(char *show_rbb, uint8_t ssn, ana_result *res);
 	void schedule_next_frame();
 
@@ -109,8 +105,6 @@
 	unsigned int get_egprs_dl_spb_status(int bsn);
 	enum egprs_rlcmac_dl_spb get_egprs_dl_spb(int bsn);
 
-	struct osmo_timer_list m_llc_timer;
-
 	/* Please note that all variables below will be reset when changing
 	 * from WAIT RELEASE back to FLOW state (re-use of TBF).
 	 * All states that need reset must be in this struct, so this is why
@@ -124,7 +118,7 @@
 	return m_window.ws();
 }
 
-struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms,
+struct gprs_rlcmac_dl_tbf *dl_tbf_alloc(struct gprs_rlcmac_bts *bts, GprsMs *ms,
 					    int8_t use_trx, bool single_slot);
 
 #else /* ifdef __cplusplus */
@@ -145,6 +139,7 @@
 		  const uint8_t *data, const uint16_t len);
 
 void tbf_dl_trigger_ass(struct gprs_rlcmac_dl_tbf *tbf, struct gprs_rlcmac_tbf *old_tbf);
+void tbf_dl_request_dl_ack(struct gprs_rlcmac_dl_tbf *tbf);
 
 #define LOGPTBFDL(tbf, level, fmt, args...) LOGP(DTBFDL, level, "%s " fmt, tbf_name(tbf), ## args)
 #ifdef __cplusplus

osmo-pcu_1.1.0.28.d6bb6.tar.xz/src/tbf_ul_ack_fsm.c -> osmo-pcu_1.1.0.31.8757.tar.xz/src/tbf_ul_ack_fsm.c Changed

@@ -216,7 +216,7 @@
 }
 
 
-struct msgb *tbf_ul_ack_create_rlcmac_msg(const struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts)
+struct msgb *tbf_ul_ack_create_rlcmac_msg(const struct gprs_rlcmac_ul_tbf *ul_tbf, uint32_t fn, uint8_t ts)
 {
 	int rc;
 	struct tbf_ul_ack_ev_create_rlcmac_msg_ctx data_ctx = {
@@ -224,31 +224,29 @@
 		.ts = ts,
 		.msg = NULL,
 	};
-	OSMO_ASSERT(tbf_direction(tbf) == GPRS_RLCMAC_UL_TBF);
 
-	rc = osmo_fsm_inst_dispatch(tbf_ul_ack_fi((const struct gprs_rlcmac_ul_tbf *)tbf), TBF_UL_ACK_EV_CREATE_RLCMAC_MSG, &data_ctx);
+	rc = osmo_fsm_inst_dispatch(tbf_ul_ack_fi(ul_tbf), TBF_UL_ACK_EV_CREATE_RLCMAC_MSG, &data_ctx);
 	if (rc != 0 || !data_ctx.msg)
 		return NULL;
 	return data_ctx.msg;
 }
 
-bool tbf_ul_ack_rts(const struct gprs_rlcmac_tbf *tbf)
+bool tbf_ul_ack_rts(const struct gprs_rlcmac_ul_tbf *ul_tbf)
 {
-	struct osmo_fsm_inst *fi = tbf_ul_ack_fi((const struct gprs_rlcmac_ul_tbf *)tbf);
+	struct osmo_fsm_inst *fi = tbf_ul_ack_fi(ul_tbf);
 	return fi->state == TBF_UL_ACK_ST_SCHED_UL_ACK;
 }
 
 /* Did we already send the Final ACK and we are waiting for its confirmation (CTRL ACK) ? */
-bool tbf_ul_ack_waiting_cnf_final_ack(const struct gprs_rlcmac_tbf* tbf)
+bool tbf_ul_ack_waiting_cnf_final_ack(const struct gprs_rlcmac_ul_tbf *ul_tbf)
 {
-	OSMO_ASSERT(tbf_direction(tbf) == GPRS_RLCMAC_UL_TBF);
-	struct osmo_fsm_inst *fi = tbf_ul_ack_fi((const struct gprs_rlcmac_ul_tbf *)tbf);
+	struct osmo_fsm_inst *fi = tbf_ul_ack_fi(ul_tbf);
 	return fi->state == TBF_UL_ACK_ST_WAIT_ACK;
 }
 
-bool tbf_ul_ack_exp_ctrl_ack(const struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts)
+bool tbf_ul_ack_exp_ctrl_ack(const struct gprs_rlcmac_ul_tbf *ul_tbf, uint32_t fn, uint8_t ts)
 {
-	struct osmo_fsm_inst *fi = tbf_ul_ack_fi((const struct gprs_rlcmac_ul_tbf *)tbf);
+	struct osmo_fsm_inst *fi = tbf_ul_ack_fi(ul_tbf);
 	return fi->state == TBF_UL_ACK_ST_WAIT_ACK;
 	/* FIXME: validate FN and TS match: && ctx->poll_fn = fn && ctx->poll_ts == ts */
 }

osmo-pcu_1.1.0.28.d6bb6.tar.xz/src/tbf_ul_ack_fsm.h -> osmo-pcu_1.1.0.31.8757.tar.xz/src/tbf_ul_ack_fsm.h Changed

osmo-pcu_1.1.0.28.d6bb6.tar.xz/tests/alloc/AllocTest.cpp -> osmo-pcu_1.1.0.31.8757.tar.xz/tests/alloc/AllocTest.cpp Changed

@@ -48,7 +48,7 @@
 	if (dir == GPRS_RLCMAC_UL_TBF)
 		return tbf_alloc_ul_tbf(bts, ms, use_trx, single_slot);
 	else
-		return tbf_alloc_dl_tbf(bts, ms, use_trx, single_slot);
+		return dl_tbf_alloc(bts, ms, use_trx, single_slot);
 }
 
 static void check_tfi_usage(struct gprs_rlcmac_bts *bts)
@@ -231,7 +231,7 @@
 	dump_assignment(ul_tbf, "UL", verbose);
 
 	/* assume final ack has not been sent */
-	dl_tbf = tbf_alloc_dl_tbf(bts, ms, ms_current_trx(ms)->trx_no, false);
+	dl_tbf = dl_tbf_alloc(bts, ms, ms_current_trx(ms)->trx_no, false);
 	if (!dl_tbf)
 		return false;
 
@@ -265,7 +265,7 @@
 	ms = bts_alloc_ms(bts, ms_class, 0);
 	/* Avoid delaying free to avoid tons of to-be-freed ms objects queuing */
 	ms_set_timeout(ms, 0);
-	dl_tbf = tbf_alloc_dl_tbf(bts, ms, -1, true);
+	dl_tbf = dl_tbf_alloc(bts, ms, -1, true);
 	if (!dl_tbf)
 		return false;
 
@@ -328,7 +328,7 @@
 	dump_assignment(ul_tbf, "UL", true);
 
 	/* assume final ack has not been sent */
-	dl_tbf = tbf_alloc_dl_tbf(bts, ms, trx_no, false);
+	dl_tbf = dl_tbf_alloc(bts, ms, trx_no, false);
 	if (!dl_tbf)
 		return false;
 
@@ -487,7 +487,7 @@
 	case TEST_MODE_DL_AND_UL:
 		if (ms_dl_tbf(old_ms))
 			tbf_free(ms_dl_tbf(old_ms));
-		tbf = tbf_alloc_dl_tbf(bts, old_ms, trx_no, false);
+		tbf = dl_tbf_alloc(bts, old_ms, trx_no, false);
 		if (tbf == NULL) {
 			OSMO_ASSERT(trx_no != -1 || bts_all_pdch_allocated(bts));
 			ms_unref(old_ms);
@@ -772,7 +772,7 @@
 	trx->pdch7.enable();
 
 	ms = bts_alloc_ms(bts, ms_class, egprs_ms_class);
-	dl_tbf1 = tbf_alloc_dl_tbf(bts, ms, 0, false);
+	dl_tbf1 = dl_tbf_alloc(bts, ms, 0, false);
 	OSMO_ASSERT(dl_tbf1);
 
 	for (int i = 0; i < 8; i++) {
@@ -783,7 +783,7 @@
 	printf("TBF1: numTs(%d)\n", numTs1);
 
 	ms = bts_alloc_ms(bts, ms_class, egprs_ms_class);
-	dl_tbf2 = tbf_alloc_dl_tbf(bts, ms, 0, false);
+	dl_tbf2 = dl_tbf_alloc(bts, ms, 0, false);
 	OSMO_ASSERT(dl_tbf2);
 
 	for (int i = 0; i < 8; i++) {

osmo-pcu_1.1.0.28.d6bb6.tar.xz/tests/app_info/AppInfoTest.cpp -> osmo-pcu_1.1.0.31.8757.tar.xz/tests/app_info/AppInfoTest.cpp Changed

osmo-pcu_1.1.0.28.d6bb6.tar.xz/tests/tbf/TbfTest.cpp -> osmo-pcu_1.1.0.31.8757.tar.xz/tests/tbf/TbfTest.cpp Changed

@@ -123,7 +123,7 @@
 	 * Make a uplink and downlink allocation
 	 */
 	ms = bts_alloc_ms(bts, 0, 0);
-	gprs_rlcmac_tbf *dl_tbf = tbf_alloc_dl_tbf(bts,
+	gprs_rlcmac_tbf *dl_tbf = dl_tbf_alloc(bts,
 						ms, 0, false);
 	OSMO_ASSERT(dl_tbf != NULL);
 	dl_tbf->update_ms(0x2342, GPRS_RLCMAC_DL_TBF);
@@ -209,7 +209,7 @@
 
 	tfi = bts_tfi_find_free(bts, GPRS_RLCMAC_DL_TBF, &trx_no, -1);
 	OSMO_ASSERT(tfi >= 0);
-	dl_tbf = tbf_alloc_dl_tbf(bts, ms, trx_no, true);
+	dl_tbf = dl_tbf_alloc(bts, ms, trx_no, true);
 	OSMO_ASSERT(dl_tbf);
 	dl_tbf->set_ta(0);
 	check_tbf(dl_tbf);
@@ -312,8 +312,8 @@
 		llc_datai = i%256;
 
 	/* Schedule two LLC frames */
-	dl_tbf->append_data(1000, llc_data, sizeof(llc_data));
-	dl_tbf->append_data(1000, llc_data, sizeof(llc_data));
+	ms_append_llc_dl_data(dl_tbf->ms(), 1000, llc_data, sizeof(llc_data));
+	ms_append_llc_dl_data(dl_tbf->ms(), 1000, llc_data, sizeof(llc_data));
 
 
 	/* Send only a few RLC/MAC blocks */
@@ -389,8 +389,8 @@
 	OSMO_ASSERT(dl_tbf->state_is(TBF_ST_FLOW));
 
 	/* Schedule two LLC frames */
-	dl_tbf->append_data(1000, llc_data, sizeof(llc_data));
-	dl_tbf->append_data(1000, llc_data, sizeof(llc_data));
+	ms_append_llc_dl_data(dl_tbf->ms(), 1000, llc_data, sizeof(llc_data));
+	ms_append_llc_dl_data(dl_tbf->ms(), 1000, llc_data, sizeof(llc_data));
 
 	OSMO_ASSERT(dl_tbf->state_is(TBF_ST_FLOW));
 
@@ -2328,7 +2328,7 @@
 
 	/* Does no support EGPRS */
 	ms = bts_alloc_ms(bts, ms_class, 0);
-	dl_tbf = tbf_alloc_dl_tbf(bts, ms, 0, false);
+	dl_tbf = dl_tbf_alloc(bts, ms, 0, false);
 
 	ws_check(dl_tbf, __func__, 4, 64, true);
 
@@ -2336,7 +2336,7 @@
 
 	/* Does support EGPRS */
 	ms = bts_alloc_ms(bts, ms_class, ms_class);
-	dl_tbf = tbf_alloc_dl_tbf(bts, ms, 0, false);
+	dl_tbf = dl_tbf_alloc(bts, ms, 0, false);
 
 	ws_check(dl_tbf, __func__, 4, 128 + 4 * 64, true);
 	fprintf(stderr, "=== end %s ===\n", __func__);
@@ -2376,7 +2376,7 @@
 
 	/* Does support EGPRS */
 	ms = bts_alloc_ms(bts, ms_class, ms_class);
-	dl_tbf = tbf_alloc_dl_tbf(bts, ms, 0, true);
+	dl_tbf = dl_tbf_alloc(bts, ms, 0, true);
 
 	ws_check(dl_tbf, __func__, 1, 128 + 1 * 64, false);
 
@@ -2744,7 +2744,7 @@
 	OSMO_ASSERT(dl_tbf->state_is(TBF_ST_FLOW));
 
 	/* Schedule a small LLC frame */
-	dl_tbf->append_data(1000, test_data, 10);
+	ms_append_llc_dl_data(dl_tbf->ms(), 1000, test_data, 10);
 
 	OSMO_ASSERT(dl_tbf->state_is(TBF_ST_FLOW));
 
@@ -2756,7 +2756,7 @@
 	send_empty_block(dl_tbf, dl_tbf->control_ts, fn);
 
 	/* Schedule a large LLC frame */
-	dl_tbf->append_data(1000, test_data, sizeof(test_data));
+	ms_append_llc_dl_data(dl_tbf->ms(), 1000, test_data, sizeof(test_data));
 
 	OSMO_ASSERT(dl_tbf->state_is(TBF_ST_FLOW));
 
@@ -2805,7 +2805,7 @@
 	 * 2 RLC data blocks. Which are enough to test Header Type 1
 	 * cases
 	 */
-	dl_tbf->append_data(1000, test_data, 100);
+	ms_append_llc_dl_data(dl_tbf->ms(), 1000, test_data, 100);
 
 	OSMO_ASSERT(dl_tbf->state_is(TBF_ST_FLOW));

osmo-pcu_1.1.0.28.d6bb6.tar.xz/tests/tbf/TbfTest.err -> osmo-pcu_1.1.0.31.8757.tar.xz/tests/tbf/TbfTest.err Changed

@@ -86,8 +86,8 @@
 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=ASSIGN) set ass. type PACCH prev CCCH:0, PACCH:0
 TBF(DL-TFI_0){ASSIGN}: state_chg to FLOW
 The MS object cannot fully confirm an unexpected TLLI: 0xffeeddcc, partly confirmed
-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) appending 200 bytes
-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) appending 200 bytes
+MS(TLLI=0xffeeddcc, IMSI=, TA=0, 45/0, DL) appending 200 bytes to DL LLC queue
+MS(TLLI=0xffeeddcc, IMSI=, TA=0, 45/0, DL) appending 200 bytes to DL LLC queue
 DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13
 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) start Packet Downlink Assignment (PACCH)
@@ -199,8 +199,8 @@
 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=ASSIGN) set ass. type PACCH prev CCCH:0, PACCH:0
 TBF(DL-TFI_0){ASSIGN}: state_chg to FLOW
 The MS object cannot fully confirm an unexpected TLLI: 0xffeeddcc, partly confirmed
-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) appending 200 bytes
-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) appending 200 bytes
+MS(TLLI=0xffeeddcc, IMSI=, TA=0, 45/0, DL) appending 200 bytes to DL LLC queue
+MS(TLLI=0xffeeddcc, IMSI=, TA=0, 45/0, DL) appending 200 bytes to DL LLC queue
 DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13
 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) start Packet Downlink Assignment (PACCH)
@@ -312,8 +312,8 @@
 TBF(TFI=0 TLLI=0xffffffff DIR=DL STATE=ASSIGN) set ass. type PACCH prev CCCH:0, PACCH:0
 TBF(DL-TFI_0){ASSIGN}: state_chg to FLOW
 The MS object cannot fully confirm an unexpected TLLI: 0xffeeddcc, partly confirmed
-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) appending 200 bytes
-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) appending 200 bytes
+MS(TLLI=0xffeeddcc, IMSI=, TA=0, 45/0, DL) appending 200 bytes to DL LLC queue
+MS(TLLI=0xffeeddcc, IMSI=, TA=0, 45/0, DL) appending 200 bytes to DL LLC queue
 DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG
 PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13
 TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) start Packet Downlink Assignment (PACCH)
@@ -641,6 +641,7 @@
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45
 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000000'
 The MS object cannot fully confirm an unexpected TLLI: 0xc0000000, partly confirmed
+MS(TLLI=0xc0000000, IMSI=001001000000000, TA=220, 45/0,) appending 256 bytes to DL LLC queue
 MS(TLLI=0xc0000000, IMSI=001001000000000, TA=220, 45/0,) ********** DL-TBF starts here **********
 MS(TLLI=0xc0000000, IMSI=001001000000000, TA=220, 45/0,) Allocating DL TBF
 TBF{NEW}: Allocated
@@ -666,11 +667,11 @@
 TBF(DL-TFI_0){NEW}: state_chg to ASSIGN
 TBF(TFI=0 TLLI=0xc0000000 DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH)
  - TRX=0 (0) TS=4 TA=220
-TBF(TFI=0 TLLI=0xc0000000 DIR=DL STATE=ASSIGN) appending 256 bytes
 Creating MS object, TLLI = 0xffffffff
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45
 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000001'
 The MS object cannot fully confirm an unexpected TLLI: 0xc0000001, partly confirmed
+MS(TLLI=0xc0000001, IMSI=001001000000001, TA=220, 45/0,) appending 256 bytes to DL LLC queue
 MS(TLLI=0xc0000001, IMSI=001001000000001, TA=220, 45/0,) ********** DL-TBF starts here **********
 MS(TLLI=0xc0000001, IMSI=001001000000001, TA=220, 45/0,) Allocating DL TBF
 TBF{NEW}: Allocated
@@ -696,11 +697,11 @@
 TBF(DL-TFI_1){NEW}: state_chg to ASSIGN
 TBF(TFI=1 TLLI=0xc0000001 DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH)
  - TRX=0 (0) TS=4 TA=220
-TBF(TFI=1 TLLI=0xc0000001 DIR=DL STATE=ASSIGN) appending 256 bytes
 Creating MS object, TLLI = 0xffffffff
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45
 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000002'
 The MS object cannot fully confirm an unexpected TLLI: 0xc0000002, partly confirmed
+MS(TLLI=0xc0000002, IMSI=001001000000002, TA=220, 45/0,) appending 256 bytes to DL LLC queue
 MS(TLLI=0xc0000002, IMSI=001001000000002, TA=220, 45/0,) ********** DL-TBF starts here **********
 MS(TLLI=0xc0000002, IMSI=001001000000002, TA=220, 45/0,) Allocating DL TBF
 TBF{NEW}: Allocated
@@ -726,11 +727,11 @@
 TBF(DL-TFI_2){NEW}: state_chg to ASSIGN
 TBF(TFI=2 TLLI=0xc0000002 DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH)
  - TRX=0 (0) TS=4 TA=220
-TBF(TFI=2 TLLI=0xc0000002 DIR=DL STATE=ASSIGN) appending 256 bytes
 Creating MS object, TLLI = 0xffffffff
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45
 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000003'
 The MS object cannot fully confirm an unexpected TLLI: 0xc0000003, partly confirmed
+MS(TLLI=0xc0000003, IMSI=001001000000003, TA=220, 45/0,) appending 256 bytes to DL LLC queue
 MS(TLLI=0xc0000003, IMSI=001001000000003, TA=220, 45/0,) ********** DL-TBF starts here **********
 MS(TLLI=0xc0000003, IMSI=001001000000003, TA=220, 45/0,) Allocating DL TBF
 TBF{NEW}: Allocated
@@ -756,11 +757,11 @@
 TBF(DL-TFI_3){NEW}: state_chg to ASSIGN
 TBF(TFI=3 TLLI=0xc0000003 DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH)
  - TRX=0 (0) TS=4 TA=220
-TBF(TFI=3 TLLI=0xc0000003 DIR=DL STATE=ASSIGN) appending 256 bytes
 Creating MS object, TLLI = 0xffffffff
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45
 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000004'
 The MS object cannot fully confirm an unexpected TLLI: 0xc0000004, partly confirmed
+MS(TLLI=0xc0000004, IMSI=001001000000004, TA=220, 45/0,) appending 256 bytes to DL LLC queue
 MS(TLLI=0xc0000004, IMSI=001001000000004, TA=220, 45/0,) ********** DL-TBF starts here **********
 MS(TLLI=0xc0000004, IMSI=001001000000004, TA=220, 45/0,) Allocating DL TBF
 TBF{NEW}: Allocated
@@ -786,11 +787,11 @@
 TBF(DL-TFI_4){NEW}: state_chg to ASSIGN
 TBF(TFI=4 TLLI=0xc0000004 DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH)
  - TRX=0 (0) TS=4 TA=220
-TBF(TFI=4 TLLI=0xc0000004 DIR=DL STATE=ASSIGN) appending 256 bytes
 Creating MS object, TLLI = 0xffffffff
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45
 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000005'
 The MS object cannot fully confirm an unexpected TLLI: 0xc0000005, partly confirmed
+MS(TLLI=0xc0000005, IMSI=001001000000005, TA=220, 45/0,) appending 256 bytes to DL LLC queue
 MS(TLLI=0xc0000005, IMSI=001001000000005, TA=220, 45/0,) ********** DL-TBF starts here **********
 MS(TLLI=0xc0000005, IMSI=001001000000005, TA=220, 45/0,) Allocating DL TBF
 TBF{NEW}: Allocated
@@ -816,11 +817,11 @@
 TBF(DL-TFI_5){NEW}: state_chg to ASSIGN
 TBF(TFI=5 TLLI=0xc0000005 DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH)
  - TRX=0 (0) TS=4 TA=220
-TBF(TFI=5 TLLI=0xc0000005 DIR=DL STATE=ASSIGN) appending 256 bytes
 Creating MS object, TLLI = 0xffffffff
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45
 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000006'
 The MS object cannot fully confirm an unexpected TLLI: 0xc0000006, partly confirmed
+MS(TLLI=0xc0000006, IMSI=001001000000006, TA=220, 45/0,) appending 256 bytes to DL LLC queue
 MS(TLLI=0xc0000006, IMSI=001001000000006, TA=220, 45/0,) ********** DL-TBF starts here **********
 MS(TLLI=0xc0000006, IMSI=001001000000006, TA=220, 45/0,) Allocating DL TBF
 TBF{NEW}: Allocated
@@ -846,11 +847,11 @@
 TBF(DL-TFI_6){NEW}: state_chg to ASSIGN
 TBF(TFI=6 TLLI=0xc0000006 DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH)
  - TRX=0 (0) TS=4 TA=220
-TBF(TFI=6 TLLI=0xc0000006 DIR=DL STATE=ASSIGN) appending 256 bytes
 Creating MS object, TLLI = 0xffffffff
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45
 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000007'
 The MS object cannot fully confirm an unexpected TLLI: 0xc0000007, partly confirmed
+MS(TLLI=0xc0000007, IMSI=001001000000007, TA=220, 45/0,) appending 256 bytes to DL LLC queue
 MS(TLLI=0xc0000007, IMSI=001001000000007, TA=220, 45/0,) ********** DL-TBF starts here **********
 MS(TLLI=0xc0000007, IMSI=001001000000007, TA=220, 45/0,) Allocating DL TBF
 TBF{NEW}: Allocated
@@ -876,11 +877,11 @@
 TBF(DL-TFI_7){NEW}: state_chg to ASSIGN
 TBF(TFI=7 TLLI=0xc0000007 DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH)
  - TRX=0 (0) TS=4 TA=220
-TBF(TFI=7 TLLI=0xc0000007 DIR=DL STATE=ASSIGN) appending 256 bytes
 Creating MS object, TLLI = 0xffffffff
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45
 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000008'
 The MS object cannot fully confirm an unexpected TLLI: 0xc0000008, partly confirmed
+MS(TLLI=0xc0000008, IMSI=001001000000008, TA=220, 45/0,) appending 256 bytes to DL LLC queue
 MS(TLLI=0xc0000008, IMSI=001001000000008, TA=220, 45/0,) ********** DL-TBF starts here **********
 MS(TLLI=0xc0000008, IMSI=001001000000008, TA=220, 45/0,) Allocating DL TBF
 TBF{NEW}: Allocated
@@ -906,11 +907,11 @@
 TBF(DL-TFI_8){NEW}: state_chg to ASSIGN
 TBF(TFI=8 TLLI=0xc0000008 DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH)
  - TRX=0 (0) TS=4 TA=220
-TBF(TFI=8 TLLI=0xc0000008 DIR=DL STATE=ASSIGN) appending 256 bytes
 Creating MS object, TLLI = 0xffffffff
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45
 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000009'
 The MS object cannot fully confirm an unexpected TLLI: 0xc0000009, partly confirmed
+MS(TLLI=0xc0000009, IMSI=001001000000009, TA=220, 45/0,) appending 256 bytes to DL LLC queue
 MS(TLLI=0xc0000009, IMSI=001001000000009, TA=220, 45/0,) ********** DL-TBF starts here **********
 MS(TLLI=0xc0000009, IMSI=001001000000009, TA=220, 45/0,) Allocating DL TBF
 TBF{NEW}: Allocated
@@ -936,11 +937,11 @@
 TBF(DL-TFI_9){NEW}: state_chg to ASSIGN
 TBF(TFI=9 TLLI=0xc0000009 DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH)
  - TRX=0 (0) TS=4 TA=220
-TBF(TFI=9 TLLI=0xc0000009 DIR=DL STATE=ASSIGN) appending 256 bytes
 Creating MS object, TLLI = 0xffffffff
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45
 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000010'
 The MS object cannot fully confirm an unexpected TLLI: 0xc000000a, partly confirmed
+MS(TLLI=0xc000000a, IMSI=001001000000010, TA=220, 45/0,) appending 256 bytes to DL LLC queue
 MS(TLLI=0xc000000a, IMSI=001001000000010, TA=220, 45/0,) ********** DL-TBF starts here **********
 MS(TLLI=0xc000000a, IMSI=001001000000010, TA=220, 45/0,) Allocating DL TBF
 TBF{NEW}: Allocated
@@ -966,11 +967,11 @@
 TBF(DL-TFI_10){NEW}: state_chg to ASSIGN
 TBF(TFI=10 TLLI=0xc000000a DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH)
  - TRX=0 (0) TS=4 TA=220
-TBF(TFI=10 TLLI=0xc000000a DIR=DL STATE=ASSIGN) appending 256 bytes
 Creating MS object, TLLI = 0xffffffff
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45
 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000011'
 The MS object cannot fully confirm an unexpected TLLI: 0xc000000b, partly confirmed
+MS(TLLI=0xc000000b, IMSI=001001000000011, TA=220, 45/0,) appending 256 bytes to DL LLC queue
 MS(TLLI=0xc000000b, IMSI=001001000000011, TA=220, 45/0,) ********** DL-TBF starts here **********
 MS(TLLI=0xc000000b, IMSI=001001000000011, TA=220, 45/0,) Allocating DL TBF
 TBF{NEW}: Allocated
@@ -996,11 +997,11 @@
 TBF(DL-TFI_11){NEW}: state_chg to ASSIGN
 TBF(TFI=11 TLLI=0xc000000b DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH)
  - TRX=0 (0) TS=4 TA=220
-TBF(TFI=11 TLLI=0xc000000b DIR=DL STATE=ASSIGN) appending 256 bytes
 Creating MS object, TLLI = 0xffffffff
 Modifying MS object, TLLI = 0xffffffff, MS class 0 -> 45
 Modifying MS object, TLLI = 0xffffffff, IMSI '' -> '001001000000012'
 The MS object cannot fully confirm an unexpected TLLI: 0xc000000c, partly confirmed
+MS(TLLI=0xc000000c, IMSI=001001000000012, TA=220, 45/0,) appending 256 bytes to DL LLC queue
 MS(TLLI=0xc000000c, IMSI=001001000000012, TA=220, 45/0,) ********** DL-TBF starts here **********
 MS(TLLI=0xc000000c, IMSI=001001000000012, TA=220, 45/0,) Allocating DL TBF
 TBF{NEW}: Allocated
@@ -1026,11 +1027,11 @@
 TBF(DL-TFI_12){NEW}: state_chg to ASSIGN
 TBF(TFI=12 TLLI=0xc000000c DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH)

osmo-pcu_1.1.0.28.d6bb6.tar.xz/tests/types/TypesTest.cpp -> osmo-pcu_1.1.0.31.8757.tar.xz/tests/types/TypesTest.cpp Changed

osmo-pcu_1.1.0.28.d6bb6.tar.xz/tests/ulc/PdchUlcTest.cpp -> osmo-pcu_1.1.0.31.8757.tar.xz/tests/ulc/PdchUlcTest.cpp Changed

Changes of Revision 10