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

[M] Change in osmo-pcu[master]: Differentiate between T3192 and T3193
by pespin 20 Jun '23

20 Jun '23

Attention is currently required from: osmith, fixeria. Hello osmith, Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/33374 to look at the new patch set (#3). Change subject: Differentiate between T3192 and T3193 ...................................................................... Differentiate between T3192 and T3193 T3192 on the MS side (boadcasted by the network on SI13) is used for the MS to stay monitoring the PDCH of a DL TBF after sending PKT DL ACK/NACK for the last DL data block (FinalAck=1). T3193 is the counterpart in the network, defined as >T3192, which is used to make sure the TFI is no longer used by the MS and hence can be reused/re-assigned again. Hence, we want to differentiate between those 2 timers, since the first one gives us information on how late can we still tx PktDlAss on PACCH on that DL TBF, while the later only provides info on when to free the DL TBF in order to reuse the TFI. Change-Id: I7421342461bf159d945651037e6fe690f88c6fae --- M src/gprs_ms.c M src/pdch.cpp M src/tbf_dl_fsm.c M src/tbf_fsm.h M tests/tbf/TbfTest.err 5 files changed, 111 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/74/33374/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7421342461bf159d945651037e6fe690f88c6fae Gerrit-Change-Number: 33374 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ttcn3-hacks[master]: pcu: TC_t3193: Fix test to properly trigger tx of last DL data block
by pespin 20 Jun '23

20 Jun '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33375 ) Change subject: pcu: TC_t3193: Fix test to properly trigger tx of last DL data block ...................................................................... pcu: TC_t3193: Fix test to properly trigger tx of last DL data block Since osmo-pcu.git 95ec50c9e4821ed1bdd15e9e30da1278ec1280c1, OsmoPCU doesn't allow receive a FINAL_ACK in FLOW state. This test was not written properly and was taking advantage of that permissive logic in osmo-pcu to trigger the target use case. Fix it to have the PCU send the last DL data block (FBI=1) so that it can send a PKT DL ACK/NACK with FinalAck=1 to terminat ethe DL TBF. Change-Id: Ibd445bdd5cc1d1ffd810eea157829403b4b65f1f --- M pcu/PCU_Tests.ttcn 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/33375/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 9388f8f..31e7c80 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -1875,6 +1875,12 @@ /* Initialize the PCU interface abstraction */ f_init_raw(testcasename()); + /* Disable "idle DL TBF alive" timer, to make the est easier and avoid + * having to keep receiving dummy LLC blocks for a while until the last + * block with FBI=1 is set. This way the first and only DL block is alrady + * the FBI one. */ + f_vty_config2(PCUVTY, {"pcu"}, "timer X2031 0"); + /* Establish BSSGP connection to the PCU */ f_bssgp_establish(); f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); @@ -1886,6 +1892,10 @@ /* 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); + if (dl_block.data.mac_hdr.hdr_ext.fbi == false) { + setverdict(fail, "Expected DL data block with FBI=1 but got FBI=0"); + f_shutdown(__BFILE__, __LINE__); + } /* ACK the DL block */ f_acknackdesc_ack_block(ms.dl_tbf.acknack_desc, dl_block, '1'B); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33375 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: Ibd445bdd5cc1d1ffd810eea157829403b4b65f1f Gerrit-Change-Number: 33375 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-msc[master]: Cosmetic: gsm48_cc_tx_setup: remove TODO comment
by pespin 20 Jun '23

20 Jun '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33360 ) Change subject: Cosmetic: gsm48_cc_tx_setup: remove TODO comment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0539632f464bc44945599bec52dc2a4df2f0115f Gerrit-Change-Number: 33360 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jun 2023 09:57:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-msc[master]: codec_filter_set_ms_from_bc: prepare for CSD
by osmith 20 Jun '23

20 Jun '23

Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33358 ) Change subject: codec_filter_set_ms_from_bc: prepare for CSD ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Not merging this one yet to give Neels a chance to review as well since he wrote the codec filter stuff that this is now modeled after. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If225f2a299ce6bc9ae35a17d6f591d889f49155e Gerrit-Change-Number: 33358 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jun 2023 09:46:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: Cosmetic: gsm48_cc_tx_setup: remove TODO comment
by osmith 20 Jun '23

20 Jun '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33360 ) Change subject: Cosmetic: gsm48_cc_tx_setup: remove TODO comment ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > "Remove comment as ... will be used... […] I've made several commits leading up to "Add initial CSD support with external MNCC" to make reviewing easier. In theory I could also carry this comment through the next patches and only remove it in that big patch, but I don't think it's worth changing that now. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33360 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0539632f464bc44945599bec52dc2a4df2f0115f Gerrit-Change-Number: 33360 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jun 2023 09:43:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: codec_mapping: add clearmode
by osmith 20 Jun '23

20 Jun '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33356 ) Change subject: codec_mapping: add clearmode ...................................................................... codec_mapping: add clearmode Related: OS#4394 Change-Id: Ieeaca6a00dc332424d443e44251f3219245511db --- M src/libmsc/codec_mapping.c 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/libmsc/codec_mapping.c b/src/libmsc/codec_mapping.c index 81ab79c..b58efd9 100644 --- a/src/libmsc/codec_mapping.c +++ b/src/libmsc/codec_mapping.c @@ -203,6 +203,14 @@ }, .mgcp = CODEC_IUFP, }, + { + .sdp = { + .payload_type = 120, + .subtype_name = "CLEARMODE", + .rate = 8000, + }, + .mgcp = CODEC_CLEARMODE, + }, }; #define foreach_codec_mapping(CODEC_MAPPING) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ieeaca6a00dc332424d443e44251f3219245511db Gerrit-Change-Number: 33356 Gerrit-PatchSet: 1 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-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-msc[master]: ran_a_channel_type_to_speech_codec_list: add CSD
by osmith 20 Jun '23

20 Jun '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33357 ) Change subject: ran_a_channel_type_to_speech_codec_list: add CSD ...................................................................... ran_a_channel_type_to_speech_codec_list: add CSD Related: OS#4394 Change-Id: I336e6aa735f894aa35b2ccfe24a54eb171d7ad10 --- M src/libmsc/ran_msg_a.c 1 file changed, 28 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index a371e65..c49adf4 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -901,12 +901,24 @@ int rc; memset(scl, 0, sizeof(*scl)); - for (i = 0; i < ct->perm_spch_len; i++) { - rc = gsm0808_speech_codec_from_chan_type(&scl->codec[i], ct->perm_spch[i]); - if (rc != 0) - return -EINVAL; + + switch (ct->ch_indctr) { + case GSM0808_CHAN_DATA: + scl->codec[0].type = GSM0808_SCT_CSD; + scl->len = 1; + break; + case GSM0808_CHAN_SPEECH: + for (i = 0; i < ct->perm_spch_len; i++) { + rc = gsm0808_speech_codec_from_chan_type(&scl->codec[i], ct->perm_spch[i]); + if (rc != 0) + return -EINVAL; + } + scl->len = i; + break; + default: + OSMO_ASSERT(0); + break; } - scl->len = i; return 0; } @@ -937,7 +949,7 @@ return NULL; } - if (ac->channel_type->ch_indctr == GSM0808_CHAN_SPEECH) { + if (ac->channel_type->ch_indctr == GSM0808_CHAN_SPEECH || ac->channel_type->ch_indctr == GSM0808_CHAN_DATA) { rc = ran_a_channel_type_to_speech_codec_list(&scl, ac->channel_type); if (rc < 0) { LOG_RAN_A_ENC(log_fi, LOGL_ERROR, "Assignment Command: Cannot translate Channel Type to Speech Codec List\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I336e6aa735f894aa35b2ccfe24a54eb171d7ad10 Gerrit-Change-Number: 33357 Gerrit-PatchSet: 1 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-pcu[master]: Differentiate between T3192 and T3193
by pespin 20 Jun '23

20 Jun '23

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33374 ) Change subject: Differentiate between T3192 and T3193 ...................................................................... Patch Set 1: (3 comments) File src/tbf_dl_fsm.c: https://gerrit.osmocom.org/c/osmo-pcu/+/33374/comment/588032dd_46025cd5 PS1, Line 267: wil > will Ack https://gerrit.osmocom.org/c/osmo-pcu/+/33374/comment/d922a72e_b7b9c414 PS1, Line 268: imtil > until Ack https://gerrit.osmocom.org/c/osmo-pcu/+/33374/comment/43aaf439_7170a48f PS1, Line 303: LOGPTBF(ctx->tbf, LOGL_DEBUG, "Waiting %lu sec. %lu microsec (T3193 - T3192) [REUSE TFI]\n", > not that important, but how about: […] you'd have to add %07lu or alike, and since other timers around are already in this same format I'm keeping this one. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7421342461bf159d945651037e6fe690f88c6fae Gerrit-Change-Number: 33374 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jun 2023 09:34:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-pcu[master]: Differentiate between T3192 and T3193
by osmith 20 Jun '23

20 Jun '23

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33374 ) Change subject: Differentiate between T3192 and T3193 ...................................................................... Patch Set 1: Code-Review+1 (3 comments) File src/tbf_dl_fsm.c: https://gerrit.osmocom.org/c/osmo-pcu/+/33374/comment/8e33cb0e_ac333457 PS1, Line 267: wil will https://gerrit.osmocom.org/c/osmo-pcu/+/33374/comment/0a28ee89_e0f70800 PS1, Line 268: imtil until https://gerrit.osmocom.org/c/osmo-pcu/+/33374/comment/38049637_0460dfc4 PS1, Line 303: LOGPTBF(ctx->tbf, LOGL_DEBUG, "Waiting %lu sec. %lu microsec (T3193 - T3192) [REUSE TFI]\n", not that important, but how about: "Waiting %lu.%lus …" -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7421342461bf159d945651037e6fe690f88c6fae Gerrit-Change-Number: 33374 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Jun 2023 09:31:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-pcu[master]: cosmetic: tbf_fsm: Fix typo in comment
by pespin 20 Jun '23

20 Jun '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33372 ) Change subject: cosmetic: tbf_fsm: Fix typo in comment ...................................................................... cosmetic: tbf_fsm: Fix typo in comment Change-Id: Iba0d438f9ce20a5a4e293b0b36565f182824a136 --- M src/tbf_fsm.h 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/tbf_fsm.h b/src/tbf_fsm.h index cb075f1..999b3c0 100644 --- a/src/tbf_fsm.h +++ b/src/tbf_fsm.h @@ -53,7 +53,7 @@ TBF_ST_FLOW, /* RLC/MAC flow, resource needed */ TBF_ST_FINISHED, /* flow finished, wait for release */ TBF_ST_WAIT_RELEASE,/* DL TBF: wait for release or restart */ - TBF_ST_RELEASING, /* releasing, wait to free TBI/USF */ + TBF_ST_RELEASING, /* releasing, wait to free TFI/USF */ }; struct tbf_dl_fsm_ctx { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iba0d438f9ce20a5a4e293b0b36565f182824a136 Gerrit-Change-Number: 33372 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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 0