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

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

12 months

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

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 submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

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 posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37291?usp=email ) Change subject: asterisk: Introduce test TC_ims_registration_423_interval_too_brief ...................................................................... Patch Set 1: Code-Review+2 -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jun 2024 09:53:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

12 months

1
0
0 0

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

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37290?usp=email ) Change subject: asterisk: Introduce test TC_ims_reregistration ...................................................................... Patch Set 1: Code-Review+2 -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jun 2024 09:53:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

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 posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37289?usp=email ) Change subject: asterisk: IMS: Set expires=N on REGISTER response ...................................................................... Patch Set 1: Code-Review+2 -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Jun 2024 09:53:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

12 months

1
0
0 0

[S] Change in docker-playground[master]: asterisk-master: Build from jolly/work branch by default

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37293?usp=email ) Change subject: asterisk-master: Build from jolly/work branch by default ...................................................................... asterisk-master: Build from jolly/work branch by default That one will not be the final branch, but it's the one where most of the development is happening. Hence, switch to that branch by default for now, so that jenkins nightly job runs that branch. Change-Id: Iabf141ae0b997f9707a7dbd555307e052b92d355 --- M make/Makefile 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/make/Makefile b/make/Makefile index 24308e5..4ee4525 100644 --- a/make/Makefile +++ b/make/Makefile @@ -17,7 +17,7 @@ USERNAME?=$(USER) UID=$(shell id -u) NAME?=$(shell basename $(CURDIR)) -ASTERISK_BRANCH?=sysmocom/master +ASTERISK_BRANCH?=jolly/work LIBOSMOCORE_BRANCH?=master OSMO_TTCN3_BRANCH?=master OSMO_BB_BRANCH?=master @@ -42,7 +42,7 @@ OSMO_STP_BRANCH?=master OSMO_UECUPS_BRANCH?=master OPEN5GS_BRANCH?=main -PJPROJECT_BRANCH?=sysmocom/2.14 +PJPROJECT_BRANCH?=jolly/work BUILD_ARGS?= RUN_ARGS?=-it UPSTREAM_DISTRO?=debian:bookworm -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37293?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: Iabf141ae0b997f9707a7dbd555307e052b92d355 Gerrit-Change-Number: 37293 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

12 months

1
0
0 0

[S] Change in docker-playground[master]: asterisk-master: Fetch required branch directly

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/37292?usp=email ) Change subject: asterisk-master: Fetch required branch directly ...................................................................... asterisk-master: Fetch required branch directly When I added the Dockerfile I initially wrote it in a 2 step fetch & build, to try to avoid recompiling the whole thing every time some patch from one of the devs was pushed to our building branch. This, whoever, creates problems sometimes due to how the build system for pjproject is generated when building asterisk, so let's drop the 2stage setup to avoid problems fetching from different branches, etc. Change-Id: Id9fbee9cdb8f9387e0daefd7925df2542d384a91 --- M asterisk-master/Dockerfile 1 file changed, 20 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/asterisk-master/Dockerfile b/asterisk-master/Dockerfile index 8e508e4..8ddbaa0 100644 --- a/asterisk-master/Dockerfile +++ b/asterisk-master/Dockerfile @@ -60,10 +60,13 @@ # clone asterisk ARG ASTERISK_REMOTE=https://gitea.sysmocom.de/sysmocom/asterisk.git +ARG ASTERISK_BRANCH=sysmocom/master RUN git clone $ASTERISK_REMOTE +ADD https://gitea.sysmocom.de/api/v1/repos/sysmocom/asterisk/git/refs/heads/$AS… /tmp/asterisk-ver + RUN cd asterisk && \ - git fetch && git checkout -f -B sysmocom/master origin/sysmocom/master + git fetch && git checkout -f -B $ASTERISK_BRANCH origin/$ASTERISK_BRANCH # Use pjproject from git repo above instead of downloading tar.gz: RUN cd asterisk/third-party/pjproject && \ @@ -72,17 +75,6 @@ RUN cd asterisk && \ ./bootstrap.sh && \ ./configure && \ - make "-j$(nproc)" - -ARG ASTERISK_BRANCH=sysmocom/master - -ADD https://gitea.sysmocom.de/api/v1/repos/sysmocom/asterisk/git/refs/heads/$AS… /tmp/asterisk-ver - -# update the source code (if needed) -RUN cd asterisk && \ - git fetch && git checkout -B $ASTERISK_BRANCH origin/$ASTERISK_BRANCH - -RUN cd asterisk && \ make "-j$(nproc)" && \ make install && \ make samples && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/37292?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: Id9fbee9cdb8f9387e0daefd7925df2542d384a91 Gerrit-Change-Number: 37292 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

12 months

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

12 months

1
0
0 0

[S] Change in osmo-dev[master]: no_uring.opts: new file

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/37294?usp=email ) Change subject: no_uring.opts: new file ...................................................................... no_uring.opts: new file Change-Id: Iafe1e78db66552e1b59818452570f9a6104742a3 --- A no_uring.opts 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/no_uring.opts b/no_uring.opts new file mode 100644 index 0000000..cf9998c --- /dev/null +++ b/no_uring.opts @@ -0,0 +1 @@ +libosmocore --disable-uring -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/37294?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iafe1e78db66552e1b59818452570f9a6104742a3 Gerrit-Change-Number: 37294 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

12 months

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2024