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

Change in osmo-ci[master]: coverity: add missing libosmo-pfcp, dependency of osmo-upf

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28998 ) Change subject: coverity: add missing libosmo-pfcp, dependency of osmo-upf ...................................................................... coverity: add missing libosmo-pfcp, dependency of osmo-upf Since recently [1] osmo-upf depends on libosmo-{gtlv,pfcp}.so, which are provided by libosmo-pfcp.git. We need to build libosmo-pfcp before attempting to build osmo-upf, otherwise it fails: configure: error: Package requirements (libosmo-gtlv >= 0.1.0) were not met: Package libosmo-gtlv was not found in the pkg-config search path. Perhaps you should add the directory containing `libosmo-gtlv.pc' to the PKG_CONFIG_PATH environment variable Package 'libosmo-gtlv', required by 'world', not found Change-Id: Ic4fe7b40cf9a57e0462b2c0806f8810fcc04a10c --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmocom.sh 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index a7f8cdd..4291558 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -75,6 +75,7 @@ build_libusrp build_default libosmo-abis build_default libosmo-netif +build_default libosmo-pfcp build_default libosmo-sccp build_default libsmpp34 build_default osmo-ggsn diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh index 31d6714..73baf2c 100755 --- a/coverity/prepare_source_Osmocom.sh +++ b/coverity/prepare_source_Osmocom.sh @@ -13,6 +13,7 @@ libosmocore libosmo-dsp libosmo-netif + libosmo-pfcp libosmo-sccp libsmpp34 libusrp -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic4fe7b40cf9a57e0462b2c0806f8810fcc04a10c Gerrit-Change-Number: 28998 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-ci[master]: coverity: add missing libosmo-pfcp, dependency of osmo-upf

by laforge

Attention is currently required from: neels, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28998 ) Change subject: coverity: add missing libosmo-pfcp, dependency of osmo-upf ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File coverity/prepare_source_Osmocom.sh: https://gerrit.osmocom.org/c/osmo-ci/+/28998/comment/d74fc3eb_e97e2e94 PS1, Line 7: add it as component here > I need somebody to help me with this step, I have no permissions to access this page. I created the component. not sure about the permissions... -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic4fe7b40cf9a57e0462b2c0806f8810fcc04a10c Gerrit-Change-Number: 28998 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 11:16:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Fix CBSP expectancies when receiving ETWS write-replace response

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28999 ) Change subject: bsc: Fix CBSP expectancies when receiving ETWS write-replace response ...................................................................... bsc: Fix CBSP expectancies when receiving ETWS write-replace response BSC_Tests_CBSP was sending an ETWS message but using non-ETWS templates to match the response, which may differ from an ETWS one (for instance, ETWS related messages have no channel_ind). Change-Id: I42941655081af6d5b04b1e061e6259d8dee94665 --- M bsc/BSC_Tests_CBSP.ttcn M library/CBSP_Templates.ttcn 2 files changed, 63 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/28999/1 diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index 5fa8881..c07b605 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -281,9 +281,9 @@ tx := ts_CBSP_WRITE_EMERG(msg_id, ser_no, cell_list, emerg_ind, warn_type, warn_per); CBSP[0].send(ts_CBSP_Send(g_cbsp_conn_id[0], tx)); if (istemplatekind(fail_list, "omit")) { - rx := tr_CBSP_WRITE_CBS_COMPL(msg_id, ser_no, success_list, omit); + rx := tr_CBSP_WRITE_EMERG_COMPL(msg_id, ser_no, success_list); } else { - rx := tr_CBSP_WRITE_CBS_FAIL(msg_id, ser_no, fail_list, *, success_list, omit); + rx := tr_CBSP_WRITE_EMERG_FAIL(msg_id, ser_no, fail_list, *, success_list); } alt { [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], rx)) { @@ -341,9 +341,9 @@ tx := ts_CBSP_REPLACE_EMERG(msg_id, new_ser_no, old_ser_no, cell_list, emerg_ind, warn_type, warn_per); CBSP[0].send(ts_CBSP_Send(g_cbsp_conn_id[0], tx)); if (istemplatekind(fail_list, "omit")) { - rx := tr_CBSP_REPLACE_CBS_COMPL(msg_id, new_ser_no, old_ser_no, omit, success_list, omit); + rx := tr_CBSP_REPLACE_EMERG_COMPL(msg_id, new_ser_no, old_ser_no, success_list); } else { - rx := tr_CBSP_REPLACE_CBS_FAIL(msg_id, new_ser_no, old_ser_no, fail_list, omit, success_list, omit); + rx := tr_CBSP_REPLACE_EMERG_FAIL(msg_id, new_ser_no, old_ser_no, fail_list, omit, success_list); } alt { [] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], rx)) { diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn index bcbb7be..e598566 100644 --- a/library/CBSP_Templates.ttcn +++ b/library/CBSP_Templates.ttcn @@ -396,7 +396,7 @@ function tr_CBSP_WRITE_CBS_COMPL(template uint16_t msg_id, template uint16_t new_ser_nr, template BSSMAP_FIELD_CellIdentificationList cell_list, - template uint8_t channel_ind) + template (present) uint8_t channel_ind) return template CBSP_PDU { var template CBSP_IEs ies := { tr_CbspMsgId(msg_id), @@ -466,7 +466,7 @@ template uint16_t old_ser_nr, template CBSP_IE_NumBcastComplList compl_list, template BSSMAP_FIELD_CellIdentificationList cell_list, - template uint8_t channel_ind) + template (present) uint8_t channel_ind) return template CBSP_PDU { var template CBSP_IEs ies := { tr_CbspMsgId(msg_id), @@ -542,7 +542,7 @@ template CBSP_FailureListItems fail_list, template CBSP_IE_NumBcastComplList compl_list, template BSSMAP_FIELD_CellIdentificationList cell_list, - template uint8_t channel_ind) + template (present) uint8_t channel_ind) return template CBSP_PDU { var template CBSP_IEs ies := { tr_CbspMsgId(msg_id), @@ -564,8 +564,33 @@ } else if (not istemplatekind(cell_list, "omit")) { ies[lengthof(ies)] := tr_CbspCellList(cell_list); } - if (not istemplatekind(channel_ind, "omit")) { - ies[lengthof(ies)] := ts_CbspChannelInd(channel_ind); + ies[lengthof(ies)] := ts_CbspChannelInd(channel_ind); + return tr_CBSP(CBSP_MSGT_WRITE_REPLACE_FAIL, ies); +} +function tr_CBSP_WRITE_EMERG_FAIL(template uint16_t msg_id, template uint16_t new_ser_nr, + template CBSP_FailureListItems fail_list, + template CBSP_IE_NumBcastComplList compl_list, + template BSSMAP_FIELD_CellIdentificationList cell_list) +return template CBSP_PDU { + var template CBSP_IEs ies := { + tr_CbspMsgId(msg_id), + tr_NewSerNo(new_ser_nr), + tr_CbspFailList(fail_list) + }; + if (istemplatekind(compl_list, "*")) { + //ies[lengthof(ies)] := tr_CbspNumComplList ifpresent; + } else if (istemplatekind(compl_list, "?")) { + ies[lengthof(ies)] := tr_CbspNumComplList(?); + } else if (not istemplatekind(compl_list, "omit")) { + ies[lengthof(ies)] := tr_CbspNumComplList(compl_list); + } + if (istemplatekind(cell_list, "*")) { + testcase.stop("TITAN > 6.5.0 doesn't support this"); + //ies[lengthof(ies)] := tr_CbspCellList ifpresent; + } else if (istemplatekind(cell_list, "?")) { + ies[lengthof(ies)] := tr_CbspCellList(?); + } else if (not istemplatekind(cell_list, "omit")) { + ies[lengthof(ies)] := tr_CbspCellList(cell_list); } return tr_CBSP(CBSP_MSGT_WRITE_REPLACE_FAIL, ies); } @@ -597,7 +622,7 @@ template CBSP_FailureListItems fail_list, template CBSP_IE_NumBcastComplList compl_list, template BSSMAP_FIELD_CellIdentificationList cell_list, - template uint8_t channel_ind) + template (present) uint8_t channel_ind) return template CBSP_PDU { var template CBSP_IEs ies := { tr_CbspMsgId(msg_id), @@ -622,6 +647,34 @@ ies[lengthof(ies)] := tr_CbspChannelInd(channel_ind); return tr_CBSP(CBSP_MSGT_WRITE_REPLACE_FAIL, ies); } +function tr_CBSP_REPLACE_EMERG_FAIL(template uint16_t msg_id, template uint16_t new_ser_nr, + template uint16_t old_ser_nr, + template CBSP_FailureListItems fail_list, + template CBSP_IE_NumBcastComplList compl_list, + template BSSMAP_FIELD_CellIdentificationList cell_list) +return template CBSP_PDU { + var template CBSP_IEs ies := { + tr_CbspMsgId(msg_id), + tr_NewSerNo(new_ser_nr), + tr_OldSerNo(old_ser_nr), + tr_CbspFailList(fail_list) + }; + if (istemplatekind(compl_list, "*")) { + //ies[lengthof(ies)] := tr_CbspCellList ifpresent; + } else if (istemplatekind(compl_list, "?")) { + ies[lengthof(ies)] := tr_CbspNumComplList(?); + } else if (not istemplatekind(compl_list, "omit")) { + ies[lengthof(ies)] := tr_CbspNumComplList(compl_list); + } + if (istemplatekind(cell_list, "*")) { + //ies[lengthof(ies)] := tr_CbspCellList ifpresent; + } else if (istemplatekind(cell_list, "?")) { + ies[lengthof(ies)] := tr_CbspCellList(?); + } else if (not istemplatekind(cell_list, "omit")) { + ies[lengthof(ies)] := tr_CbspCellList(cell_list); + } + return tr_CBSP(CBSP_MSGT_WRITE_REPLACE_FAIL, ies); +} /* 8.1.3.4 KILL */ function ts_CBSP_KILL(template (value) uint16_t msg_id, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28999 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: I42941655081af6d5b04b1e061e6259d8dee94665 Gerrit-Change-Number: 28999 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: allow populating global SACCH cache via L1CTL

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28874 ) Change subject: trxcon: allow populating global SACCH cache via L1CTL ...................................................................... trxcon: allow populating global SACCH cache via L1CTL There is a time window between activation of a dedicated channel and receipt of a L1CTL_DATA_REQ with the first RR Measurement Report, in which trxcon may need to start transmission on Uplink SACCH. In this case trxcon is using a dummy SACCH block with hard-coded L1 SACCH header values and hard-coded Measurement Results. This mimics behavior of the layer1 implementation in firmware for Calypso phones. When running the mobile application, this error can be seen: DAPP ERROR trxcon(0)[0x55ee57bee1a0]{FBSB_SEARCH}: Event TRXCON_EV_RX_DATA_IND not permitted which means that the mobile is sending L1CTL_DATA_REQ *before* establishing a dedicated channel. And this message contains an RR Measurement Report. The idea behind this is to populate the SACCH cache in advance and thus avoid sending dummy values. Let's allow the L2 apps populating SACCH cache before establishing a dedicated connection using new TRXCON_EV_UPDATE_SACCH_CACHE_REQ. Change-Id: I0f467fc07cf844cc73465f235b36ba7d00788c9f Related: OS#5635, OS#5599 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/sched_prim.c M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon_fsm.c 6 files changed, 75 insertions(+), 63 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 3f7dae0..04303f0 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -374,6 +374,8 @@ void (*clock_cb)(struct l1sched_state *sched); /*! List of timeslots maintained by this scheduler */ struct l1sched_ts *ts[TRX_TS_COUNT]; + /*! SACCH cache (common for all lchans) */ + uint8_t sacch_cache[GSM_MACBLOCK_LEN]; /*! BSIC value learned from SCH bursts */ uint8_t bsic; /*! Logging context (used as prefix for messages) */ diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index eed3d61..2a6f7d5 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -25,6 +25,7 @@ TRXCON_EV_SET_TCH_MODE_REQ, TRXCON_EV_SET_PHY_CONFIG_REQ, TRXCON_EV_TX_ACCESS_BURST_REQ, + TRXCON_EV_UPDATE_SACCH_CACHE_REQ, TRXCON_EV_DEDICATED_ESTABLISH_REQ, TRXCON_EV_DEDICATED_RELEASE_REQ, TRXCON_EV_TX_TRAFFIC_REQ, diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 28086a2..4d6bed2 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -644,10 +644,18 @@ "Recv %s Req (chan_nr=0x%02x, link_id=0x%02x, len=%zu)\n", traffic ? "TRAFFIC" : "DATA", req.chan_nr, req.link_id, req.data_len); - if (traffic) - osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_TRAFFIC_REQ, &req); - else - osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_DATA_REQ, &req); + switch (trxcon->fi->state) { + case TRXCON_ST_DEDICATED: + if (traffic) + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_TRAFFIC_REQ, &req); + else + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_TX_DATA_REQ, &req); + break; + default: + if (!traffic && req.link_id == 0x40) /* only for SACCH */ + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_UPDATE_SACCH_CACHE_REQ, &req); + /* TODO: log an error about uhnandled DATA.req / TRAFFIC.req */ + } msgb_free(msg); return 0; diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index 9b6d28d..f97e505 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -116,8 +116,7 @@ } /** - * Composes a new primitive using either cached (if populated), - * or "dummy" Measurement Report message. + * Composes a new primitive from cached RR Measurement Report. * * @param lchan lchan to assign a primitive * @return SACCH primitive to be transmitted @@ -125,38 +124,8 @@ static struct l1sched_ts_prim *prim_compose_mr(struct l1sched_lchan_state *lchan) { struct l1sched_ts_prim *prim; - uint8_t *mr_src_ptr; bool cached; - /* "Dummy" Measurement Report */ - static const uint8_t meas_rep_dummy[] = { - /* L1 SACCH pseudo-header */ - 0x0f, 0x00, - - /* LAPDm header */ - 0x01, 0x03, 0x49, - - /* RR Management messages, Measurement Report */ - 0x06, 0x15, - - /* Measurement results (see 3GPP TS 44.018, section 10.5.2.20): - * 0... .... = BA-USED: 0 - * .0.. .... = DTX-USED: DTX was not used - * ..11 0110 = RXLEV-FULL-SERVING-CELL: -57 <= x < -56 dBm (54) - * 0... .... = 3G-BA-USED: 0 - * .1.. .... = MEAS-VALID: The measurement results are not valid - * ..11 0110 = RXLEV-SUB-SERVING-CELL: -57 <= x < -56 dBm (54) - * 0... .... = SI23_BA_USED: 0 - * .000 .... = RXQUAL-FULL-SERVING-CELL: BER < 0.2%, Mean value 0.14% (0) - * .... 000. = RXQUAL-SUB-SERVING-CELL: BER < 0.2%, Mean value 0.14% (0) - * .... ...1 11.. .... = NO-NCELL-M: Neighbour cell information not available */ - 0x36, 0x76, 0x01, 0xc0, - - /* 0** -- Padding with zeroes */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - }; - /* Allocate a new primitive */ prim = prim_alloc(lchan, GSM_MACBLOCK_LEN, L1SCHED_PRIM_DATA, l1sched_lchan_desc[lchan->type].chan_nr, @@ -167,43 +136,24 @@ cached = (lchan->sacch.mr_cache[2] != 0x00 && lchan->sacch.mr_cache[3] != 0x00 && lchan->sacch.mr_cache[4] != 0x00); - if (cached) { /* Use the cached one */ - mr_src_ptr = lchan->sacch.mr_cache; - lchan->sacch.mr_cache_usage++; - } else { /* Use "dummy" one */ - mr_src_ptr = (uint8_t *) meas_rep_dummy; + if (!cached) { + memcpy(&lchan->sacch.mr_cache[0], + &lchan->ts->sched->sacch_cache[0], + sizeof(lchan->sacch.mr_cache)); } /* Compose a new Measurement Report primitive */ - memcpy(prim->payload, mr_src_ptr, GSM_MACBLOCK_LEN); - - /** - * Update the L1 SACCH pseudo-header (only for cached MRs) - * - * TODO: filling of the actual values into cached Measurement - * Reports would break the distance spoofing feature. If it - * were known whether the spoofing is enabled or not, we could - * decide whether to update the cached L1 SACCH header here. - */ - if (!cached) { -#warning "FIXME: no direct access to trxcon->l1p.{tx_power,ta}" -#if 0 - prim->payload[0] = lchan->ts->sched->trx->tx_power; - prim->payload[1] = lchan->ts->sched->trx->ta; -#endif - } + memcpy(&prim->payload[0], &lchan->sacch.mr_cache[0], GSM_MACBLOCK_LEN); /* Inform about the cache usage count */ - if (cached && lchan->sacch.mr_cache_usage > 5) { + if (++lchan->sacch.mr_cache_usage > 5) { LOGP_LCHAND(lchan, LOGL_NOTICE, "SACCH MR cache usage count=%u > 5 " "=> ancient measurements, please fix!\n", lchan->sacch.mr_cache_usage); } - LOGP_LCHAND(lchan, LOGL_NOTICE, - "Using a %s Measurement Report\n", - cached ? "cached" : "dummy"); + LOGP_LCHAND(lchan, LOGL_NOTICE, "Using cached Measurement Report\n"); return prim; } diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index af2d9b3..be1f820 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -39,6 +39,35 @@ int l1sched_log_cat_common = DLGLOBAL; int l1sched_log_cat_data = DLGLOBAL; +/* "Dummy" Measurement Report */ +static const uint8_t meas_rep_dummy[] = { + /* L1 SACCH pseudo-header */ + 0x0f, 0x00, + + /* LAPDm header */ + 0x01, 0x03, 0x49, + + /* RR Management messages, Measurement Report */ + 0x06, 0x15, + + /* Measurement results (see 3GPP TS 44.018, section 10.5.2.20): + * 0... .... = BA-USED: 0 + * .0.. .... = DTX-USED: DTX was not used + * ..11 0110 = RXLEV-FULL-SERVING-CELL: -57 <= x < -56 dBm (54) + * 0... .... = 3G-BA-USED: 0 + * .1.. .... = MEAS-VALID: The measurement results are not valid + * ..11 0110 = RXLEV-SUB-SERVING-CELL: -57 <= x < -56 dBm (54) + * 0... .... = SI23_BA_USED: 0 + * .000 .... = RXQUAL-FULL-SERVING-CELL: BER < 0.2%, Mean value 0.14% (0) + * .... 000. = RXQUAL-SUB-SERVING-CELL: BER < 0.2%, Mean value 0.14% (0) + * .... ...1 11.. .... = NO-NCELL-M: Neighbour cell information not available */ + 0x36, 0x76, 0x01, 0xc0, + + /* 0** -- Padding with zeroes */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + static int l1sched_cfg_pchan_comb_req(struct l1sched_state *sched, uint8_t tn, enum gsm_phys_chan_config pchan) { @@ -175,6 +204,8 @@ .priv = priv, }; + memcpy(&sched->sacch_cache[0], &meas_rep_dummy[0], sizeof(meas_rep_dummy)); + if (cfg->log_prefix == NULL) sched->log_prefix = talloc_asprintf(sched, "l1sched[0x%p]: ", sched); else @@ -217,6 +248,8 @@ /* Stop and reset clock counter if required */ if (reset_clock) l1sched_clck_reset(sched); + + memcpy(&sched->sacch_cache[0], &meas_rep_dummy[0], sizeof(meas_rep_dummy)); } struct l1sched_ts *l1sched_add_ts(struct l1sched_state *sched, int tn) diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 3c30565..40d5253 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -71,6 +71,22 @@ trxcon->l1p.ta = req->timing_advance; break; } + case TRXCON_EV_UPDATE_SACCH_CACHE_REQ: + { + const struct trxcon_param_tx_traffic_data_req *req = data; + + if (req->link_id != L1SCHED_CH_LID_SACCH) { + LOGPFSML(fi, LOGL_ERROR, "Unexpected link_id=0x%02x\n", req->link_id); + break; + } + if (req->data_len != GSM_MACBLOCK_LEN) { + LOGPFSML(fi, LOGL_ERROR, "Unexpected data length=%u\n", req->data_len); + break; + } + + memcpy(&trxcon->sched->sacch_cache[0], req->data, req->data_len); + break; + } default: OSMO_ASSERT(0); } @@ -451,6 +467,7 @@ OSMO_VALUE_STRING(TRXCON_EV_SET_TCH_MODE_REQ), OSMO_VALUE_STRING(TRXCON_EV_SET_PHY_CONFIG_REQ), OSMO_VALUE_STRING(TRXCON_EV_TX_ACCESS_BURST_REQ), + OSMO_VALUE_STRING(TRXCON_EV_UPDATE_SACCH_CACHE_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_ESTABLISH_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_RELEASE_REQ), OSMO_VALUE_STRING(TRXCON_EV_TX_TRAFFIC_REQ), @@ -471,7 +488,8 @@ | S(TRXCON_EV_L2IF_FAILURE) | S(TRXCON_EV_RESET_FULL_REQ) | S(TRXCON_EV_RESET_SCHED_REQ) - | S(TRXCON_EV_SET_PHY_CONFIG_REQ), + | S(TRXCON_EV_SET_PHY_CONFIG_REQ) + | S(TRXCON_EV_UPDATE_SACCH_CACHE_REQ), .allstate_action = &trxcon_allstate_action, .timer_cb = &trxcon_timer_cb, }; 3 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/osmocom-bb/+/28874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0f467fc07cf844cc73465f235b36ba7d00788c9f Gerrit-Change-Number: 28874 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: populate SACCH cache in f_TC_ms_pwr_ctrl_{constant,pf_ewma}

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28876 ) Change subject: BTS_Tests: populate SACCH cache in f_TC_ms_pwr_ctrl_{constant,pf_ewma} ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28876 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: I89eb90815e86db466ea626f4c25f2634c1d942d5 Gerrit-Change-Number: 28876 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 10:25:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: populate SACCH cache in f_TC_ms_pwr_ctrl_{constant,pf_ewma}

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28876 ) Change subject: BTS_Tests: populate SACCH cache in f_TC_ms_pwr_ctrl_{constant,pf_ewma} ...................................................................... Patch Set 5: (1 comment) Patchset: PS2: > Can you explain why is this needed? Commit message updated. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28876 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: I89eb90815e86db466ea626f4c25f2634c1d942d5 Gerrit-Change-Number: 28876 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 10:22:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: populate SACCH cache in f_TC_ms_pwr_ctrl_{constant,pf_ewma}

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28876 ) Change subject: BTS_Tests: populate SACCH cache in f_TC_ms_pwr_ctrl_{constant,pf_ewma} ...................................................................... Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28876 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: I89eb90815e86db466ea626f4c25f2634c1d942d5 Gerrit-Change-Number: 28876 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 10:22:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmocore[master]: Add osmo_sockaddr_str_from_sockaddr2()

by dexter

Attention is currently required from: msuraev. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28995 ) Change subject: Add osmo_sockaddr_str_from_sockaddr2() ...................................................................... Patch Set 4: (2 comments) File src/sockaddr_str.c: https://gerrit.osmocom.org/c/libosmocore/+/28995/comment/76558c6b_76811d3f PS4, Line 380: { as far as I can see the guess is the only difference. Maybe the api doc can reflect that. Also or maybe update the existing function so that it is able to guess? https://gerrit.osmocom.org/c/libosmocore/+/28995/comment/90c5cc31_a578bec7 PS4, Line 385: the guess above dereferences src, in the case where src == NULL, the function would have crashed already. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I36f20701663c3c7eae7fedc6551da44800b325bf Gerrit-Change-Number: 28995 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 10:04:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmocore[master]: Add osmo_sockaddr_str_from_sockaddr2()

by pespin

Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28995 ) Change subject: Add osmo_sockaddr_str_from_sockaddr2() ...................................................................... Patch Set 4: Code-Review-2 (1 comment) Patchset: PS4: Ideally the existing function should have been passed a "struct sockaddr" pointer, but it's not really an issue, a cast is expected there and that's totally usual in this context. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I36f20701663c3c7eae7fedc6551da44800b325bf Gerrit-Change-Number: 28995 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 09:47:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmocore[master]: Diversify osmo_sockaddr_str_*() error codes

by pespin

Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28996 ) Change subject: Diversify osmo_sockaddr_str_*() error codes ...................................................................... Patch Set 4: Code-Review-1 (1 comment) Patchset: PS4: I'm sorry but I see the previous errors make a lot more sense than the one you are setting now, so I'm not really liking this. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic1be25a076776de5b417cb5ac66f954ac5680e10 Gerrit-Change-Number: 28996 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 09 Aug 2022 09:46:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022