July 2023 - gerrit-log - lists.osmocom.org

[M] Change in libosmo-gprs[master]: rlcmac: Introduce L1CTL-CCCH_READY.ind primitive

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33770 ) Change subject: rlcmac: Introduce L1CTL-CCCH_READY.ind primitive ...................................................................... Patch Set 1: Code-Review+1 (3 comments) Patchset: PS1: Don't you need to modify the unit tests to send the new prim? File include/osmocom/gprs/rlcmac/rlcmac_prim.h: https://gerrit.osmocom.org/c/libosmo-gprs/+/33770/comment/8154d56e_eedbfd4a PS1, Line 198: ccch_ready Having empty structs is a bit weird, but ok. File src/rlcmac/gre.c: https://gerrit.osmocom.org/c/libosmo-gprs/+/33770/comment/238b3f0a_ff32d567 PS1, Line 42: struct gprs_rlcmac_entity *gre = data; Why not removing it? Does it make sense to keep it commented out? -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I4cfb1e2db217a97b7a1dc8849cd13d58e4034c56 Gerrit-Change-Number: 33770 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 09:11:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in libosmo-gprs[master]: cosmetic: gmm: Fix typo in comment

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33765 ) Change subject: cosmetic: gmm: Fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I9c32def9571294abe2e67235a50809839ed5966a Gerrit-Change-Number: 33765 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 09:07:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Fix length calculation in iofd_handle_segmentation()

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33771 ) Change subject: osmo_io: Fix length calculation in iofd_handle_segmentation() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5486ddc0d3345e92b20cbc6e5bcf2cefea3958c8 Gerrit-Change-Number: 33771 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 08:23:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Fix length calculation in iofd_handle_segmentation()

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/33771 ) Change subject: osmo_io: Fix length calculation in iofd_handle_segmentation() ...................................................................... osmo_io: Fix length calculation in iofd_handle_segmentation() We need to account for the fact that segmentation_cb() could have changed the length by calling msgb_pull(). Calculate the new len according to the new tail/data pointers. Change-Id: I5486ddc0d3345e92b20cbc6e5bcf2cefea3958c8 --- M src/core/osmo_io.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/33771/1 diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index b4c8eb6..37127c1 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -267,8 +267,8 @@ /* Trim the original msgb to size. Don't use msgb_trim because we need to reference * msg->data from before it might have been modified by the segmentation_cb(). */ - msg->len = expected_len; msg->tail = data + expected_len; + msg->len = msg->tail - msg->data; return IOFD_SEG_ACT_HANDLE_MORE; defer: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5486ddc0d3345e92b20cbc6e5bcf2cefea3958c8 Gerrit-Change-Number: 33771 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in openbsc[master]: configure.ac: migrate from python2 to python3

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/openbsc/+/33769 ) Change subject: configure.ac: migrate from python2 to python3 ...................................................................... configure.ac: migrate from python2 to python3 VTY and CTRL tests pass fine with python3. Drop the python2 requirement, so we can use debian 12 in CI. Some of the files in openbsc/contrib probably still need python2, but since this is a legacy project we probably don't care. Related: OS#5950 Change-Id: I052c59dcc21b8e1dd4a3460cf8af9ccbeed6de5b --- M openbsc/configure.ac 1 file changed, 18 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/openbsc/configure.ac b/openbsc/configure.ac index c5d7a3a..2a864c5 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -198,9 +198,9 @@ [Include the VTY/CTRL tests in make check [default=no]]), [enable_ext_tests="$enableval"],[enable_ext_tests="no"]) if test "x$enable_ext_tests" = "xyes" ; then - AC_CHECK_PROG(PYTHON2_AVAIL,python2,yes) - if test "x$PYTHON2_AVAIL" != "xyes" ; then - AC_MSG_ERROR([Please install python2 to run the VTY/CTRL tests.]) + AC_CHECK_PROG(PYTHON3_AVAIL,python3,yes) + if test "x$PYTHON3_AVAIL" != "xyes" ; then + AC_MSG_ERROR([Please install python3 to run the VTY/CTRL tests.]) fi AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes) if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/33769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I052c59dcc21b8e1dd4a3460cf8af9ccbeed6de5b Gerrit-Change-Number: 33769 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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

1 year, 11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: MGW_Tests: Add test for "confecho" connection.

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33720 ) Change subject: MGW_Tests: Add test for "confecho" connection. ...................................................................... MGW_Tests: Add test for "confecho" connection. The test uses two connections: "confecho" and "sendonly". It is expected that "confecho" connection receives as many RTP packets as it sends, because it echoes back its packets. It is also expected that "sendonly" connection receives the same amount of RTP packets. Change-Id: I7df4a58ad9287a564b2daf7548b882c03787f7f2 --- M mgw/MGCP_Test.ttcn 1 file changed, 67 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 7d01b97..73591b2 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -2283,6 +2283,58 @@ setverdict(pass); } + testcase TC_two_crcx_confecho_sendonly_rtp() runs on dummy_CT { + var RtpFlowData flow[2]; + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; + var MgcpCallId call_id := '1225'H; + var RtpemStats stats[2]; + + f_init(ep); + + /* "Talker" is sending to MGW and receives echo. */ + flow[0] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "GSM-HR-08/8000/1")); + flow[0].em.portnr := 10000; + f_flow_create(RTPEM[0], ep, call_id, "confecho", flow[0]); + + /* "Listener" receives from MGW. */ + flow[1] := valueof(t_RtpFlow(mp_local_ipv4, mp_remote_ipv4, 112, "GSM-HR-08/8000/1")); + flow[1].em.portnr := 20000; + f_flow_create(RTPEM[1], ep, call_id, "sendonly", flow[1]); + + + f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); + f_rtpem_mode(RTPEM[1], RTPEM_MODE_BIDIR); + f_sleep(1.0); + f_flow_delete(RTPEM[0]); + f_flow_delete(RTPEM[1], ep, call_id); + + stats[0] := f_rtpem_stats_get(RTPEM[0]); + stats[1] := f_rtpem_stats_get(RTPEM[1]); + + /* The "Talker" will receive his RTP, so TX must match RX. + * As RTP from "Listener" is ignored, no extra packets shall be received. */ + if (stats[0].num_pkts_tx != stats[0].num_pkts_rx) { + setverdict(fail, "Talker does not receive as many packets as it transmits!"); + } + if (stats[0].bytes_payload_tx != stats[0].bytes_payload_rx) { + setverdict(fail, "Talker does not receive as many payload as it transmits!"); + } + + /* The "Listener" will also receive RTP of the "Talker", + * so TX of "Talker" must match RX of "Listener". */ + if (stats[0].num_pkts_tx != stats[1].num_pkts_rx) { + setverdict(fail, "Listener does not receive as many packets as talker transmits!"); + } + if (stats[0].bytes_payload_tx != stats[1].bytes_payload_rx) { + setverdict(fail, "Listener does not receive as many payload as talker transmits!"); + } + + f_rtpem_stats_err_check(stats[0]); + f_rtpem_stats_err_check(stats[1]); + + setverdict(pass); + } + /* create two local RTP emulations; create two connections on MGW EP, see if * exchanged data is converted between ts101318 and rfc5993 */ @@ -3081,6 +3133,7 @@ execute(TC_two_crcx_mdcx_and_rtp()); execute(TC_two_crcx_and_unsolicited_rtp()); execute(TC_two_crcx_and_one_mdcx_rtp_ho()); + execute(TC_two_crcx_confecho_sendonly_rtp()); execute(TC_ts101318_rfc5993_rtp_conversion()); execute(TC_ts101318_rfc5993_rtp_conversion_fmtp()); execute(TC_amr_oa_bwe_rtp_conversion()); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33720 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: I7df4a58ad9287a564b2daf7548b882c03787f7f2 Gerrit-Change-Number: 33720 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: MGW_Tests: Add test for "confecho" connection.

by laforge

Attention is currently required from: jolly, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33720 ) Change subject: MGW_Tests: Add test for "confecho" connection. ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33720 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: I7df4a58ad9287a564b2daf7548b882c03787f7f2 Gerrit-Change-Number: 33720 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 07:08:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in osmo-pcu[master]: nacc_fsm: Add support for NACC with UTRAN and E-UTRAN cells

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33538 ) Change subject: nacc_fsm: Add support for NACC with UTRAN and E-UTRAN cells ...................................................................... nacc_fsm: Add support for NACC with UTRAN and E-UTRAN cells The NACC procedure in OsmoPCU currently only supports NACC with GERAN cells. When an UTRAN or E-UTRAN cell is proposed in the PacketCellChangeNotification, then the FSM is immediately terminated, meaning that the NACC procedure can not commence. When the NACC procedure is carried out for UTRAN or E-UTRAN cells, the PCU will not send any system information to the UE. Instead it immediately sends a PacketCellChangeContinue message. This also means that we do not carry out any RAN Information Requests in the background. This patch adds logic to detect if the proprosed cell is an UTRAN or E-UTRAN cell and the adds a new transition to the FSM so that a short route to NACC_ST_TX_CELL_CHG_CONTINUE can be taken. Related: OS#6044 Change-Id: I96280f0ec5955ed3cb17641bf4118496c929bdac --- M src/nacc_fsm.c M src/nacc_fsm.h 2 files changed, 127 insertions(+), 18 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c index c513423..6ccfee9 100644 --- a/src/nacc_fsm.c +++ b/src/nacc_fsm.c @@ -191,7 +191,7 @@ uint8_t tfi_is_dl = tbf_direction(tbf) == GPRS_RLCMAC_DL_TBF; uint8_t tfi = tbf_tfi(tbf); uint8_t container_id = 0; - write_packet_cell_change_continue(mac_control_block, 1, rrbp, tfi_is_dl, tfi, true, + write_packet_cell_change_continue(mac_control_block, 1, rrbp, tfi_is_dl, tfi, ctx->neigh_key_present, ctx->neigh_key.tgt_arfcn, ctx->neigh_key.tgt_bsic, container_id); LOGP(DNACC, LOGL_DEBUG, "+++++++++++++++++++++++++ TX : Packet Cell Change Continue +++++++++++++++++++++++++\n"); rc = encode_gsm_rlcmac_downlink(&bv, mac_control_block); @@ -270,19 +270,90 @@ return 0; } -static int fill_neigh_key_from_bts_pkt_cell_chg_not(struct neigh_cache_entry_key *neigh_key, +static int fill_neigh_key_from_bts_pkt_cell_chg_not(struct nacc_fsm_ctx *ctx, const struct gprs_rlcmac_bts *bts, const Packet_Cell_Change_Notification_t *notif) { + const Target_Cell_GSM_Notif_t *notif_gsm; + const Target_Cell_3G_Notif_t *notif_3g; + const Target_Cell_4G_Notif_t *notif_4g; + + memset(&ctx->neigh_key, 0, sizeof(ctx->neigh_key)); + ctx->neigh_key_present = false; + switch (notif->Target_Cell.UnionType) { - case 0: /* GSM */ - neigh_key->local_lac = bts->cgi_ps.rai.lac.lac; - neigh_key->local_ci = bts->cgi_ps.cell_identity; - neigh_key->tgt_arfcn = notif->Target_Cell.u.Target_Cell_GSM_Notif.ARFCN; - neigh_key->tgt_bsic = notif->Target_Cell.u.Target_Cell_GSM_Notif.BSIC; + case 0: /* GSM */ + notif_gsm = &notif->Target_Cell.u.Target_Cell_GSM_Notif; + LOGPFSML(ctx->fi, LOGL_NOTICE, "TargetCell: RAT=GSM, ARFCN=%u, BSIC=%u\n", + notif_gsm->ARFCN, notif_gsm->BSIC); + + ctx->neigh_key.local_lac = bts->cgi_ps.rai.lac.lac; + ctx->neigh_key.local_ci = bts->cgi_ps.cell_identity; + ctx->neigh_key.tgt_arfcn = notif_gsm->ARFCN; + ctx->neigh_key.tgt_bsic = notif_gsm->BSIC; + ctx->neigh_key_present = true; return 0; default: - return -ENOTSUP; + switch (notif->Target_Cell.u.Target_Other_RAT_Notif.UnionType) { + case 0: /* UTRAN */ + notif_3g = &notif->Target_Cell.u.Target_Other_RAT_Notif.u.Target_Cell_3G_Notif; + if (notif_3g->Exist_FDD_Description) { + LOGPFSML(ctx->fi, LOGL_NOTICE, + "TargetCell: RAT=UTRAN, FDD-ARFCN=%u => no system information provided.\n", + notif_3g->FDD_Target_Cell_Notif.FDD_ARFCN); + } else if (notif_3g->Exist_TDD_Description) { + LOGPFSML(ctx->fi, LOGL_NOTICE, + "TargetCell: RAT=UTRAN, TDD-ARFCN=%u => no system information provided.\n", + notif_3g->TDD_Target_Cell.TDD_ARFCN); + } + return 0; + default: + switch (notif->Target_Cell.u.Target_Other_RAT_Notif.u.Target_Other_RAT_2_Notif.UnionType) { + case 0: /* E-UTRAN (and older RAT) */ + notif_4g = + &notif->Target_Cell.u.Target_Other_RAT_Notif.u.Target_Other_RAT_2_Notif.u.Target_Cell_4G_Notif; + notif_3g = &notif_4g->Target_Cell_3G_Notif; + if (notif_4g->Exist_Arfcn) { + LOGPFSML(ctx->fi, LOGL_NOTICE, "TargetCell: RAT=GSM, ARFCN=%u, BSIC=%u\n", + notif_4g->Arfcn, notif_4g->bsic); + ctx->neigh_key.local_lac = bts->cgi_ps.rai.lac.lac; + ctx->neigh_key.local_ci = bts->cgi_ps.cell_identity; + ctx->neigh_key.tgt_arfcn = notif_4g->Arfcn; + ctx->neigh_key.tgt_bsic = notif_4g->bsic; + ctx->neigh_key_present = true; + return 0; + } + if (notif_4g->Exist_3G_Target_Cell) { + if (notif_3g->Exist_FDD_Description) { + LOGPFSML(ctx->fi, LOGL_NOTICE, + "TargetCell: RAT=UTRAN, FDD-ARFCN=%u => no system information provided.\n", + notif_3g->FDD_Target_Cell_Notif.FDD_ARFCN); + } else if (notif_3g->Exist_TDD_Description) { + LOGPFSML(ctx->fi, LOGL_NOTICE, + "TargetCell: RAT=UTRAN, TDD-ARFCN=%u => no system information provided.\n", + notif_3g->TDD_Target_Cell.TDD_ARFCN); + } + return 0; + } + if (notif_4g->Exist_Eutran_Target_Cell) { + LOGPFSML(ctx->fi, LOGL_NOTICE, + "TargetCell: RAT=E-UTRAN, EARFCN=%u, CI=%u => no system information provided.\n", + notif_4g->Target_EUTRAN_Cell.EARFCN, + notif_4g->Target_EUTRAN_Cell.Physical_Layer_Cell_Identity); + return 0; + } + + /* TODO: do something meaningful with an Eutran_Ccn_Measurement_Report, in case it is + * provided. */ + + LOGPFSML(ctx->fi, LOGL_NOTICE, "TargetCell: (none, invalid)\n"); + return -EINVAL; + default: + LOGPFSML(ctx->fi, LOGL_NOTICE, + "TargetCell: RAT=CSG-UTRAN|CSG-EUTRAN, (not supported)\n"); + return -ENOTSUP; /* TODO: Add support */ + } + } } } @@ -316,14 +387,23 @@ { struct gprs_rlcmac_bts *bts = ctx->ms->bts; struct neigh_cache_entry_key neigh_key; + int rc; - if (fill_neigh_key_from_bts_pkt_cell_chg_not(&neigh_key, bts, notif) < 0) { - LOGPFSML(ctx->fi, LOGL_NOTICE, "TargetCell type=0x%x not supported\n", - notif->Target_Cell.UnionType); + rc = fill_neigh_key_from_bts_pkt_cell_chg_not(ctx, bts, notif); + if (rc < 0) { + /* (see comment below) */ if (ctx->fi->state != NACC_ST_TX_CELL_CHG_CONTINUE) nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE); return; + } else if (!ctx->neigh_key_present) { + /* In case no neighbour key information is present, (This would be the case for UTRAN or EUTRAN cells) + * then we will not provide any system information. Instead we will send the PacketCellChangeContinue + * message immediately. This also applies in the case of re-transmissions. See also: 3GPP TS 48.018, + * section 8c.6.1. */ + nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE); + return; } + /* If tgt cell changed, restart resolving it */ if (!neigh_cache_entry_key_eq(&ctx->neigh_key, &neigh_key)) { ctx->neigh_key = neigh_key; @@ -341,17 +421,21 @@ struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv; struct gprs_rlcmac_bts *bts = ctx->ms->bts; Packet_Cell_Change_Notification_t *notif; + int rc; switch (event) { case NACC_EV_RX_CELL_CHG_NOTIFICATION: notif = (Packet_Cell_Change_Notification_t *)data; - if (fill_neigh_key_from_bts_pkt_cell_chg_not(&ctx->neigh_key, bts, notif) < 0) { - LOGPFSML(fi, LOGL_NOTICE, "TargetCell type=0x%x not supported\n", - notif->Target_Cell.UnionType); + rc = fill_neigh_key_from_bts_pkt_cell_chg_not(ctx, bts, notif); + if (rc < 0) osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); - } else { + else if (!ctx->neigh_key_present) { + /* In case no neighbour key information is present, (This would be the case for UTRAN or EUTRAN + * cells) then we will not provide any system information. Instead we will send the + * PacketCellChangeContinue message immediately. See also: 3GPP TS 48.018, section 8c.6.1. */ + nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE); + } else nacc_fsm_state_chg(fi, NACC_ST_WAIT_RESOLVE_RAC_CI); - } break; default: OSMO_ASSERT(0); @@ -382,7 +466,6 @@ } /* CGI-PS not in cache, resolve it using BSC Neighbor Resolution CTRL interface */ - LOGPFSML(fi, LOGL_DEBUG, "No CGI-PS found in cache, resolving " NEIGH_CACHE_ENTRY_KEY_FMT "...\n", NEIGH_CACHE_ENTRY_KEY_ARGS(&ctx->neigh_key)); @@ -622,7 +705,8 @@ .in_event_mask = X(NACC_EV_RX_CELL_CHG_NOTIFICATION), .out_state_mask = - X(NACC_ST_WAIT_RESOLVE_RAC_CI), + X(NACC_ST_WAIT_RESOLVE_RAC_CI) | + X(NACC_ST_TX_CELL_CHG_CONTINUE), .name = "INITIAL", .action = st_initial, }, diff --git a/src/nacc_fsm.h b/src/nacc_fsm.h index ec6db2e..cab62af 100644 --- a/src/nacc_fsm.h +++ b/src/nacc_fsm.h @@ -47,6 +47,7 @@ struct osmo_fsm_inst *fi; struct GprsMs* ms; /* back pointer */ struct neigh_cache_entry_key neigh_key; /* target cell info from MS */ + bool neigh_key_present; /* target cell info from MS is present */ struct osmo_cell_global_id_ps cgi_ps; /* target cell info resolved from req_{arfcn+bsic} */ struct si_cache_value si_info; /* SI info resolved from SGSN, to be sent to MS */ size_t si_info_bytes_sent; /* How many bytes out of si_info->si_len were already sent to MS */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I96280f0ec5955ed3cb17641bf4118496c929bdac Gerrit-Change-Number: 33538 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmo-pcu[master]: nacc_fsm: Add support for NACC with UTRAN and E-UTRAN cells

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33538 ) Change subject: nacc_fsm: Add support for NACC with UTRAN and E-UTRAN cells ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I96280f0ec5955ed3cb17641bf4118496c929bdac Gerrit-Change-Number: 33538 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 07:07:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: TC_lu_and_mt/mo_csd: reduce call open time

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33631 ) Change subject: msc: TC_lu_and_mt/mo_csd: reduce call open time ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33631 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: Ie733028f7953d5d9fa1907efdb19485dee93ece9 Gerrit-Change-Number: 33631 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Jul 2023 06:33:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2023