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

[S] Change in ...osmo_dia2gsup[master]: debian/postinst: chmod +x

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36773?usp=email ) Change subject: debian/postinst: chmod +x ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/36773?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I281d55eaa9e058018604544599e80e60fb0aca79 Gerrit-Change-Number: 36773 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 15:01:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-mgw[master]: contrib/systemd: run as osmocom user

by laforge

Attention is currently required from: fixeria, msuraev, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/30094?usp=email ) Change subject: contrib/systemd: run as osmocom user ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/30094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibb83c231231b39dc6732c0f375aeb3b21f3938ef Gerrit-Change-Number: 30094 Gerrit-PatchSet: 8 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 15:01:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in libosmo-netif[master]: contrib: remove rpm spec file

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36725?usp=email ) Change subject: contrib: remove rpm spec file ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: > see https://gerrit.osmocom. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc Gerrit-Change-Number: 36725 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 15:01:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in libosmo-sccp[master]: contrib: remove rpm spec file

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36727?usp=email ) Change subject: contrib: remove rpm spec file ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: > The customer said that they only use osmo-pcap on centos 7 (SYS#6760), and that they deploy all othe […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36727?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iff549b7695512c76514ed8915c4807c455e2bdcc Gerrit-Change-Number: 36727 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 15:00:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36774?usp=email ) Change subject: ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter implementation ...................................................................... ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter implementation Change-Id: I8d89e1694347f93e84c692d23b375062e003878e --- M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg index e8e5058..c9011d5 100644 --- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -5,7 +5,6 @@ [LOGGING] [TESTPORT_PARAMETERS] -*.AMI.CTRL_HOSTNAME := "172.18.11.10" Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_local_address := "172.18.11.103" Asterisk_Tests_LOCAL_SIP_EMU.SIP.local_sip_port := "5061" Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_dest_address := "172.18.11.10" @@ -21,6 +20,7 @@ Asterisk_Tests.mp_remote_sip_host := "172.18.11.10" Asterisk_Tests.mp_local_sip_port := 5061 Asterisk_Tests.mp_remote_sip_port := 5094 +Asterisk_Tests.mp_ami_remote_host := "172.18.11.10" [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36774?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: I8d89e1694347f93e84c692d23b375062e003878e Gerrit-Change-Number: 36774 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter...

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36774?usp=email ) Change subject: ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter implementation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36774?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: I8d89e1694347f93e84c692d23b375062e003878e Gerrit-Change-Number: 36774 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 14:30:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36774?usp=email ) Change subject: ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter implementation ...................................................................... ttcn3-asterisk: Update Asterisk_Tests.cfg to adapt to new AMI_Adapter implementation Change-Id: I8d89e1694347f93e84c692d23b375062e003878e --- M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/74/36774/1 diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg index e8e5058..c9011d5 100644 --- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -5,7 +5,6 @@ [LOGGING] [TESTPORT_PARAMETERS] -*.AMI.CTRL_HOSTNAME := "172.18.11.10" Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_local_address := "172.18.11.103" Asterisk_Tests_LOCAL_SIP_EMU.SIP.local_sip_port := "5061" Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_dest_address := "172.18.11.10" @@ -21,6 +20,7 @@ Asterisk_Tests.mp_remote_sip_host := "172.18.11.10" Asterisk_Tests.mp_local_sip_port := 5061 Asterisk_Tests.mp_remote_sip_port := 5094 +Asterisk_Tests.mp_ami_remote_host := "172.18.11.10" [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36774?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: I8d89e1694347f93e84c692d23b375062e003878e Gerrit-Change-Number: 36774 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]: AMI_Function: Match field keys in case insensitive way

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36758?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: AMI_Function: Match field keys in case insensitive way ...................................................................... AMI_Function: Match field keys in case insensitive way As per [1], "Keys are case insensitive". [1] https://docs.asterisk.org/Configuration/Interfaces/Asterisk-Manager-Interfa… Change-Id: I9080f617c4e7272b9dd67d616069ac9350411f3c --- M asterisk/AMI_Functions.ttcn 1 file changed, 20 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index b70e0ee..c1211a9 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -84,22 +84,22 @@ ts_AMI_Field_Registration(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_REGISTRATION, val); template (present) AMI_Field -tr_AMI_Field_Action(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_ACTION, val); +tr_AMI_Field_Action(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_ACTION, val); template (present) AMI_Field -tr_AMI_Field_ActionId(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_ACTION_ID, val); +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_Username(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_USERNAME, val); +tr_AMI_Field_Username(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_USERNAME, val); template (present) AMI_Field -tr_AMI_Field_Secret(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_SECRET, val); +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(AMI_FIELD_RESPONSE, val); +tr_AMI_Field_Response(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_RESPONSE, val); /* Extensions: */ template (present) AMI_Field -tr_AMI_Field_Registration(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_REGISTRATION, val); +tr_AMI_Field_Registration(template (present) charstring val := ?) := tr_AMI_Field(pattern @nocase AMI_FIELD_REGISTRATION, val); template (present) AMI_Field -tr_AMI_Field_ResponseSuccess := tr_AMI_Field(AMI_FIELD_RESPONSE, "Success"); +tr_AMI_Field_ResponseSuccess := tr_AMI_Field(pattern @nocase AMI_FIELD_RESPONSE, "Success"); /*********************** -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36758?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: I9080f617c4e7272b9dd67d616069ac9350411f3c Gerrit-Change-Number: 36758 Gerrit-PatchSet: 4 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 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Emulation: Handle SIP REGISTER from peer

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36757?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: SIP_Emulation: Handle SIP REGISTER from peer ...................................................................... SIP_Emulation: Handle SIP REGISTER from peer This is needed when emulating an IMS core. Change-Id: I49dfe54434113eb8b75306a3a8ddda940fa14743 --- M library/SIP_Emulation.ttcn 1 file changed, 27 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/library/SIP_Emulation.ttcn b/library/SIP_Emulation.ttcn index a5ebcfb..3de7169 100644 --- a/library/SIP_Emulation.ttcn +++ b/library/SIP_Emulation.ttcn @@ -249,6 +249,19 @@ var SipUrl sip_to; alt { + /* SIP REGISTER was received on SIP socket/port */ + [] SIP.receive(tr_SIP_REGISTER) -> value sip_req { + var CallidString call_id := sip_req.msgHeader.callId.callid; + if (f_call_id_known(call_id)) { + /* re-register? */ + vc_conn := f_comp_by_call_id(call_id); + } else { + /* new REGISTER: check expect */ + vc_conn := ops.create_cb.apply(sip_req, id); + f_call_table_add(vc_conn, call_id); + } + CLIENT.send(sip_req) to vc_conn; + } /* SIP INVITE was received on SIP socket/port */ [] SIP.receive(tr_SIP_INVITE) -> value sip_req { var CallidString call_id := sip_req.msgHeader.callId.callid; @@ -355,8 +368,9 @@ var SipUrl sip_to; var integer i; - if (sip_req.requestLine.method != INVITE_E) { - setverdict(fail, "SIP ExpectedCreateCallback needs INVITE"); + if (sip_req.requestLine.method != INVITE_E and + sip_req.requestLine.method != REGISTER_E) { + setverdict(fail, "SIP ExpectedCreateCallback needs REGISTER/INVITE"); mtc.stop return ret; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36757?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: I49dfe54434113eb8b75306a3a8ddda940fa14743 Gerrit-Change-Number: 36757 Gerrit-PatchSet: 3 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 month

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email ) Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET ...................................................................... asterisk: Implement AMI_Adapter using IPL4 instead of TELNET Change Telnet_PT to a regular TCP socket for the AMI interface. 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. The current TEXT decoder/encoder from Titan seems to be struggling in 2 scenarios, so for now we are adding some workarounds in dec_AMI_Msg_ext() before calling it in order to be able to go forward and avoid errors: 1- Fields of format "MyFieldName: \r\n" (empty value). I tried changing the "value" field in record AMI_Field to "optional", but then apparently the TEXT decoder fails to decode values consisting of several words. Ideally, I'd expect the TEXT decoder to put an empty "" string in the "value" field in that case if "optional" is not flagged in the record. 2- Fields of format "MyFieldName: foobar: hey there \r\n" containing a ": " token in the value. I'd expect TEXT decoder to put all subsequent strings in the last field "value" if no more fields are described in the record. Change-Id: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.cfg M asterisk/Asterisk_Tests.default M asterisk/Asterisk_Tests.ttcn 4 files changed, 213 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index 6e0b8d0..b70e0ee 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -15,10 +15,11 @@ module AMI_Functions { import from Misc_Helpers all; -import from TELNETasp_PortType all; import from Osmocom_Types all; -import from TCCConversion_Functions all; +import from IPL4asp_Types all; +import from IPL4asp_PortType all; import from Socket_API_Definitions all; +import from TCCConversion_Functions all; modulepar { float mp_ami_prompt_timeout := 10.0; @@ -172,47 +173,167 @@ * Adapter: ***********************/ +type record AMI_Adapter_Parameters { + charstring remote_host, + IPL4asp_Types.PortNumber remote_port, + charstring local_host, + IPL4asp_Types.PortNumber local_port, + charstring welcome_str +} + +const AMI_Adapter_Parameters c_default_AMI_Adapter_pars := { + remote_host := "127.0.0.1", + remote_port := 5038, + local_host := "0.0.0.0", + local_port := 0, + welcome_str := "Asterisk Call Manager/9.0.0\r\n" +}; + type port AMI_Msg_PT message { inout AMI_Msg; } with { extension "internal" }; type component AMI_Adapter_CT { - port TELNETasp_PT AMI; + port IPL4asp_PT IPL4; port AMI_Msg_PT CLIENT; + var AMI_Adapter_Parameters g_pars; + + /* Connection identifier of the client itself */ + var IPL4asp_Types.ConnectionId g_self_conn_id := -1; } -function f_AMI_Adapter_main() runs on AMI_Adapter_CT { - var AMI_Msg msg; +/* Function to use to connect as client to a remote IPA Server */ +private function f_AMI_Adapter_connect() runs on AMI_Adapter_CT { + var IPL4asp_Types.Result res; + map(self:IPL4, system:IPL4); + res := IPL4asp_PortType.f_IPL4_connect(IPL4, g_pars.remote_host, g_pars.remote_port, + g_pars.local_host, g_pars.local_port, 0, { tcp:={} }); + if (not ispresent(res.connId)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Could not connect AMI socket from ", g_pars.local_host, " port ", + g_pars.local_port, " to ", g_pars.remote_host, " port ", g_pars.remote_port, + "; check your configuration")); + } + g_self_conn_id := res.connId; + log("AMI connected, ConnId=", g_self_conn_id) +} +private function f_ASP_RecvFrom_msg_to_charstring(ASP_RecvFrom rx_rf) return charstring { + return oct2char(rx_rf.msg); +} + +/* Function to use to connect as client to a remote IPA Server */ +private function f_AMI_Adapter_wait_rx_welcome_str() runs on AMI_Adapter_CT { + var ASP_RecvFrom rx_rf; + var charstring rx_str; + timer Twelcome := 3.0; + + Twelcome.start; + alt { + [] IPL4.receive(ASP_RecvFrom:?) -> value rx_rf { + rx_str := f_ASP_RecvFrom_msg_to_charstring(rx_rf); + if (g_pars.welcome_str != rx_str) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("AMI Welcome message mismatch: '", rx_str, + "' vs exp '", g_pars.welcome_str, "'")); + } + } + [] Twelcome.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("AMI Welcome timeout")); + } + } + Twelcome.stop; + log("AMI Welcome message received: '", rx_str, "'"); +} + +private function dec_AMI_Msg_ext(charstring txt) return AMI_Msg { + log("AMI dec: '", txt, "'"); + /* TEXT Enc/dec is not happy with empty values, workaround it: */ + var charstring patched_txt := f_str_replace(txt, "Challenge: \r\n", ""); + patched_txt := f_str_replace(patched_txt, "AccountCode: \r\n", ""); + patched_txt := f_str_replace(patched_txt, "Value: \r\n", ""); + patched_txt := f_str_replace(patched_txt, "DestExten: \r\n", ""); + patched_txt := f_str_replace(patched_txt, "Exten: \r\n", ""); + patched_txt := f_str_replace(patched_txt, "Extension: \r\n", ""); + + /* "AppData" field sometimes has a value containing separator ": ", which makes + * TEXT dec not happy. Workaround it for now by removing the whole field line: + * "AppData: 5,0502: Call pjsip endpoint from 0501\r\n" + */ + var integer pos := f_strstr(patched_txt, "AppData: ", 0); + if (pos >= 0) { + var integer pos_end := f_strstr(patched_txt, "\r\n", pos) + lengthof("\r\n"); + var charstring to_remove := substr(patched_txt, pos, pos_end - pos); + patched_txt := f_str_replace(patched_txt, to_remove, ""); + } + + log("AMI patched dec: '", patched_txt, "'"); + return dec_AMI_Msg(patched_txt); +} + +function f_AMI_Adapter_main(AMI_Adapter_Parameters pars := c_default_AMI_Adapter_pars) + runs on AMI_Adapter_CT { + var AMI_Msg msg; var charstring rx, buf := ""; var integer fd; + var ASP_RecvFrom rx_rf; + var ASP_Event rx_ev; - map(self:AMI, system:AMI); + g_pars := pars; + + f_AMI_Adapter_connect(); + + f_AMI_Adapter_wait_rx_welcome_str(); 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 */ + [] IPL4.receive(ASP_RecvFrom:?) -> value rx_rf { + var charstring rx_str := f_ASP_RecvFrom_msg_to_charstring(rx_rf); + log("AMI rx: '", rx_str, "'"); + buf := buf & rx_str; + log("AMI buf: '", buf, "'"); + + /* If several messages come together */ + var boolean last_is_complete := f_str_endswith(buf, "\r\n\r\n"); + var Misc_Helpers.ro_charstring msgs := f_str_split(buf, "\r\n\r\n"); + log("AMI split: ", msgs); + if (lengthof(msgs) > 0) { + for (var integer i := 0; i < lengthof(msgs) - 1; i := i + 1) { + var charstring txt := msgs[i] & "\r\n"; + msg := dec_AMI_Msg_ext(txt); + CLIENT.send(msg); + } + if (last_is_complete) { + var charstring txt := msgs[lengthof(msgs) - 1] & "\r\n"; + msg := dec_AMI_Msg_ext(txt); + CLIENT.send(msg); + buf := ""; + } else { + buf := msgs[lengthof(msgs) - 1]; + } } + log("AMI remain buf: '", buf, "'"); + } + [] IPL4.receive(ASP_ConnId_ReadyToRelease:?) { + } + + [] IPL4.receive(ASP_Event:?) -> value rx_ev { + log("Rx AMI ASP_Event: ", rx_ev); } [] 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); + var charstring tx_txt := enc_AMI_Msg(msg) & "\r\n"; + + var ASP_SendTo tx := { + connId := g_self_conn_id, + remName := g_pars.remote_host, + remPort := g_pars.remote_port, + proto := { tcp := {} }, + msg := char2oct(tx_txt) + }; + IPL4.send(tx); } } } @@ -355,4 +476,14 @@ f_ami_transceive_match_response_success(pt, ts_AMI_Action_PJSIPRegister(register, reg_action_id)); } +private function f_ami_selftest_decode(charstring txt) { + log("Text to decode: '", txt, "'"); + var AMI_Msg msg := dec_AMI_Msg(txt); + log("AMI_Msg decoded: ", msg); +} + +function f_ami_selftest() { + f_ami_selftest_decode("AppData: 5,0502: Call pjsip endpoint from 0501\r\n"); +} + } diff --git a/asterisk/Asterisk_Tests.cfg b/asterisk/Asterisk_Tests.cfg index a3669f9..bcc8a30 100644 --- a/asterisk/Asterisk_Tests.cfg +++ b/asterisk/Asterisk_Tests.cfg @@ -15,4 +15,5 @@ [MAIN_CONTROLLER] [EXECUTE] -Asterisk_Tests.control +#Asterisk_Tests.control +Asterisk_Tests.TC_selftest \ No newline at end of file diff --git a/asterisk/Asterisk_Tests.default b/asterisk/Asterisk_Tests.default index 622a5a9..ed4ec44 100644 --- a/asterisk/Asterisk_Tests.default +++ b/asterisk/Asterisk_Tests.default @@ -6,17 +6,6 @@ [TESTPORT_PARAMETERS] #*.*.DEBUG := "yes" #*.*.debug := "enabled" -*.AMI.PROMPT1 := "Asterisk Call Manager/9.0.0\n" -*.AMI.PROMPT2 := "\n" -#*.AMI.REGEX_PROMPT1 := "^Asterisk Call Manager.*$" -*.AMI.CTRL_MODE := "client" -*.AMI.CTRL_HOSTNAME := "127.0.0.1" -*.AMI.CTRL_PORTNUM := "5038" -*.AMI.CTRL_LOGIN_SKIPPED := "yes" -*.AMI.CTRL_DETECT_SERVER_DISCONNECTED := "yes" -*.AMI.CTRL_READMODE := "buffered" -*.AMI.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" -*.AMI.CTRL_CRLF := "yes" # Local SIP UAs: Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_sip_protocol := "UDP"; Asterisk_Tests_LOCAL_SIP_EMU.SIP.local_sip_port := "5060" diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index d2fc0d5..08a5f65 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -39,6 +39,10 @@ integer mp_local_ims_port := 5060; /* Asterisk AMI: */ + charstring mp_ami_remote_host := "127.0.0.1"; + integer mp_ami_remote_port := 5038; + charstring mp_ami_local_host := "0.0.0.0"; + integer mp_ami_local_port := 0; charstring mp_ami_user := "test_user"; charstring mp_ami_secret := "1234"; } @@ -73,9 +77,17 @@ /* Initialize connection towards Asterisk AMI */ private function f_init_ami() runs on test_CT { var charstring id := "Asterisk_Tests_AMI_EMU"; - vc_AMI := AMI_Adapter_CT.create(id); + vc_AMI := AMI_Adapter_CT.create(id) alive; connect(self:AMI_CLIENT, vc_AMI:CLIENT); - vc_AMI.start(f_AMI_Adapter_main()); + + var AMI_Adapter_Parameters ami_pars := { + remote_host := mp_ami_remote_host, + remote_port := mp_ami_remote_port, + local_host := mp_ami_local_host, + local_port := mp_ami_local_port, + welcome_str := c_default_AMI_Adapter_pars.welcome_str + }; + vc_AMI.start(f_AMI_Adapter_main(ami_pars)); f_ami_action_login(AMI_CLIENT, mp_ami_user, mp_ami_secret); @@ -102,6 +114,15 @@ log("end of f_init"); } +function f_shutdown() runs on test_CT { + /* Tear down AMI Adapter to avoid it keep receiving data from Asterisk + * and sending it to us after we stopped, causing error (Broken Pipe): */ + vc_AMI.stop; + vc_AMI.done; + log("end of ", testcasename()); + setverdict(pass); +} + function f_start_handler(void_fn fn, SIPConnHdlrPars pars) runs on test_CT return SIPConnHdlr { var SIPConnHdlr vc_conn; @@ -132,6 +153,7 @@ pars := f_init_ConnHdlrPars(); vc_conn := f_start_handler(refers(f_TC_internal_registration), pars); vc_conn.done; + f_shutdown(); } /* Successful SIP MO-MT Call between local clients: */ @@ -210,6 +232,7 @@ vc_conn[0].done; vc_conn[1].done; + f_shutdown(); } /* One of the users calls (INVITE) shared extension, which makes all other user @@ -281,6 +304,7 @@ for (var integer i := 0; i < num_conns; i := i + 1) { vc_conn_list[i].done; } + f_shutdown(); } testcase TC_internal_call_all_2registered() runs on test_CT { TC_internal_call_all_Nregistered(2); @@ -293,6 +317,7 @@ } testcase TC_selftest() runs on test_CT { + f_ami_selftest(); f_sip_digest_selftest(); setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?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: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d Gerrit-Change-Number: 36755 Gerrit-PatchSet: 4 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 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024