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

[M] Change in libosmo-abis[master]: trau_rtp_conv: add support for HRv1 in 8k format

by fixeria

Attention is currently required from: falconia, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37287?usp=email ) Change subject: trau_rtp_conv: add support for HRv1 in 8k format ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/trau/trau_rtp_conv.c: https://gerrit.osmocom.org/c/libosmo-abis/+/37287/comment/20a3b2d6_b5d058c5 PS2, Line 669: tf->xc_bits[0] = 0; > I tried doing this: […] Oh, then my approach would not work either. AFAIU, array assignment is only possible during the definition, but not after that. I did an experiment, and even with `-std=c89` both gcc and clang refuse to compile the following code: ``` int main(void) { char data[6]; data = { 0, 0, 0, 1, 0, 0 }; data = { [3] = 1 }; return 0; } ``` So yeah, let's keep this as-is then. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37287?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I8ee01b73360501ca380a8695cbc7070ceaaba1be Gerrit-Change-Number: 37287 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Jun 2024 18:41:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

12 months

1
0
0 0

[M] Change in libosmo-abis[master]: trau_rtp_conv: add support for HRv1 in 8k format

by falconia

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/37287?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: trau_rtp_conv: add support for HRv1 in 8k format ...................................................................... trau_rtp_conv: add support for HRv1 in 8k format GSM 08.61 defines two alternative Abis transport formats for HRv1 codec, using either 16 kbit/s or 8 kbit/s submultiplexing, as chosen by each BSS hardware manufacturer. libosmotrau previously supported TRAU<->RTP conversion only for 16k format - add support for HRv1 in 8k submux format. Change-Id: I8ee01b73360501ca380a8695cbc7070ceaaba1be --- M src/trau/trau_rtp_conv.c 1 file changed, 186 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/87/37287/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37287?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I8ee01b73360501ca380a8695cbc7070ceaaba1be Gerrit-Change-Number: 37287 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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-MessageType: newpatchset

12 months

1
0
0 0

[M] Change in libosmo-abis[master]: trau_rtp_conv: add support for HRv1 in 8k format

by falconia

Attention is currently required from: fixeria. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37287?usp=email ) Change subject: trau_rtp_conv: add support for HRv1 in 8k format ...................................................................... Patch Set 2: (1 comment) File src/trau/trau_rtp_conv.c: https://gerrit.osmocom.org/c/libosmo-abis/+/37287/comment/bc035ff5_01447673 PS2, Line 669: tf->xc_bits[0] = 0; > Shorter != more readable in this case, I would argue. […] I tried doing this: ``` if (osmo_hr_check_sid(data, data_len)) tf->xc_bits = {0, 0, 0, 1, 0, 0}; else tf->xc_bits = {0, 0, 0, 0, 0, 1}; ``` but the compiler is barfing at me: ``` trau/trau_rtp_conv.c:669:17: error: expected expression before '{' token tf->xc_bits = {0, 0, 0, 1, 0, 0}; ``` I am afraid this old hag of K&R C and Ancient UNIX upbringing is not up to speed with modern C tricks. I'll put my original code back in for the next patch iteration, and leave it there until/unless someone shows me a way to do what I was trying above. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37287?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I8ee01b73360501ca380a8695cbc7070ceaaba1be Gerrit-Change-Number: 37287 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Jun 2024 18:22:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

12 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_ims_registration_423_interval_too_brief

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37291?usp=email ) Change subject: asterisk: Introduce test TC_ims_registration_423_interval_too_brief ...................................................................... asterisk: Introduce test TC_ims_registration_423_interval_too_brief Related: SYS#6983 Change-Id: I9e1fc9b79496956d27102d940dfa3897897733a7 --- M asterisk/Asterisk_Tests.ttcn M asterisk/IMS_ConnectionHandler.ttcn M asterisk/expected-results.xml M library/SIP_Templates.ttcn 4 files changed, 105 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/37291/1 diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 6982146..b7981eb 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -562,6 +562,60 @@ } /* Test IMS re-registration based on Expires (TS 24.229 5.1.1.4.1, RFC 3261 10.3)*/ +private function f_TC_ims_registration_423_interval_too_brief(charstring id) runs on IMS_ConnHdlr { + f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); + + var template (present) PDU_SIP_Request exp_req := + tr_SIP_REGISTER(g_pars.registrar_sip_req_uri, + ?, + tr_From(), + tr_To(), + tr_Via_from(?), + expires := tr_Expires(int2str(g_pars.subscr.registrar_expires))); + SIP.receive(exp_req) -> value g_rx_sip_req; + + /* Double it and expect UAC to use it. */ + g_pars.subscr.registrar_expires := g_pars.subscr.registrar_expires * 2; + + /* Tx 423 Interval Too Brief */ + var template (value) PDU_SIP_Response tx_resp; + tx_resp := ts_SIP_Response_423_Interval_Too_Brief( + g_rx_sip_req.msgHeader.callId.callid, + g_rx_sip_req.msgHeader.fromField, + g_rx_sip_req.msgHeader.toField, + g_rx_sip_req.msgHeader.via, + g_rx_sip_req.msgHeader.cSeq.seqNumber, + minExpires := ts_MinExpires(int2str(g_pars.subscr.registrar_expires)), + server := g_pars.server_name, + userAgent := omit); + SIP.send(tx_resp); + + g_pars.subscr.exp_uac_expires := g_pars.subscr.registrar_expires; + as_IMS_register(); + + as_IMS_unregister(); + setverdict(pass); +} +testcase TC_ims_registration_423_interval_too_brief() runs on test_CT { + var IMS_ConnHdlrPars pars; + var IMS_ConnHdlr vc_conn; + f_init(); + pars := f_init_IMS_ConnHdlrPars(); + vc_conn := f_start_handler_IMS(refers(f_TC_ims_registration_423_interval_too_brief), pars); + + f_AMI_IMS_register(pars); + + /* Stay registered for one second */ + f_sleep(1.0); + + /* Trigger unregistration: */ + f_AMI_IMS_unregister(pars); + + vc_conn.done; + f_shutdown(); +} + +/* Test IMS re-registration based on Expires (TS 24.229 5.1.1.4.1, RFC 3261 10.3)*/ private function f_TC_ims_reregistration(charstring id) runs on IMS_ConnHdlr { f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); as_IMS_register(); @@ -780,6 +834,7 @@ execute( TC_ims_registration_timeout_resync_401Unauthorized() ); execute( TC_ims_registration_timeout_protected_100Trying() ); execute( TC_ims_registration_timeout_protected_200OK() ); + execute( TC_ims_registration_423_interval_too_brief() ); execute( TC_ims_reregistration() ); execute( TC_ims_call_mo() ); execute( TC_ims_call_mo_noprecondition() ); diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index ba2a2fd..674b281 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -94,6 +94,7 @@ SipAddr registrar_sip_record, CallidString registrar_sip_call_id, integer registrar_sip_seq_nr, + integer exp_uac_expires, integer registrar_expires, SipUrl local_sip_url_ext, SipAddr local_sip_record, @@ -215,6 +216,7 @@ f_sip_str_quote(display_name)), registrar_sip_call_id := hex2str(f_rnd_hexstring(15)) & "@" & domain, registrar_sip_seq_nr := f_sip_rand_seq_nr(), + exp_uac_expires := c_def_expires, registrar_expires := c_def_expires, local_sip_url_ext := ts_SipUrl(ts_HostPort(domain, local_sip_port), ts_UserInfo(imsi)), @@ -747,7 +749,7 @@ tr_From(), tr_To(), tr_Via_from(?), - expires := tr_Expires(int2str(c_def_expires)), + expires := tr_Expires(int2str(g_pars.subscr.exp_uac_expires)), require := tr_Require(superset("sec-agree")), security_client := tr_Security_client(superset(tr_Security_mechanism("ipsec-3gpp", superset(tr_Param("alg","hmac-sha-1-96"))))), diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml index 65a495b..26c2fa4 100644 --- a/asterisk/expected-results.xml +++ b/asterisk/expected-results.xml @@ -12,6 +12,7 @@ <testcase classname='Asterisk_Tests' name='TC_ims_registration_timeout_resync_401Unauthorized' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_registration_timeout_protected_100Trying' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_registration_timeout_protected_200OK' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_ims_registration_423_interval_too_brief' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_reregistration' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_noprecondition' time='MASKED'/> diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index ce5998b..26f7ea8 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -245,6 +245,12 @@ fromParams := fromParams } +// [20.23] +template (value) MinExpires ts_MinExpires(template (value) DeltaSec deltaSec := "800000") := { + fieldName := MIN_EXPIRES_E, + deltaSec := deltaSec +} + // [RFC3455 5.4] + 3GPP 24.229 V8.7.0 template (present) Access_net_spec tr_Access_net_spec(template (present) charstring access_type := ?, template SemicolonParam_List access_info := *) := { @@ -685,6 +691,7 @@ template (omit)Authorization authorization := omit, template (omit) Allow allow := ts_Allow(c_SIP_defaultMethods), template (omit) Expires expires := omit, + template (omit) MinExpires minExpires := omit, template (omit) P_Associated_Uri p_associated_uri := omit, template (omit) RAck rack := omit, template (omit) Require require := omit, @@ -712,6 +719,7 @@ }, expires := expires, fromField := from_addr, + minExpires := minExpires, p_associated_uri := p_associated_uri, rack := rack, require := require, @@ -1152,6 +1160,34 @@ payload := omit } +/* Tx 423 Interval Too Brief */ +template (value) PDU_SIP_Response +ts_SIP_Response_423_Interval_Too_Brief( + template (value) CallidString call_id, + template (value) From from_addr, + template (value) To to_addr, + Via via, + integer seq_nr, + charstring method := "REGISTER", + template (omit) Allow allow := omit, + template (value) MinExpires minExpires := ts_MinExpires(), + template (omit) Server server := omit, + template (omit) Supported supported := omit, + template (omit) UserAgent userAgent := omit) := { + statusLine := ts_SIP_StatusLine(423, "Interval Too Brief"), + msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, method, seq_nr, + via, + content_length := f_ContentLength(omit), + content_type := f_ContentTypeOrOmit(ts_CT_SDP, omit), + allow := allow, + minExpires := minExpires, + server := server, + supported := supported, + userAgent := userAgent), + messageBody := omit, + payload := omit +} + template (present) PDU_SIP_Response tr_SIP_Response(template CallidString call_id, template From from_addr, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37291?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: I9e1fc9b79496956d27102d940dfa3897897733a7 Gerrit-Change-Number: 37291 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

12 months

1
0
0 0

[M] Change in libosmo-abis[master]: trau_rtp_conv: add support for HRv1 in 8k format

by falconia

Attention is currently required from: fixeria. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37287?usp=email ) Change subject: trau_rtp_conv: add support for HRv1 in 8k format ...................................................................... Patch Set 2: (2 comments) File src/trau/trau_rtp_conv.c: https://gerrit.osmocom.org/c/libosmo-abis/+/37287/comment/0892ab9b_6b4aea97 PS2, Line 258: if (xc_bits[i]) : sum++; > Can we do `sum += xc_bits[i]` here? Theoretically, this should be better in terms of performance. […] Given that the input bits come from other Osmocom library layers (osmo_i460 demux followed by trau_sync module), I would say that requiring each ubit_t to be strictly either 0 or 1 (for performance benefit) is fine. I'll change the code to do direct summation like you suggested. https://gerrit.osmocom.org/c/libosmo-abis/+/37287/comment/9ae58d6e_fe0a6172 PS2, Line 669: tf->xc_bits[0] = 0; > cosmetic: maybe use designated initializers to make it shorter / more readable? […] Shorter != more readable in this case, I would argue. The way I have each bit explicitly broken out, with a comment on xc_bits[5] saying that it is odd parity, makes it much easier IMO to visually verify correctness against the official word of the spec. However, I just thought of another way to make the code shorter, yet retain direct correspondence (perhaps even more direct) to how the table appears in the TS 48.061 spec - see the next patchset iteration. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37287?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I8ee01b73360501ca380a8695cbc7070ceaaba1be Gerrit-Change-Number: 37287 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Jun 2024 17:57:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

12 months

1
0
0 0

[S] Change in libosmo-abis[master]: trau_frame.c cosmetic: fix misleading comment

by falconia

falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/37284?usp=email ) Change subject: trau_frame.c cosmetic: fix misleading comment ...................................................................... trau_frame.c cosmetic: fix misleading comment The 4 static const ubit_t arrays ft_hr_up_bits[5], ft_hr_down_bits[5], ft_data_hr_up_bits[5] and ft_data_hr_down_bits[5] contain frame type bit patterns that are defined in GSM 08.61 for half-rate speech and data channels with 16 kbit/s Abis transport, and are used as such in the code. However, the comment next to them stated incorrectly that these frame type bit patterns are for 8 kbit/s submultiplexing - fix it. Change-Id: Ic2f818a7f8bab4e82f239464511ab430906d4680 --- M src/trau/trau_frame.c 1 file changed, 19 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c index 9c9baa7..0be005a 100644 --- a/src/trau/trau_frame.c +++ b/src/trau/trau_frame.c @@ -82,7 +82,7 @@ TS48060_AMR_FC_NO_SPEECH = 0x0, }; -/* 16k sub-slots */ +/* GSM 08.60 frame types, 16k sub-slots */ static const ubit_t ft_fr_up_bits[5] = { 0, 0, 0, 1, 0 }; static const ubit_t ft_fr_down_bits[5] = { 1, 1, 1, 0, 0 }; static const ubit_t ft_data_up_bits[5] = { 0, 1, 0, 0, 0 }; @@ -96,7 +96,7 @@ static const ubit_t ft_d145s_bits[5] = { 1, 0, 1, 0, 0 }; static const ubit_t ft_edata_bits[5] = { 1, 1, 1, 1, 1 }; -/* 8k sub-slots */ +/* GSM 08.61 frame types, still on 16k sub-slots */ static const ubit_t ft_hr_up_bits[5] = { 0, 0, 0, 1, 1 }; static const ubit_t ft_hr_down_bits[5] = { 1, 1, 1, 0, 1 }; static const ubit_t ft_data_hr_up_bits[5] = { 0, 1, 0, 0, 1 }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/37284?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic2f818a7f8bab4e82f239464511ab430906d4680 Gerrit-Change-Number: 37284 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

12 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Set expires=N on REGISTER response

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37289?usp=email ) Change subject: asterisk: IMS: Set expires=N on REGISTER response ...................................................................... asterisk: IMS: Set expires=N on REGISTER response Related: SYS#6983 Change-Id: I0682fbc97128ed8aa193cb14ea571a8db9ee3279 --- M asterisk/IMS_ConnectionHandler.ttcn 1 file changed, 24 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/37289/1 diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 69e8abf..ba2a2fd 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -94,6 +94,7 @@ SipAddr registrar_sip_record, CallidString registrar_sip_call_id, integer registrar_sip_seq_nr, + integer registrar_expires, SipUrl local_sip_url_ext, SipAddr local_sip_record, Contact registered_contact optional, @@ -214,6 +215,7 @@ f_sip_str_quote(display_name)), registrar_sip_call_id := hex2str(f_rnd_hexstring(15)) & "@" & domain, registrar_sip_seq_nr := f_sip_rand_seq_nr(), + registrar_expires := c_def_expires, local_sip_url_ext := ts_SipUrl(ts_HostPort(domain, local_sip_port), ts_UserInfo(imsi)), local_sip_record := ts_SipAddr(ts_HostPort(domain), @@ -922,6 +924,7 @@ [] SIP.receive(exp_req) -> value g_rx_sip_req { var template (value) PDU_SIP_Response tx_resp; var Via via; + var Contact contact; var CallidString sip_call_id; var template (value) From from_addr; var template (value) To to_addr; @@ -970,9 +973,16 @@ scheme := "tel"))), ts_P_Assoc_uri_spec(g_rx_sip_req.msgHeader.toField.addressField.nameAddr) })); - f_ims_validate_register_contact(g_rx_sip_req.msgHeader.contact); - f_ims_parse_register_contact(g_rx_sip_req.msgHeader.contact); - g_pars.subscr.registered_contact := g_rx_sip_req.msgHeader.contact; + + contact := g_rx_sip_req.msgHeader.contact; + f_ims_validate_register_contact(contact); + f_ims_parse_register_contact(contact); + g_pars.subscr.registered_contact := contact; + /* Set expires= to configured value: RFC3261 10.3 8) */ + for (var integer i := 0; i < lengthof(contact.contactBody.contactAddresses); i := i + 1) { + contact.contactBody.contactAddresses[i].contactParams := + valueof({ ts_Param("expires", int2str(g_pars.subscr.registrar_expires)) }); + } /* Tx 200 OK */ to_addr.toParams := f_sip_param_set(to_addr.toParams, "tag", f_sip_rand_tag()); @@ -983,6 +993,7 @@ sip_seq_nr, "OK", via, + contact := contact, p_associated_uri := g_pars.subscr.p_associated_uri, require := require, server := g_pars.server_name, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37289?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: I0682fbc97128ed8aa193cb14ea571a8db9ee3279 Gerrit-Change-Number: 37289 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

12 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce test TC_ims_reregistration

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37290?usp=email ) Change subject: asterisk: Introduce test TC_ims_reregistration ...................................................................... asterisk: Introduce test TC_ims_reregistration So far Asterisk seems to be doing "initial registration" during re-registration, instead of using the existing security context. This is "OK" afaiu, but not the best pick (TS 24.229 5.1.1.4.1). Related: SYS#6983 Change-Id: Icaeec6e2be3469b9e49d4361ca2b039ab44683c0 --- M asterisk/Asterisk_Tests.ttcn M asterisk/expected-results.xml 2 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/37290/1 diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index cee7adc..6982146 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -561,6 +561,45 @@ true, false); } +/* Test IMS re-registration based on Expires (TS 24.229 5.1.1.4.1, RFC 3261 10.3)*/ +private function f_TC_ims_reregistration(charstring id) runs on IMS_ConnHdlr { + f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); + as_IMS_register(); + + /* Re-Register: This should optimally be a as_IMS_2nd_register() instead... */ + timer Trereg; + Trereg.start(int2float(g_pars.subscr.registrar_expires) - 5.0); + alt { + [] as_IMS_register(); + [] Trereg.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(g_name & ": Timeout waiting for re-registration")); + } + } + Trereg.stop; + + as_IMS_unregister(); + setverdict(pass); +} +testcase TC_ims_reregistration() runs on test_CT { + var IMS_ConnHdlrPars pars; + var IMS_ConnHdlr vc_conn; + f_init(); + pars := f_init_IMS_ConnHdlrPars(); + pars.subscr.registrar_expires := 30; + vc_conn := f_start_handler_IMS(refers(f_TC_ims_reregistration), pars); + + f_AMI_IMS_register(pars); + + /* Re-Register: if this was a 2nd REGISTER, then reauth shouldn't be needed... */ + as_AMI_IMS_register_Auth(pars, resync := false); + + /* Trigger unregistration: */ + f_AMI_IMS_unregister(pars); + + vc_conn.done; + f_shutdown(); +} + /* Test IMS MO call emulating an MT which doesn't support precondition */ private function f_TC_ims_call_mo_IMS_ConnHdlr(charstring id) runs on IMS_ConnHdlr { f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); @@ -741,6 +780,7 @@ execute( TC_ims_registration_timeout_resync_401Unauthorized() ); execute( TC_ims_registration_timeout_protected_100Trying() ); execute( TC_ims_registration_timeout_protected_200OK() ); + execute( TC_ims_reregistration() ); execute( TC_ims_call_mo() ); execute( TC_ims_call_mo_noprecondition() ); execute( TC_ims_call_mt() ); diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml index 31a03e5..65a495b 100644 --- a/asterisk/expected-results.xml +++ b/asterisk/expected-results.xml @@ -12,6 +12,7 @@ <testcase classname='Asterisk_Tests' name='TC_ims_registration_timeout_resync_401Unauthorized' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_registration_timeout_protected_100Trying' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_registration_timeout_protected_200OK' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_ims_reregistration' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mo_noprecondition' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_ims_call_mt' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37290?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: Icaeec6e2be3469b9e49d4361ca2b039ab44683c0 Gerrit-Change-Number: 37290 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

12 months

1
0
0 0

[S] Change in docker-playground[master]: asterisk: logger.conf: Log milliseconds in timestamps

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/37288?usp=email ) Change subject: asterisk: logger.conf: Log milliseconds in timestamps ...................................................................... asterisk: logger.conf: Log milliseconds in timestamps Change-Id: I4d518547d1e284b18034ae195e6d05da283593de --- M ttcn3-asterisk-ims-ue-test/asterisk/logger.conf 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/88/37288/1 diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/logger.conf b/ttcn3-asterisk-ims-ue-test/asterisk/logger.conf index 292e624..47a91b1 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/logger.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/logger.conf @@ -1,3 +1,6 @@ +[general] +dateformat = %F %T.%3q + [logfiles] ;messages = notice,warning,error ;console = verbose,notice,warning,error,debug,trace,dtmf -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37288?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: I4d518547d1e284b18034ae195e6d05da283593de Gerrit-Change-Number: 37288 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

12 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Set mp_ims_imei matching pjsip.conf

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37263?usp=email ) Change subject: ttcn3-asterisk: Set mp_ims_imei matching pjsip.conf ...................................................................... ttcn3-asterisk: Set mp_ims_imei matching pjsip.conf Since recently, the testsuite validates the IMEI received at IMS Core over REGISTER Contact header matches the one configured at Asterisk config file. Hence, add the same value to Asterisk_Tests.cfg so it can match the value. Depends: osmo-ttcn3-hacks.git Change-Id I866d89ec137d264e257b05226900b744a93c257e Related: SYS#6877 Change-Id: Id8bb7886ffcea506348496148e17f71cef1edc90 --- M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg index 35eb420..840cbf7 100644 --- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -24,6 +24,7 @@ Asterisk_Tests.mp_local_ims_port := 5060 Asterisk_Tests.mp_ims_domain := "ims.mnc001.mcc238.3gppnetwork.org" Asterisk_Tests.mp_ims_imsi := "238010000090828" +Asterisk_Tests.mp_ims_imei := "35876110-027790-0"; Asterisk_Tests.mp_ami_remote_host := "172.18.11.10" IMS_ConnectionHandler.mp_ipsec_setup_script_path := "/osmo-ttcn3-hacks/asterisk/IMS_ipsec_setup.sh" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37263?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: Id8bb7886ffcea506348496148e17f71cef1edc90 Gerrit-Change-Number: 37263 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

12 months

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2024