- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: msc: test re-assignment to match codec with MT
by neels 21 Jun '24

21 Jun '24

Attention is currently required from: fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35053?usp=email ) Change subject: msc: test re-assignment to match codec with MT ...................................................................... Patch Set 4: Code-Review+2 (1 comment) Patchset: PS4: re-add +2 from patch set 3, after trivial commit log tweak -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35053?usp=email 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: I402ed0523a2a87b83f29c5577b2c828102005d53 Gerrit-Change-Number: 35053 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 21 Jun 2024 18:55:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: msc: split off f_mo_call_establish__handle_assignment_request()
by neels 21 Jun '24

21 Jun '24

Attention is currently required from: fixeria, laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35052?usp=email ) Change subject: msc: split off f_mo_call_establish__handle_assignment_request() ...................................................................... Patch Set 4: (1 comment) This change is ready for review. File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35052/comment/7836bb15_a208… PS2, Line 1690: valueof(ts_CodecFR > (wait, resolved too soon) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35052?usp=email 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: I98c6171a592dfe1573e15136c4ecf4ff234048d7 Gerrit-Change-Number: 35052 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 21 Jun 2024 18:54:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: msc: test re-assignment to match codec with MT
by neels 21 Jun '24

21 Jun '24

Attention is currently required from: fixeria, neels, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35053?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+2 by pespin, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: msc: test re-assignment to match codec with MT ...................................................................... msc: test re-assignment to match codec with MT Related: osmo-msc I8760feaa8598047369ef8c3ab2673013bac8ac8a Depends: osmo-msc I0f1e1a551aed545b555b9f236fc5967b1e4cc940 Change-Id: I402ed0523a2a87b83f29c5577b2c828102005d53 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 85 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/35053/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35053?usp=email 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: I402ed0523a2a87b83f29c5577b2c828102005d53 Gerrit-Change-Number: 35053 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: validate P-Preferred-Service in INVITE
by pespin 21 Jun '24

21 Jun '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37274?usp=email ) Change subject: asterisk: IMS: validate P-Preferred-Service in INVITE ...................................................................... asterisk: IMS: validate P-Preferred-Service in INVITE Change-Id: Iaa219d7b16965b27cd62ec27d810cb490dbc7a5a --- M asterisk/IMS_ConnectionHandler.ttcn M library/SIP_Templates.ttcn 2 files changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/37274/1 diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 4f87f95..69e8abf 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -466,6 +466,37 @@ } } +/* Validate P-Preferred-Service: GSMA FCM.01 3.2.3.3 */ +private function f_ims_validate_invite_P_Preferred_Service(PDU_SIP_Request req, + boolean exp_present := true) runs on IMS_ConnHdlr + +{ + if (not exp_present) { + if (ispresent(g_rx_sip_req.msgHeader.p_preferred_service)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received unexpected [rfc6050] P-Preferred-Service := ", + g_rx_sip_req.msgHeader.p_preferred_service)); + } + return; + } + + /* exp_present: */ + var template (present) P_Preferred_Service expl_tmpl := + tr_P_Preferred_Service({ "urn:urn-7:3gpp-service.ims.icsi.mmtel" }); + + if (not ispresent(g_rx_sip_req.msgHeader.p_preferred_service)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received no P-Access-Info vs exp := ", + expl_tmpl)); + } + if (not match(g_rx_sip_req.msgHeader.p_preferred_service, expl_tmpl)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received unexpected P-Preferred-Service := ", + g_rx_sip_req.msgHeader.p_preferred_service, + "\nvs exp := ", expl_tmpl)); + } +} + /* GSMA IR.92 2.2.4 Call Establishment and Termination */ private function f_ims_validate_INVITE_SDP(SDP_Message sdp) runs on IMS_ConnHdlr { @@ -1344,6 +1375,7 @@ via := g_rx_sip_req.msgHeader.via; f_ims_validate_register_P_Access_Network_info(g_rx_sip_req, exp_present := true); + f_ims_validate_invite_P_Preferred_Service(g_rx_sip_req, exp_present := true); f_ims_validate_INVITE_Contact(g_rx_sip_req.msgHeader.contact); f_ims_validate_INVITE_SDP(g_pars.subscr.cp.peer_sdp); diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index d0210d1..ce5998b 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -284,6 +284,12 @@ p_assoc_uris := p_assoc_uris } +// [RFC6050] +template (present) P_Preferred_Service tr_P_Preferred_Service(template (present) Service_ID_List p_ps := ?) := { + fieldName := P_PREFERRED_SERVICE_E, + p_ps := p_ps +} + // RFC 3262 template (value) RAck ts_RAck(template (value) integer response_num, template (value) integer seq_nr, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37274?usp=email 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: Iaa219d7b16965b27cd62ec27d810cb490dbc7a5a Gerrit-Change-Number: 37274 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: validate ICSI present in INVITE Contact header
by pespin 21 Jun '24

21 Jun '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37273?usp=email ) Change subject: asterisk: IMS: validate ICSI present in INVITE Contact header ...................................................................... asterisk: IMS: validate ICSI present in INVITE Contact header Related: SYS#6984 Change-Id: I630f0aaef0436ea1c12e8fffef7a5c657cfcc35c --- M asterisk/IMS_ConnectionHandler.ttcn 1 file changed, 16 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/37273/1 diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 58ca87a..4f87f95 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -452,13 +452,16 @@ } for (var integer i := 0; i < lengthof(caddrs); i := i + 1) { var ContactAddress caddr := caddrs[i]; - /* "The UE must include the audio media feature tag, as defined in IETF RFC 3840, - * in the Contact header field of the SIP INVITE request, and in the Contact header - * field of the SIP response to the SIP INVITE request" */ if (not ispresent(caddr.contactParams)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(g_name & ": Received unexpected empty Contact attributes (omit)")); } + /* GSMA FCM.01 3.2.3.3: "The INVITE request contains Within the Contact header [...] the IMS + * Communication Service Identifier's (ICSI) for IMS Multimedia Telephony" */ + f_sip_param_match_value_or_fail(caddr.contactParams, "+g.3gpp.icsi-ref", "\"urn\\%3Aurn-7\\%3A3gpp-service.ims.icsi.mmtel\""); + /* "The UE must include the audio media feature tag, as defined in IETF RFC 3840, + * in the Contact header field of the SIP INVITE request, and in the Contact header + * field of the SIP response to the SIP INVITE request" */ f_sip_param_match_value_or_fail(caddr.contactParams, "audio", omit); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37273?usp=email 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: I630f0aaef0436ea1c12e8fffef7a5c657cfcc35c Gerrit-Change-Number: 37273 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-msc[master]: do not invoke two Assignments (fixup for re-assignment)
by pespin 21 Jun '24

21 Jun '24

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/37272?usp=email ) Change subject: do not invoke two Assignments (fixup for re-assignment) ...................................................................... Patch Set 1: Code-Review+1 (2 comments) Patchset: PS1: This patch may actually be more clear if you spit it into 2 steps (no need to really the change the code I think). In any case, explaining here to make sure I got it right: 1- Implement tear down due to Assignment timeout (the timer thing you added) 2- Avoid invoking concurrent Assignments (actually 2-3 line patch) File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/37272/comment/7bf3ccde_c7e1f871 PS1, Line 962: osmo_timer_del(&msc_a->cc.assignment_request_pending); is it fine calling osmo_timer_del for a timer object which may not have gone through osmo_timer_setup() (line 694) ? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/37272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f1e1a551aed545b555b9f236fc5967b1e4cc940 Gerrit-Change-Number: 37272 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 21 Jun 2024 17:59:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-msc[master]: do not invoke two Assignments (fixup for re-assignment)
by neels 21 Jun '24

21 Jun '24

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/37272?usp=email ) Change subject: do not invoke two Assignments (fixup for re-assignment) ...................................................................... do not invoke two Assignments (fixup for re-assignment) Make sure we wait for Assignment responses before dispatching an Assignment Request towards RAN. In particular, when the remote call leg sends its codecs, we may trigger Re-Assignment to match that codec. Make sure this is done only once: when receiving another SDP message, wait for the first Assignment. Implement as an osmo_timer, since there still is no osmo_fsm implementation for Assignment nor for CC trans FSM. Also it doesn't belong in the msc_a FSM (it should remain in state COMMUNICATING). Without this patch, new ttcn3 test TC_lu_and_mo_call_reass_for_mt_codec sporadically fails, if MNCC with SDP falls in-between Assignment Request and Assignment Complete. Related: osmo-msc d767c73a1f93253a54d6a8650a4cf2143353bba0 == I8760feaa8598047369ef8c3ab2673013bac8ac8a Related: osmo-ttcn3-hacks I402ed0523a2a87b83f29c5577b2c828102005d53 Change-Id: I0f1e1a551aed545b555b9f236fc5967b1e4cc940 --- M include/osmocom/msc/msc_a.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_a.c M src/libmsc/ran_infra.c 4 files changed, 75 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/72/37272/1 diff --git a/include/osmocom/msc/msc_a.h b/include/osmocom/msc/msc_a.h index a5b624c..d180e38 100644 --- a/include/osmocom/msc/msc_a.h +++ b/include/osmocom/msc/msc_a.h @@ -137,6 +137,8 @@ /* There may be up to 7 incoming calls for this subscriber. This is the currently serviced voice call, * as in, the other person the subscriber is currently talking to. */ struct gsm_trans *active_trans; + + struct osmo_timer_list assignment_request_pending; } cc; struct msc_ho_state ho; diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 63b1699..fc4f730 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -772,7 +772,8 @@ const struct gsm_mncc_bearer_cap *bcap) { struct codec_filter *codecs = &trans->cc.codecs; - struct call_leg *cl = trans->msc_a ? trans->msc_a->cc.call_leg : NULL; + struct msc_a *msc_a = trans->msc_a; + struct call_leg *cl = msc_a ? msc_a->cc.call_leg : NULL; struct rtp_stream *rtp_cn = cl ? cl->rtp[RTP_TO_CN] : NULL; if (sdp[0]) { @@ -818,6 +819,16 @@ return; } + if (msc_a && osmo_timer_pending(&msc_a->cc.assignment_request_pending)) { + /* Still waiting for an Assignment Response. + * For example, when the remote call leg sends some MNCC with SDP with a mismatching codec, + * we start Re-Assignment to match that codec: we send an Assignment Request and wait for a response. + * When we receive another MNCC with SDP from the remote call leg before this Re-Assignment is + * completed, we must not trigger *another* Assignment Request, but instead wait for the Re-Assignment + * to come back with a response first. */ + return; + } + /* We've already completed Assignment of a voice channel (some time ago), and now the remote side has changed * to a mismatching codec (list). Try to re-assign this side to a matching codec. */ LOG_TRANS(trans, LOGL_INFO, "Remote call leg mismatches assigned codec: %s\n", diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index bff5e67..2e88a32 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -673,6 +673,8 @@ rtp_to_ran->codecs_known ? &rtp_to_ran->codecs : NULL, NULL); } +static void assignment_request_timeout_cb(void *data); + /* The MGW has given us a local IP address for the RAN side. Ready to start the Assignment of a voice channel. */ void msc_a_tx_assignment_cmd(struct msc_a *msc_a) { @@ -680,6 +682,19 @@ struct gsm_trans *cc_trans = msc_a->cc.active_trans; struct gsm0808_channel_type channel_type; + /* Do not dispatch another Assignment Command before an earlier assignment is completed. This is a sanity + * safeguard, ideally callers should not even invoke this function when an Assignment is already ongoing. + * (There is no osmo_fsm for Assignment / the CC trans code; when we refactor that one day, this timer should be + * an FSM state.) */ + if (osmo_timer_pending(&msc_a->cc.assignment_request_pending)) { + LOG_MSC_A(msc_a, LOGL_ERROR, + "Not transmitting Assignment, still waiting for the response to an earlier Assignment\n"); + return; + } + osmo_timer_setup(&msc_a->cc.assignment_request_pending, assignment_request_timeout_cb, msc_a); + osmo_timer_schedule(&msc_a->cc.assignment_request_pending, + osmo_tdef_get(msc_a->c.ran->tdefs, -37, OSMO_TDEF_S, 10), 0); + if (!cc_trans) { LOG_MSC_A(msc_a, LOGL_ERROR, "No CC transaction active\n"); call_leg_release(msc_a->cc.call_leg); @@ -943,6 +958,9 @@ vlr_subscr_enable_expire_lu(vsub); } + /* We no longer care about assignment responses. */ + osmo_timer_del(&msc_a->cc.assignment_request_pending); + /* If we're closing in a middle of a trans, we need to clean up */ trans_conn_closed(msc_a); @@ -1051,6 +1069,7 @@ vsub->msc_conn_ref = NULL; osmo_timer_del(&msc_a->lu_delay_timer); + osmo_timer_del(&msc_a->cc.assignment_request_pending); } const struct value_string msc_a_fsm_event_names[] = { @@ -1479,6 +1498,9 @@ const struct gsm0808_speech_codec *codec_if_known = ac->assignment_complete.codec_present ? &ac->assignment_complete.codec : NULL; + /* Pending assignment has worked out. We're no longer waiting for a response now. */ + osmo_timer_del(&msc_a->cc.assignment_request_pending); + /* For a voice group call, handling is performed by VGCS FSM */ gcc_trans = trans_find_by_type(msc_a, TRANS_GCC); if (gcc_trans) { @@ -1582,10 +1604,15 @@ } } +/* Invoked when Assignment has failed, either by a failure response, or by timeout. When failing on timeout, + * pass af == NULL. */ static void msc_a_up_call_assignment_failure(struct msc_a *msc_a, const struct ran_msg *af) { struct gsm_trans *trans; + /* Pending assignment has failed. We're no longer waiting for a response now. */ + osmo_timer_del(&msc_a->cc.assignment_request_pending); + /* For a normal voice call, there will be an rtp_stream FSM. */ if (msc_a->cc.call_leg && msc_a->cc.call_leg->rtp[RTP_TO_RAN]) { LOG_MSC_A(msc_a, LOGL_ERROR, "Assignment Failure, releasing call\n"); @@ -1617,6 +1644,12 @@ msc_a_release_cn(msc_a); } +static void assignment_request_timeout_cb(void *data) +{ + struct msc_a *msc_a = data; + msc_a_up_call_assignment_failure(msc_a, NULL); +} + static void msc_a_up_classmark_update(struct msc_a *msc_a, const struct osmo_gsm48_classmark *classmark, struct osmo_gsm48_classmark *dst) { diff --git a/src/libmsc/ran_infra.c b/src/libmsc/ran_infra.c index 79de7d2..0656cca 100644 --- a/src/libmsc/ran_infra.c +++ b/src/libmsc/ran_infra.c @@ -47,6 +47,8 @@ { .T = -36, .default_val = 0, .unit = OSMO_TDEF_MS, \ .desc = "Delay connection release after LU. Useful to optimize an SMSC to dispatch " \ "pending messages within the initial connection." }, \ + { .T = -37, .default_val = 10, \ + .desc = "Voice channel Assignment sanity timeout, when no response is received (should never happen)." }, \ struct osmo_tdef msc_tdefs_geran[] = { RAN_TDEFS -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/37272?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0f1e1a551aed545b555b9f236fc5967b1e4cc940 Gerrit-Change-Number: 37272 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: validate sendrecv audio attr in INVITE SDP
by pespin 21 Jun '24

21 Jun '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37271?usp=email ) Change subject: asterisk: IMS: validate sendrecv audio attr in INVITE SDP ...................................................................... asterisk: IMS: validate sendrecv audio attr in INVITE SDP Related: SYS#6984 Change-Id: I52f421a8168f6f55e182409751ec537c0f5147a8 --- M asterisk/IMS_ConnectionHandler.ttcn M library/SDP_Templates.ttcn 2 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/71/37271/1 diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index b9a9852..58ca87a 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -463,6 +463,22 @@ } } +/* GSMA IR.92 2.2.4 Call Establishment and Termination */ +private function f_ims_validate_INVITE_SDP(SDP_Message sdp) runs on IMS_ConnHdlr +{ + /* "The UE must indicate in the SDP of the initial INVITE that the audio media + * is send-receive i.e. either by including the direction attribute "a=sendrecv" + * or by omitting the direction attributes. */ + if (ispresent(sdp.attributes)) { + if (match (sdp.attributes, superset(tr_SDP_recvonly)) or + match (sdp.attributes, superset(tr_SDP_sendonly))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Unexpected SDP direction attribute != sendrecv: ", + sdp.attributes)); + } + } +} + private function f_ims_parse_security_client(Security_client security_client) runs on IMS_ConnHdlr { var boolean found := false; @@ -1326,6 +1342,7 @@ f_ims_validate_register_P_Access_Network_info(g_rx_sip_req, exp_present := true); f_ims_validate_INVITE_Contact(g_rx_sip_req.msgHeader.contact); + f_ims_validate_INVITE_SDP(g_pars.subscr.cp.peer_sdp); if (g_pars.subscr.cp.require_precondition_ext and not peer_support_precondition) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, diff --git a/library/SDP_Templates.ttcn b/library/SDP_Templates.ttcn index ece6147..ef91953 100644 --- a/library/SDP_Templates.ttcn +++ b/library/SDP_Templates.ttcn @@ -147,6 +147,14 @@ } } +template (present) SDP_attribute tr_SDP_recvonly := { + recvonly := {} +} + +template (present) SDP_attribute tr_SDP_sendonly := { + sendonly := {} +} + /* rfc3312 */ const charstring c_SDP_PRECON_TYPE_qos := "qos"; const charstring c_SDP_PRECON_STRENGTH_TAG_mandatory := "mandatory"; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37271?usp=email 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: I52f421a8168f6f55e182409751ec537c0f5147a8 Gerrit-Change-Number: 37271 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw
by fixeria 21 Jun '24

21 Jun '24

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37270?usp=email ) Change subject: ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw ...................................................................... Patch Set 1: (1 comment) File ttcn3-s1gw-test/S1GW_Tests.cfg: https://gerrit.osmocom.org/c/docker-playground/+/37270/comment/f8ee1812_1c8… PS1, Line 10: S1GW_Tests.mp_s1gw_enb_ip := "172.18.10.100"; > My understanding is of this patch is that since we asked you drop the multiple interface changes to the docker setup, you decided to move back to use the same IP address for both sides. Ack. > It's fine to keep using the same IP address, but if you really need/want to test with multiple addresses, you can do so in the docker setup too, by adding an intermediate .sh script which does "ip addr add A.B.C.D". This requires `iproute2` package, which is sadly missing in the base `docker` image and in the `debian-bookworm-erlang` we build on top of it. I see you're installing it in `osmo-epdg-master/Dockerfile`, and I could just do the same, but how about installing it in `debian-bookworm-erlang` (in which we already install pkgs like `vim`, `netcat`, `wget`)? Would you CR+ such a patch? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37270?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I109a5feaca5acf050008e883cc8b4e1e28beebab Gerrit-Change-Number: 37270 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 21 Jun 2024 16:42:19 +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 docker-playground[master]: ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw
by pespin 21 Jun '24

21 Jun '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37270?usp=email ) Change subject: ttcn3-s1gw-test: fix using unassigned addr for osmo-s1gw ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File ttcn3-s1gw-test/S1GW_Tests.cfg: https://gerrit.osmocom.org/c/docker-playground/+/37270/comment/91b29da7_b14… PS1, Line 10: S1GW_Tests.mp_s1gw_enb_ip := "172.18.10.100"; My understanding is of this patch is that since we asked you drop the multiple interface changes to the docker setup, you decided to move back to use the same IP address for both sides. It's fine to keep using the same IP address, but if you really need/want to test with multiple addresses, you can do so in the docker setup too, by adding an intermediate .sh script which does "ip addr add A.B.C.D". We do that already in several testsuites like PGW, ePDG, Asterisk, etc. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37270?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I109a5feaca5acf050008e883cc8b4e1e28beebab Gerrit-Change-Number: 37270 Gerrit-PatchSet: 1 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: Fri, 21 Jun 2024 16:29:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log