April 2025 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: jobs/testsuites: move msc to testenv

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39942?usp=email ) Change subject: jobs/testsuites: move msc to testenv ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39942?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia5879b5eeca80f2aac5834ce757a5953e2af98b7 Gerrit-Change-Number: 39942 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Apr 2025 07:40:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[XS] Change in osmo-remsim[master]: Bump version: 1.1.0.2-6d24 → 1.1.1

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-remsim/+/39953?usp=email ) Change subject: Bump version: 1.1.0.2-6d24 → 1.1.1 ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Make a release with the patch that fixes currently crashing ttcn3-remsim-test-latest during RemsimClient_Tests.TC_bank_disconnect. Until recently (before converted to testenv) the RemsimClient_Tests testsuite didn't run in jenkins. -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/39953?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I7ba61e6fdd67f19950f3f5834bdc2fabe8d7a1c3 Gerrit-Change-Number: 39953 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 08 Apr 2025 06:09:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

4 months, 1 week

1
0
0 0

[XS] Change in osmo-remsim[master]: Bump version: 1.1.0.2-6d24 → 1.1.1

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/39953?usp=email ) Change subject: Bump version: 1.1.0.2-6d24 → 1.1.1 ...................................................................... Bump version: 1.1.0.2-6d24 → 1.1.1 Change-Id: I7ba61e6fdd67f19950f3f5834bdc2fabe8d7a1c3 --- M debian/changelog M src/Makefile.am 2 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/53/39953/1 diff --git a/debian/changelog b/debian/changelog index 3161642..1766907 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-remsim (1.1.1) unstable; urgency=medium + + * src/client/user_shell: add missing \n + * src/rspro_client_fsm: fix osmo_stream_cli_destroy + + -- Oliver Smith <osmith(a)sysmocom.de> Tue, 08 Apr 2025 08:05:08 +0200 + osmo-remsim (1.1.0) unstable; urgency=medium [ Harald Welte ] diff --git a/src/Makefile.am b/src/Makefile.am index 8a77f36..7a18c46 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,7 @@ $(OSMOCORE_CFLAGS) \ $(NULL) -RSPRO_LIBVERSION=2:1:0 +RSPRO_LIBVERSION=2:2:0 lib_LTLIBRARIES = libosmo-rspro.la libosmo_rspro_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RSPRO_LIBVERSION) # OSMONETIF_LIBS, OSMOGSM_LIBS not needed, we don't use any of its symbols, only the header above -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/39953?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I7ba61e6fdd67f19950f3f5834bdc2fabe8d7a1c3 Gerrit-Change-Number: 39953 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-testsuites-testenv: Add ttcn3-pcap-client-test-io_uring

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ci/+/39943?usp=email ) Change subject: jobs/ttcn3-testsuites-testenv: Add ttcn3-pcap-client-test-io_uring ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39943?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I817b4d27cd2e8faabf2ebb5ad28f025535571282 Gerrit-Change-Number: 39943 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Apr 2025 05:24:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: add/expect network-originated MT-Forward-SM.Err

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39951?usp=email to look at the new patch set (#3). Change subject: msc: add/expect network-originated MT-Forward-SM.Err ...................................................................... msc: add/expect network-originated MT-Forward-SM.Err The idea is to have two variants of the MT-Forward-SM.Err: * _MS: originated by the MS/UE (via RP-ERROR), * _NET: originated by the network (MSC) itself. In both testcase scenarios we expect the network to indicate the MT_FORWARD_SM_ERROR on its own, due to the lack of response from MS/UE. Use the right template kind for that, expect a specific Cause value. Change-Id: Ic27d943645fdff8d34f958e3bf16c8ee6e8368d2 Related: osmo-msc.git I51d92752471147e6d21a5059bebb0702b32642a5 Related: e9de1515 ("msc: add TC_gsup_mt_sms_{paging,conn}_timeout") Related: SYS#7323 --- M library/GSUP_Templates.ttcn M msc/MSC_Tests.ttcn 2 files changed, 39 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/39951/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39951?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic27d943645fdff8d34f958e3bf16c8ee6e8368d2 Gerrit-Change-Number: 39951 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library/gsup: distinguish GSUP_MT_FORWARD_SM_ERR_{MS,NET}

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39950?usp=email ) Change subject: library/gsup: distinguish GSUP_MT_FORWARD_SM_ERR_{MS,NET} ...................................................................... Abandoned Merged into https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39951. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39950?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I58e3566731d232b731b2c0be104d8a1098bbf21b Gerrit-Change-Number: 39950 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: add/expect network-originated MT-Forward-SM.Err

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39951?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: msc: add/expect network-originated MT-Forward-SM.Err ...................................................................... msc: add/expect network-originated MT-Forward-SM.Err The idea is to have two variants of the MT_FORWARD_SM_ERROR: * _MS: originated by the MS/UE (via RP-ERROR), * _NET: originated by the network itself. In both testcase scenarios we expect the network to indicate the MT_FORWARD_SM_ERROR on its own, due to the lack of response from MS/UE. Use the right template kind for that, expect a specific Cause value. Change-Id: Ic27d943645fdff8d34f958e3bf16c8ee6e8368d2 Related: osmo-msc.git I51d92752471147e6d21a5059bebb0702b32642a5 Related: e9de1515 ("msc: add TC_gsup_mt_sms_{paging,conn}_timeout") Related: SYS#7323 --- M library/GSUP_Templates.ttcn M msc/MSC_Tests.ttcn 2 files changed, 39 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/39951/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39951?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic27d943645fdff8d34f958e3bf16c8ee6e8368d2 Gerrit-Change-Number: 39951 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

4 months, 1 week

1
0
0 0

[M] Change in osmo-msc[master]: SMS-over-GSUP: send network-originated MT-forwardSM-Err

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/39952?usp=email ) Change subject: SMS-over-GSUP: send network-originated MT-forwardSM-Err ...................................................................... SMS-over-GSUP: send network-originated MT-forwardSM-Err When SMS-over-GSUP is enabled, there's currently no indication of failed MT SMS delivery due to paging timeout or connection issues. In such cases, the SMSC that initiated the MT-forwardSM-Req receives no response at all. This leaves the SMSC with no clear criterion for retrying delivery other than a generic timeout. So far, MT-forwardSM-Err was only sent when the MS/UE explicitly indicated an error (via RP-ERROR). This patch extends its use to also cover situations where no RP-ACK or RP-ERROR is received, allowing the network to notify the SMSC of delivery failure due to lower-layer issues. The key difference between the MS/UE-originated and network-originated MT-forwardSM-Err messages is presence/absence of the following IEs: * SM-RP-Cause IE -- indicated by the MS/UE, * Cause IE -- indicated by the network. Either of these IEs shall always be present. Change-Id: I51d92752471147e6d21a5059bebb0702b32642a5 Related: osmo-ttcn3-hacks.git Ief16753783e044911f1e3cef8d7012810d709e61 Related: osmo-ttcn3-hacks.git Ic27d943645fdff8d34f958e3bf16c8ee6e8368d2 Related: SYS#7323 --- M include/osmocom/msc/gsm_04_11_gsup.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_11.c M src/libmsc/gsm_04_11_gsup.c 4 files changed, 43 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/52/39952/1 diff --git a/include/osmocom/msc/gsm_04_11_gsup.h b/include/osmocom/msc/gsm_04_11_gsup.h index 9c8c7cf..602f9dc 100644 --- a/include/osmocom/msc/gsm_04_11_gsup.h +++ b/include/osmocom/msc/gsm_04_11_gsup.h @@ -14,6 +14,9 @@ int gsm411_gsup_mt_fwd_sm_res(struct gsm_trans *trans, uint8_t sm_rp_mr, const uint8_t *ui_buf, uint8_t ui_len); int gsm411_gsup_mt_fwd_sm_err(struct gsm_trans *trans, - uint8_t sm_rp_mr, uint8_t cause, const uint8_t *ui_buf, uint8_t ui_len); + uint8_t sm_rp_mr, + const int *net_cause, + const uint8_t *sm_rp_cause, + const uint8_t *ui_buf, uint8_t ui_len); int gsm411_gsup_rx(struct gsup_client_mux *gcm, void *data, const struct osmo_gsup_message *gsup_msg); diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index aa529e4..f891d2c 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -152,6 +152,7 @@ uint8_t *gsup_source_name; size_t gsup_source_name_len; + bool gsup_rsp_pending; } sms; struct { /** diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c index 209ca28..d45f1ea 100644 --- a/src/libmsc/gsm_04_11.c +++ b/src/libmsc/gsm_04_11.c @@ -43,6 +43,7 @@ #include <osmocom/gsm/gsm0411_utils.h> #include <osmocom/gsm/protocol/gsm_04_11.h> #include <osmocom/gsm/protocol/gsm_03_40.h> +#include <osmocom/gsm/protocol/gsm_04_08_gprs.h> #include <osmocom/msc/debug.h> #include <osmocom/msc/gsm_data.h> @@ -935,7 +936,11 @@ ui_buf = &(rph->data[ui_buf_idx]); } - return gsm411_gsup_mt_fwd_sm_err(trans, rph->msg_ref, cause, ui_buf, ui_len); + return gsm411_gsup_mt_fwd_sm_err(trans, + rph->msg_ref, + NULL, /* Cause (not indicated by network) */ + &cause, /* SM-RP-Cause (indicated by MS/UE) */ + ui_buf, ui_len); } if (!sms) { @@ -1284,6 +1289,7 @@ { struct gsm_trans *trans; struct msgb *msg; + int rc; /* Allocate a new transaction for MT SMS */ trans = gsm411_alloc_mt_trans(net, vsub); @@ -1325,9 +1331,13 @@ /* FIXME: MT SMS is not guaranteed to be delivered (e.g. the MS may be detached) */ rate_ctr_inc(rate_ctr_group_get_ctr(net->msc_ctrs, MSC_CTR_SMS_DELIVERED)); - return gsm411_rp_sendmsg(&trans->sms.smr_inst, msg, - GSM411_MT_RP_DATA_MT, trans->sms.sm_rp_mr, - GSM411_SM_RL_DATA_REQ); + rc = gsm411_rp_sendmsg(&trans->sms.smr_inst, msg, + GSM411_MT_RP_DATA_MT, + trans->sms.sm_rp_mr, + GSM411_SM_RL_DATA_REQ); + if (rc == 0) + trans->sms.gsup_rsp_pending = true; + return rc; } /* Entry point for incoming GSM48_PDISC_SMS from abis_rsl.c */ @@ -1435,6 +1445,17 @@ sms_free(trans->sms.sms); trans->sms.sms = NULL; } + + if (trans->net->sms_over_gsup) { + if (trans->sms.gsup_rsp_pending) { + const int net_cause = GMM_CAUSE_NET_FAIL; + gsm411_gsup_mt_fwd_sm_err(trans, + trans->sms.sm_rp_mr, + &net_cause, /* Cause IE (indicated by network) */ + NULL, /* SM-RP-Cause (not indicated by MS/UE) */ + NULL, 0 /* SM-RP-UI */); + } + } } /* Process incoming SAPI N-REJECT from BSC */ diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c index 4dcc302..0acd688 100644 --- a/src/libmsc/gsm_04_11_gsup.c +++ b/src/libmsc/gsm_04_11_gsup.c @@ -208,11 +208,16 @@ gsup_msg.sm_rp_ui = ui_buf; } + trans->sms.gsup_rsp_pending = false; + return gsup_client_mux_tx(trans->net->gcm, &gsup_msg); } int gsm411_gsup_mt_fwd_sm_err(struct gsm_trans *trans, - uint8_t sm_rp_mr, uint8_t cause, const uint8_t *ui_buf, uint8_t ui_len) + uint8_t sm_rp_mr, + const int *net_cause, /* indicated by network, may be NULL */ + const uint8_t *sm_rp_cause, /* indicated by MS/UE, may be NULL */ + const uint8_t *ui_buf, uint8_t ui_len) { struct osmo_gsup_message gsup_msg; @@ -230,8 +235,11 @@ gsup_msg.destination_name_len = trans->sms.gsup_source_name_len; gsup_client_mux_tx_set_source(trans->net->gcm, &gsup_msg); - /* SM-RP-Cause value */ - gsup_msg.sm_rp_cause = &cause; + /* SM-RP-Cause IE value (indicated by MS/UE) */ + gsup_msg.sm_rp_cause = sm_rp_cause; + /* Cause IE value (indicated by network) */ + if (net_cause != NULL) + gsup_msg.cause = (enum gsm48_gmm_cause)(*net_cause); /* include optional SM-RP-UI field if present */ if (ui_len) { @@ -239,6 +247,8 @@ gsup_msg.sm_rp_ui = ui_buf; } + trans->sms.gsup_rsp_pending = false; + return gsup_client_mux_tx(trans->net->gcm, &gsup_msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/39952?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I51d92752471147e6d21a5059bebb0702b32642a5 Gerrit-Change-Number: 39952 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library/gsup: distinguish GSUP_MT_FORWARD_SM_ERR_{MS,NET}

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39950?usp=email ) Change subject: library/gsup: distinguish GSUP_MT_FORWARD_SM_ERR_{MS,NET} ...................................................................... library/gsup: distinguish GSUP_MT_FORWARD_SM_ERR_{MS,NET} The idea is to have two variants of the MT_FORWARD_SM_ERROR: * _MS: originated by the MS/UE (via RP-ERROR), * _NET: originated by the network itself. The network-originated kind will be used to indicate unsuccessful delivery of a MT SMS in absence of response from the MS/UE. Change-Id: I58e3566731d232b731b2c0be104d8a1098bbf21b Related: SYS#7323 --- M library/GSUP_Templates.ttcn M msc/MSC_Tests.ttcn 2 files changed, 35 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/39950/1 diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn index cbe4566..327f7f6 100644 --- a/library/GSUP_Templates.ttcn +++ b/library/GSUP_Templates.ttcn @@ -1679,7 +1679,8 @@ } ); -template (value) GSUP_PDU ts_GSUP_MT_FORWARD_SM_ERR( +/* MT delivery error indicated by the MS/UE */ +template (value) GSUP_PDU ts_GSUP_MT_FORWARD_SM_ERR_MS( hexstring imsi, OCT1 sm_rp_mr, /* Message Reference, see GSM TS 04.11, 8.2.3 */ OCT1 sm_rp_cause /* RP-Cause value, see GSM TS 04.11, 8.2.5.4 */ @@ -1692,7 +1693,7 @@ valueof(ts_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS)) } ); -template GSUP_PDU tr_GSUP_MT_FORWARD_SM_ERR( +template GSUP_PDU tr_GSUP_MT_FORWARD_SM_ERR_MS( template hexstring imsi := ?, template OCT1 sm_rp_mr := ?, /* Message Reference, see GSM TS 04.11, 8.2.3 */ template OCT1 sm_rp_cause := ? /* RP-Cause value, see GSM TS 04.11, 8.2.5.4 */ @@ -1707,6 +1708,37 @@ } ); +/* MT delivery error indicated by the network */ +template (value) GSUP_PDU ts_GSUP_MT_FORWARD_SM_ERR_NET( + hexstring imsi, + OCT1 sm_rp_mr, /* Message Reference, see GSM TS 04.11, 8.2.3 */ + integer cause /* Cause (indicated by network) */ +) := ts_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR, + { + valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_Cause(cause)), + valueof(ts_GSUP_IE_SM_RP_MR(sm_rp_mr)), + /* Cause IE replaces the SM-RP-Cause IE */ + valueof(ts_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS)) + } +); +template GSUP_PDU tr_GSUP_MT_FORWARD_SM_ERR_NET( + template hexstring imsi := ?, + template OCT1 sm_rp_mr := ?, /* Message Reference, see GSM TS 04.11, 8.2.3 */ + template integer cause := ? /* Cause (indicated by network) */ +) := tr_GSUP( + OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR, + { + tr_GSUP_IE_IMSI(imsi), + tr_GSUP_IE_Cause(cause), + tr_GSUP_IE_SM_RP_MR(sm_rp_mr), + /* Cause IE replaces the SM-RP-Cause IE */ + tr_GSUP_IE_Message_Class(OSMO_GSUP_MESSAGE_CLASS_SMS), + tr_GSUP_IE_Source_Name(?) + } +); + template (value) GSUP_PDU ts_GSUP_MO_READY_FOR_SM_REQ( hexstring imsi, OCT1 sm_rp_mr, /* Message Reference, see GSM TS 04.11, 8.2.3 */ diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index a36dbb8..40cd9fd 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -2945,7 +2945,7 @@ /* Register an 'expect' for given IMSI (+TMSI) */ f_ran_register_imsi(g_pars.imsi, g_pars.tmsi); - var template GSUP_PDU mt_forwardSM_err := tr_GSUP_MT_FORWARD_SM_ERR( + var template GSUP_PDU mt_forwardSM_err := tr_GSUP_MT_FORWARD_SM_ERR_MS( imsi := g_pars.imsi, /* NOTE: MSC should assign RP-MR itself */ sm_rp_mr := ?, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39950?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I58e3566731d232b731b2c0be104d8a1098bbf21b Gerrit-Change-Number: 39950 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

4 months, 1 week

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: msc: expect network-originated MT_FORWARD_SM_ERR

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39951?usp=email ) Change subject: msc: expect network-originated MT_FORWARD_SM_ERR ...................................................................... msc: expect network-originated MT_FORWARD_SM_ERR In both testcase scenarios we expect the network to indicate the MT_FORWARD_SM_ERROR on its own, due to the lack of response from MS/UE. Use the right template kind for that, expect a specific Cause value. Change-Id: Ic27d943645fdff8d34f958e3bf16c8ee6e8368d2 Related: e9de1515 ("msc: add TC_gsup_mt_sms_{paging,conn}_timeout") Related: SYS#7323 --- M msc/MSC_Tests.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/39951/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 40cd9fd..492a551 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -3297,6 +3297,7 @@ /* Test sending of GSUP MT-forwardSM-Err if MS does not respond to paging */ friend function f_TC_gsup_mt_sms_paging_timeout(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + const integer cause := 17; /* GMM_CAUSE_NET_FAIL */ var SmsParameters spars := valueof(t_SmsPars); var boolean released := false; timer T; @@ -3321,9 +3322,8 @@ T.start(10.0 + 2.0); /* X4 + 2 seconds */ alt { /* Expect the MSC to indicate an error after paging timeout - * TODO: expect a specific SM-RP-Cause value * XXX: should we expect SM-RP-REF to be 'FF'O? */ - [] GSUP.receive(tr_GSUP_MT_FORWARD_SM_ERR(g_pars.imsi, ?, ?)); + [] GSUP.receive(tr_GSUP_MT_FORWARD_SM_ERR_NET(g_pars.imsi, ?, cause)); [] as_unexp_gsup_msg(); [] as_unexp_bssap_msg(); [] T.timeout { @@ -3343,6 +3343,7 @@ /* Test sending of GSUP MT-forwardSM-Err if MS does not send RP-ACK */ friend function f_TC_gsup_mt_sms_conn_timeout(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + const integer cause := 17; /* GMM_CAUSE_NET_FAIL */ var SmsParameters spars := valueof(t_SmsPars); var boolean released := false; timer T; @@ -3372,9 +3373,8 @@ T.start(5.0 + 2.0); /* X1 + 2 seconds */ alt { /* Expect the MSC to indicate an error after connection timeout - * TODO: expect a specific SM-RP-Cause value * XXX: should we expect SM-RP-REF to be 'FF'O? */ - [] GSUP.receive(tr_GSUP_MT_FORWARD_SM_ERR(g_pars.imsi, ?, ?)); + [] GSUP.receive(tr_GSUP_MT_FORWARD_SM_ERR_NET(g_pars.imsi, ?, cause)); /* Timeout of X1 (5s) will trigger connection release */ [not released] as_expect_clear() { released := true; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39951?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic27d943645fdff8d34f958e3bf16c8ee6e8368d2 Gerrit-Change-Number: 39951 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

4 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2025