<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/18133">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Expect ms object to exist before calling tbf_alloc_ul_tbf()<br><br>It's really non-sense from architectural point of view to pass an<br>optional pointer to the MS holding the TBF and creating it otherwise.<br>TBFs shouldn't be creating MS they belong too.<br><br>This simple change requiring so many code line changes really exhibits<br>how badly entangled the object relationship is.<br><br>Another commit will follow doing the same for dl tbf.<br><br>Change-Id: I010aa5877902816ae246e09ad5ad87946f96855c<br>---<br>M src/bts.cpp<br>M src/pdch.cpp<br>M src/tbf.cpp<br>M src/tbf.h<br>M tests/alloc/AllocTest.cpp<br>M tests/tbf/TbfTest.cpp<br>M tests/tbf/TbfTest.err<br>M tests/types/TypesTest.cpp<br>8 files changed, 105 insertions(+), 103 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.cpp b/src/bts.cpp</span><br><span>index 1d073aa..2916ee7 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -753,6 +753,7 @@</span><br><span> uint8_t tsc = 0, ta = qta2ta(qta);</span><br><span> uint8_t egprs_ms_class = egprs_mslot_class_from_ra(ra, is_11bit);</span><br><span> bool failure = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsMs *ms;</span><br><span> </span><br><span> rach_frame();</span><br><span> </span><br><span>@@ -792,9 +793,10 @@</span><br><span> "Uplink (AGCH)\n");</span><br><span> }</span><br><span> } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ ms = ms_alloc(0, egprs_ms_class);</span><br><span> // Create new TBF</span><br><span> /* FIXME: Copy and paste with other routines.. */</span><br><span style="color: hsl(0, 100%, 40%);">- tbf = tbf_alloc_ul_tbf(&m_bts, NULL, -1, 0, egprs_ms_class, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf = tbf_alloc_ul_tbf(&m_bts, ms, -1, true);</span><br><span> </span><br><span> if (!tbf) {</span><br><span> LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource sending "</span><br><span>diff --git a/src/pdch.cpp b/src/pdch.cpp</span><br><span>index 77be1b5..149ca1f 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -118,8 +118,7 @@</span><br><span> bts->channel_request_description();</span><br><span> </span><br><span> /* This call will register the new TBF with the MS on success */</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_rlcmac_ul_tbf *ul_tbf = tbf_alloc_ul(bts_data, tbf->trx->trx_no, tbf->ms_class(),</span><br><span style="color: hsl(0, 100%, 40%);">- tbf->ms()->egprs_ms_class(), tbf->tlli(), tbf->ta(), tbf->ms());</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_rlcmac_ul_tbf *ul_tbf = tbf_alloc_ul(bts_data, tbf->ms(), tbf->trx->trx_no, tbf->tlli(), tbf->ta());</span><br><span> </span><br><span> /* schedule uplink assignment or reject */</span><br><span> if (ul_tbf) {</span><br><span>@@ -552,19 +551,17 @@</span><br><span> struct gprs_rlcmac_ul_tbf *ul_tbf = NULL;</span><br><span> struct gprs_rlcmac_dl_tbf *dl_tbf = NULL;</span><br><span> uint32_t tlli = request->ID.u.TLLI;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ms_class = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t egprs_ms_class = 0;</span><br><span> uint8_t ta = GSM48_TA_INVALID;</span><br><span> </span><br><span> GprsMs *ms = bts()->ms_by_tlli(tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ms)</span><br><span style="color: hsl(120, 100%, 40%);">+ ms = bts()->ms_alloc(0, 0); /* ms class updated later */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Keep the ms, even if it gets idle temporarily */</span><br><span> GprsMs::Guard guard(ms);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ms) {</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf = ms->ul_tbf();</span><br><span style="color: hsl(0, 100%, 40%);">- dl_tbf = ms->dl_tbf();</span><br><span style="color: hsl(0, 100%, 40%);">- ta = ms->ta();</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf = ms->ul_tbf();</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_tbf = ms->dl_tbf();</span><br><span style="color: hsl(120, 100%, 40%);">+ ta = ms->ta();</span><br><span> </span><br><span> /* We got a RACH so the MS was in packet idle mode and thus</span><br><span> * didn't have any active TBFs */</span><br><span>@@ -597,20 +594,23 @@</span><br><span> bts()->sba()->free_sba(sba);</span><br><span> }</span><br><span> if (request->Exist_MS_Radio_Access_capability2) {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ms_class, egprs_ms_class;</span><br><span> ms_class = Decoding::get_ms_class_by_capability(</span><br><span> &request->MS_Radio_Access_capability2);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->set_ms_class(ms_class);</span><br><span> egprs_ms_class =</span><br><span> Decoding::get_egprs_ms_class_by_capability(</span><br><span> &request->MS_Radio_Access_capability2);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->set_egprs_ms_class(egprs_ms_class);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ms_class)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ms->ms_class())</span><br><span> LOGP(DRLCMAC, LOGL_NOTICE, "MS does not give us a class.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- if (egprs_ms_class)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ms->egprs_ms_class())</span><br><span> LOGP(DRLCMAC, LOGL_NOTICE,</span><br><span> "MS supports EGPRS multislot class %d.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- egprs_ms_class);</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf = tbf_alloc_ul(bts_data(), trx_no(), ms_class,</span><br><span style="color: hsl(0, 100%, 40%);">- egprs_ms_class, tlli, ta, ms);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->egprs_ms_class());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf = tbf_alloc_ul(bts_data(), ms, trx_no(), tlli, ta);</span><br><span> </span><br><span> if (!ul_tbf) {</span><br><span> handle_tbf_reject(bts_data(), ms, tlli,</span><br><span>@@ -626,10 +626,6 @@</span><br><span> /* schedule uplink assignment */</span><br><span> TBF_SET_ASS_STATE_UL(ul_tbf, GPRS_RLCMAC_UL_ASS_SEND_ASS);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* get capabilities */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ul_tbf->ms())</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf->ms()->set_egprs_ms_class(egprs_ms_class);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* get measurements */</span><br><span> if (ul_tbf->ms()) {</span><br><span> get_meas(meas, request);</span><br><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index fb985d4..e41ed9f 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -415,17 +415,15 @@</span><br><span> ms()->confirm_tlli(tlli);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts,</span><br><span style="color: hsl(0, 100%, 40%);">- int8_t use_trx, uint8_t ms_class, uint8_t egprs_ms_class,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t tlli, uint8_t ta, GprsMs *ms)</span><br><span style="color: hsl(120, 100%, 40%);">+gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t tlli, uint8_t ta)</span><br><span> {</span><br><span> struct gprs_rlcmac_ul_tbf *tbf;</span><br><span> </span><br><span> /* FIXME: Copy and paste with tbf_new_dl_assignment */</span><br><span> /* create new TBF, use same TRX as DL TBF */</span><br><span> /* use multislot class of downlink TBF */</span><br><span style="color: hsl(0, 100%, 40%);">- tbf = tbf_alloc_ul_tbf(bts, ms, use_trx, ms_class, egprs_ms_class,</span><br><span style="color: hsl(0, 100%, 40%);">- false);</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf = tbf_alloc_ul_tbf(bts, ms, use_trx, false);</span><br><span> if (!tbf) {</span><br><span> LOGP(DTBF, LOGL_NOTICE, "No PDCH resource\n");</span><br><span> /* FIXME: send reject */</span><br><span>@@ -979,13 +977,14 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, uint8_t ms_class,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t egprs_ms_class, bool single_slot)</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot)</span><br><span> {</span><br><span> struct gprs_rlcmac_ul_tbf *tbf;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (egprs_ms_class == 0 && bts->egprs_enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(ms != NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ms->egprs_ms_class() == 0 && bts->egprs_enabled) {</span><br><span> LOGP(DTBF, LOGL_NOTICE, "Not accepting non-EGPRS phone in EGPRS-only mode\n");</span><br><span> bts->bts->tbf_failed_egprs_only();</span><br><span> return NULL;</span><br><span>@@ -993,26 +992,21 @@</span><br><span> </span><br><span> LOGP(DTBF, LOGL_DEBUG, "********** UL-TBF starts here **********\n");</span><br><span> LOGP(DTBF, LOGL_INFO, "Allocating UL TBF: MS_CLASS=%d/%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ms_class, egprs_ms_class);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->ms_class(), ms->egprs_ms_class());</span><br><span> </span><br><span> tbf = talloc(tall_pcu_ctx, struct gprs_rlcmac_ul_tbf);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (!tbf)</span><br><span> return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> talloc_set_destructor(tbf, ul_tbf_dtor);</span><br><span> new (tbf) gprs_rlcmac_ul_tbf(bts->bts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!ms)</span><br><span style="color: hsl(0, 100%, 40%);">- ms = bts->bts->ms_alloc(ms_class, egprs_ms_class);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (egprs_ms_class > 0 && bts->egprs_enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ms->egprs_ms_class() > 0 && bts->egprs_enabled) {</span><br><span> tbf->enable_egprs();</span><br><span> setup_egprs_mode(bts, ms);</span><br><span> LOGPTBF(tbf, LOGL_INFO, "Enabled EGPRS, mode %s\n", mode_name(ms->mode()));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = setup_tbf(tbf, ms, use_trx, ms_class, egprs_ms_class, single_slot);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = setup_tbf(tbf, ms, use_trx, ms->ms_class(), ms->egprs_ms_class(), single_slot);</span><br><span> </span><br><span> /* if no resource */</span><br><span> if (rc < 0) {</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index 9545385..33d996f 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -346,12 +346,10 @@</span><br><span> };</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts,</span><br><span style="color: hsl(0, 100%, 40%);">- int8_t use_trx, uint8_t ms_class, uint8_t egprs_ms_class,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t tlli, uint8_t ta, GprsMs *ms);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, GprsMs *ms,</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t use_trx, uint32_t tlli, uint8_t ta);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, uint8_t ms_class,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t egprs_ms_class, bool single_slot);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot);</span><br><span> </span><br><span> struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, uint8_t ms_class,</span><br><span> uint8_t egprs_ms_class, bool single_slot);</span><br><span>diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp</span><br><span>index 2fdee3f..abd5d22 100644</span><br><span>--- a/tests/alloc/AllocTest.cpp</span><br><span>+++ b/tests/alloc/AllocTest.cpp</span><br><span>@@ -44,9 +44,11 @@</span><br><span> uint8_t use_trx,</span><br><span> uint8_t ms_class, uint8_t egprs_ms_class, bool single_slot)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dir == GPRS_RLCMAC_UL_TBF && !ms)</span><br><span style="color: hsl(120, 100%, 40%);">+ ms = bts->bts->ms_alloc(ms_class, egprs_ms_class);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (dir == GPRS_RLCMAC_UL_TBF)</span><br><span style="color: hsl(0, 100%, 40%);">- return tbf_alloc_ul_tbf(bts, ms, use_trx,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_class, egprs_ms_class, single_slot);</span><br><span style="color: hsl(120, 100%, 40%);">+ return tbf_alloc_ul_tbf(bts, ms, use_trx, single_slot);</span><br><span> else</span><br><span> return tbf_alloc_dl_tbf(bts, ms, use_trx,</span><br><span> ms_class, egprs_ms_class, single_slot);</span><br><span>@@ -205,6 +207,7 @@</span><br><span> {</span><br><span> BTS the_bts;</span><br><span> struct gprs_rlcmac_bts *bts = the_bts.bts_data();</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsMs *ms;</span><br><span> gprs_rlcmac_ul_tbf *ul_tbf;</span><br><span> gprs_rlcmac_dl_tbf *dl_tbf;</span><br><span> </span><br><span>@@ -215,7 +218,8 @@</span><br><span> </span><br><span> enable_ts_on_bts(bts, ts0, ts1, ts2, ts3, ts4, ts5, ts6, ts7);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf = tbf_alloc_ul_tbf(bts, NULL, -1, ms_class, 0, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms = the_bts.ms_alloc(ms_class, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf = tbf_alloc_ul_tbf(bts, ms, -1, true);</span><br><span> if (!ul_tbf)</span><br><span> return false;</span><br><span> </span><br><span>@@ -247,6 +251,7 @@</span><br><span> {</span><br><span> BTS the_bts;</span><br><span> struct gprs_rlcmac_bts *bts = the_bts.bts_data();</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsMs *ms;</span><br><span> gprs_rlcmac_ul_tbf *ul_tbf;</span><br><span> gprs_rlcmac_dl_tbf *dl_tbf;</span><br><span> </span><br><span>@@ -262,14 +267,14 @@</span><br><span> return false;</span><br><span> </span><br><span> dl_tbf->update_ms(0x23, GPRS_RLCMAC_DL_TBF);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ ms = dl_tbf->ms();</span><br><span> OSMO_ASSERT(dl_tbf->ms());</span><br><span> OSMO_ASSERT(dl_tbf->ms()->current_trx());</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->set_ms_class(ms_class);</span><br><span> </span><br><span> dump_assignment(dl_tbf, "DL", verbose);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf = tbf_alloc_ul_tbf(bts, dl_tbf->ms(), dl_tbf->ms()->current_trx()->trx_no, ms_class, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- false);</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf = tbf_alloc_ul_tbf(bts, ms, ms->current_trx()->trx_no, false);</span><br><span> if (!ul_tbf)</span><br><span> return false;</span><br><span> </span><br><span>@@ -297,6 +302,7 @@</span><br><span> {</span><br><span> BTS the_bts;</span><br><span> struct gprs_rlcmac_bts *bts = the_bts.bts_data();</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsMs *ms;</span><br><span> int tfi;</span><br><span> uint8_t trx_no;</span><br><span> gprs_rlcmac_tbf *ul_tbf, *dl_tbf;</span><br><span>@@ -309,7 +315,8 @@</span><br><span> </span><br><span> tfi = the_bts.tfi_find_free(GPRS_RLCMAC_UL_TBF, &trx_no, -1);</span><br><span> OSMO_ASSERT(tfi >= 0);</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf = tbf_alloc_ul_tbf(bts, NULL, -1, ms_class, 0, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms = the_bts.ms_alloc(ms_class, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ul_tbf = tbf_alloc_ul_tbf(bts, ms, -1, false);</span><br><span> if (!ul_tbf)</span><br><span> return false;</span><br><span> </span><br><span>@@ -455,6 +462,8 @@</span><br><span> struct gprs_rlcmac_bts *bts;</span><br><span> uint8_t trx_no = -1;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(ms != NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bts = the_bts->bts_data();</span><br><span> </span><br><span> gprs_rlcmac_tbf *tbf = NULL;</span><br><span>@@ -471,7 +480,8 @@</span><br><span> case TEST_MODE_UL_AND_DL:</span><br><span> if (ms && ms->ul_tbf())</span><br><span> tbf_free(ms->ul_tbf());</span><br><span style="color: hsl(0, 100%, 40%);">- tbf = tbf_alloc_ul_tbf(bts, ms, trx_no, ms_class, 0, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->set_ms_class(ms_class);</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf = tbf_alloc_ul_tbf(bts, ms, trx_no, false);</span><br><span> if (tbf == NULL)</span><br><span> return NULL;</span><br><span> break;</span><br><span>@@ -549,6 +559,8 @@</span><br><span> uint32_t tlli = counter + 0xc0000000;</span><br><span> </span><br><span> ms = the_bts->ms_by_tlli(tlli);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ms)</span><br><span style="color: hsl(120, 100%, 40%);">+ ms = the_bts->ms_alloc(0, 0);</span><br><span> </span><br><span> ms = alloc_tbfs(the_bts, ms, ms_class, mode);</span><br><span> if (!ms)</span><br><span>diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp</span><br><span>index 6420aca..0a979e5 100644</span><br><span>--- a/tests/tbf/TbfTest.cpp</span><br><span>+++ b/tests/tbf/TbfTest.cpp</span><br><span>@@ -95,8 +95,7 @@</span><br><span> dl_tbf->set_ta(4);</span><br><span> </span><br><span> gprs_rlcmac_tbf *ul_tbf = tbf_alloc_ul_tbf(the_bts.bts_data(),</span><br><span style="color: hsl(0, 100%, 40%);">- dl_tbf->ms(),</span><br><span style="color: hsl(0, 100%, 40%);">- 0, 0, 0, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ dl_tbf->ms(), 0, false);</span><br><span> OSMO_ASSERT(ul_tbf != NULL);</span><br><span> ul_tbf->update_ms(0x2342, GPRS_RLCMAC_UL_TBF);</span><br><span> </span><br><span>diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err</span><br><span>index 47146dd..3f72266 100644</span><br><span>--- a/tests/tbf/TbfTest.err</span><br><span>+++ b/tests/tbf/TbfTest.err</span><br><span>@@ -1444,9 +1444,9 @@</span><br><span> Searching for first unallocated TFI: TRX=0</span><br><span> Found TFI=0.</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x03 Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -1524,11 +1524,11 @@</span><br><span> Found TFI=0.</span><br><span> +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++</span><br><span> ------------------------- RX : Uplink Control Block -------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> MS requests UL TBF in packet resource request of single block, so we provide one:</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> [UL] Slot Allocation (Algorithm A) for class 1</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -1606,11 +1606,11 @@</span><br><span> Found TFI=0.</span><br><span> +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++</span><br><span> ------------------------- RX : Uplink Control Block -------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> MS requests UL TBF in packet resource request of single block, so we provide one:</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> [UL] Slot Allocation (Algorithm A) for class 1</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -1736,11 +1736,11 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) No downlink ACK received yet</span><br><span> +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++</span><br><span> ------------------------- RX : Uplink Control Block -------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> MS requests UL TBF in packet resource request of single block, so we provide one:</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> [UL] Slot Allocation (Algorithm A) for class 1</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -1803,11 +1803,11 @@</span><br><span> Found TFI=0.</span><br><span> +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++</span><br><span> ------------------------- RX : Uplink Control Block -------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> MS requests UL TBF in packet resource request of single block, so we provide one:</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> [UL] Slot Allocation (Algorithm A) for class 1</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -1975,11 +1975,11 @@</span><br><span> Found TFI=0.</span><br><span> +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++</span><br><span> ------------------------- RX : Uplink Control Block -------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> MS requests UL TBF in packet resource request of single block, so we provide one:</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> [UL] Slot Allocation (Algorithm A) for class 1</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -2059,9 +2059,9 @@</span><br><span> Searching for first unallocated TFI: TRX=0</span><br><span> Found TFI=0.</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x03 Fn=2654275 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -2126,11 +2126,11 @@</span><br><span> Found TFI=0.</span><br><span> +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++</span><br><span> ------------------------- RX : Uplink Control Block -------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> MS requests UL TBF in packet resource request of single block, so we provide one:</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span> [UL] Slot Allocation (Algorithm A) for class 1</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -3146,13 +3146,13 @@</span><br><span> Found TFI=0.</span><br><span> +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++</span><br><span> ------------------------- RX : Uplink Control Block -------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> MS requests UL TBF in packet resource request of single block, so we provide one:</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span> MS supports EGPRS multislot class 1.</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/1</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS</span><br><span> [UL] Slot Allocation (Algorithm A) for class 1</span><br><span> - Skipping TS 0, because not enabled</span><br><span>@@ -3238,13 +3238,13 @@</span><br><span> Found TFI=0.</span><br><span> +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++</span><br><span> ------------------------- RX : Uplink Control Block -------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> MS requests UL TBF in packet resource request of single block, so we provide one:</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span> MS supports EGPRS multislot class 1.</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/1</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS</span><br><span> [UL] Slot Allocation (Algorithm A) for class 1</span><br><span> - Skipping TS 0, because not enabled</span><br><span>@@ -5877,13 +5877,13 @@</span><br><span> Found TFI=0.</span><br><span> +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++</span><br><span> ------------------------- RX : Uplink Control Block -------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> MS requests UL TBF in packet resource request of single block, so we provide one:</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span> MS supports EGPRS multislot class 1.</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/1</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS</span><br><span> [UL] Slot Allocation (Algorithm A) for class 1</span><br><span> - Skipping TS 0, because not enabled</span><br><span>@@ -6042,13 +6042,13 @@</span><br><span> Found TFI=0.</span><br><span> +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++</span><br><span> ------------------------- RX : Uplink Control Block -------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> MS requests UL TBF in packet resource request of single block, so we provide one:</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span> MS supports EGPRS multislot class 1.</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/1</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS</span><br><span> [UL] Slot Allocation (Algorithm A) for class 1</span><br><span> - Skipping TS 0, because not enabled</span><br><span>@@ -6180,9 +6180,9 @@</span><br><span> === end test_tbf_epdan_out_of_rx_window ===</span><br><span> === start test_immediate_assign_rej_multi_block ===</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x78 Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -6205,9 +6205,9 @@</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=FLOW) TX: START Immediate Assignment Uplink (AGCH)</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=0 USF=0</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x79 Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -6230,9 +6230,9 @@</span><br><span> TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=FLOW) TX: START Immediate Assignment Uplink (AGCH)</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=1 USF=1</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x7a Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -6255,9 +6255,9 @@</span><br><span> TBF(TFI=2 TLLI=0x00000000 DIR=UL STATE=FLOW) TX: START Immediate Assignment Uplink (AGCH)</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=2 USF=2</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x7b Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -6280,9 +6280,9 @@</span><br><span> TBF(TFI=3 TLLI=0x00000000 DIR=UL STATE=FLOW) TX: START Immediate Assignment Uplink (AGCH)</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=3 USF=3</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x7c Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -6305,9 +6305,9 @@</span><br><span> TBF(TFI=4 TLLI=0x00000000 DIR=UL STATE=FLOW) TX: START Immediate Assignment Uplink (AGCH)</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=4 USF=4</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x7d Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -6330,9 +6330,9 @@</span><br><span> TBF(TFI=5 TLLI=0x00000000 DIR=UL STATE=FLOW) TX: START Immediate Assignment Uplink (AGCH)</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=5 USF=5</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x7e Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -6355,9 +6355,9 @@</span><br><span> TBF(TFI=6 TLLI=0x00000000 DIR=UL STATE=FLOW) TX: START Immediate Assignment Uplink (AGCH)</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=6 USF=6</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x7f Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -6387,13 +6387,13 @@</span><br><span> Found TFI=0.</span><br><span> +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++</span><br><span> ------------------------- RX : Uplink Control Block -------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> MS requests UL TBF in packet resource request of single block, so we provide one:</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span> MS supports EGPRS multislot class 1.</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=1/1</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, MS class 0 -> 1</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 1</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL EGPRS) Enabled EGPRS, mode EGPRS</span><br><span> [UL] Slot Allocation (Algorithm A) for class 1</span><br><span> - Skipping TS 0, because not enabled</span><br><span>@@ -7810,9 +7810,9 @@</span><br><span> === end test_packet_access_rej_epdan ===</span><br><span> === start test_packet_access_rej_prr ===</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x78 Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7835,9 +7835,9 @@</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=FLOW) TX: START Immediate Assignment Uplink (AGCH)</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=0 USF=0</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x79 Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7860,9 +7860,9 @@</span><br><span> TBF(TFI=1 TLLI=0x00000000 DIR=UL STATE=FLOW) TX: START Immediate Assignment Uplink (AGCH)</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=1 USF=1</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x7a Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7885,9 +7885,9 @@</span><br><span> TBF(TFI=2 TLLI=0x00000000 DIR=UL STATE=FLOW) TX: START Immediate Assignment Uplink (AGCH)</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=2 USF=2</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x7b Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7910,9 +7910,9 @@</span><br><span> TBF(TFI=3 TLLI=0x00000000 DIR=UL STATE=FLOW) TX: START Immediate Assignment Uplink (AGCH)</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=3 USF=3</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x7c Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7935,9 +7935,9 @@</span><br><span> TBF(TFI=4 TLLI=0x00000000 DIR=UL STATE=FLOW) TX: START Immediate Assignment Uplink (AGCH)</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=4 USF=4</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x7d Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7960,9 +7960,9 @@</span><br><span> TBF(TFI=5 TLLI=0x00000000 DIR=UL STATE=FLOW) TX: START Immediate Assignment Uplink (AGCH)</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=5 USF=5</span><br><span> MS requests UL TBF on RACH, so we provide one: ra=0x7e Fn=2654167 qta=31 is_11bit=0:</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=0/0</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> [UL] Slot Allocation (Algorithm A) for class 0</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7986,14 +7986,14 @@</span><br><span> - TRX=0 (0) TS=7 TA=7 TSC=0 TFI=6 USF=6</span><br><span> +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++</span><br><span> ------------------------- RX : Uplink Control Block -------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+Creating MS object, TLLI = 0x00000000</span><br><span> MS requests UL TBF in packet resource request of single block, so we provide one:</span><br><span> MS requests UL TBF in packet resource request of single block, but there is no resource request scheduled!</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11</span><br><span style="color: hsl(120, 100%, 40%);">+Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11</span><br><span> MS supports EGPRS multislot class 11.</span><br><span> ********** UL-TBF starts here **********</span><br><span> Allocating UL TBF: MS_CLASS=11/11</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, MS class 0 -> 11</span><br><span style="color: hsl(0, 100%, 40%);">-Modifying MS object, TLLI = 0x00000000, EGPRS MS class 0 -> 11</span><br><span> [UL] Slot Allocation (Algorithm A) for class 11</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -8005,7 +8005,6 @@</span><br><span> - Skipping TS 7, because no USF available</span><br><span> [UL] algo A <single> (suggested TRX: 0): failed to allocate a TS, no USF available</span><br><span> No PDCH resource</span><br><span style="color: hsl(0, 100%, 40%);">-Creating MS object, TLLI = 0x00000000</span><br><span> Modifying MS object, UL TLLI: 0x00000000 -> 0xffeeddcc, not yet confirmed</span><br><span> TBF(TFI=0 TLLI=0x00000000 DIR=UL STATE=NULL) changes state from NULL to ASSIGN</span><br><span> Attaching TBF to MS object, TLLI = 0xffeeddcc, TBF = TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN)</span><br><span>@@ -8014,7 +8013,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN) starting timer T0 [reject (PACCH)] with 0 sec. 2000 microsec, cur_fn=0</span><br><span> Scheduling control message at RTS for TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN) (TRX=0, TS=7)</span><br><span> === end test_packet_access_rej_prr ===</span><br><span style="color: hsl(0, 100%, 40%);">-Destroying MS object, TLLI = 0x00000000</span><br><span> === start test_packet_access_rej_prr_no_other_tbfs ===</span><br><span> Creating MS object, TLLI = 0x00000000</span><br><span> Modifying MS object, UL TLLI: 0x00000000 -> 0xffeeddcc, not yet confirmed</span><br><span>diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp</span><br><span>index aa0a366..8469d60 100644</span><br><span>--- a/tests/types/TypesTest.cpp</span><br><span>+++ b/tests/types/TypesTest.cpp</span><br><span>@@ -674,7 +674,8 @@</span><br><span> the_bts.bts_data()->alloc_algorithm = alloc_algorithm_a;</span><br><span> the_bts.bts_data()->trx[0].pdch[4].enable();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_ul_tbf *tbf = tbf_alloc_ul_tbf(the_bts.bts_data(), NULL, 0, 1, 1, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsMs *ms = the_bts.ms_alloc(1, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_ul_tbf *tbf = tbf_alloc_ul_tbf(the_bts.bts_data(), ms, 0, true);</span><br><span> struct crbb_test crbb_test = {0};</span><br><span> bitvec *rbb = NULL;</span><br><span> unsigned int rbb_size;</span><br><span>@@ -779,7 +780,8 @@</span><br><span> the_bts.bts_data()->trx[0].pdch[4].enable();</span><br><span> the_bts.bts_data()->trx[0].pdch[5].enable();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_tbf *tbf = tbf_alloc_ul_tbf(the_bts.bts_data(), NULL, 0, 1, 1, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsMs *ms = the_bts.ms_alloc(1, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_tbf *tbf = tbf_alloc_ul_tbf(the_bts.bts_data(), ms, 0, false);</span><br><span> static uint8_t res[] = { 0x06,</span><br><span> 0x3f, /* Immediate Assignment Message Type */</span><br><span> 0x10, /* §10.5.2.26 Page Mode and §10.5.2.25b Dedicated mode/TBF */</span><br><span>@@ -819,7 +821,8 @@</span><br><span> the_bts.bts_data()->trx[0].pdch[1].enable();</span><br><span> the_bts.bts_data()->trx[0].pdch[2].enable();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_tbf *tbf = tbf_alloc_ul_tbf(the_bts.bts_data(), NULL, 0, 1, 1, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ GprsMs *ms = the_bts.ms_alloc(1, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_tbf *tbf = tbf_alloc_ul_tbf(the_bts.bts_data(), ms, 0, false);</span><br><span> static uint8_t res[] = { 0x06,</span><br><span> 0x3f, /* Immediate Assignment Message Type */</span><br><span> 0x10, /* §10.5.2.26 Page Mode and §10.5.2.25b Dedicated mode/TBF */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/18133">change 18133</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcu/+/18133"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I010aa5877902816ae246e09ad5ad87946f96855c </div>
<div style="display:none"> Gerrit-Change-Number: 18133 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>