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

[S] Change in osmo-bts[master]: rsl.adoc: mention currently undocumented IEs

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/36712?usp=email ) Change subject: rsl.adoc: mention currently undocumented IEs ...................................................................... rsl.adoc: mention currently undocumented IEs RSL_IE_OSMO_TEMP_OVP_ACCH_CAP and RSL_IE_OSMO_OSMUX_CID have been defined for a while now, but are still not documented. Until someone who knows them can document them properly, we need to at least acknowledge their existence, and show the IEI code points that have been allocated to them, so it is clear from the documentation what IEI code points have already been allocated and where new extensions are to be added. Change-Id: I55d7eef946c24cd0e224157d95fdac3243a374ef --- M doc/manuals/abis/rsl.adoc 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/12/36712/1 diff --git a/doc/manuals/abis/rsl.adoc b/doc/manuals/abis/rsl.adoc index e627f5c..6e8746a 100644 --- a/doc/manuals/abis/rsl.adoc +++ b/doc/manuals/abis/rsl.adoc @@ -867,6 +867,8 @@ | 0x01 | RSL_IE_CHAN_NR | <<RSL_IE_CHAN_NR>> | 0x60 | RSL_IE_OSMO_REP_ACCH_CAP | <<RSL_IE_OSMO_REP_ACCH_CAP>> | 0x61 | RSL_IE_OSMO_TRAINING_SEQUENCE | <<RSL_IE_OSMO_TRAINING_SEQUENCE>> +| 0x62 | RSL_IE_OSMO_TEMP_OVP_ACCH_CAP | <<RSL_IE_OSMO_TEMP_OVP_ACCH_CAP>> +| 0x63 | RSL_IE_OSMO_OSMUX_CID | <<RSL_IE_OSMO_OSMUX_CID>> | 0xf0 | RSL_IE_IPAC_REMOTE_IP | <<RSL_IE_IPAC_REMOTE_IP>> | 0xf1 | RSL_IE_IPAC_REMOTE_PORT | <<RSL_IE_IPAC_REMOTE_PORT>> | 0xf3 | RSL_IE_IPAC_LOCAL_PORT | <<RSL_IE_IPAC_LOCAL_PORT>> @@ -1089,6 +1091,16 @@ | 8..255 | reserved values |=== +[[RSL_IE_OSMO_TEMP_OVP_ACCH_CAP]] +==== RSL_IE_OSMO_TEMP_OVP_ACCH_CAP + +FIXME: this IE has been defined, but remains to be documented. + +[[RSL_IE_OSMO_OSMUX_CID]] +==== RSL_IE_OSMO_OSMUX_CID + +FIXME: this IE has been defined, but remains to be documented. + [[RSL_IE_IPAC_RTP_CSD_FORMAT]] ==== RSL_IE_IPAC_RTP_CSD_FORMAT -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36712?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I55d7eef946c24cd0e224157d95fdac3243a374ef Gerrit-Change-Number: 36712 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: rsl.adoc: document RSL_IE_OSMO_RTP_EXTENSIONS

by falconia

Attention is currently required from: pespin. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36706?usp=email ) Change subject: rsl.adoc: document RSL_IE_OSMO_RTP_EXTENSIONS ...................................................................... Patch Set 1: (2 comments) File doc/manuals/abis/rsl.adoc: https://gerrit.osmocom.org/c/osmo-bts/+/36706/comment/8b58b70a_77cfacb1 PS1, Line 872: | 0x62 | RSL_IE_OSMO_TEMP_OVP_ACCH_CAP | <<RSL_IE_OSMO_TEMP_OVP_ACCH_CAP>> > These 2 above seem to actually be missing but not really related to this patch, so perhaps submit th […] The current state of the doc covers IEIs up to 0x61, but libosmocore has definitions up to 0x63. I picked 0x64 for my new IE, but attempting to document 0x64 right after 0x61 makes it obvious that the documentation step got skipped for 0x62 and 0x63. But yes, I will split this part off into a separate pre-patch. https://gerrit.osmocom.org/c/osmo-bts/+/36706/comment/234cb521_8172cf88 PS1, Line 1110: This information element requests the use of non-standard enhanced RTP > I'm maybe missing some sort of packetdiag output (see for instance packetdiag examples in . […] About TLV: I am open to changing this IE to TV. For context, please read TW-TS-003: https://www.freecalypso.org/specs/tw-ts-003-v010001.txt TW-TS-003 defines one new IE on AoIP BSSMAP interface, and that one is of fixed-length TV format. Now we need to propagate the same signaling from the BSC to the BTS - but for Abis-IP, unlike AoIP, there are no 3GPP specs at all, hence nothing to extend with TW-TS-* specs - instead all Abis-IP definitions have to be worked out in Osmocom only. For the Osmocom-controlled IE from OsmoBSC to OsmoBTS, my first thought was to make it TV and define it as an exact copy of TW-TS-003 on AoIP. But then I saw that all other Osmocom extension IEs, e.g., RSL_IE_OSMO_OSMUX_CID, are defined as TLV, even though Osmux CID for example is always one byte. Hence I followed suit with my new IE. Maybe we can now decide if the new IE (that replicates TW-TS-003 on Abis-IP) should be TV or TLV, and then document it accordingly? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36706?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6117049b17ced5fb6635ac70d9238169033af4de Gerrit-Change-Number: 36706 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 May 2024 17:24:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

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

by pespin

Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36711?usp=email ) Change subject: asterisk: Introduce AMI_Adapter_CT ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: FYI, I plan to submit a follow-up patch to this one which changes Telnet_PT to a regular TCP socket for the AMI interface. This is a step forward towards separating the wire coding from ttcn3 message encoding. I started using Telnet_PT port since initial use of the interface was done through telnet, but it's not really a telnet interface and stuff starts becoming difficult to maintain properly when events (generated by Asterisk at any time) arrive. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36711?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: Ibf230d2302fecf443f34e1c4d4acfd4802f4cc79 Gerrit-Change-Number: 36711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 May 2024 15:06:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36711?usp=email ) Change subject: asterisk: Introduce AMI_Adapter_CT ...................................................................... asterisk: Introduce AMI_Adapter_CT This allows to keep string handling totally internal to the AMI_Adapter component, which also means now the CLIENT port acts asynchronously on full AMI messages. This allows for instance using activated altsteps to ignore events or answer to them. Change-Id: Ibf230d2302fecf443f34e1c4d4acfd4802f4cc79 --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.ttcn 2 files changed, 126 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/36711/1 diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index 72420e1..6e0b8d0 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -167,6 +167,58 @@ tr_AMI_Field_ActionId(action_id) ); + +/*********************** + * Adapter: + ***********************/ + +type port AMI_Msg_PT message { + inout AMI_Msg; +} with { extension "internal" }; + +type component AMI_Adapter_CT { + port TELNETasp_PT AMI; + port AMI_Msg_PT CLIENT; +} + +function f_AMI_Adapter_main() runs on AMI_Adapter_CT { + var AMI_Msg msg; + + var charstring rx, buf := ""; + var integer fd; + + map(self:AMI, system:AMI); + + while (true) { + + alt { + [] AMI.receive(pattern "\n") { + buf := buf & "\n"; + msg := dec_AMI_Msg(buf); + buf := ""; + CLIENT.send(msg); + }; + [] AMI.receive(charstring:?) -> value rx { + buf := buf & rx; + }; + [] AMI.receive(integer:?) -> value fd { + if (fd == -1) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "AMI Telnet Connection Failure: " & int2str(fd)); + } else { + /* telnet connection succeeded */ + } + } + [] CLIENT.receive(AMI_Msg:?) -> value msg { + /* TODO: in the future, queue Action if there's already one Action in transit, to fullfill AMI requirements. */ + var charstring tx_txt := enc_AMI_Msg(msg); + AMI.send(tx_txt); + } + } + } +} + + /* * Functions: */ @@ -223,62 +275,66 @@ return field.val; } -private function f_ami_wait_for_prompt_str(TELNETasp_PT pt, charstring log_label := "(?)") -return charstring { - var charstring rx, buf := ""; - var integer fd; +function f_ami_transceive_ret(AMI_Msg_PT pt, template (value) AMI_Msg tx_msg, float rx_timeout := 10.0) return AMI_Msg { + var AMI_Msg rx_msg; timer T; - T.start(mp_ami_prompt_timeout); + T.start(rx_timeout); + pt.send(tx_msg); alt { - [] pt.receive(pattern "\n") { buf := buf & "\n" }; - [] pt.receive(charstring:?) -> value rx { buf := buf & rx; repeat }; - [] pt.receive(integer:?) -> value fd { - if (fd == -1) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "AMI Telnet Connection Failure: " & log_label); - } else { - repeat; /* telnet connection succeeded */ - } - } + [] pt.receive(AMI_Msg:?) -> value rx_msg; [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "AMI Timeout for prompt: " & log_label); - }; + log2str("AMI Response timeout: ", tx_msg)); + } } T.stop; - return buf; + return rx_msg; + } -function f_ami_wait_for_prompt(TELNETasp_PT pt, charstring log_label := "(?)") return AMI_Msg { - var charstring buf := f_ami_wait_for_prompt_str(pt, log_label); - var AMI_Msg msg := dec_AMI_Msg(buf); - return msg; -} - -/* send a AMI command and obtain response until prompt is received */ -private function f_ami_transceive_ret_str(TELNETasp_PT pt, charstring tx) return charstring { - pt.send(tx); - return f_ami_wait_for_prompt_str(pt, tx); -} - -function f_ami_transceive_ret(TELNETasp_PT pt, template (value) AMI_Msg tx_msg) return AMI_Msg { - var charstring tx_txt := enc_AMI_Msg(valueof(tx_msg)); - var charstring resp_txt := f_ami_transceive_ret_str(pt, tx_txt); - return dec_AMI_Msg(resp_txt); -} - -function f_ami_transceive_match(TELNETasp_PT pt, - template (value) AMI_Msg tx_msg, - template (present) AMI_Msg exp_ret := ?) { - var AMI_Msg ret := f_ami_transceive_ret(pt, tx_msg); - if (not match(ret, exp_ret)) { +private altstep as_ami_rx_fail(AMI_Msg_PT pt, template AMI_Msg exp_msg := *) +{ + var AMI_Msg msg; + [] pt.receive(AMI_Msg:?) -> value msg { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Non-matching AMI response: ", ret, " vs exp: ", exp_ret)); + log2str("Received unexpected AMI message := ", msg, "\nvs exp := ", exp_msg)); } } -function f_ami_transceive_match_response_success(TELNETasp_PT pt, +altstep as_ami_expect_msg(AMI_Msg_PT pt, template (present) AMI_Msg msg_expect, boolean fail_others := true) +{ + [] pt.receive(msg_expect); + [fail_others] as_ami_rx_fail(pt, msg_expect); +} + +function f_ami_transceive_match(AMI_Msg_PT pt, + template (value) AMI_Msg tx_msg, + template (present) AMI_Msg exp_ret := ?, + boolean fail_others := true, + float rx_timeout := 10.0) return AMI_Msg { + var AMI_Msg rx_msg; + timer T; + + T.start(rx_timeout); + pt.send(tx_msg); + alt { + [] pt.receive(exp_ret) -> value rx_msg; + [not fail_others] pt.receive(AMI_Msg:?) -> value rx_msg { + log("AMI: Ignoring Rx msg ", rx_msg); + repeat; + } + [fail_others] as_ami_rx_fail(pt, exp_ret); + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("AMI Response timeout: ", tx_msg)); + } + } + T.stop; + return rx_msg; +} + +function f_ami_transceive_match_response_success(AMI_Msg_PT pt, template (value) AMI_Msg tx_msg) { var template (present) AMI_Msg exp_resp; var template (omit) charstring action_id := f_ami_msg_get_value(valueof(tx_msg), AMI_FIELD_ACTION_ID); @@ -290,11 +346,11 @@ f_ami_transceive_match(pt, tx_msg, exp_resp); } -function f_ami_action_login(TELNETasp_PT pt, charstring username, charstring secret) { +function f_ami_action_login(AMI_Msg_PT pt, charstring username, charstring secret) { f_ami_transceive_match_response_success(pt, ts_AMI_Action_Login(username, secret)); } -function f_ami_action_PJSIPRegister(TELNETasp_PT pt, charstring register) { +function f_ami_action_PJSIPRegister(AMI_Msg_PT pt, charstring register) { var charstring reg_action_id := f_gen_action_id(); f_ami_transceive_match_response_success(pt, ts_AMI_Action_PJSIPRegister(register, reg_action_id)); } diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index c94f97f..d2fc0d5 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -49,7 +49,9 @@ /* Manages the IMS server Asterisk connects to: */ var SIP_Emulation_CT vc_IMS; - port TELNETasp_PT AMI; + /* Connection towards Asterisk AMI iface: */ + var AMI_Adapter_CT vc_AMI; + port AMI_Msg_PT AMI_CLIENT; port Coord_PT COORD; port IMSCoord_PT IMS_COORD; @@ -70,8 +72,13 @@ /* Initialize connection towards Asterisk AMI */ private function f_init_ami() runs on test_CT { - map(self:AMI, system:AMI); - f_ami_action_login(AMI, mp_ami_user, mp_ami_secret); + var charstring id := "Asterisk_Tests_AMI_EMU"; + vc_AMI := AMI_Adapter_CT.create(id); + connect(self:AMI_CLIENT, vc_AMI:CLIENT); + vc_AMI.start(f_AMI_Adapter_main()); + + + f_ami_action_login(AMI_CLIENT, mp_ami_user, mp_ami_secret); } /* Local SIP UAs */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36711?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: Ibf230d2302fecf443f34e1c4d4acfd4802f4cc79 Gerrit-Change-Number: 36711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Emulation: Rename component id

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?usp=email ) Change subject: SIP_Emulation: Rename component id ...................................................................... SIP_Emulation: Rename component id Remove the dash character, since it makes it impossible to reference the component name under TESTPORT_PARAMETERS in .default/.cfg files. While at it, actually, allow the test to provide a full id instead of always appending the suffix to it. This provides more freedom on the testsuite to provide a fitting component name. Change-Id: Iecefe7d98a5842872f1efc55e013f672186ef1a8 --- M asterisk/Asterisk_Tests.ttcn M library/SIP_Emulation.ttcn M sip/SIP_Tests.ttcn 3 files changed, 19 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index b164ee5..caa941c 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -66,7 +66,7 @@ function f_init() runs on test_CT { f_init_ami(); - f_init_sip(vc_SIP, "Asterisk_Test"); + f_init_sip(vc_SIP, "Asterisk_Test_SIP_EMU"); log("end of f_init"); } diff --git a/library/SIP_Emulation.ttcn b/library/SIP_Emulation.ttcn index 1b357b7..a5ebcfb 100644 --- a/library/SIP_Emulation.ttcn +++ b/library/SIP_Emulation.ttcn @@ -226,9 +226,7 @@ SipCreateCallback create_cb }; -function f_init_sip(inout SIP_Emulation_CT ct, charstring id) { - id := id & "-SIP"; - +function f_init_sip(inout SIP_Emulation_CT ct, charstring id := "SIP_EMU") { var SipOps ops := { create_cb := refers(SIP_Emulation.ExpectedCreateCallback) }; diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 95f09e8..5899311 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -131,7 +131,7 @@ //f_ipa_ctrl_start_client(mp_osmosip_host, mp_osmosip_port_ctrl); f_init_mncc("SIP_Test"); log("end of f_init_mncc"); - f_init_sip(vc_SIP, "SIP_Test"); + f_init_sip(vc_SIP, "SIP_Test_SIP_EMU"); log("end of f_init_sip"); map(self:SIPVTY, system:SIPVTY); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?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: Iecefe7d98a5842872f1efc55e013f672186ef1a8 Gerrit-Change-Number: 36641 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-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Initial steps to emulate IMS core

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36642?usp=email ) Change subject: asterisk: Initial steps to emulate IMS core ...................................................................... asterisk: Initial steps to emulate IMS core Add the initial infrastructure to manage 2 SIPmsg_PT ports, one for the local SIP UAs and one for the IMS core. Still missing: * Trigger Asterisk (through AMI) to do the initial connect + register to it * Configure ipsec after Unauthorized response from IMS core Change-Id: Ibbbadd54b7facf4ef7384499704e742f482a1252 --- M asterisk/Asterisk_Tests.default M asterisk/Asterisk_Tests.ttcn A asterisk/IMS_ConnectionHandler.ttcn 3 files changed, 145 insertions(+), 7 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/asterisk/Asterisk_Tests.default b/asterisk/Asterisk_Tests.default index 0996545..622a5a9 100644 --- a/asterisk/Asterisk_Tests.default +++ b/asterisk/Asterisk_Tests.default @@ -4,7 +4,8 @@ mtc.FileMask := ERROR | WARNING | PARALLEL | VERDICTOP; [TESTPORT_PARAMETERS] -*.*.DEBUG := "yes" +#*.*.DEBUG := "yes" +#*.*.debug := "enabled" *.AMI.PROMPT1 := "Asterisk Call Manager/9.0.0\n" *.AMI.PROMPT2 := "\n" #*.AMI.REGEX_PROMPT1 := "^Asterisk Call Manager.*$" @@ -16,11 +17,20 @@ *.AMI.CTRL_READMODE := "buffered" *.AMI.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" *.AMI.CTRL_CRLF := "yes" -*.SIP.local_sip_port := "5060" -*.SIP.default_local_address := "127.0.0.2" -*.SIP.default_sip_protocol := "UDP" -*.SIP.default_dest_port := "5060" -*.SIP.default_dest_address := "127.0.0.1" +# Local SIP UAs: +Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_sip_protocol := "UDP"; +Asterisk_Tests_LOCAL_SIP_EMU.SIP.local_sip_port := "5060" +Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_local_address := "127.0.0.2" +Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_dest_port := "5060" +Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_dest_address := "127.0.0.1" +# IMS Core: +Asterisk_Tests_IMS_SIP_EMU.SIP.default_sip_protocol := "TCP"; +Asterisk_Tests_IMS_SIP_EMU.SIP.listen_enabled := "enabled"; +Asterisk_Tests_IMS_SIP_EMU.SIP.local_sip_port := "5060" +Asterisk_Tests_IMS_SIP_EMU.SIP.default_local_address := "127.0.0.3" +# Disabled for Server mode: +#Asterisk_Tests_IMS_SIP_EMU.SIP.default_dest_address := "127.0.0.1" +#Asterisk_Tests_IMS_SIP_EMU.SIP.default_dest_port := "5060" [MODULE_PARAMETERS] diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index caa941c..c94f97f 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -27,6 +27,7 @@ import from SIP_Templates all; import from SIP_ConnectionHandler all; +import from IMS_ConnectionHandler all; modulepar { charstring mp_local_sip_host := "127.0.0.2"; @@ -34,15 +35,24 @@ charstring mp_remote_sip_host := "127.0.0.1"; integer mp_remote_sip_port := 5060; + charstring mp_local_ims_host := "127.0.0.3"; + integer mp_local_ims_port := 5060; + /* Asterisk AMI: */ charstring mp_ami_user := "test_user"; charstring mp_ami_secret := "1234"; } type component test_CT { + /* Manages all local VoIP users Asterisk is serving: */ var SIP_Emulation_CT vc_SIP; + /* Manages the IMS server Asterisk connects to: */ + var SIP_Emulation_CT vc_IMS; + port TELNETasp_PT AMI; + port Coord_PT COORD; + port IMSCoord_PT IMS_COORD; } const charstring broadcast_sip_extension := "0500"; @@ -64,9 +74,24 @@ f_ami_action_login(AMI, mp_ami_user, mp_ami_secret); } +/* Local SIP UAs */ +private function f_init_sip_local() runs on test_CT { + var charstring id := "Asterisk_Tests_LOCAL_SIP_EMU"; + f_init_sip(vc_SIP, id); +} + +/* IMS Server connection */ +private function f_init_sip_ims() runs on test_CT { + var charstring id := "Asterisk_Tests_IMS_SIP_EMU"; + f_init_sip(vc_IMS, id); +} + function f_init() runs on test_CT { + var charstring id; + f_init_ami(); - f_init_sip(vc_SIP, "Asterisk_Test_SIP_EMU"); + f_init_sip_local(); + f_init_sip_ims(); log("end of f_init"); } diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn new file mode 100644 index 0000000..a1baeb4 --- /dev/null +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -0,0 +1,88 @@ +/* Component implementing a IMS server towards Asterisk's IMS UE + * (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ +module IMS_ConnectionHandler { + +import from TCCOpenSecurity_Functions all; +import from General_Types all; +import from Osmocom_Types all; +import from Native_Functions all; +import from Misc_Helpers all; + +import from SDP_Types all; +import from SDP_Templates all; + +import from SIP_Emulation all; +import from SIPmsg_Types all; +import from SIP_Templates all; + +type port IMSCoord_PT message +{ + inout charstring; +} with { extension "internal" }; + +const charstring IMS_COORD_CMD_REGISTERED := "COORD_CMD_REGISTERED"; + +type component IMS_ConnHdlr extends SIP_ConnHdlr { + var charstring g_name; + var IMS_ConnHdlrPars g_pars; + timer g_Tguard; + var PDU_SIP_Request g_rx_sip_req; + var PDU_SIP_Response g_rx_sip_resp; + + port IMSCoord_PT COORD; +} +type record of IMS_ConnHdlr IMS_ConnHdlrList; + +type record IMS_ConnHdlrPars { + float t_guard, + charstring remote_sip_host, + uint16_t remote_sip_port, + charstring user, + charstring display_name, + charstring password, + SipUrl registrar_sip_req_uri, + SipAddr registrar_sip_record, + CallidString registrar_sip_call_id, + integer registrar_sip_seq_nr, + Via local_via, + SipUrl local_sip_url_ext, + SipAddr local_sip_record, + Contact local_contact, + IMS_CallPars cp optional +} +type record of IMS_ConnHdlrPars IMS_ConnHdlrParsList; + +type record IMS_CallParsMT { + /* Whether to wait for COORD.receive(COORD_CMD_PICKUP) before accepting the call. */ + boolean wait_coord_cmd_pickup, + /* Whether to expect CANCEL instead of ACK as answer to our OK */ + boolean exp_cancel +} + +type record IMS_CallPars { + SipAddr calling optional, + SipAddr called optional, + + SipAddr from_addr optional, + SipAddr to_addr optional, + + CallidString sip_call_id, + integer sip_seq_nr, + charstring sip_body optional, + + charstring local_rtp_addr, + uint16_t local_rtp_port, + + SDP_Message peer_sdp optional, + IMS_CallParsMT mt +} + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36642?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: Ibbbadd54b7facf4ef7384499704e742f482a1252 Gerrit-Change-Number: 36642 Gerrit-PatchSet: 2 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

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: tr_SIP_REGISTER(): Pass via field directly as a param

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36644?usp=email ) Change subject: SIP_Templates: tr_SIP_REGISTER(): Pass via field directly as a param ...................................................................... SIP_Templates: tr_SIP_REGISTER(): Pass via field directly as a param Similar to other templates which already required it. There's no user of this template (yet). Change-Id: I9fe477370e028543b04dee35a3285ddae6bb2c59 --- M library/SIP_Templates.ttcn 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index e115bb7..3492dc4 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -572,14 +572,14 @@ template (present) CallidString call_id := ?, template (present) SipAddr from_addr := ?, template (present) SipAddr to_addr := ?, + template (present) Via via := tr_Via_from(f_tr_HostPort_opt_defport(?)), template integer seq_nr := *, template Contact contact := *, template Expires expires := *, template charstring body := *) := { requestLine := tr_SIP_ReqLine(REGISTER_E, sip_url_host_port), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, contact, - tr_Via_from(f_tr_HostPort_opt_defport(from_addr.addr.nameAddr.addrSpec.hostPort)), - "REGISTER", *, seq_nr, + via, "REGISTER", *, seq_nr, expires := expires), messageBody := body, payload := omit -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36644?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: I9fe477370e028543b04dee35a3285ddae6bb2c59 Gerrit-Change-Number: 36644 Gerrit-PatchSet: 2 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

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Initial steps to emulate IMS core

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36642?usp=email ) Change subject: asterisk: Initial steps to emulate IMS core ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36642?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: Ibbbadd54b7facf4ef7384499704e742f482a1252 Gerrit-Change-Number: 36642 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 May 2024 14:48:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Emulation: Rename component id

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?usp=email ) Change subject: SIP_Emulation: Rename component id ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?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: Iecefe7d98a5842872f1efc55e013f672186ef1a8 Gerrit-Change-Number: 36641 Gerrit-PatchSet: 1 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-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 May 2024 14:48:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-sgsn[master]: VTY: sync default UMTS UEA config with osmo-msc

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36702?usp=email ) Change subject: VTY: sync default UMTS UEA config with osmo-msc ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: so iiuc this patch is actually enabling EUA1 and EUA2 and removing EUA2 when default config is used? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36702?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4eb9451b4267fc1436ed90a55ff200cf36f16bf6 Gerrit-Change-Number: 36702 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 07 May 2024 14:43:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024