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

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

by pespin

pespin has uploaded this change for review. ( 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, 65 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/29906/1 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..a85e720 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3907,6 +3907,66 @@ 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 octetstring ra_id := enc_RoutingAreaIdentification(mp_gb_cfg.bvc[0].cell_id.ra_id); + var BTS_PDTCH_Block data_msg; + 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 resoultion) 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 +6901,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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29905 ) 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 tests/tbf/TbfTest.cpp M tests/tbf/TbfTest.err 8 files changed, 218 insertions(+), 66 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/05/29905/1 diff --git a/src/gprs_ms.c b/src/gprs_ms.c index f4da3a5..5733a7c 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -23,6 +23,7 @@ #include "gprs_codel.h" #include "pcu_utils.h" #include "nacc_fsm.h" +#include "tbf_ul_ack_fsm.h" #include <time.h> @@ -1024,10 +1025,75 @@ } } +/* Can we get to send a DL TBF ass to the MS? */ +static bool ms_is_reachable_for_dl_ass(const struct GprsMs *ms) +{ + struct gprs_rlcmac_ul_tbf *ul_tbf = ms_ul_tbf(ms); + + /* This function assumes it is called when no DL TBF is present */ + OSMO_ASSERT(!ms_dl_tbf(ms)); + + /* 3GPP TS 44.060 sec 7.1.3.1 Initiation of the Packet resource request procedure: + * "Furthermore, the mobile station shall not respond to PACKET DOWNLINK ASSIGNMENT + * or MULTIPLE TBF DOWNLINK ASSIGNMENT messages before contention resolution is + * completed on the mobile station side." */ + /* The possible uplink TBF is used to trigger downlink assignment: + * - If there is no uplink TBF the MS is potentially in packet idle mode + * and hence assignment will be done over CCCH (PCH) + * - If there's an uplink TBF but it is finished (waiting for last PKT + * CTRL ACK after sending last Pkt UL ACK/NACK with FINAL_ACK=1, then we + * have no ways to contact the MS right now. Assignment will be delayed + * until PKT CTRL ACK is received and the TBF is released at the MS side + * (then assignment goes through PCH). + */ + if (!ul_tbf) + return true; + if (ul_tbf_contention_resolution_done(ul_tbf) && + !tbf_ul_ack_waiting_cnf_final_ack(ul_tbf)) + return true; + + return false; + +} + +/* This should be called only when MS is reachable, see ms_is_reachable_for_dl_ass(). */ +int ms_new_dl_tbf_assignment(struct GprsMs *ms) +{ + bool ss; + int8_t use_trx; + struct gprs_rlcmac_ul_tbf *ul_tbf; + struct gprs_rlcmac_dl_tbf *dl_tbf; + + ul_tbf = ms_ul_tbf(ms); + + if (ul_tbf) { + use_trx = tbf_get_trx((struct gprs_rlcmac_tbf *)ul_tbf)->trx_no; + ss = false; + } else { + use_trx = -1; + ss = true; /* PCH assignment only allows one timeslot */ + } + + /* set number of downlink slots according to multislot class */ + dl_tbf = dl_tbf_alloc(ms->bts, ms, use_trx, ss); + + if (!dl_tbf) { + LOGPMS(ms, DTBF, LOGL_NOTICE, "No PDCH resource\n"); + return -EBUSY; + } + + LOGPTBFDL(dl_tbf, LOGL_DEBUG, "[DOWNLINK] START\n"); + + /* Trigger the assignment now. */ + tbf_dl_trigger_ass(dl_tbf, ul_tbf_as_tbf(ul_tbf)); + return 0; +} + 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; + int rc = 0; LOGPMS(ms, DTBFDL, LOGL_DEBUG, "appending %u bytes to DL LLC queue\n", len); @@ -1041,10 +1107,17 @@ ms_start_llc_timer(ms); dl_tbf = ms_dl_tbf(ms); - if (dl_tbf && tbf_state(dl_tbf_as_tbf_const(dl_tbf)) == TBF_ST_WAIT_RELEASE) { - LOGPTBFDL(dl_tbf, LOGL_DEBUG, "in WAIT RELEASE state (T3193), so reuse TBF\n"); - tbf_establish_dl_tbf_on_pacch(dl_tbf_as_tbf(dl_tbf)); + if (dl_tbf) { + if (tbf_state(dl_tbf_as_tbf_const(dl_tbf)) == TBF_ST_WAIT_RELEASE) { + LOGPTBFDL(dl_tbf, LOGL_DEBUG, "in WAIT RELEASE state (T3193), so reuse TBF\n"); + tbf_establish_dl_tbf_on_pacch(dl_tbf_as_tbf(dl_tbf)); + } + } else { + /* Check if we can create a DL TBF to start sending the enqueued + * data. Otherwise it will be triggered later when it is reachable + * again. */ + if (ms_is_reachable_for_dl_ass(ms)) + rc = ms_new_dl_tbf_assignment(ms); } - - return 0; + return rc; } diff --git a/src/gprs_ms.h b/src/gprs_ms.h index 703e84b..b9a1386 100644 --- a/src/gprs_ms.h +++ b/src/gprs_ms.h @@ -144,6 +144,7 @@ bool ms_nacc_rts(const struct GprsMs *ms); struct msgb *ms_nacc_create_rlcmac_msg(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts); +int ms_new_dl_tbf_assignment(struct GprsMs *ms); int ms_append_llc_dl_data(struct GprsMs *ms, uint16_t pdu_delay_csec, const uint8_t *data, uint16_t len); static inline bool ms_is_idle(const struct GprsMs *ms) diff --git a/src/pdch.cpp b/src/pdch.cpp index 369406f..dd9e270 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -385,9 +385,20 @@ } pdch_ulc_release_fn(ulc, fn); osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_RX_CTRL_ACK, NULL); + /* We only set polling on final UL ACK/NACK */ LOGPTBF(tbf, LOGL_DEBUG, "[UPLINK] END\n"); + /* Ref the MS, otherwise it may be freed after ul_tbf is detached when sending event below. */ + ms_ref(ms); osmo_fsm_inst_dispatch(ul_tbf->state_fsm.fi, TBF_EV_FINAL_UL_ACK_CONFIRMED, NULL); + /* ul_tbf is freed here! */ + /* TS 44.060 9.3.3.3.2: There might be LLC packets waiting in the queue but the DL TBF assignment + * might have been delayed because there was no way to reach the + * MS (because it was in packet-active mode with UL TBF in + * FINISHED state) while the UL TBF has been established */ + if (ms_need_dl_tbf(ms)) + ms_new_dl_tbf_assignment(ms); + ms_unref(ms); return; case PDCH_ULC_POLL_UL_ASS: diff --git a/src/tbf.cpp b/src/tbf.cpp index 4f0162e..d115b82 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -955,3 +955,8 @@ { return tbf->establish_dl_tbf_on_pacch(); } + +struct gprs_rlcmac_trx *tbf_get_trx(struct gprs_rlcmac_tbf *tbf) +{ + return tbf->trx; +} diff --git a/src/tbf.h b/src/tbf.h index b34476e..d69ae5a 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -149,6 +149,7 @@ bool tbf_can_upgrade_to_multislot(const struct gprs_rlcmac_tbf *tbf); 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); #ifdef __cplusplus } #endif diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index a8fb6fc..0936e1c 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -182,52 +182,6 @@ { } -static int tbf_new_dl_assignment(struct gprs_rlcmac_bts *bts, GprsMs *ms, - struct gprs_rlcmac_dl_tbf **tbf) -{ - bool ss; - int8_t use_trx; - struct gprs_rlcmac_ul_tbf *ul_tbf = NULL, *old_ul_tbf; - struct gprs_rlcmac_dl_tbf *dl_tbf = NULL; - - ul_tbf = ms_ul_tbf(ms); - - /* 3GPP TS 44.060 sec 7.1.3.1 Initiation of the Packet resource request procedure: - * "Furthermore, the mobile station shall not respond to PACKET DOWNLINK ASSIGNMENT - * or MULTIPLE TBF DOWNLINK ASSIGNMENT messages before contention resolution is - * completed on the mobile station side." */ - if (ul_tbf && ul_tbf->m_contention_resolution_done - && !tbf_ul_ack_waiting_cnf_final_ack(ul_tbf)) { - use_trx = ul_tbf->trx->trx_no; - ss = false; - old_ul_tbf = ul_tbf; - } else { - use_trx = -1; - ss = true; /* PCH assignment only allows one timeslot */ - old_ul_tbf = NULL; - } - - // Create new TBF (any TRX) -/* FIXME: Copy and paste with alloc_ul_tbf */ - /* set number of downlink slots according to multislot class */ - dl_tbf = dl_tbf_alloc(bts, ms, use_trx, ss); - - if (!dl_tbf) { - LOGPMS(ms, DTBF, LOGL_NOTICE, "No PDCH resource\n"); - return -EBUSY; - } - - LOGPTBFDL(dl_tbf, LOGL_DEBUG, "[DOWNLINK] START\n"); - - /* trigger downlink assignment and set state to ASSIGN. - * we don't use old_downlink, so the possible uplink is used - * to trigger downlink assignment. if there is no uplink, - * AGCH is used. */ - dl_tbf->trigger_ass(old_ul_tbf); - *tbf = dl_tbf; - return 0; -} - /** * TODO: split into unit test-able parts... */ @@ -286,13 +240,6 @@ 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; - } return 0; } diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 43ea8c7..91d1f07 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -1715,7 +1715,6 @@ ms = bts_ms_by_imsi(bts, imsi); OSMO_ASSERT(ms != NULL); - OSMO_ASSERT(ms_dl_tbf(ms) != NULL); if (imsi[0] != '\0') { ms2 = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); @@ -1779,6 +1778,38 @@ TALLOC_FREE(the_pcu); } +static void test_tbf_single_phase2() +{ + the_pcu = prepare_pcu(); + struct gprs_rlcmac_bts *bts = bts_alloc(the_pcu, 0); + int ts_no = 7; + uint32_t fn = DUMMY_FN; /* 17,25,9 */ + uint32_t tlli = 0xf1223344; + const char *imsi = "0011223344"; + uint16_t qta = 31; + gprs_rlcmac_ul_tbf *ul_tbf; + + fprintf(stderr, "=== start %s ===\n", __func__); + + setup_bts(bts, ts_no); + + ul_tbf = establish_ul_tbf_single_phase(bts, ts_no, tlli, &fn, qta); + + print_ta_tlli(ul_tbf, true); + /* PCU sends CTRL ACK/NCK with FINAL_ACK=1, hence TBF is not in state FINISHED */ + request_dl_rlc_block(bts, ul_tbf->trx->trx_no, ts_no, &fn); + OSMO_ASSERT(ul_tbf->state_is(TBF_ST_FINISHED)); + /* Now data is sent but no DL TBF is created because MS is not reachable for DL Assignment */ + send_dl_data(bts, tlli, imsi, (const uint8_t *)"TEST", 4); + + /* After MS CTRL ACKs the FINAL_ACK=1 then it releases the TBF and goes + * to packet-idle mode. Hence PCU will trigger ImmAss(PktDlAss) on PCH. */ + send_control_ack(ul_tbf); + + fprintf(stderr, "=== end %s ===\n", __func__); + TALLOC_FREE(the_pcu); +} + static void test_tbf_egprs_two_phase_puan(void) { the_pcu = prepare_pcu(); @@ -3363,6 +3394,7 @@ test_tbf_exhaustion(); test_tbf_dl_llc_loss(); test_tbf_single_phase(); + test_tbf_single_phase2(); test_tbf_two_phase(); test_tbf_ra_update_rach(); test_tbf_dl_flow_and_rach_two_phase(); diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 8060c7f..79bc7ab 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -1849,8 +1849,91 @@ Modifying MS object, TLLI = 0xf1223344, IMSI '' -> '0011223344' Modifying MS object, TLLI: 0xf1223344 confirmed MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0, UL) appending 4 bytes to DL LLC queue -MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0, UL) ********** DL-TBF starts here ********** -MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0, UL) Allocating DL TBF +=== end test_tbf_single_phase === +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0, UL) Destroying MS object +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0,) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) +=== start test_tbf_single_phase2 === +PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled +Found first unallocated TRX=0 TFI=0 +MS requests Uplink resource on CCCH/RACH: ra=0x03 (8 bit) Fn=2654167 qta=31 +MS requests single TS uplink transmission (one phase packet access) +Creating MS object, TLLI = 0xffffffff +MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) ********** UL-TBF starts here ********** +MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) Allocating UL TBF +TBF{NEW}: Allocated +UL_ASS_TBF{NONE}: Allocated +DL_ASS_TBF{NONE}: Allocated +UL_ACK_TBF{NONE}: Allocated +[UL] algo A <single> (suggested TRX: -1): Alloc start +- Skipping TS 0, because not enabled +- Skipping TS 1, because not enabled +- Skipping TS 2, because not enabled +- Skipping TS 3, because not enabled +- Skipping TS 4, because not enabled +- Skipping TS 5, because not enabled +- Skipping TS 6, because not enabled +[UL] Assign uplink TS=7 TFI=0 USF=0 +PDCH(bts=0,trx=0,ts=7) Attaching TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NEW), 1 TBFs, USFs = 01, TFIs = 00000001. +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NEW) Setting Control TS 7 +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NEW) Allocated: trx = 0, ul_slots = 80, dl_slots = 00 +MS(TLLI=0xffffffff, IMSI=, TA=220, 0/0,) Attaching UL TBF: TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NEW) +TBF(UL-TFI_0){NEW}: Received Event ASSIGN_ADD_CCCH +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NEW) set ass. type CCCH [prev CCCH:0, PACCH:0] +TBF(UL-TFI_0){NEW}: state_chg to FLOW +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=FLOW) starting timer T3141 [Contention resolution (UL-TBF, CCCH)] with 10 sec. 0 microsec, cur_fn=2654167 +Modifying MS object, TLLI = 0xffffffff, TA 220 -> 7 +Tx Immediate Assignment on AGCH: TRX=0 (ARFCN 0) TS=7 TA=7 TSC=0 TFI=0 USF=0 +PDCH(bts=0,trx=0,ts=7) Got CS-1 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=184 +PDCH(bts=0,trx=0,ts=7) FN=2654167 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=FLOW) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=FLOW) UL DATA TFI=0 received (V(Q)=0 .. V(R)=0) +MS(TLLI=0xffffffff, IMSI=, TA=7, 0/0, UL) Link quality 12dB (old 12dB) left window [-256, 6], modifying uplink CS level: CS-1 -> CS-2 +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=FLOW) Got CS-1 RLC data block: CV=0, BSN=0, SPB=0, PI=0, E=1, TI=1, bitoffs=24 +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=FLOW) BSN 0 storing in window (0..63) +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=FLOW) data_length=20, data=f1 22 33 44 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=FLOW) Decoded premier TLLI=0xf1223344 of UL DATA TFI=0. +Modifying MS object, UL TLLI: 0xffffffff -> 0xf1223344, not yet confirmed +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Assembling frames: (len=20) +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Frame 1 starts at offset 4, length=16, is_complete=1 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) complete UL frame len=16 +LLC [PCU -> SGSN] TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) len=16 +No bctx +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) No gaps in received block, last block: BSN=0 CV=0 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Finished with UL TBF +TBF(UL-TFI_0){FLOW}: Received Event LAST_UL_DATA_RECVD +TBF(UL-TFI_0){FLOW}: state_chg to FINISHED +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) Scheduling Ack/Nack, because TLLI is included. +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) Scheduling final Ack/Nack, because all data was received and last block has CV==0. +UL_ACK_TBF(UL-TFI_0){NONE}: Received Event SCHED_ACK +UL_ACK_TBF(UL-TFI_0){NONE}: state_chg to SCHED_UL_ACK +Got 'TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED)', TA=7 +Got MS: TLLI = 0xf1223344, TA = 7 +UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event CREATE_RLCMAC_MSG +PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654167 + 17 = 2654184 +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) stopping timer T3141 [Contention resolution success (UL-TBF, CCCH)] +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) Scheduled UL Acknowledgement polling on PACCH (FN=2654184, TS=7) +UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: state_chg to WAIT_ACK +PDCH(bts=0,trx=0,ts=7) FN=2654167 Scheduling control message at RTS for TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) +Modifying MS object, TLLI = 0xf1223344, IMSI '' -> '0011223344' +Modifying MS object, TLLI: 0xf1223344 confirmed +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0, UL) appending 4 bytes to DL LLC queue +Detected FN jump! 2654167 -> 2654184 (expected 2654171) +PDCH(bts=0,trx=0,ts=7) FN=2654184 +++++++++++++++++++++++++ RX : Uplink Control Block +++++++++++++++++++++++++ +PDCH(bts=0,trx=0,ts=7) FN=2654184 ------------------------- RX : Uplink Control Block ------------------------- +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) FN=2654184 Rx Packet Control Ack (reason=UL_ACK) +UL_ACK_TBF(UL-TFI_0){WAIT_ACK}: Received Event RX_CTRL_ACK +UL_ACK_TBF(UL-TFI_0){WAIT_ACK}: state_chg to NONE +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) [UPLINK] END +TBF(UL-TFI_0){FINISHED}: Received Event FINAL_UL_ACK_CONFIRMED +TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) free +PDCH(bts=0,trx=0,ts=7) Detaching TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED), 1 TBFs, USFs = 01, TFIs = 00000001. +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0,) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) +********** UL-TBF ends here ********** +UL_ACK_TBF(UL-TFI_0){NONE}: Deallocated +TBF(UL-TFI_0){FINISHED}: Deallocated +UL_ASS_TBF(UL-TFI_0){NONE}: Deallocated +DL_ASS_TBF(UL-TFI_0){NONE}: Deallocated +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0,) ********** DL-TBF starts here ********** +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0,) Allocating DL TBF TBF{NEW}: Allocated UL_ASS_TBF{NONE}: Allocated DL_ASS_TBF{NONE}: Allocated @@ -1863,10 +1946,10 @@ - Skipping TS 5, because not enabled - Skipping TS 6, because not enabled [DL] Assign downlink TS=7 TFI=0 -PDCH(bts=0,trx=0,ts=7) Attaching TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NEW), 1 TBFs, USFs = 01, TFIs = 00000001. +PDCH(bts=0,trx=0,ts=7) Attaching TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NEW), 1 TBFs, USFs = 00, TFIs = 00000001. TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NEW) Setting Control TS 7 TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NEW) Allocated: trx = 0, ul_slots = 80, dl_slots = 80 -MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0, UL) Attaching DL TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NEW) +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0,) Attaching DL TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NEW) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NEW) [DOWNLINK] START TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=NEW) Send downlink assignment on PCH, no TBF exist (IMSI=0011223344) TBF(DL-TFI_0){NEW}: Received Event ASSIGN_ADD_CCCH @@ -1874,9 +1957,8 @@ TBF(DL-TFI_0){NEW}: state_chg to ASSIGN TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) TX: START Immediate Assignment Downlink (PCH) - TRX=0 (0) TS=7 TA=7 -=== end test_tbf_single_phase === -MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0, UL DL) Destroying MS object -MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0, DL) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) +=== end test_tbf_single_phase2 === +MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0, DL) Destroying MS object MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 0/0,) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) === start test_tbf_two_phase === PDCH(bts=0,trx=0,ts=7) PDCH state: disabled => enabled -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in libosmocore[master]: gb/vty: Show if an NSVC is locally blocked or blocked by remote

by arehbein

Attention is currently required from: arehbein. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/29903 to look at the new patch set (#3). Change subject: gb/vty: Show if an NSVC is locally blocked or blocked by remote ...................................................................... gb/vty: Show if an NSVC is locally blocked or blocked by remote Related: OS#5085 Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0 --- M include/osmocom/core/fsm.h M src/gb/gprs_ns2_vc_fsm.c M src/gb/gprs_ns2_vty.c M tests/gb/gprs_ns2_vty.vty 4 files changed, 29 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/29903/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0 Gerrit-Change-Number: 29903 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: SMPP: fix possible NULL pointer dereference

by pespin

Attention is currently required from: laforge, msuraev, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28848 ) Change subject: SMPP: fix possible NULL pointer dereference ...................................................................... Patch Set 39: (1 comment) Patchset: PS39: All this to fix a possible NULL pointer dereference? or you screwed it with patch rebasing/merging? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I875eb5249004d3a960aee46c5099592d18fcaa76 Gerrit-Change-Number: 28848 Gerrit-PatchSet: 39 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Oct 2022 14:53:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-ci[master]: jenkins-gerrit: send mail for V+1 for some users

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29904 ) Change subject: jenkins-gerrit: send mail for V+1 for some users ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I603b8a911c8f17aa726d9e3d5d644ad3262b42dd Gerrit-Change-Number: 29904 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Oct 2022 14:51:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: SMPP: fix possible NULL pointer dereference

by msuraev

Attention is currently required from: laforge, pespin, msuraev, dexter. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28848 ) Change subject: SMPP: fix possible NULL pointer dereference ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I875eb5249004d3a960aee46c5099592d18fcaa76 Gerrit-Change-Number: 28848 Gerrit-PatchSet: 39 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Oct 2022 14:45:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-ci[master]: jenkins-gerrit: send mail for V+1 for some users

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29904 ) Change subject: jenkins-gerrit: send mail for V+1 for some users ...................................................................... jenkins-gerrit: send mail for V+1 for some users Add a list of users that do not only get a notification mail when the gerrit verification failed, but also on success. Change-Id: I603b8a911c8f17aa726d9e3d5d644ad3262b42dd --- M jobs/gerrit-pipeline-result.yml M jobs/gerrit-verifications.yml M scripts/jenkins-gerrit/pipeline_summary.py M scripts/jenkins-gerrit/pipeline_summary_send.sh 4 files changed, 32 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/04/29904/1 diff --git a/jobs/gerrit-pipeline-result.yml b/jobs/gerrit-pipeline-result.yml index ac54cee..c3c03b6 100644 --- a/jobs/gerrit-pipeline-result.yml +++ b/jobs/gerrit-pipeline-result.yml @@ -38,6 +38,9 @@ name: GERRIT_PATCHSET_REVISION description: set by gerrit verification pipeline job - string: + name: GERRIT_PATCHSET_UPLOADER_NAME + description: set by gerrit verification pipeline job + - string: name: GERRIT_PORT description: set by gerrit verification pipeline job - string: diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index a9616ff..9db1ebc 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -484,6 +484,7 @@ string(name: "GERRIT_BRANCH", value: "${{env.GERRIT_BRANCH}}"), string(name: "GERRIT_HOST", value: "${{env.GERRIT_HOST}}"), string(name: "GERRIT_PATCHSET_REVISION", value: "${{env.GERRIT_PATCHSET_REVISION}}"), + string(name: "GERRIT_PATCHSET_UPLOADER_NAME", value: "${{env.GERRIT_PATCHSET_UPLOADER_NAME}}"), string(name: "GERRIT_PORT", value: "${{env.GERRIT_PORT}}"), string(name: "GERRIT_REFSPEC", value: "${{env.GERRIT_REFSPEC}}"), string(name: "PIPELINE_BUILD_URL", value: "${{env.BUILD_URL}}"), diff --git a/scripts/jenkins-gerrit/pipeline_summary.py b/scripts/jenkins-gerrit/pipeline_summary.py index 95ae821..44424d7 100755 --- a/scripts/jenkins-gerrit/pipeline_summary.py +++ b/scripts/jenkins-gerrit/pipeline_summary.py @@ -19,6 +19,9 @@ help="$BUILD_URL of the pipeline job, e.g." " https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-bsc-nat/17/") parser.add_argument("-o", "--output", help="output json file") + parser.add_argument("-n", "--notify-on-success", action="store_true", + help="always indicate in json that the owner should be" + " notified via mail, not only on failure") return parser.parse_args() @@ -132,7 +135,7 @@ return ret -def get_pipeline_summary(build_url): +def get_pipeline_summary(build_url, notify_on_success): """ Generate a summary of failed and successful builds for gerrit. :returns: a dict that is expected by gerrit's set-review api, e.g. {"tag": "jenkins", @@ -179,7 +182,7 @@ else: summary += "Build Successful\n" vote = 1 - notify = "NONE" + notify = "OWNER" if notify_on_success else "NONE" # Reference: # https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#… @@ -192,9 +195,11 @@ def main(): args = parse_args() - summary = get_pipeline_summary(args.build_url) + summary = get_pipeline_summary(args.build_url, args.notify_on_success) + print() print(summary["message"]) + print(f"notify: {summary['notify']}") if args.output: with open(args.output, "w") as handle: diff --git a/scripts/jenkins-gerrit/pipeline_summary_send.sh b/scripts/jenkins-gerrit/pipeline_summary_send.sh index d52ad9f..c49f428 100755 --- a/scripts/jenkins-gerrit/pipeline_summary_send.sh +++ b/scripts/jenkins-gerrit/pipeline_summary_send.sh @@ -1,6 +1,24 @@ -#!/bin/sh -ex +#!/bin/sh -e -./pipeline_summary.py "$PIPELINE_BUILD_URL" -o gerrit_report.json +# By default, a mail notification will only be sent if the gerrit verification +# failed. Add yourself here to also receive notifications on successs. +notify_on_success_users=" + pespin +" + +arg_notify="" +for i in $notify_on_success_users; do + if [ "$GERRIT_PATCHSET_UPLOADER_NAME" = "$i" ]; then + arg_notify="--notify-on-success" + break + fi +done + +set -x + +./pipeline_summary.py "$PIPELINE_BUILD_URL" \ + -o gerrit_report.json \ + $arg_notify ssh \ -p "$GERRIT_PORT" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I603b8a911c8f17aa726d9e3d5d644ad3262b42dd Gerrit-Change-Number: 29904 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: libosmonetify SMPP

by msuraev

Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28849 ) Change subject: libosmonetify SMPP ...................................................................... Patch Set 49: (3 comments) File src/libsmpputil/smpp_msc.c: https://gerrit.osmocom.org/c/osmo-msc/+/28849/comment/3fa9e4c2_f44d41de PS49, Line 847: if (!g_smsc->link) { > why is this check added now? Hmm.. yepp, it can be dropped. File src/libsmpputil/smpp_smsc.c: https://gerrit.osmocom.org/c/osmo-msc/+/28849/comment/6b0e2d42_9448e55f PS49, Line 166: acl->esme = NULL; > Nice bug here setting to null before calling put on it. […] Ack https://gerrit.osmocom.org/c/osmo-msc/+/28849/comment/bd987a53_ba352839 PS49, Line 760: uint32_t smpp_size = esme->read_msg ? esme->read_msg->cb[0] : 0; > you are casting unsigned long to "uint32_t". […] I think it's better to use the type which matches exactly the size from SMPP spec - 4 bytes. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Idc2e60af1010783e555e61b114ae61f55a89d890 Gerrit-Change-Number: 28849 Gerrit-PatchSet: 49 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Oct 2022 14:36:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in libosmocore[master]: gb/vty: Show if an NSVC is locally blocked or blocked by remote

by arehbein

arehbein has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmocore/+/29903 ) Change subject: gb/vty: Show if an NSVC is locally blocked or blocked by remote ...................................................................... gb/vty: Show if an NSVC is locally blocked or blocked by remote Related: OS#5085 Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0 --- M include/osmocom/core/fsm.h M src/gb/gprs_ns2_vc_fsm.c M src/gb/gprs_ns2_vty.c 3 files changed, 21 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/29903/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0 Gerrit-Change-Number: 29903 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in libosmocore[master]: gb/vty: Show if an NSVC is locally blocked or blocked by remote

by arehbein

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/29903 ) Change subject: gb/vty: Show if an NSVC is locally blocked or blocked by remote ...................................................................... gb/vty: Show if an NSVC is locally blocked or blocked by remote Related: OS#5085 Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0 --- M include/osmocom/core/fsm.h M src/gb/gprs_ns2_vc_fsm.c M src/gb/gprs_ns2_vty.c 3 files changed, 21 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/03/29903/1 diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 5e5b091..fc63378 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -99,6 +99,8 @@ int log_level; /*! current state of the FSM */ uint32_t state; + /*! if blocked by O&M/vty */ + bool om_blocked; /*! timer number for states with time-out */ int T; diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 1db2a8e..a094aba 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -58,8 +58,6 @@ bool initiator; bool initiate_block; bool initiate_reset; - /* if blocked by O&M/vty */ - bool om_blocked; /* if unitdata is forwarded to the user */ bool accept_unitdata; @@ -268,7 +266,7 @@ struct gprs_ns2_inst *nsi = priv->nsvc->nse->nsi; priv->initiate_reset = priv->initiate_block = priv->initiator; - priv->om_blocked = false; + fi->om_blocked = false; switch (event) { case GPRS_NS2_EV_REQ_START: @@ -338,14 +336,13 @@ static void ns2_st_blocked_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) { struct gprs_ns2_vc_priv *priv = fi->priv; - if (old_state != GPRS_NS2_ST_BLOCKED) { priv->N = 0; RATE_CTR_INC_NS(priv->nsvc, NS_CTR_BLOCKED); } ns2_nse_notify_unblocked(priv->nsvc, false); - if (priv->om_blocked) { + if (fi->om_blocked) { /* we are already blocked after a RESET */ if (old_state == GPRS_NS2_ST_RESET) { osmo_timer_del(&fi->timer); @@ -363,7 +360,7 @@ { struct gprs_ns2_vc_priv *priv = fi->priv; - if (priv->om_blocked) { + if (fi->om_blocked) { switch (event) { case GPRS_NS2_EV_RX_BLOCK_ACK: priv->accept_unitdata = false; @@ -563,7 +560,7 @@ case GPRS_NS2_ST_BLOCKED: if (priv->initiate_block) { priv->N++; - if (priv->om_blocked) { + if (fi->om_blocked) { if (priv->N <= nsi->timeout[NS_TOUT_TNS_BLOCK_RETRIES]) { osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED, nsi->timeout[NS_TOUT_TNS_BLOCK], 0); } else { @@ -717,14 +714,14 @@ case GPRS_NS2_EV_REQ_OM_BLOCK: /* vty cmd: block */ priv->initiate_block = true; - priv->om_blocked = true; + fi->om_blocked = true; osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED, nsi->timeout[NS_TOUT_TNS_BLOCK], 0); break; case GPRS_NS2_EV_REQ_OM_UNBLOCK: - /* vty cmd: unblock*/ - if (!priv->om_blocked) + /* vty cmd: unblock */ + if (!fi->om_blocked) return; - priv->om_blocked = false; + fi->om_blocked = false; if (fi->state == GPRS_NS2_ST_BLOCKED) osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED, nsi->timeout[NS_TOUT_TNS_BLOCK], 0); break; @@ -833,8 +830,7 @@ * \return 0 on success; negative on error */ int ns2_vc_block(struct gprs_ns2_vc *nsvc) { - struct gprs_ns2_vc_priv *priv = nsvc->fi->priv; - if (priv->om_blocked) + if (nsvc->fi->om_blocked) return -EALREADY; return osmo_fsm_inst_dispatch(nsvc->fi, GPRS_NS2_EV_REQ_OM_BLOCK, NULL); @@ -845,8 +841,7 @@ * \return 0 on success; negative on error */ int ns2_vc_unblock(struct gprs_ns2_vc *nsvc) { - struct gprs_ns2_vc_priv *priv = nsvc->fi->priv; - if (!priv->om_blocked) + if (!nsvc->fi->om_blocked) return -EALREADY; return osmo_fsm_inst_dispatch(nsvc->fi, GPRS_NS2_EV_REQ_OM_UNBLOCK, NULL); diff --git a/src/gb/gprs_ns2_vty.c b/src/gb/gprs_ns2_vty.c index 016199d..14beea8 100644 --- a/src/gb/gprs_ns2_vty.c +++ b/src/gb/gprs_ns2_vty.c @@ -1875,18 +1875,23 @@ void ns2_vty_dump_nsvc(struct vty *vty, struct gprs_ns2_vc *nsvc, bool stats) { if (nsvc->nsvci_is_valid) - vty_out(vty, " NSVCI %05u: %s %s %s %s since ", nsvc->nsvci, + vty_out(vty, " NSVCI %05u: %s %s %s %s %ssince ", nsvc->nsvci, osmo_fsm_inst_state_name(nsvc->fi), nsvc->persistent ? "PERSIST" : "DYNAMIC", gprs_ns2_ll_str(nsvc), - ns2_vc_is_unblocked(nsvc) ? "ALIVE" : "DEAD"); + ns2_vc_is_unblocked(nsvc) ? "ALIVE" : "DEAD", + nsvc->fi->om_blocked ? "(blocked by O&M/vty) " : + !ns2_vc_is_unblocked(nsvc) ? "(cause: remote) " : ""); else - vty_out(vty, " %s %s sig_weight=%u data_weight=%u %s %s since ", + vty_out(vty, + " %s %s sig_weight=%u data_weight=%u %s %s %s since ", osmo_fsm_inst_state_name(nsvc->fi), nsvc->persistent ? "PERSIST" : "DYNAMIC", nsvc->sig_weight, nsvc->data_weight, gprs_ns2_ll_str(nsvc), - ns2_vc_is_unblocked(nsvc) ? "ALIVE" : "DEAD"); + ns2_vc_is_unblocked(nsvc) ? "ALIVE" : "DEAD", + nsvc->fi->om_blocked ? "(blocked by O&M/vty) " : + !ns2_vc_is_unblocked(nsvc) ? "(cause: remote) " : ""); vty_out_uptime(vty, &nsvc->ts_alive_change); vty_out_newline(vty); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0e8a12c3e54b701c9e697d50de1c9cb0bcc817e0 Gerrit-Change-Number: 29903 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022