lists.osmocom.org
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

gerrit-log

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
gerrit-log@lists.osmocom.org

July 2023

  • 1 participants
  • 3051 discussions
[S] Change in osmo-ttcn3-hacks[master]: S1AP_Templates: fix tr_S1AP_SetupReq
by pespin 07 Jul '23

07 Jul '23
Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33633 ) Change subject: S1AP_Templates: fix tr_S1AP_SetupReq ...................................................................... Patch Set 1: (1 comment) File library/s1ap/S1AP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33633/comment/cc789996_b60f… PS1, Line 72: }, *, { please add it as a separate line, otherwise it is hidden and may cause some headaches :) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33633 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: Id4b52921053884e79349301598b75c264b7f058c Gerrit-Change-Number: 33633 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Jul 2023 14:01:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
1 0
0 0
[S] Change in libosmocore[master]: gsm: Fix comment for TCH/F4.8 code
by fixeria 07 Jul '23

07 Jul '23
Attention is currently required from: tnt. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33640 ) Change subject: gsm: Fix comment for TCH/F4.8 code ...................................................................... Patch Set 1: (1 comment) File utils/conv_codes_gsm.py: https://gerrit.osmocom.org/c/libosmocore/+/33640/comment/6cf80f4a_3b088708 PS1, Line 80: 148 bits blocks Hmm, but TS 45.003 section 3.4.3 says 152... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I62f6d0e9fec180138be5f37664969d56e79f3c13 Gerrit-Change-Number: 33640 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Fri, 07 Jul 2023 14:01:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
1 0
0 0
[S] Change in osmo-ttcn3-hacks[master]: S1AP_Templates: cosmetic: fix sourcecode formatting
by pespin 07 Jul '23

07 Jul '23
Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33632 ) Change subject: S1AP_Templates: cosmetic: fix sourcecode formatting ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33632 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: I6e70377315fdcc7ea6d0708fc6de87c335539282 Gerrit-Change-Number: 33632 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Jul 2023 14:00:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
[S] Change in libosmocore[master]: gsm: Fix comment for TCH/F4.8 code
by pespin 07 Jul '23

07 Jul '23
Attention is currently required from: tnt. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33640 ) Change subject: gsm: Fix comment for TCH/F4.8 code ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I62f6d0e9fec180138be5f37664969d56e79f3c13 Gerrit-Change-Number: 33640 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Fri, 07 Jul 2023 14:00:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
1 0
0 0
[M] Change in libosmocore[master]: gsm: Improve the TCH/H2.4 coding routines
by Jenkins Builder 07 Jul '23

07 Jul '23
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33641 ) Change subject: gsm: Improve the TCH/H2.4 coding routines ...................................................................... Patch Set 1: (2 comments) File src/coding/gsm0503_coding.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9161): https://gerrit.osmocom.org/c/libosmocore/+/33641/comment/8f085bb2_f41320e6 PS1, Line 3485: osmo_conv_encode(&gsm0503_tch_h24, &data[ 0], &cB[ 0]); space prohibited after that open square bracket '[' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9161): https://gerrit.osmocom.org/c/libosmocore/+/33641/comment/01498b54_d084eea6 PS1, Line 3522: osmo_conv_decode_ber(&gsm0503_tch_h24, &cB[ 0], &data[ 0], &n_errors_l[0], &n_bits_total_l[0]); space prohibited after that open square bracket '[' -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id2551ffe2a0ebfd0a6df0e1d288a6f0af7e1eda7 Gerrit-Change-Number: 33641 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 07 Jul 2023 13:58:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
1 0
0 0
[S] Change in libosmocore[master]: gsm: Fix comment for TCH/F4.8 code
by tnt 07 Jul '23

07 Jul '23
tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/33640 ) Change subject: gsm: Fix comment for TCH/F4.8 code ...................................................................... gsm: Fix comment for TCH/F4.8 code Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I62f6d0e9fec180138be5f37664969d56e79f3c13 --- M utils/conv_codes_gsm.py 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/33640/1 diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py index 721e546..62b5a0b 100644 --- a/utils/conv_codes_gsm.py +++ b/utils/conv_codes_gsm.py @@ -77,7 +77,7 @@ name = "tch_f48", description = [ "TCH/F4.8 convolutional code:", - "152 bits blocks, rate 1/3, k = 5", + "148 bits blocks, rate 1/3, k = 5", "G1 = 1 + D + D3 + D4", "G2 = 1 + D2 + D4", "G3 = 1 + D + D2 + D3 + D4", -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I62f6d0e9fec180138be5f37664969d56e79f3c13 Gerrit-Change-Number: 33640 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange
1 0
0 0
[M] Change in libosmocore[master]: gsm: Improve the TCH/H2.4 coding routines
by tnt 07 Jul '23

07 Jul '23
tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/33641 ) Change subject: gsm: Improve the TCH/H2.4 coding routines ...................................................................... gsm: Improve the TCH/H2.4 coding routines The spec isn't super clear, but basically the conv coding is done in two blocks of 72 bits. The way it's currently implemented isn't "wrong" in the sense it will produce correct output given no bit errors, but it's better to do the decoding in two blocks because this then it makes use of the fact we know the state of the encoder after the 72 bits, which improves the corrective ability of the code. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Id2551ffe2a0ebfd0a6df0e1d288a6f0af7e1eda7 --- M src/coding/gsm0503_coding.c M src/gsm/libosmogsm.map M utils/conv_codes_gsm.py 3 files changed, 50 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/41/33641/1 diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index 286981e..1249ce9 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -3480,15 +3480,10 @@ int gsm0503_tch_hr24_encode(ubit_t *bursts, const ubit_t *data) { ubit_t iB[22 * 114], cB[4 * 114]; - ubit_t conv[2 * 72 + 8]; - /* 3.7.2 Block code: d1(72) + pad(4) + d2(72) + pad(4) */ - memset(&conv[0], 0, sizeof(conv)); - memcpy(&conv[0], &data[0], 72); - memcpy(&conv[76], &data[72], 72); - - /* 3.7.3 Convolutional encoder: as specified for the TCH/F4.8 in subclause 3.4.3 */ - osmo_conv_encode(&gsm0503_tch_f48, &conv[0], &cB[0]); + /* 3.7.{1-3} Block code and Convolutional encoder */ + osmo_conv_encode(&gsm0503_tch_h24, &data[ 0], &cB[ 0]); + osmo_conv_encode(&gsm0503_tch_h24, &data[72], &cB[228]); /* 3.7.4 Interleaving: as specified for the TCH/F9.6 in subclause 3.3.4 */ memset(&iB[0], 0, sizeof(iB)); @@ -3511,8 +3506,8 @@ int gsm0503_tch_hr24_decode(ubit_t *data, const sbit_t *bursts, int *n_errors, int *n_bits_total) { + int n_errors_l[2], n_bits_total_l[2]; sbit_t iB[22 * 114], cB[4 * 114]; - ubit_t conv[120 + 32]; /* 3.7.5 Mapping on a burst: as specified for TCH/FS in subclause 3.1.4 */ for (unsigned int i = 0; i < 22; i++) { @@ -3523,12 +3518,15 @@ /* 3.7.4 Interleaving: as specified for the TCH/F9.6 in subclause 3.3.4 */ gsm0503_tch_f96_deinterleave(&cB[0], &iB[0]); - /* 3.7.3 Convolutional encoder: as specified for the TCH/F4.8 in subclause 3.4.3 */ - osmo_conv_decode_ber(&gsm0503_tch_f48, &cB[0], &conv[0], n_errors, n_bits_total); + /* 3.7.{1-3} Block code and Convolutional encoder */ + osmo_conv_decode_ber(&gsm0503_tch_h24, &cB[ 0], &data[ 0], &n_errors_l[0], &n_bits_total_l[0]); + osmo_conv_decode_ber(&gsm0503_tch_h24, &cB[228], &data[72], &n_errors_l[1], &n_bits_total_l[1]); - /* 3.7.2 Block code: d1(72) + pad(4) + d2(72) + pad(4) */ - memcpy(&data[0], &conv[0], 72); - memcpy(&data[72], &conv[76], 72); + if (n_errors) + *n_errors = n_errors_l[0] + n_errors_l[1]; + + if (n_bits_total) + *n_bits_total = n_bits_total_l[0] + n_bits_total_l[1]; return 2 * 72; } diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 609ee7e..0dfffd3 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -123,6 +123,7 @@ gsm0503_cs3_np; gsm0503_tch_fr; gsm0503_tch_f24; +gsm0503_tch_h24; gsm0503_tch_f48; gsm0503_tch_f96; gsm0503_tch_f144; diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py index 62b5a0b..24a8ee2 100644 --- a/utils/conv_codes_gsm.py +++ b/utils/conv_codes_gsm.py @@ -66,6 +66,24 @@ ] ), + # TCH/H2.4 definition + ConvolutionalCode( + 72, + [ + (G1, 1), + (G2, 1), + (G3, 1), + ], + name = "tch_h24", + description = [ + "TCH/H2.4 convolutional code:", + "72 bits blocks, rate 1/3, k = 5", + "G1 = 1 + D + D3 + D4", + "G2 = 1 + D2 + D4", + "G3 = 1 + D + D2 + D3 + D4", + ] + ), + # TCH/F4.8 definition ConvolutionalCode( 148, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id2551ffe2a0ebfd0a6df0e1d288a6f0af7e1eda7 Gerrit-Change-Number: 33641 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange
1 0
0 0
[S] Change in osmo-ttcn3-hacks[master]: library/RAN_Emulation: testcase.stop -> mtc.stop
by fixeria 07 Jul '23

07 Jul '23
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33630 ) Change subject: library/RAN_Emulation: testcase.stop -> mtc.stop ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: > It should be said that I definitely don't want to force using `f_shutdown` everywhere, especially us […] On the other hand, I find this `Stopping testcase execution from ...` logging very useful when investigating various issues. All in all, I am fine with this patch as it as, but would also welcome doing `setverdict(fail, ...); Misc_Helpers.f_shutdown(__BFILE__, __LINE__)`. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33630 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: I8923975f6cb48f5f628e2ac5dc412f0f3ab97aab Gerrit-Change-Number: 33630 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Jul 2023 13:39:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment
1 0
0 0
[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests: Add support for PCUIF protocol version 11
by dexter 07 Jul '23

07 Jul '23
dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33418 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: BTS_Tests: Add support for PCUIF protocol version 11 ...................................................................... BTS_Tests: Add support for PCUIF protocol version 11 The PCUIF protocol version 11 uses a more distinct (direct TLLI) way to signal PAGING COMMAND and IMMEDIATE ASSIGNMENT messages towards the PCU. Since OsmoBTS will soon fully support v.11 of the PCUIF protocol we need to add compatibility in the OsmoBTS TTCN3 testsuite early. We also have to stay compatible with older versions of OsmoBTS. The BTS_Tests.default config still sets up mp_pcuif_version to version 10, so this will be the default until we have full version 11 support in current master and latest. Related: OS#5927 Change-Id: I08de02e951e10bc8b4381cc2ad32e63f2747e3c4 --- M bts/BTS_Tests.ttcn M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn 3 files changed, 72 insertions(+), 18 deletions(-) Approvals: fixeria: Looks good to me, approved dexter: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index fddfcca..f59cc89 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5812,8 +5812,17 @@ f_l1_tune(L1CTL); f_TC_pcu_act_req(0, 0, 7, true); - /* three characters prefix: last 3 digits of IMSI as ASCII */ - f_pcu_data_req(0, 0, 7, 0, 0, PCU_IF_SAPI_PCH, '313233'O & c_PCU_DATA); + + if (mp_pcuif_version < 11) { + /* three characters prefix: last 3 digits of IMSI as ASCII */ + f_pcu_data_req(0, 0, 7, 0, 0, PCU_IF_SAPI_PCH, '313233'O & c_PCU_DATA); + } else { + var PCUIF_pch_dt pch_dt; + pch_dt.tlli := '01020304'O; + pch_dt.imsi := "00101000000000123"; + pch_dt.data := c_PCU_DATA; + f_pcu_data_req(0, 0, 7, 0, 0, PCU_IF_SAPI_PCH_DT, enc_PCUIF_pch_dt(pch_dt)); + } T.start; alt { diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn index f3e4810..0f850e9 100644 --- a/library/PCUIF_CodecPort.ttcn +++ b/library/PCUIF_CodecPort.ttcn @@ -15,6 +15,7 @@ import from PCUIF_Types all; import from UD_PortType all; import from UD_Types all; +import from General_Types all; type record PCUIF_send_data { PCUIF_Message data, @@ -139,18 +140,27 @@ } function f_PCUIF_tx_imm_ass_pch(PCUIF_CODEC_PT pt, integer conn_id, octetstring imm_ass, hexstring imsi, - uint8_t bts_nr := 0, boolean wait_for_cnf := true) return uint32_t { + uint8_t bts_nr := 0, boolean wait_for_cnf := true, OCT4 tlli := '01020304'O) return uint32_t { var PCUIF_send_data sd; timer T := 3.0; - /* append 3 last imsi digits so BTS can compute pagng group */ - var hexstring last_digits := substr(imsi, lengthof(imsi)-3, 3); - var octetstring prefix := ''O; - log("3 last imsi digits: ", last_digits); - for (var integer i := 0; i < 3; i := i+1) { - prefix := prefix & int2oct(hex2int('30'H) + hex2int(last_digits[i]), 1); - } - pt.send(t_SD_PCUIF(conn_id, + + if (mp_pcuif_version < 11) { + /* append 3 last imsi digits so that the BTS is able to compute paging group */ + var hexstring last_digits := substr(imsi, lengthof(imsi)-3, 3); + log("3 last imsi digits: ", last_digits); + var octetstring prefix := ''O; + for (var integer i := 0; i < 3; i := i+1) { + prefix := prefix & int2oct(hex2int('30'H) + hex2int(last_digits[i]), 1); + } + pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH, prefix & imm_ass))); + } else { + var PCUIF_pch_dt pch_dt; + pch_dt.tlli := tlli; + pch_dt.imsi := hex2str(imsi); + pch_dt.data := imm_ass; + pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH_DT, enc_PCUIF_pch_dt(pch_dt)))); + } /* Exit early when the caller is not interested in the confirmation message */ if (wait_for_cnf == false) { @@ -159,10 +169,23 @@ T.start; alt { - [] pt.receive(t_SD_PCUIF(conn_id, - tr_PCUIF_DATA_CNF(bts_nr, 0, 0, PCU_IF_SAPI_PCH))) -> value sd { - log("IMM.ASS was sent on fn ", sd.data.u.data_cnf.fn); - return sd.data.u.data_cnf.fn; + [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF(bts_nr, 0, 0, PCU_IF_SAPI_PCH))) -> value sd { + if (mp_pcuif_version >= 11) { + setverdict(fail, "expecting tr_PCUIF_DATA_CNF_DT in PCUIF v.11 or later"); + mtc.stop; + } else { + log("IMM.ASS was sent on fn ", sd.data.u.data_cnf.fn); + return sd.data.u.data_cnf.fn; + } + } + [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF_DT(bts_nr, 0, 0, PCU_IF_SAPI_PCH_DT))) -> value sd { + if (mp_pcuif_version < 11) { + setverdict(fail, "expecting tr_PCUIF_DATA_CNF in PCUIF v.10 or earlier"); + mtc.stop; + } else { + log("IMM.ASS was sent on fn ", sd.data.u.data_cnf_dt.fn); + return sd.data.u.data_cnf_dt.fn; + } } [] pt.receive { repeat; } [] T.timeout { diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 8f5d4eb..65d0c41 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -17,11 +17,11 @@ modulepar { /* PCUIF version supported by the IUT */ - PCUIF_Version mp_pcuif_version := 10; + PCUIF_Version mp_pcuif_version := 11; }; const charstring PCU_SOCK_DEFAULT := "/tmp/pcu_bts"; -type integer PCUIF_Version (9..10); /* supported versions */ +type integer PCUIF_Version (9..11); /* supported versions */ type enumerated PCUIF_MsgType { PCU_IF_MSG_DATA_REQ ('00'O), @@ -324,6 +324,9 @@ variant (data) "FIELDLENGTH(23)" }; +external function enc_PCUIF_pch_dt(in PCUIF_pch_dt pdu) return octetstring + with { extension "prototype(convert) encode(RAW)" }; + type union PCUIF_MsgUnion { PCUIF_data data_req, PCUIF_data data_cnf, @@ -374,7 +377,6 @@ external function dec_PCUIF_Message(in octetstring stream) return PCUIF_Message with { extension "prototype(convert) decode(RAW)" }; - /* Generic template for matching messages by type and/or the BTS number */ template PCUIF_Message tr_PCUIF_MSG(template PCUIF_MsgType msg_type := ?, template uint8_t bts_nr := ?) := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33418 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: I08de02e951e10bc8b4381cc2ad32e63f2747e3c4 Gerrit-Change-Number: 33418 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged
1 0
0 0
[S] Change in osmo-ttcn3-hacks[master]: library/RAN_Emulation: testcase.stop -> mtc.stop
by fixeria 07 Jul '23

07 Jul '23
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33630 ) Change subject: library/RAN_Emulation: testcase.stop -> mtc.stop ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I agree with fixeria that we should tend to use MISC_Helpers.f_shutdown when possible. It should be said that I definitely don't want to force using `f_shutdown` everywhere, especially using it to set the verdict (because we have `setverdict` for that). My concern was that doing `mtc.stop` sometimes causes DTEs due to port messages arriving on unconnected ports, and doing `all component.stop` in this function is supposed to avoid this. But in this specific case `self != mtc`, so as Oliver said it evaluates to `mtc.stop` anyway... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33630 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: I8923975f6cb48f5f628e2ac5dc412f0f3ab97aab Gerrit-Change-Number: 33630 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 07 Jul 2023 13:09:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 250
  • 251
  • 252
  • 253
  • 254
  • 255
  • 256
  • ...
  • 306
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.