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

[S] Change in ...osmo-epdg[master]: contrib/systemd: use StateDirectory

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36943?usp=email ) Change subject: contrib/systemd: use StateDirectory ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36943?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I83c7749ca1277b71e25c41b4dc943e83608bd442 Gerrit-Change-Number: 36943 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 28 May 2024 14:56:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-pcap[master]: contrib/systemd: run as osmocom user

by pespin

Attention is currently required from: fixeria, msuraev, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/29724?usp=email ) Change subject: contrib/systemd: run as osmocom user ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/29724?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Iccea921f0d3e92dd7ca2f4810932568121260a2a Gerrit-Change-Number: 29724 Gerrit-PatchSet: 6 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 28 May 2024 14:55:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-gbproxy[master]: debian/osmo-gbproxy.init: delete

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/36942?usp=email ) Change subject: debian/osmo-gbproxy.init: delete ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/36942?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I890b1ee9c201f09dcef968482c0bc5ed65ea7def Gerrit-Change-Number: 36942 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 28 May 2024 14:54:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in osmo-gbproxy[master]: contrib/systemd: run as osmocom user

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/36941?usp=email ) Change subject: contrib/systemd: run as osmocom user ...................................................................... Patch Set 3: (1 comment) File contrib/systemd/osmo-gbproxy.service: https://gerrit.osmocom.org/c/osmo-gbproxy/+/36941/comment/42672b4f_91ee8563 PS3, Line 16: AmbientCapabilities=CAP_NET_RAW Why is this needed? for DAHDI related E1 lines? -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/36941?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I13529cd8c6ca94c43a9a81e2ea60bafc3f189ab4 Gerrit-Change-Number: 36941 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 28 May 2024 14:53:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in openbsc[master]: tests: adjust to osmotestconfig no copytree change

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/36940?usp=email ) Change subject: tests: adjust to osmotestconfig no copytree change ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/36940?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ice759b2205308ffb827293256eb1c0de9ac67edd Gerrit-Change-Number: 36940 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 28 May 2024 14:53:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in docker-playground[master]: asterisk: pjsip.conf: Stop Asterisk doing unexpected REGISTER on IMS

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36945?usp=email ) Change subject: asterisk: pjsip.conf: Stop Asterisk doing unexpected REGISTER on IMS ...................................................................... asterisk: pjsip.conf: Stop Asterisk doing unexpected REGISTER on IMS REGISTER should only be done when the IMS APN is ready, and baseband then interface asks it to register. Change-Id: I56249d4138c0a1f5824e089c14c095badc41dc95 --- M ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/45/36945/1 diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf index 07f68ba..60cdb36 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf @@ -93,6 +93,7 @@ contact_user=volte_ims endpoint=volte_ims line=yes +manual_register=yes [volte_ims] type=endpoint -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36945?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: I56249d4138c0a1f5824e089c14c095badc41dc95 Gerrit-Change-Number: 36945 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in docker-playground[master]: asterisk: pjsip.conf: Enable USIM Auth over AMI interface

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36946?usp=email ) Change subject: asterisk: pjsip.conf: Enable USIM Auth over AMI interface ...................................................................... asterisk: pjsip.conf: Enable USIM Auth over AMI interface Astersik_Tests already implement the related AMI procedures, hence configure Asterisk to use them. Depends: osmo-ttcn3-hacks.git ddc4c709e51b92dae4d10f0c71b062e4719da673 Change-Id: Iab2e9ad21ff6271ae51329608658ffe353173f38 --- M ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/46/36946/1 diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf index 60cdb36..8c7dbc8 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf @@ -110,7 +110,7 @@ type=auth auth_type=ims_aka username=238010000090828(a)172.18.11.103 -usim_ami=no +usim_ami=yes usim_opc=775A1F887D2AD66F9719C2C79F847B50 usim_k=D534E07854B75E475C667A856AA31F9C usim_sqn=000000011000 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36946?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: Iab2e9ad21ff6271ae51329608658ffe353173f38 Gerrit-Change-Number: 36946 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: AMI: Wait for Event Registry after IMS REGISTER

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36906?usp=email ) Change subject: asterisk: AMI: Wait for Event Registry after IMS REGISTER ...................................................................... asterisk: AMI: Wait for Event Registry after IMS REGISTER Change-Id: I735a4298ec0d13009d8971880fe870810608d7e0 --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.ttcn 2 files changed, 52 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index be1be70..a82af97 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -27,11 +27,14 @@ const charstring AMI_FIELD_ACTION := "Action"; const charstring AMI_FIELD_ACTION_ID := "ActionID"; +const charstring AMI_FIELD_CHAN_TYPE := "ChannelType"; +const charstring AMI_FIELD_DOMAIN := "Domain"; const charstring AMI_FIELD_EVENT := "Event"; const charstring AMI_FIELD_INFO := "Info"; -const charstring AMI_FIELD_USERNAME := "Username"; -const charstring AMI_FIELD_SECRET := "Secret"; const charstring AMI_FIELD_RESPONSE := "Response"; +const charstring AMI_FIELD_SECRET := "Secret"; +const charstring AMI_FIELD_STATUS := "Status"; +const charstring AMI_FIELD_USERNAME := "Username"; /* Extensions: */ const charstring AMI_FIELD_ALGORITHM := "Algorithm"; @@ -85,13 +88,19 @@ template (value) AMI_Field ts_AMI_Field_ActionId(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_ACTION_ID, val); template (value) AMI_Field +ts_AMI_Field_ChannelType(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_CHAN_TYPE, val); +template (value) AMI_Field +ts_AMI_Field_Domain(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_DOMAIN, val); +template (value) AMI_Field ts_AMI_Field_Event(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_EVENT, val); template (value) AMI_Field ts_AMI_Field_Info(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_INFO, val); template (value) AMI_Field -ts_AMI_Field_Username(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_USERNAME, val); -template (value) AMI_Field ts_AMI_Field_Secret(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_SECRET, val); +template (value) AMI_Field +ts_AMI_Field_Status(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_STATUS, val); +template (value) AMI_Field +ts_AMI_Field_Username(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_USERNAME, val); /* Extensions: */ template (value) AMI_Field ts_AMI_Field_Algorithm(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_ALGORITHM, val); @@ -115,15 +124,21 @@ template (present) AMI_Field tr_AMI_Field_ActionId(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_ACTION_ID, val); template (present) AMI_Field +tr_AMI_Field_ChannelType(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_CHAN_TYPE, val); +template (present) AMI_Field +tr_AMI_Field_Domain(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_DOMAIN, val); +template (present) AMI_Field tr_AMI_Field_Event(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_EVENT, val); template (present) AMI_Field tr_AMI_Field_Info(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_INFO, val); template (present) AMI_Field -tr_AMI_Field_Username(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_USERNAME, val); +tr_AMI_Field_Response(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_RESPONSE, val); template (present) AMI_Field tr_AMI_Field_Secret(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_SECRET, val); template (present) AMI_Field -tr_AMI_Field_Response(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_RESPONSE, val); +tr_AMI_Field_Status(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_STATUS, val); +template (present) AMI_Field +tr_AMI_Field_Username(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_USERNAME, val); /* Extensions: */ template (present) AMI_Field tr_AMI_Field_Algorithm(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_ALGORITHM, val); @@ -304,6 +319,25 @@ tr_AMI_Field_AUTN(autn) ); +/* Event: Registry + * Privilege: system,all + * ChannelType: PJSIP + * Username: sip:238010000090828@172.18.155.103 + * Domain: sip:172.18.155.103 + * Status: Registered + */ +template (present) AMI_Msg +tr_AMI_Event_Registry(template (present) charstring username := ?, + template (present) charstring domain := ?, + template (present) charstring status := ?, + template (present) charstring chan_type := "PJSIP") := superset( + tr_AMI_Field_Event("Registry"), + tr_AMI_Field_ChannelType(chan_type), + tr_AMI_Field_Username(username), + tr_AMI_Field_Domain(domain), + tr_AMI_Field_Status(status) +); + /*********************** * Adapter: ***********************/ diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 6852a57..e7d0616 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -400,13 +400,9 @@ ck := "9a6460bcc3c84a3eac69455a93b67a77", ik := "5238297dfcca759bd05d48ff49bc63fa"); - /* TODO: once registration is successful, rx: - * Event: Registry - * ChannelType: pjsip - * Username: <value> - * Domain: <value> - * Status: <value> - * Cause: <value> */ + AMI_CLIENT.receive(tr_AMI_Event_Registry(f_sip_SipAddr_to_str(pars.local_sip_record), + "sip:" & mp_local_ims_host, + "Registered")); /* TODO: test "Action: PJSIPUnregister" */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36906?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: I735a4298ec0d13009d8971880fe870810608d7e0 Gerrit-Change-Number: 36906 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Send P-Associated-URI in IMS Register Response

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36907?usp=email ) Change subject: asterisk: Send P-Associated-URI in IMS Register Response ...................................................................... asterisk: Send P-Associated-URI in IMS Register Response Change-Id: I4c163f34c052d0463baba799c44fecaaa15be394 --- M asterisk/IMS_ConnectionHandler.ttcn M library/SIP_Templates.ttcn 2 files changed, 62 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 091f5da..a55935a 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -66,6 +66,7 @@ charstring user, charstring display_name, charstring password, + charstring msisdn, /* Expected User-Location-Info in P-Access-Network-Info */ charstring uli_str, octetstring rand, @@ -150,6 +151,7 @@ user := user, display_name := f_sip_str_quote(display_name), password := password, + msisdn := "90828", uli_str := "2380100010000101", /* The Nonce field is the Base64 encoded version of the RAND value and concatenated with the AUTN: */ rand := '14987631f65f8e3788a0798b6ebcd08e'O, @@ -404,6 +406,7 @@ var template (value) SipAddr to_addr; var template (value) CommaParam_List digestCln ; var template (value) WwwAuthenticate wwwAuthenticate; + var template (value) P_Associated_Uri p_associated_uri := ts_P_Associated_Uri({}); var template (value) Security_server security_server; var template (value) Server server_name := ts_Server({c_sip_server_name}); var template (value) Require require := ts_Require({"sec-agree"}); @@ -487,6 +490,7 @@ wwwAuthenticate, sip_seq_nr, "REGISTER", + p_associated_uri := p_associated_uri, security_server := security_server, server := server_name, supported := supported, @@ -537,6 +541,16 @@ /* Validate P-Access-Network-Info: */ f_ims_validate_register_P_Access_Network_info(g_rx_sip_req, exp_present := true); + p_associated_uri := ts_P_Associated_Uri({ + ts_P_Assoc_uri_spec(ts_NameAddr(ts_SipUrl(ts_HostPort(g_pars.realm), + ts_UserInfo(g_pars.msisdn), + scheme := "sip"))), + ts_P_Assoc_uri_spec(ts_NameAddr(ts_SipUrl(ts_HostPort(g_pars.msisdn), + omit, + scheme := "tel"))), + ts_P_Assoc_uri_spec(g_rx_sip_req.msgHeader.toField.addressField.nameAddr) + }); + /* Tx 200 OK */ to_addr.params := f_sip_param_set(to_addr.params, "tag", f_sip_rand_tag()); tx_resp := ts_SIP_Response(sip_call_id, @@ -546,6 +560,7 @@ sip_seq_nr, "OK", via, + p_associated_uri := p_associated_uri, require := require, server := server_name, supported := supported, diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index 56404da..72a4426 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -37,16 +37,18 @@ } template (value) SipUrl ts_SipUrl(template (value) HostPort host_port, - template (omit) UserInfo user_info := omit) := { - scheme := "sip", + template (omit) UserInfo user_info := omit, + template (value) charstring scheme := "sip") := { + scheme := scheme, userInfo := user_info, hostPort := host_port, urlParameters := omit, headers := omit } template (present) SipUrl tr_SipUrl(template (present) HostPort host_port := ?, - template UserInfo user_info := *) := { - scheme := "sip", + template UserInfo user_info := *, + template (present) charstring scheme := "sip") := { + scheme := scheme, userInfo := user_info, hostPort := host_port, urlParameters := *, @@ -54,8 +56,9 @@ } template (value) SipUrl ts_SipUrlHost(template (value) charstring host, - template (omit) integer portField := omit) - := ts_SipUrl(ts_HostPort(host, portField)); + template (omit) integer portField := omit, + template (value) charstring scheme := "sip") + := ts_SipUrl(ts_HostPort(host, portField), scheme := scheme); function ts_SipUrl_from_Addr_Union(template (value) Addr_Union au) return template (value) SipUrl { @@ -241,6 +244,27 @@ access_net_specs := access_net_specs } +// [RFC3455 4.1] +template (present) P_Assoc_uri_spec tr_P_Assoc_uri_spec(template (present) NameAddr p_asso_uri := ?, + template SemicolonParam_List ai_params := *) := { + p_asso_uri := p_asso_uri, + ai_params := ai_params +} +template (value) P_Assoc_uri_spec ts_P_Assoc_uri_spec(template (value) NameAddr p_asso_uri, + template (omit) SemicolonParam_List ai_params := omit) := { + p_asso_uri := p_asso_uri, + ai_params := ai_params +} + +// [RFC3455 4.1] +template (present) P_Associated_Uri tr_P_Associated_Uri(template (present) P_Assoc_uri_spec_list p_assoc_uris := ?) := { + fieldName := P_ASSOCIATED_URI, + p_assoc_uris := p_assoc_uris +} +template (value) P_Associated_Uri ts_P_Associated_Uri(template (value) P_Assoc_uri_spec_list p_assoc_uris := {}) := { + fieldName := P_ASSOCIATED_URI, + p_assoc_uris := p_assoc_uris +} // [20.32] template (value) Require ts_Require(template (value) OptionTag_List optionsTags := {}) := { @@ -588,6 +612,7 @@ template (omit)Authorization authorization := omit, template (omit) Allow allow := ts_Allow(c_SIP_defaultMethods), template (omit) Expires expires := omit, + template (omit) P_Associated_Uri p_associated_uri := omit, template (omit) Require require := omit, template (omit) Security_client security_client := omit, template (omit) Security_server security_server := omit, @@ -616,6 +641,7 @@ addressField := from_addr.addr, fromParams := from_addr.params }, + p_associated_uri := p_associated_uri, require := require, security_client := security_client, security_server := security_server, @@ -644,6 +670,7 @@ template Allow allow := *, template Authorization authorization := *, template Expires expires := *, + template P_Associated_Uri p_associated_uri := *, template Require require := *, template Security_client security_client := *, template Security_server security_server := *, @@ -672,6 +699,7 @@ addressField := from_addr.addr, fromParams := from_addr.params }, + p_associated_uri := p_associated_uri, require := require, security_client := security_client, security_server := security_server, @@ -864,6 +892,7 @@ charstring reason, Via via, template (omit) Allow allow := omit, + template (omit) P_Associated_Uri p_associated_uri := omit, template (omit) Require require := omit, template (omit) Server server := omit, template (omit) Supported supported := omit, @@ -875,6 +904,7 @@ content_length := f_ContentLength(body), content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), allow := allow, + p_associated_uri := p_associated_uri, require := require, server := server, supported := supported, @@ -936,6 +966,7 @@ integer seq_nr, charstring method := "REGISTER", template (omit) Allow allow := omit, + template (omit) P_Associated_Uri p_associated_uri := omit, template (omit) Security_server security_server := omit, template (omit) Server server := omit, template (omit) Supported supported := omit, @@ -947,6 +978,7 @@ content_length := f_ContentLength(body), content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), allow := allow, + p_associated_uri := p_associated_uri, security_server := security_server, server := server, supported := supported, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36907?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: I4c163f34c052d0463baba799c44fecaaa15be394 Gerrit-Change-Number: 36907 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: f_sip_SipUrl_to_str(): Print username if present

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36905?usp=email ) Change subject: SIP_Templates: f_sip_SipUrl_to_str(): Print username if present ...................................................................... SIP_Templates: f_sip_SipUrl_to_str(): Print username if present Since now user is printed, adapt existing user in Asterisk_Tests to use the proper field. Change-Id: Ifb1470768222ddee1b1d96ecb9153412ed10fd42 --- M asterisk/IMS_ConnectionHandler.ttcn M library/SIP_Templates.ttcn 2 files changed, 17 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 0d11922..091f5da 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -503,7 +503,7 @@ */ authorization := f_tr_Authorization_AKAv1MD5(valueof(wwwAuthenticate), g_pars.user & "@" & g_pars.realm, - f_sip_SipUrl_to_str(g_pars.registrar_sip_record.addr.nameAddr.addrSpec)); + f_sip_SipUrl_to_str(g_pars.registrar_sip_req_uri)); /* TODO: match Authorization from above: */ exp_req := tr_SIP_REGISTER(g_pars.registrar_sip_req_uri, diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index 7da56bc..56404da 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -1426,7 +1426,11 @@ } function f_sip_SipUrl_to_str(SipUrl uri) return charstring { - var charstring str := uri.scheme & ":" & f_sip_HostPort_to_str(uri.hostPort); + var charstring str := uri.scheme & ":"; + if (ispresent(uri.userInfo)) { + str := str & uri.userInfo.userOrTelephoneSubscriber & "@"; + } + str := str & f_sip_HostPort_to_str(uri.hostPort); return str; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36905?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: Ifb1470768222ddee1b1d96ecb9153412ed10fd42 Gerrit-Change-Number: 36905 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024