October 2022 - gerrit-log - lists.osmocom.org

Change in osmo-pcu[master]: Refactor and clarify tbf->triger_ass() code

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29914 ) Change subject: Refactor and clarify tbf->triger_ass() code ...................................................................... Refactor and clarify tbf->triger_ass() code Split the function into 2 functions, one for assignment on PACCH and one for assignment on PCH. This makes code calling this API far more clearer on what is the exact aim when assigning the TBF. Change-Id: Ic92867e55337b0bd6b5bfc97f13b7982eedb1cb7 --- M src/gprs_ms.c M src/tbf.cpp M src/tbf.h M src/tbf_dl.cpp M src/tbf_dl.h M src/tbf_fsm.c 6 files changed, 43 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/14/29914/1 diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 5733a7c..c072b0a 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -1085,7 +1085,10 @@ LOGPTBFDL(dl_tbf, LOGL_DEBUG, "[DOWNLINK] START\n"); /* Trigger the assignment now. */ - tbf_dl_trigger_ass(dl_tbf, ul_tbf_as_tbf(ul_tbf)); + if (ul_tbf) + dl_tbf_trigger_ass_on_pacch(dl_tbf, ul_tbf_as_tbf(ul_tbf)); + else + dl_tbf_trigger_ass_on_pch(dl_tbf); return 0; } diff --git a/src/tbf.cpp b/src/tbf.cpp index d115b82..4bf4ce8 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -703,7 +703,7 @@ } LOGPTBF(this, LOGL_DEBUG, "Trigger downlink assignment on PACCH\n"); - new_tbf->trigger_ass(this); + dl_tbf_trigger_ass_on_pacch(new_tbf, this); return 0; } @@ -960,3 +960,8 @@ { return tbf->trx; } + +void tbf_stop_timers(struct gprs_rlcmac_tbf *tbf, const char *reason) +{ + tbf->stop_timers(reason); +} \ No newline at end of file diff --git a/src/tbf.h b/src/tbf.h index d69ae5a..09de188 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -150,6 +150,7 @@ int tbf_update(struct gprs_rlcmac_tbf *tbf); int tbf_establish_dl_tbf_on_pacch(struct gprs_rlcmac_tbf *tbf); struct gprs_rlcmac_trx *tbf_get_trx(struct gprs_rlcmac_tbf *tbf); +void tbf_stop_timers(struct gprs_rlcmac_tbf *tbf, const char *reason); #ifdef __cplusplus } #endif diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 0936e1c..856dae6 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -418,29 +418,41 @@ return create_dl_acked_block(fn, ts, bsn, bsn2); } -/* depending on the current TBF, we assign on PACCH or AGCH */ -void gprs_rlcmac_dl_tbf::trigger_ass(struct gprs_rlcmac_tbf *old_tbf) +/* old_tbf (UL TBF or DL TBF) will send a Pkt Dl Ass on PACCH to assign tbf. + * Note: It is possible that "tbf == old_tbf" if the TBF is being updated. This can + * happen when we first assign over PCH (only single slot is possible) and we want + * to upgrade the DL-TBF to be multislot. See code calling tbf_update() for more + * information. + */ +void dl_tbf_trigger_ass_on_pacch(struct gprs_rlcmac_dl_tbf *tbf, struct gprs_rlcmac_tbf *old_tbf) +{ + OSMO_ASSERT(tbf); + OSMO_ASSERT(old_tbf); + /* stop pending timer */ + tbf_stop_timers(tbf, "DL assignment (PACCH)"); + + LOGPTBFDL(tbf, LOGL_DEBUG, "Send downlink assignment on PACCH, because %s exists\n", old_tbf->name()); + osmo_fsm_inst_dispatch(old_tbf->dl_ass_fsm.fi, TBF_DL_ASS_EV_SCHED_ASS, NULL); + + /* change state */ + osmo_fsm_inst_dispatch(tbf->state_fsm.fi, TBF_EV_ASSIGN_ADD_PACCH, NULL); + +} + +void dl_tbf_trigger_ass_on_pch(struct gprs_rlcmac_dl_tbf *tbf) { /* stop pending timer */ - stop_timers("assignment (DL-TBF)"); + struct GprsMs *ms = tbf_ms(tbf); - /* check for downlink tbf: */ - if (old_tbf) { - LOGPTBFDL(this, LOGL_DEBUG, "Send downlink assignment on PACCH, because %s exists\n", old_tbf->name()); - osmo_fsm_inst_dispatch(old_tbf->dl_ass_fsm.fi, TBF_DL_ASS_EV_SCHED_ASS, NULL); + tbf_stop_timers(tbf, "DL assignment (PCH)"); - /* change state */ - osmo_fsm_inst_dispatch(this->state_fsm.fi, TBF_EV_ASSIGN_ADD_PACCH, NULL); - } else { - LOGPTBFDL(this, LOGL_DEBUG, "Send downlink assignment on PCH, no TBF exist (IMSI=%s)\n", - imsi()); + LOGPTBFDL(tbf, LOGL_DEBUG, "Send downlink assignment on PCH, no TBF exist (IMSI=%s)\n", ms_imsi(ms)); - /* change state */ - osmo_fsm_inst_dispatch(this->state_fsm.fi, TBF_EV_ASSIGN_ADD_CCCH, NULL); + /* change state */ + osmo_fsm_inst_dispatch(tbf->state_fsm.fi, TBF_EV_ASSIGN_ADD_CCCH, NULL); - /* send immediate assignment */ - bts_snd_dl_ass(bts, this); - } + /* send immediate assignment */ + bts_snd_dl_ass(ms->bts, tbf); } void gprs_rlcmac_dl_tbf::schedule_next_frame() @@ -1272,8 +1284,3 @@ else return NULL; } - -void tbf_dl_trigger_ass(struct gprs_rlcmac_dl_tbf *tbf, struct gprs_rlcmac_tbf *old_tbf) -{ - return tbf->trigger_ass(old_tbf); -} diff --git a/src/tbf_dl.h b/src/tbf_dl.h index e0daf57..ba5d582 100644 --- a/src/tbf_dl.h +++ b/src/tbf_dl.h @@ -41,7 +41,6 @@ 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); void request_dl_ack(); bool need_poll_for_dl_ack_nack() const; @@ -138,7 +137,8 @@ const uint8_t egprs_ms_class, const uint16_t delay_csec, 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 dl_tbf_trigger_ass_on_pacch(struct gprs_rlcmac_dl_tbf *tbf, struct gprs_rlcmac_tbf *old_tbf); +void dl_tbf_trigger_ass_on_pch(struct gprs_rlcmac_dl_tbf *tbf); void tbf_dl_request_dl_ack(struct gprs_rlcmac_dl_tbf *tbf); static inline struct gprs_rlcmac_tbf *dl_tbf_as_tbf(struct gprs_rlcmac_dl_tbf *dl_tbf) diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index 25253fd..eeccd6b 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -387,8 +387,7 @@ ctx->state_flags &= GPRS_RLCMAC_FLAG_TO_MASK; tbf_update(ctx->tbf); - - tbf_dl_trigger_ass(dl_tbf, ctx->tbf); + dl_tbf_trigger_ass_on_pacch(dl_tbf, ctx->tbf); } else LOGPTBF(ctx->tbf, LOGL_NOTICE, "Continue flow after IMM.ASS confirm\n"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic92867e55337b0bd6b5bfc97f13b7982eedb1cb7 Gerrit-Change-Number: 29914 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in docker-playground[master]: debian-buster-jenkins: add more pysim related deps

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29913 ) Change subject: debian-buster-jenkins: add more pysim related deps ...................................................................... debian-buster-jenkins: add more pysim related deps Install all depends to properly generate the manuals. Otherwise it prints errors like the following and the resulting manual has empty sections: /build/docs/shell.rst:329: ERROR: Failed to import "LinFixedEF" from "pySim.filesystem". No module named 'smartcard' Get the requirements.txt directly from the git repository, so we don't need to update the list of dependencies here. Remove the dependencies from the list that I added recently for pysim, and which are are also in requirements.txt. Add swig, as otherwise pyscard fails to install. Related: OS#5497 Change-Id: I13a0b0dc8be81bf4034b08b1ef1100f1420fa3a1 --- M debian-buster-jenkins/Dockerfile 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/13/29913/1 diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile index ca11719..1fa0e9a 100644 --- a/debian-buster-jenkins/Dockerfile +++ b/debian-buster-jenkins/Dockerfile @@ -143,14 +143,15 @@ 'git+https://github.com/eriwen/lcov-to-cobertura-xml.git' \ 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse' \ 'git+https://github.com/podshumok/python-smpplib.git' \ - 'construct>=2.9.51' \ 'pydbus' \ 'pylint' \ 'pysispm' \ - 'pytlv' \ 'pyyaml>=5.1' \ 'sphinx' \ - 'sphinxcontrib-napoleon' + 'sphinxcontrib-napoleon' \ + 'swig' +ADD https://gitea.osmocom.org/sim-card/pysim/raw/branch/master/requirements.txt /tmp/pysim_requirements.txt +RUN pip3 install -r /tmp/pysim_requirements.txt # match the outside user RUN useradd --uid=1000 build -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I13a0b0dc8be81bf4034b08b1ef1100f1420fa3a1 Gerrit-Change-Number: 29913 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-pcu[master]: Delay ImmAss(PCH, PktDlAss) if waiting for PKT_CTRL_ACK answering UL_...

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/29905 to look at the new patch set (#6). Change subject: Delay ImmAss(PCH, PktDlAss) if waiting for PKT_CTRL_ACK answering UL_ACK_NACK (FinACK=1) ...................................................................... Delay ImmAss(PCH, PktDlAss) if waiting for PKT_CTRL_ACK answering UL_ACK_NACK (FinACK=1) In that state (ul_tbf=TBF_ST_FINISHED), we are unable to reach the MS to assign a new DL TBF. * MS Is not available in CCCH because it's attached the PDCH. * MS won't be able to PKT_CTRL_ACK a PktDlAss on PACCH, because next thing it will do is to PKT_CTRL_ACK the UL_ACK_NACK(FINACK=1) we already polled it for, and immediatelly after that it will release the UL TBF on its side and go back to packet idle mode. Hence, we must wait for MS to send the PKT_CTRL_ACK to us in order to be able to assign the DL TBF in PCH (CCCH). Related: OS#5700 Change-Id: I7a30db9cc7dae70e04054f1a4dba004bd1780d4a --- M src/gprs_ms.c M src/gprs_ms.h M src/pdch.cpp M src/tbf.cpp M src/tbf.h M src/tbf_dl.cpp M src/tbf_fsm.c M src/tbf_fsm.h M tests/tbf/TbfTest.cpp M tests/tbf/TbfTest.err 10 files changed, 237 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/05/29905/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7a30db9cc7dae70e04054f1a4dba004bd1780d4a Gerrit-Change-Number: 29905 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_finished_pkt_dl_ass_pch

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29906 ) Change subject: pcu: Introduce test TC_ul_tbf_finished_pkt_dl_ass_pch ...................................................................... pcu: Introduce test TC_ul_tbf_finished_pkt_dl_ass_pch Related: OS#5700 Change-Id: Id99b048e7c305fe616bb54437313a1e45449ff57 --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn M pcu/expected-results.xml 3 files changed, 63 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index f9a39a6..e248860 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -1189,7 +1189,7 @@ function f_rx_rlcmac_dl_block_exp_dummy(out RlcmacDlBlock dl_block, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) -runs on MS_BTS_IFACE_CT { +runs on MS_BTS_IFACE_CT return uint32_t { var uint32_t dl_fn; f_rx_rlcmac_dl_block(dl_block, dl_fn, nr := nr); @@ -1197,6 +1197,7 @@ setverdict(fail, "Failed to match Packet DUMMY DL"); f_shutdown(__BFILE__, __LINE__); } + return dl_fn; } function f_rx_rlcmac_dl_block_exp_pkt_pag_req(out RlcmacDlBlock dl_block, diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 1648a92..8b3d1ea 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3907,6 +3907,64 @@ f_tc_dl_data_no_llc_ui_dummy(bssgp_ms_racap_egprs_def); } +/* Scenario: MS creates one phase access, does contention resolution CV>0 and + * finishes sending data (CV=0), which is forwarded to SGSN by PCU. PCU acks with + * FINAL_ACK=1 (hence UL TBF moves to FINISHED state). Then SGSN answers and PCU + * has to assign a DL TBF (through PCH because of FINISHED state, TS 44.060 9.3.3.3.2). + * Make sure the assignment is not done until we receive the PKT CTRL ACK from the MS + * (at that time we know the MS is listening on PCH again). OS#5700. + */ +testcase TC_ul_tbf_finished_pkt_dl_ass_pch() runs on RAW_PCU_Test_CT { + var RlcmacDlBlock dl_block; + var octetstring data := f_rnd_octstring(10); + var uint32_t sched_fn; + var uint32_t dl_fn; + var GprsMS ms; + timer T; + var octetstring payload; + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS)); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Establish an Uplink TBF */ + f_ms_establish_ul_tbf(ms); + + /* Send one UL block (with TLLI since we are in One-Phase Access + contention resolution) and make sure it is ACKED fine. */ + payload := f_rnd_octstring(f_ultbf_payload_fill_length(ms.ul_tbf, true)); + dl_fn := f_rx_rlcmac_dl_block_exp_dummy(dl_block); + f_ms_tx_ul_data_block(ms, payload, cv := 1, with_tlli := true, fn := f_next_pdch_block(dl_fn)); + + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn); + payload := f_rnd_octstring(f_ultbf_payload_fill_length(ms.ul_tbf, false)); + f_ms_tx_ul_data_block(ms, payload, cv := 0); + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn); + + /* 1 UL block should be received in SGSN */ + BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.bvc[0].cell_id)); + /* Now SGSN sends some DL data, PCU will page on CCCH (PCH) */ + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data)); + + /* UL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ + f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), sched_fn); + f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH); + /* Wait timer X2002 and DL block is available after CCCH IMM ASS: */ + f_sleep(X2002); + f_rx_rlcmac_dl_block_exp_data(dl_block, dl_fn, data, 0); + + f_shutdown(__BFILE__, __LINE__, final := true); +} + private function f_TC_egprs_pkt_chan_req(in EGPRSPktChRequest req, template GsmRrMessage t_imm_ass := ?, PCUIF_BurstType bt := BURST_TYPE_1) @@ -6841,6 +6899,8 @@ execute( TC_dl_gprs_data_no_llc_ui_dummy() ); execute( TC_dl_egprs_data_no_llc_ui_dummy() ); + execute( TC_ul_tbf_finished_pkt_dl_ass_pch() ); + /* EGPRS specific test cases */ execute( TC_egprs_pkt_chan_req_signalling() ); execute( TC_egprs_pkt_chan_req_one_phase() ); diff --git a/pcu/expected-results.xml b/pcu/expected-results.xml index 7f138cd..c666ff7 100644 --- a/pcu/expected-results.xml +++ b/pcu/expected-results.xml @@ -70,6 +70,7 @@ <testcase classname='PCU_Tests' name='TC_bssgp_dl_unitdata_with_invalid_imsi' time='MASKED'/> <testcase classname='PCU_Tests' name='TC_dl_gprs_data_no_llc_ui_dummy' time='MASKED'/> <testcase classname='PCU_Tests' name='TC_dl_egprs_data_no_llc_ui_dummy' time='MASKED'/> + <testcase classname='PCU_Tests' name='TC_ul_tbf_finished_pkt_dl_ass_pch' time='MASKED'/> <testcase classname='PCU_Tests' name='TC_egprs_pkt_chan_req_signalling' time='MASKED'/> <testcase classname='PCU_Tests' name='TC_egprs_pkt_chan_req_one_phase' time='MASKED'/> <testcase classname='PCU_Tests' name='TC_egprs_pkt_chan_req_two_phase' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id99b048e7c305fe616bb54437313a1e45449ff57 Gerrit-Change-Number: 29906 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cosmetic: pcu: Fix typo in several comments

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29909 ) Change subject: cosmetic: pcu: Fix typo in several comments ...................................................................... cosmetic: pcu: Fix typo in several comments Change-Id: I7a2419514582cb9efd8df126bf449711f78586fe --- M pcu/PCU_Tests.ttcn 1 file changed, 14 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 8b3d1ea..6d17d96 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -430,7 +430,7 @@ f_ms_establish_ul_tbf(ms); /* Send one UL block (with TLLI since we are in One-Phase Access - contention resoultion) and make sure it is ACKED fine */ + contention resolution) and make sure it is ACKED fine */ f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true, fn := ms.ul_tbf.start_time_fn); f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn); /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ @@ -538,7 +538,7 @@ /* Simulate a delay > 0 */ ms.ta := 2; - /* We're in One-Phase Access contention resoultion, include TLLI */ + /* We're in One-Phase Access contention resolution, include TLLI */ f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true, fn := ms.ul_tbf.start_time_fn); f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn); @@ -832,7 +832,7 @@ ms.lqual_cb := 0; /* Send one UL block (with TLLI since we are in One-Phase Access - contention resoultion) and make sure it is ACKED fine. */ + contention resolution) and make sure it is ACKED fine. */ /* 16 bytes fills the llc block (because TLLI takes 4 bytes) */ /* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */ f_ms_tx_ul_data_block(ms, f_rnd_octstring(16), cv := 15, with_tlli := true, fn := ms.ul_tbf.start_time_fn) @@ -916,7 +916,7 @@ f_ms_establish_ul_tbf(ms); /* Send one UL block (with TLLI since we are in One-Phase Access - contention resoultion) and make sure it is ACKED fine. */ + contention resolution) and make sure it is ACKED fine. */ /* 16 bytes fills the llc block (because TLLI takes 4 bytes) */ /* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */ f_ms_tx_ul_data_block(ms, f_rnd_octstring(16), cv := 15, with_tlli := true, fn := ms.ul_tbf.start_time_fn) @@ -988,7 +988,7 @@ f_ms_establish_ul_tbf(ms); /* Send one UL block (with TLLI since we are in One-Phase Access - contention resoultion) and make sure it is ACKED fine. */ + contention resolution) and make sure it is ACKED fine. */ /* 16 bytes fills the llc block (because TLLI takes 4 bytes) */ /* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */ f_ms_tx_ul_data_block(ms, f_rnd_octstring(16), cv := 15, with_tlli := true, fn := ms.ul_tbf.start_time_fn) @@ -2152,7 +2152,7 @@ f_ms_establish_ul_tbf(ms); /* Send one UL block (with TLLI since we are in One-Phase Access - contention resoultion) and make sure it is ACKED fine. */ + contention resolution) and make sure it is ACKED fine. */ total_payload := f_rnd_octstring(f_ultbf_payload_fill_length(ms.ul_tbf, true)); /* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */ f_ms_tx_ul_data_block(ms, total_payload, cv := 15, with_tlli := true, fn := ms.ul_tbf.start_time_fn) @@ -2203,7 +2203,7 @@ f_ms_establish_ul_tbf(ms); /* Send one UL block (with TLLI since we are in One-Phase Access - contention resoultion) and make sure it is ACKED fine. */ + contention resolution) and make sure it is ACKED fine. */ payload := f_rnd_octstring(16); /* 16 bytes fills the llc block (because TLLI takes 4 bytes) */ blk_hdr := t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload), more := false, e := true); @@ -2285,7 +2285,7 @@ block_len := f_rlcmac_cs_mcs2block_len(cs); /* We need to send with TLLI since we are in One-Phase Access Contenion - * resoultion), so that's -4 bytes of data, -3 for headers, -1 for LI + * resolution), so that's -4 bytes of data, -3 for headers, -1 for LI * indicator, -1 for spare bits octet at the end */ max_valid_data_len := block_len - 4 - 3 - 1 - 1; payload := f_rnd_octstring(max_valid_data_len + 1); /* +1 to write LLC data on last padding octet */ @@ -2371,7 +2371,7 @@ f_ms_establish_ul_tbf(ms); /* Send one UL block (with TLLI since we are in One-Phase Access - contention resoultion) and make sure it is ACKED fine */ + contention resolution) and make sure it is ACKED fine */ f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true, fn := ms.ul_tbf.start_time_fn); f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn); /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ @@ -2581,7 +2581,7 @@ f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS); /* Send one UL block (with TLLI since we are in One-Phase Access - contention resoultion) and make sure it is ACKED fine */ + contention resolution) and make sure it is ACKED fine */ f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true); f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn); /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ @@ -2639,7 +2639,7 @@ tfi := ms.ul_tbf.tfi; /* Send one UL block (with TLLI since we are in One-Phase Access - contention resoultion) and make sure it is ACKED fine. */ + contention resolution) and make sure it is ACKED fine. */ payload := f_rnd_octstring(f_ultbf_payload_fill_length(ms.ul_tbf, true)); /* 16 bytes fills the llc block (because TLLI takes 4 bytes) */ f_ms_tx_ul_data_block(ms, payload, cv := 15, with_tlli := true, fn := ms.ul_tbf.start_time_fn); @@ -3154,7 +3154,7 @@ f_ms_establish_ul_tbf(ms); /* Send one UL block (with TLLI since we are in One-Phase Access - contention resoultion) and make sure it is ACKED fine */ + contention resolution) and make sure it is ACKED fine */ f_ms_tx_ul_data_block(ms, data, with_tlli := true, fn := ms.ul_tbf.start_time_fn, nr := f_ms_tx_TsTrxBtsNum(ms)); /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ @@ -3299,7 +3299,7 @@ f_ms_establish_ul_tbf(ms); /* Send one UL block (with TLLI since we are in One-Phase Access - contention resoultion) and make sure it is ACKED fine */ + contention resolution) and make sure it is ACKED fine */ f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true, fn := ms.ul_tbf.start_time_fn); /* UL block should be received in SGSN */ @@ -3386,7 +3386,7 @@ f_ms_establish_ul_tbf(ms); /* Send one UL block (with TLLI since we are in One-Phase Access - contention resoultion) and make sure it is ACKED fine */ + contention resolution) and make sure it is ACKED fine */ f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true, fn := ms.ul_tbf.start_time_fn); /* UL block should be received in SGSN */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7a2419514582cb9efd8df126bf449711f78586fe Gerrit-Change-Number: 29909 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_finished_pkt_dl_ass_pch

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29906 ) Change subject: pcu: Introduce test TC_ul_tbf_finished_pkt_dl_ass_pch ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: REadding fixeria's +1 and merging. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id99b048e7c305fe616bb54437313a1e45449ff57 Gerrit-Change-Number: 29906 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Oct 2022 14:34:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: pcuif_proto: cosmetic: add constant PCU_IF_NUM_NSVC and replace magic...

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29901 ) Change subject: pcuif_proto: cosmetic: add constant PCU_IF_NUM_NSVC and replace magic numbers ...................................................................... pcuif_proto: cosmetic: add constant PCU_IF_NUM_NSVC and replace magic numbers The number of NSVCs is fixed but lets not use magic numbers to define the sizes of the arrays that hold the config values. In osmo-pcu there is already a define constant, so lets use a define here as well. Change-Id: Ic94dadd3374c6db9323baca83b6b07b89e96768c --- M include/osmocom/bsc/pcuif_proto.h 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: dexter: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index 4921fc3..5084cb8 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -62,6 +62,8 @@ #define PCU_IF_ADDR_TYPE_IPV4 0x04 /* IPv4 address */ #define PCU_IF_ADDR_TYPE_IPV6 0x29 /* IPv6 address */ +#define PCU_IF_NUM_NSVC 2 + enum gsm_pcu_if_text_type { PCU_VERSION, PCU_OML_ALERT, @@ -173,14 +175,14 @@ uint8_t initial_cs; uint8_t initial_mcs; /* NSVC */ - uint16_t nsvci[2]; - uint16_t local_port[2]; - uint16_t remote_port[2]; - uint8_t address_type[2]; + uint16_t nsvci[PCU_IF_NUM_NSVC]; + uint16_t local_port[PCU_IF_NUM_NSVC]; + uint16_t remote_port[PCU_IF_NUM_NSVC]; + uint8_t address_type[PCU_IF_NUM_NSVC]; union { struct in_addr v4; struct in6_addr v6; - } remote_ip[2]; + } remote_ip[PCU_IF_NUM_NSVC]; } __attribute__ ((packed)); struct gsm_pcu_if_act_req { 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic94dadd3374c6db9323baca83b6b07b89e96768c Gerrit-Change-Number: 29901 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: pcuif_proto: cosmetic: add constant PCU_IF_NUM_NSVC and replace magic...

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29901 ) Change subject: pcuif_proto: cosmetic: add constant PCU_IF_NUM_NSVC and replace magic numbers ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic94dadd3374c6db9323baca83b6b07b89e96768c Gerrit-Change-Number: 29901 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Oct 2022 14:27:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: be more clear about vendor specif RSL extension

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29888 ) Change subject: abis_rsl: be more clear about vendor specif RSL extension ...................................................................... abis_rsl: be more clear about vendor specif RSL extension The function rsl_ericsson_imm_assign_cmd has a comment "Chapter 8.5.6" above it. However, thats only half true. The function implements ericsson vendor specific RSL IEs, so lets be more clear about this in the spec reference. Change-Id: Id27662e208ca8ac0a48851583c11fbacf85f988c --- M src/osmo-bsc/abis_rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: dexter: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 304e95c..bb1c5d6 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -963,7 +963,7 @@ return abis_rsl_sendmsg(msg); } -/* Chapter 8.5.6 */ +/* Chapter 8.5.6 Immediate Assignment Command (with Ericcson vendor specific RSL extension) */ int rsl_ericsson_imm_assign_cmd(struct gsm_bts *bts, uint32_t tlli, uint8_t len, uint8_t *val) { struct msgb *msg = rsl_imm_assign_cmd_common(bts, len, val); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id27662e208ca8ac0a48851583c11fbacf85f988c Gerrit-Change-Number: 29888 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: be more clear about vendor specif RSL extension

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29888 ) Change subject: abis_rsl: be more clear about vendor specif RSL extension ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id27662e208ca8ac0a48851583c11fbacf85f988c Gerrit-Change-Number: 29888 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Oct 2022 14:25:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022