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

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Expect P-Early-Media supported in MO INVITE

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37325?usp=email ) Change subject: asterisk: IMS: Expect P-Early-Media supported in MO INVITE ...................................................................... asterisk: IMS: Expect P-Early-Media supported in MO INVITE Change-Id: I21f2c84b50be9b16fc45fa1fe72af40d715ee883 --- M asterisk/IMS_ConnectionHandler.ttcn M library/SIP_Templates.ttcn 2 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/37325/1 diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 1305e1d..51f96ea 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -1413,6 +1413,7 @@ tr_Via_from(f_tr_HostPort(g_pars.subscr.remote_sip_host, g_pars.subscr.ipsec_remote_port_s)), ?, accept := tr_Accept(superset(tr_AcceptBody("application/sdp"), tr_AcceptBody("application/3gpp-ims+xml"))), + p_early_media := tr_P_Early_Media(superset("supported")), supported := tr_Supported(superset("timer")), body := ?); var charstring sip_expect_str := log2str(exp_req); @@ -1516,6 +1517,7 @@ g_pars.subscr.cp.to_addr, invite_via, g_pars.subscr.cp.sip_seq_nr, + p_early_media := ts_P_Early_Media({"recvonly"}), rseq := ts_RSeq(1), body := tx_sdp); SIP.send(tx_resp); diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index bfb3655..3d2112c 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -325,6 +325,16 @@ p_assoc_uris := p_assoc_uris } +// RFC5009 +template (present) P_Early_Media tr_P_Early_Media(template Em_param_List em_param_list := *) := { + fieldName := P_EARLY_MEDIA_E, + em_param_list := em_param_list +} +template (value) P_Early_Media ts_P_Early_Media(template (omit) Em_param_List em_param_list := omit) := { + fieldName := P_EARLY_MEDIA_E, + em_param_list := em_param_list +} + // [RFC6050] template (present) P_Preferred_Service tr_P_Preferred_Service(template (present) Service_ID_List p_ps := ?) := { fieldName := P_PREFERRED_SERVICE_E, @@ -738,6 +748,7 @@ template (omit) MinExpires minExpires := omit, template (omit) Min_SE min_SE := omit, template (omit) P_Associated_Uri p_associated_uri := omit, + template (omit) P_Early_Media p_early_media := omit, template (omit) RAck rack := omit, template (omit) Require require := omit, template (omit) RSeq rseq := omit, @@ -769,6 +780,7 @@ minExpires := minExpires, min_SE := min_SE, p_associated_uri := p_associated_uri, + p_Early_Media := p_early_media, rack := rack, require := require, rseq := rseq, @@ -799,6 +811,7 @@ template Expires expires := *, template Min_SE min_SE := *, template P_Associated_Uri p_associated_uri := *, + template P_Early_Media p_early_media := *, template RAck rack := *, template Require require := *, template RSeq rseq := *, @@ -829,6 +842,7 @@ fromField := from_addr, min_SE := min_SE, p_associated_uri := p_associated_uri, + p_Early_Media := p_early_media, rack := rack, require := require, rseq := rseq, @@ -905,6 +919,7 @@ template (value) Contact contact, integer seq_nr, template (omit) Accept accept := omit, + template (omit) P_Early_Media p_early_media := omit, template (omit) Min_SE min_SE := omit, template (omit) Session_expires session_expires := omit, template (omit) Supported supported := omit, @@ -917,6 +932,7 @@ content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), accept := accept, min_SE := min_SE, + p_early_media := p_early_media, session_expires := session_expires, supported := supported), messageBody := body, @@ -930,6 +946,7 @@ template Via via := tr_Via_from(f_tr_HostPort_opt_defport(?)), template integer seq_nr, template Accept accept := *, + template P_Early_Media p_early_media := *, template Min_SE min_SE := *, template Session_expires session_expires := *, template Supported supported := *, @@ -939,6 +956,7 @@ via, "INVITE", seq_nr, accept := accept, min_SE := min_SE, + p_early_media := p_early_media, session_expires := session_expires), messageBody := body, payload := omit @@ -1185,6 +1203,7 @@ Via via, integer seq_nr, charstring method := "INVITE", + template (omit) P_Early_Media p_early_media := omit, template (omit) Require require := ts_Require({"100rel", "precondition"}), template (omit) RSeq rseq := ts_RSeq(1), template (omit) charstring body := omit) := { @@ -1193,6 +1212,7 @@ via, content_length := f_ContentLength(body), content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), + p_early_media := p_early_media, require := require, rseq := rseq), messageBody := body, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37325?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: I21f2c84b50be9b16fc45fa1fe72af40d715ee883 Gerrit-Change-Number: 37325 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: SIP: Fix INVITE template use

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37323?usp=email ) Change subject: asterisk: SIP: Fix INVITE template use ...................................................................... asterisk: SIP: Fix INVITE template use New optional parameters for extra headers were added to tr_SIP_INVITE, but this user was not updated to keep the previous logic. Change-Id: I98b23533f35ffa09f488cb520ed9282935793408 --- M asterisk/SIP_ConnectionHandler.ttcn 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/asterisk/SIP_ConnectionHandler.ttcn b/asterisk/SIP_ConnectionHandler.ttcn index 3bc4f1d..0cb6167 100644 --- a/asterisk/SIP_ConnectionHandler.ttcn +++ b/asterisk/SIP_ConnectionHandler.ttcn @@ -564,7 +564,8 @@ tr_From(tr_Addr_Union_from_val(g_pars.cp.calling.addr), *), tr_To(tr_Addr_Union_from_val(g_pars.cp.called.addr), *), tr_Via_from(f_tr_HostPort(g_pars.remote_sip_host, g_pars.remote_sip_port)), - ?, ?); + ?, + body := ?); var charstring sip_expect_str := log2str(exp_req); [] SIP.receive(exp_req) -> value g_rx_sip_req { @@ -695,7 +696,7 @@ g_pars.cp.to_addr, tr_Via_from(f_tr_HostPort(g_pars.remote_sip_host, g_pars.remote_sip_port)), exp_seq_nr, - ?); + body := ?); var charstring sip_expect_str := log2str(exp_req); [] SIP.receive(exp_req) -> value g_rx_sip_req { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37323?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: I98b23533f35ffa09f488cb520ed9282935793408 Gerrit-Change-Number: 37323 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: fix SDP precondition validation

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37322?usp=email ) Change subject: asterisk: IMS: fix SDP precondition validation ...................................................................... asterisk: IMS: fix SDP precondition validation Change-Id: I8e22f76f7c0a8e6fda70252b330b1b174ca5c66f --- M asterisk/IMS_ConnectionHandler.ttcn M library/SDP_Templates.ttcn 2 files changed, 39 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 32c129e..1305e1d 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -1200,9 +1200,12 @@ f_tr_Via_response(via), g_pars.subscr.cp.sip_seq_nr, "INVITE", require := tr_Require(superset("100rel", "precondition")), - rseq := tr_RSeq(?)); + rseq := tr_RSeq(?), + body := ?); alt { - [] SIP.receive(exp) -> value g_rx_sip_resp; + [] SIP.receive(exp) -> value g_rx_sip_resp { + f_SDP_decodeMessage(g_rx_sip_resp.messageBody, g_pars.subscr.cp.peer_sdp); + }; [] SIP.receive(tr_SIP_Response_Ringing(?, ?, ?)) -> value g_rx_sip_resp { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(g_name & ": Expected 183 Session Progress instead of 180 Ringing: ", @@ -1223,11 +1226,11 @@ tr_SDP_des(c_SDP_PRECON_STRENGTH_TAG_mandatory, c_SDP_PRECON_STATUS_TYPE_local, c_SDP_PRECON_DIR_TAG_sendrecv), tr_SDP_des(c_SDP_PRECON_STRENGTH_TAG_mandatory, c_SDP_PRECON_STATUS_TYPE_remote, c_SDP_PRECON_DIR_TAG_sendrecv), tr_SDP_conf(c_SDP_PRECON_STATUS_TYPE_remote, c_SDP_PRECON_DIR_TAG_sendrecv)); - if (not ispresent(g_pars.subscr.cp.peer_sdp.attributes) or - not match(g_pars.subscr.cp.peer_sdp.attributes, preconds)) { + if (not ispresent(g_pars.subscr.cp.peer_sdp.media_list[0].attributes) or + not match(g_pars.subscr.cp.peer_sdp.media_list[0].attributes, preconds)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(g_name & ": Unexpected precondition attrs in Session Progress : ", - g_pars.subscr.cp.peer_sdp.attributes)); + g_pars.subscr.cp.peer_sdp.media_list[0].attributes)); } /* Tx PRACK */ @@ -1294,11 +1297,11 @@ tr_SDP_curr(c_SDP_PRECON_STATUS_TYPE_remote, c_SDP_PRECON_DIR_TAG_sendrecv), tr_SDP_des(c_SDP_PRECON_STRENGTH_TAG_mandatory, c_SDP_PRECON_STATUS_TYPE_local, c_SDP_PRECON_DIR_TAG_sendrecv), tr_SDP_des(c_SDP_PRECON_STRENGTH_TAG_mandatory, c_SDP_PRECON_STATUS_TYPE_remote, c_SDP_PRECON_DIR_TAG_sendrecv)); - if (not ispresent(g_pars.subscr.cp.peer_sdp.attributes) or - not match(g_pars.subscr.cp.peer_sdp.attributes, preconds)) { + if (not ispresent(g_pars.subscr.cp.peer_sdp.media_list[0].attributes) or + not match(g_pars.subscr.cp.peer_sdp.media_list[0].attributes, preconds)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(g_name & ": Unexpected precondition attrs in 200 OK (UPDATE): ", - g_pars.subscr.cp.peer_sdp.attributes)); + g_pars.subscr.cp.peer_sdp.media_list[0].attributes)); } g_pars.subscr.cp.sip_seq_nr := g_rx_sip_resp.msgHeader.cSeq.seqNumber + 1; @@ -1498,11 +1501,12 @@ tr_SDP_curr(c_SDP_PRECON_STATUS_TYPE_remote, c_SDP_PRECON_DIR_TAG_none), tr_SDP_des(c_SDP_PRECON_STRENGTH_TAG_mandatory, c_SDP_PRECON_STATUS_TYPE_local, c_SDP_PRECON_DIR_TAG_sendrecv), tr_SDP_des(c_SDP_PRECON_STRENGTH_TAG_optional, c_SDP_PRECON_STATUS_TYPE_remote, c_SDP_PRECON_DIR_TAG_sendrecv)); - if (not ispresent(g_pars.subscr.cp.peer_sdp.attributes) or - not match(g_pars.subscr.cp.peer_sdp.attributes, preconds)) { + if (not ispresent(g_pars.subscr.cp.peer_sdp.media_list[0].attributes) or + not match(g_pars.subscr.cp.peer_sdp.media_list[0].attributes, preconds)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(g_name & ": Unexpected precondition attrs in INVITE : ", - g_pars.subscr.cp.peer_sdp.attributes)); + g_pars.subscr.cp.peer_sdp.media_list[0].attributes, + " vs exp: ", preconds)); } /* Tx 183 Session Progress */ @@ -1549,6 +1553,7 @@ supported := tr_Supported(superset("100rel", "timer")), body := ?); as_SIP_expect_req(exp_req); + f_SDP_decodeMessage(g_rx_sip_req.messageBody, g_pars.subscr.cp.peer_sdp); /* Validate SDP in UPDATE contains the preconditions: * a=curr:qos local sendrecv @@ -1561,11 +1566,12 @@ tr_SDP_curr(c_SDP_PRECON_STATUS_TYPE_remote, c_SDP_PRECON_DIR_TAG_none), tr_SDP_des(c_SDP_PRECON_STRENGTH_TAG_mandatory, c_SDP_PRECON_STATUS_TYPE_local, c_SDP_PRECON_DIR_TAG_sendrecv), tr_SDP_des(c_SDP_PRECON_STRENGTH_TAG_mandatory, c_SDP_PRECON_STATUS_TYPE_remote, c_SDP_PRECON_DIR_TAG_sendrecv)); - if (not ispresent(g_pars.subscr.cp.peer_sdp.attributes) or - not match(g_pars.subscr.cp.peer_sdp.attributes, preconds)) { + if (not ispresent(g_pars.subscr.cp.peer_sdp.media_list[0].attributes) or + not match(g_pars.subscr.cp.peer_sdp.media_list[0].attributes, preconds)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(g_name & ": Unexpected precondition attrs in UPDATE: ", - g_pars.subscr.cp.peer_sdp.attributes)); + g_pars.subscr.cp.peer_sdp.media_list[0].attributes, + " vs exp: ", preconds)); } /* Tx 200 OK (UPDATE) */ @@ -1588,13 +1594,13 @@ tx_sdp := omit; } else { /* Check no precondition is sent in SDP */ - if (ispresent(g_pars.subscr.cp.peer_sdp.attributes) and - match (g_pars.subscr.cp.peer_sdp.attributes, superset(tr_SDP_curr_present, - tr_SDP_des_present, - tr_SDP_conf_present))) { + if (ispresent(g_pars.subscr.cp.peer_sdp.media_list[0].attributes) and + match (g_pars.subscr.cp.peer_sdp.media_list[0].attributes, superset(tr_SDP_curr_present, + tr_SDP_des_present, + tr_SDP_conf_present))) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(g_name & ": Unexpected precondition attrs in INVITE: ", - g_pars.subscr.cp.peer_sdp.attributes)); + g_pars.subscr.cp.peer_sdp.media_list[0].attributes)); } /* 200 OK (INVITE) has SDP if no precondition is used: */ tx_sdp := f_gen_sdp(); diff --git a/library/SDP_Templates.ttcn b/library/SDP_Templates.ttcn index ef91953..782c672 100644 --- a/library/SDP_Templates.ttcn +++ b/library/SDP_Templates.ttcn @@ -190,11 +190,11 @@ } } -template (present) SDP_attribute tr_SDP_des(charstring status_type, - charstring strength_tag, +template (present) SDP_attribute tr_SDP_des(charstring strength_tag, + charstring status_type, charstring dir_tag, charstring precondition_type := c_SDP_PRECON_TYPE_qos) := { - curr := { + des := { attr_value := precondition_type & " " & strength_tag & " " & status_type & " " & dir_tag } } @@ -203,8 +203,8 @@ attr_value := ? } } -template (value) SDP_attribute ts_SDP_des(charstring status_type, - charstring strength_tag, +template (value) SDP_attribute ts_SDP_des(charstring strength_tag, + charstring status_type, charstring dir_tag, charstring precondition_type := c_SDP_PRECON_TYPE_qos) := { des := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37322?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: I8e22f76f7c0a8e6fda70252b330b1b174ca5c66f Gerrit-Change-Number: 37322 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: fix SDP precondition validation

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37322?usp=email ) Change subject: asterisk: IMS: fix SDP precondition validation ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37322?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: I8e22f76f7c0a8e6fda70252b330b1b174ca5c66f Gerrit-Change-Number: 37322 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Jul 2024 15:56:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: SIP: Fix INVITE template use

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37323?usp=email ) Change subject: asterisk: SIP: Fix INVITE template use ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37323?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: I98b23533f35ffa09f488cb520ed9282935793408 Gerrit-Change-Number: 37323 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Jul 2024 15:56:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1ap: add {enc,dec}_S1AP_Global_ENB_ID() API

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37226?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: s1ap: add {enc,dec}_S1AP_Global_ENB_ID() API ...................................................................... s1ap: add {enc,dec}_S1AP_Global_ENB_ID() API Change-Id: I856fd426b92046dcae72149f46737da3e1b65219 --- M library/s1ap/S1AP_EncDec.cc M library/s1ap/S1AP_Types.ttcn M mme/MME_Tests.ttcn 3 files changed, 35 insertions(+), 29 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/s1ap/S1AP_EncDec.cc b/library/s1ap/S1AP_EncDec.cc index a17f20e..919c9e9 100644 --- a/library/s1ap/S1AP_EncDec.cc +++ b/library/s1ap/S1AP_EncDec.cc @@ -61,4 +61,26 @@ return ret_dcc; } +OCTETSTRING enc__S1AP__Global__ENB__ID(const S1AP__IEs::Global__ENB__ID &ie) +{ + TTCN_Buffer buf; + + buf.clear(); + ie.encode(S1AP__IEs::Global__ENB__ID_descr_, buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return OCTETSTRING(buf.get_len(), buf.get_data()); +} + +S1AP__IEs::Global__ENB__ID dec__S1AP__Global__ENB__ID(const OCTETSTRING &stream) +{ + S1AP__IEs::Global__ENB__ID ie; + TTCN_Buffer buf; + + buf.clear(); + buf.put_os(stream); + ie.decode(S1AP__IEs::Global__ENB__ID_descr_, buf, + TTCN_EncDec::CT_PER, PER_ALIGNED); + return ie; +} + } diff --git a/library/s1ap/S1AP_Types.ttcn b/library/s1ap/S1AP_Types.ttcn index 6730ff3..5d0ecbe 100644 --- a/library/s1ap/S1AP_Types.ttcn +++ b/library/s1ap/S1AP_Types.ttcn @@ -1,7 +1,11 @@ module S1AP_Types { import from S1AP_PDU_Descriptions language "ASN.1:1997" all; + import from S1AP_IEs language "ASN.1:1997" all; external function enc_S1AP_PDU(in S1AP_PDU pdu) return octetstring; external function dec_S1AP_PDU(in octetstring stream) return S1AP_PDU; + + external function enc_S1AP_Global_ENB_ID(in Global_ENB_ID ie) return octetstring; + external function dec_S1AP_Global_ENB_ID(in octetstring stream) return Global_ENB_ID; } diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 76c9c7e..95b11aa 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -124,35 +124,6 @@ var UeParams g_ue_pars[NUM_UE]; } -/* Encode an S1AP Global-ENB-ID into an octetstring */ -private function enc_S1AP_Global_ENB_ID(Global_ENB_ID global_enb_id) return octetstring { - - /* Due to the limitations of libfftranscode, we can not define encoders (or decoders) for individual - * information elements (in S1AP_Types.cc). Unfortuantely Global-ENB-ID also appears in BSSGP in its - * encoded form. (see also: GTP-C 3GPP TS 48.018, section 11.3.70). To encode a given Global-ENB-ID - * we craft a full S1AP PDU and encode it. Then we can cut out the encoded Global-ENB-ID from the - * generated octetstring. */ - - var SupportedTAs supported_tas_dummy := {{ - tAC := '0000'O, - broadcastPLMNs := { '00f000'O }, - iE_Extensions := omit - }}; - var octetstring encoded; - var integer global_enb_id_len; - - if (ispresent(global_enb_id.eNB_ID.macroENB_ID)) { - global_enb_id_len := 8; - } else { - /* All other ENB ID types fit into 8 byte (homeENB_ID, short_macroENB_ID, long_macroENB_ID) */ - global_enb_id_len := 9; - } - - encoded := enc_S1AP_PDU(valueof(ts_S1AP_SetupReq(global_enb_id, supported_tas_dummy, v32))); - - return substr(encoded, 11, global_enb_id_len); -} - type component ConnHdlr extends S1AP_ConnHdlr, SGsAP_ConnHdlr, DIAMETER_ConnHdlr, GTP_ConnHdlr, GTP2_ConnHdlr { var ConnHdlrPars g_pars; timer g_Tguard := 30.0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37226?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: I856fd426b92046dcae72149f46737da3e1b65219 Gerrit-Change-Number: 37226 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

11 months, 3 weeks

1
0
0 0

[M] Change in libosmocore[master]: gsm48_ie: add helper function for speech bearer cap on GSM MS side

by laforge

Attention is currently required from: falconia, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36967?usp=email ) Change subject: gsm48_ie: add helper function for speech bearer cap on GSM MS side ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36967?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaf41687da1d377e98f26e6a16d991ab7d95be0fc Gerrit-Change-Number: 36967 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> 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-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Jul 2024 15:14:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

[S] Change in simtrace2[master]: dissector: add support for sim polarity

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/36980?usp=email ) Change subject: dissector: add support for sim polarity ...................................................................... dissector: add support for sim polarity Needs testing. Related: SYS#6946 Change-Id: If3ae350d0f4d737bc9e80c4f5d73cc1a39d076af --- M contrib/simtrace.lua 1 file changed, 27 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua index 9015085..598a4e2 100644 --- a/contrib/simtrace.lua +++ b/contrib/simtrace.lua @@ -58,6 +58,7 @@ local hf_cemu_cfg_features = ProtoField.uint32("usb_simtrace.cemu_cfg.features.status_irq", "CardEm Features", base.HEX) local hf_cemu_cfg_slot_mux_nr = ProtoField.uint32("usb_simtrace.cemu_cfg.features.slot_mux_nr", "CardEm Slot Mux Nr", base.DEC) +local hf_cemu_cfg_presence_polarity = ProtoField.uint8("usb_simtrace.cemu_cfg.features.presence_polarity", "Sim presence polarity", base.DEC) local card_insert_types = { [0x00] = "not inserted", @@ -71,6 +72,9 @@ local CEMU_STATUS_F_CARD_INSERT = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_CARD_INSERT", "CARD_INSERT", base.HEX_DEC, NULL, 0x00000008) local CEMU_STATUS_F_RESET_ACTIVE = ProtoField.uint32("usb_simtrace.CEMU_STATUS.F_RESET_ACTIVE", "RESET_ACTIVE", base.HEX_DEC, NULL, 0x00000010) +local CEMU_CONFIG_PRES_POL_PRES_H = ProtoField.uint32("usb_simtrace.CEMU_CONFIG.PRES_POL_PRES_H", "PRESENCE_HIGH", base.HEX_DEC, NULL, 0x00000001) +local CEMU_CONFIG_PRES_POL_VALID = ProtoField.uint32("usb_simtrace.CEMU_CONFIG.PRES_POL_VALID", "PRESENCE_VALID", base.HEX_DEC, NULL, 0x00000002) + local modem_reset_types = { [0x00] = "de-assert", [0x01] = "assert", @@ -89,9 +93,10 @@ msgtype, seqnr, slotnr, reserved, payloadlen, payload, pb_and_rx, pb_and_tx, final, tpdu_hdr, rxtxdatalen, rxtxdata, CEMU_STATUS_F_VCC_PRESENT, CEMU_STATUS_F_CLK_ACTIVE, CEMU_STATUS_F_RCEMU_ACTIVE, CEMU_STATUS_F_CARD_INSERT, CEMU_STATUS_F_RESET_ACTIVE, + CEMU_CONFIG_PRES_POL_PRES_H, CEMU_CONFIG_PRES_POL_VALID, modem_reset_status, modem_reset_len, hf_pts_len, hf_pts_req, hf_pts_resp, - hf_cemu_cfg_features, hf_cemu_cfg_slot_mux_nr, + hf_cemu_cfg_features, hf_cemu_cfg_slot_mux_nr, hf_cemu_cfg_presence_polarity, hf_cemu_cardinsert, hf_modem_sim_select, } @@ -214,7 +219,15 @@ local subtree = tree:add(usb_simtrace_protocol, payload_data, "Card Emu Config") subtree:add(hf_cemu_cfg_features, payload_data(0,4)); - subtree:add(hf_cemu_cfg_slot_mux_nr, payload_data(4,1)); + if payload_data:len() >= 4 then + subtree:add(hf_cemu_cfg_slot_mux_nr, payload_data(4,1)); + end + if payload_data:len() >= 5 then + local pres = payload_data(5,1):le_uint(); + subtree:add(hf_cemu_cfg_presence_polarity, payload_data(5,1)); + headerSubtree:add(CEMU_CONFIG_PRES_POL_PRES_H, pres) + headerSubtree:add(CEMU_CONFIG_PRES_POL_VALID, pres) + end end function dissect_modem_sim_sel(payload_data, pinfo, tree) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36980?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: If3ae350d0f4d737bc9e80c4f5d73cc1a39d076af Gerrit-Change-Number: 36980 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

11 months, 3 weeks

1
0
0 0

[S] Change in simtrace2[master]: simtrace2-cardem-pcsc: allow to set sim presence polarity

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/36982?usp=email ) Change subject: simtrace2-cardem-pcsc: allow to set sim presence polarity ...................................................................... simtrace2-cardem-pcsc: allow to set sim presence polarity Add api call osmo_st2_cardem_request_config2(struct cardemu_usb_msg_config *) which contains a full cardemu_usb_msg_config. Related: SYS#6946 Change-Id: Iacde63e667472a85a5f18cb4ca99dcfa1a84dd59 --- M TODO-RELEASE M host/include/osmocom/simtrace2/simtrace2_api.h M host/lib/simtrace2_api.c M host/src/simtrace2-cardem-pcsc.c 4 files changed, 41 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index fb35723..3b33942 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line simtrace2 API/ABI change osmo_st2_transport new member simtrace2 API/ABI change cardemu_usb_msg_config new member +simtrace2 API/ABI change add function osmo_st2_cardem_request_config2() diff --git a/host/include/osmocom/simtrace2/simtrace2_api.h b/host/include/osmocom/simtrace2/simtrace2_api.h index d658d16..a29389c 100644 --- a/host/include/osmocom/simtrace2/simtrace2_api.h +++ b/host/include/osmocom/simtrace2/simtrace2_api.h @@ -41,6 +41,8 @@ void *priv; }; +struct cardemu_usb_msg_config; + int osmo_st2_slot_tx_msg(struct osmo_st2_slot *slot, struct msgb *msg, uint8_t msg_class, uint8_t msg_type); @@ -53,7 +55,7 @@ int osmo_st2_cardem_request_set_atr(struct osmo_st2_cardem_inst *ci, const uint8_t *atr, unsigned int atr_len); int osmo_st2_cardem_request_config(struct osmo_st2_cardem_inst *ci, uint32_t features); - +int osmo_st2_cardem_request_config2(struct osmo_st2_cardem_inst *ci, const struct cardemu_usb_msg_config *config); int osmo_st2_modem_reset_pulse(struct osmo_st2_slot *slot, uint16_t duration_ms); int osmo_st2_modem_reset_active(struct osmo_st2_slot *slot); diff --git a/host/lib/simtrace2_api.c b/host/lib/simtrace2_api.c index 4ad7eb7..37be08a 100644 --- a/host/lib/simtrace2_api.c +++ b/host/lib/simtrace2_api.c @@ -272,6 +272,21 @@ return osmo_st2_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_CONFIG); } +/* user_cfg is in host byte order. */ +int osmo_st2_cardem_request_config2(struct osmo_st2_cardem_inst *ci, const struct cardemu_usb_msg_config *user_cfg) +{ + struct msgb *msg = st_msgb_alloc(); + struct cardemu_usb_msg_config *tx_cfg; + + tx_cfg = (struct cardemu_usb_msg_config *) msgb_put(msg, sizeof(*tx_cfg)); + + LOGSLOT(ci->slot, LOGL_NOTICE, "<= %s(features=%08x)\n", __func__, tx_cfg->features); + memcpy(tx_cfg, user_cfg, sizeof(*tx_cfg)); + osmo_store32le(user_cfg->features, &tx_cfg->features); + + return osmo_st2_slot_tx_msg(ci->slot, msg, SIMTRACE_MSGC_CARDEM, SIMTRACE_MSGT_BD_CEMU_CONFIG); +} + /*********************************************************************** * Modem Control protocol ***********************************************************************/ diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 4acf268..f26698e 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -413,6 +413,7 @@ "\t-S\t--usb-altsetting ALTSETTING_ID\n" "\t-A\t--usb-address\tADDRESS\n" "\t-H\t--usb-path\tPATH\n" + "\t-Z\t--set-sim-presence\t<0/1>\n" "\n" ); } @@ -431,6 +432,7 @@ { "usb-altsetting", 1, 0, 'S' }, { "usb-address", 1, 0, 'A' }, { "usb-path", 1, 0, 'H' }, + { "set-sim-presence", 1, 0, 'Z' }, { NULL, 0, 0, 0 } }; @@ -487,6 +489,7 @@ char *path = NULL; struct osim_reader_hdl *reader; struct osim_card_hdl *card; + struct cardemu_usb_msg_config cardem_config = { .features = CEMU_FEAT_F_STATUS_IRQ }; print_welcome(); @@ -509,7 +512,7 @@ while (1) { int option_index = 0; - c = getopt_long(argc, argv, "hi:V:P:C:I:S:A:H:akn:t:", opts, &option_index); + c = getopt_long(argc, argv, "hi:V:P:C:I:S:A:H:akn:t:Z:", opts, &option_index); if (c == -1) break; switch (c) { @@ -553,6 +556,10 @@ case 'H': path = optarg; break; + case 'Z': + cardem_config.pres_pol = atoi(optarg) ? CEMU_CONFIG_PRES_POL_PRES_H : 0; + cardem_config.pres_pol |= CEMU_CONFIG_PRES_POL_VALID; + break; } } @@ -636,7 +643,7 @@ allocate_and_submit_in(ci); /* request firmware to generate STATUS on IRQ endpoint */ - osmo_st2_cardem_request_config(ci, CEMU_FEAT_F_STATUS_IRQ); + osmo_st2_cardem_request_config2(ci, &cardem_config); /* simulate card-insert to modem (owhw, not qmod) */ osmo_st2_cardem_request_card_insert(ci, true); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36982?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iacde63e667472a85a5f18cb4ca99dcfa1a84dd59 Gerrit-Change-Number: 36982 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

11 months, 3 weeks

1
0
0 0

[M] Change in simtrace2[master]: firmware: allow to change the sim presence pin polarity

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/36981?usp=email ) Change subject: firmware: allow to change the sim presence pin polarity ...................................................................... firmware: allow to change the sim presence pin polarity The sim presence pin allows the simtrace2 to inform the modem about the presence of the simcard. On a generic simcard slot a button is pressed by the simcard which generate a high or low voltage level. Even though there are specifications of minipcie or ngff defining this signal, certain modems behave different. Certain modems require different signals from the specification. Extend the usb protocol to set the behaviour at runtime. Related: SYS#6946 Change-Id: I77118114ba873fdf0778137402888b40f2442456 --- M TODO-RELEASE M firmware/libcommon/include/simtrace.h M firmware/libcommon/include/simtrace_prot.h M firmware/libcommon/source/card_emu.c M firmware/libcommon/source/mode_cardemu.c M firmware/test/Makefile M firmware/test/card_emu_tests.c 7 files changed, 83 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 5da461b..fb35723 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line simtrace2 API/ABI change osmo_st2_transport new member +simtrace2 API/ABI change cardemu_usb_msg_config new member diff --git a/firmware/libcommon/include/simtrace.h b/firmware/libcommon/include/simtrace.h index a37ec4f..4a7aca1 100644 --- a/firmware/libcommon/include/simtrace.h +++ b/firmware/libcommon/include/simtrace.h @@ -124,4 +124,8 @@ void Timer_Init( void ); void TC0_Counter_Reset( void ); +/* Sim presence pins */ +bool mode_cardemu_get_presence_pol(uint8_t instance); +void mode_cardemu_set_presence_pol(uint8_t instance, bool high); + #endif /* SIMTRACE_H */ diff --git a/firmware/libcommon/include/simtrace_prot.h b/firmware/libcommon/include/simtrace_prot.h index d1eb89b..50042a0 100644 --- a/firmware/libcommon/include/simtrace_prot.h +++ b/firmware/libcommon/include/simtrace_prot.h @@ -261,12 +261,21 @@ /* enable/disable the generation of DO_STATUS on IRQ endpoint */ #define CEMU_FEAT_F_STATUS_IRQ 0x00000001 +#define CEMU_CONFIG_PRES_POL_PRES_L 0x00 +#define CEMU_CONFIG_PRES_POL_PRES_H 0x01 +#define CEMU_CONFIG_PRES_POL_VALID 0x02 + /* SIMTRACE_MSGT_BD_CEMU_CONFIG */ struct cardemu_usb_msg_config { /* bit-mask of CEMU_FEAT_F flags */ uint32_t features; /* the selected slot number (if an external mux is present) */ uint8_t slot_mux_nr; + /* Sim presence pin polarity. Bit 1 is a validity bit. Bit 0 gpio value when sim present. + * When sim is present, set sim_present gpio to high -> 0x03 + * When sim is present, set sim_present gpio to low -> 0x02 + */ + uint8_t pres_pol; } __attribute__ ((packed)); /*********************************************************************** diff --git a/firmware/libcommon/source/card_emu.c b/firmware/libcommon/source/card_emu.c index e6907e6..ab54fc5 100644 --- a/firmware/libcommon/source/card_emu.c +++ b/firmware/libcommon/source/card_emu.c @@ -24,6 +24,7 @@ #include "trace.h" #include "iso7816_fidi.h" #include "card_emu.h" +#include "simtrace.h" #include "simtrace_prot.h" #include "usb_buf.h" #include <osmocom/core/linuxlist.h> @@ -1096,7 +1097,7 @@ #else cfg->slot_mux_nr = 0; #endif - + cfg->pres_pol = mode_cardemu_get_presence_pol(ch->num) | CEMU_CONFIG_PRES_POL_VALID; usb_buf_upd_len_and_submit(msg); } @@ -1270,6 +1271,11 @@ } #endif + if (scfg_len >= sizeof(uint32_t)+sizeof(uint8_t)+sizeof(uint8_t)) { + if (scfg->pres_pol & CEMU_CONFIG_PRES_POL_VALID) + mode_cardemu_set_presence_pol(ch->num, scfg->pres_pol & CEMU_CONFIG_PRES_POL_PRES_H); + } + /* send back a report of our current configuration */ card_emu_report_config(ch); diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index a05840e..a5485e4 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -79,7 +79,10 @@ uint8_t ep_out; uint8_t ep_in; uint8_t ep_int; + /*! Pin to set when SIM is present/inserted (SIM presence pin). */ const Pin pin_insert; + /*! Invert the Pin polarity. When not inverted, the SIM pin_insert will be High, when a SIM is present. */ + bool pin_insert_inverted; #ifdef DETECT_VCC_BY_ADC uint32_t vcc_uv; #endif @@ -113,7 +116,10 @@ .ep_int = SIMTRACE_CARDEM_USB_EP_USIM1_INT, #ifdef PIN_SET_USIM1_PRES .pin_insert = PIN_SET_USIM1_PRES, -#endif +#endif /* PIN_SET_USIM1_PRES */ +#ifdef PIN_SET_USIM1_PRES_INVERTED + .pin_insert_inverted = true, +#endif /* PIN_SET_USIM1_PRES_INVERTED */ }, #ifdef CARDEMU_SECOND_UART { @@ -128,7 +134,10 @@ .ep_int = SIMTRACE_CARDEM_USB_EP_USIM2_INT, #ifdef PIN_SET_USIM2_PRES .pin_insert = PIN_SET_USIM2_PRES, -#endif +#endif /* PIN_SET_USIM2_PRES */ +#ifdef PIN_SET_USIM2_PRES_INVERTED + .pin_insert_inverted = true, +#endif /* PIN_SET_USIM2_PRES_INVERTED */ }, #endif }; @@ -700,7 +709,7 @@ TRACE_INFO("%u: set card_insert to %s\r\n", ci->num, card_insert ? "INSERTED" : "REMOVED"); #ifdef HAVE_BOARD_CARDINSERT - board_set_card_insert(ci, card_insert); + board_set_card_insert(ci, card_insert ^ ci->pin_insert_inverted); #else if (!ci->pin_insert.pio) { TRACE_INFO("%u: skipping unsupported card_insert to %s\r\n", @@ -708,7 +717,7 @@ return; } - if (card_insert) + if (card_insert ^ ci->pin_insert_inverted) PIO_Set(&ci->pin_insert); else PIO_Clear(&ci->pin_insert); @@ -962,3 +971,25 @@ process_any_usb_commands(queue, ci); } } + +void mode_cardemu_set_presence_pol(uint8_t instance, bool high) +{ + struct cardem_inst *ci; + + if (instance >= ARRAY_SIZE(cardem_inst)) + return; + + ci = &cardem_inst[instance]; + ci->pin_insert_inverted = !high; +} + +bool mode_cardemu_get_presence_pol(uint8_t instance) +{ + struct cardem_inst *ci; + + if (instance >= ARRAY_SIZE(cardem_inst)) + return false; + + ci = &cardem_inst[instance]; + return !ci->pin_insert_inverted; +} diff --git a/firmware/test/Makefile b/firmware/test/Makefile index 4341c92..883219b 100644 --- a/firmware/test/Makefile +++ b/firmware/test/Makefile @@ -7,6 +7,7 @@ -I../atmel_softpack_libraries/libchip_sam3s/cmsis \ -I../atmel_softpack_libraries/libchip_sam3s/include \ -I../atmel_softpack_libraries/usb/include \ + -I../atmel_softpack_libraries/ \ -I../libcommon/include \ -I../libboard/common/include \ -I../libboard/simtrace/include \ diff --git a/firmware/test/card_emu_tests.c b/firmware/test/card_emu_tests.c index 5d5bd3e..1fa4a88 100644 --- a/firmware/test/card_emu_tests.c +++ b/firmware/test/card_emu_tests.c @@ -93,7 +93,14 @@ printf("%s(uart_chan=%u\n", __func__, uart_chan); } +void mode_cardemu_set_presence_pol(uint8_t instance, bool high) +{ +} +bool mode_cardemu_get_presence_pol(uint8_t instance) +{ + return false; +} /*********************************************************************** * test helper functions -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36981?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I77118114ba873fdf0778137402888b40f2442456 Gerrit-Change-Number: 36981 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024