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

[M] Change in osmo-ttcn3-hacks[master]: WIP: asterisk: Initial IMS registration

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36756?usp=email ) Change subject: WIP: asterisk: Initial IMS registration ...................................................................... WIP: asterisk: Initial IMS registration Change-Id: Idbb390e34ab3d008009a0f1b182c4165c86100e4 --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.ttcn M asterisk/IMS_ConnectionHandler.ttcn 3 files changed, 211 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/36756/1 diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index a144239..1223051 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -26,7 +26,7 @@ } const charstring AMI_FIELD_ACTION := "Action"; -const charstring AMI_FIELD_ACTION_ID := "ActionId"; +const charstring AMI_FIELD_ACTION_ID := "ActionID"; const charstring AMI_FIELD_USERNAME := "Username"; const charstring AMI_FIELD_SECRET := "Secret"; const charstring AMI_FIELD_RESPONSE := "Response"; @@ -115,16 +115,21 @@ * Secret: <value> */ template (value) AMI_Msg -ts_AMI_Action_Login(charstring username, charstring secret) := { +ts_AMI_Action_Login(charstring username, + charstring secret, + template (value) charstring action_id := "0001") := { ts_AMI_Field_Action("Login"), + ts_AMI_Field_ActionId(action_id), ts_AMI_Field_Username(username), ts_AMI_Field_Secret(secret) }; template (present) AMI_Msg tr_AMI_Action_Login(template(present) charstring username := ?, - template(present) charstring secret := ?) := superset( + template(present) charstring secret := ?, + template (present) charstring action_id := ?) := superset( tr_AMI_Field_Action("Login"), + tr_AMI_Field_ActionId(action_id), tr_AMI_Field_Username(username), tr_AMI_Field_Secret(secret) ); @@ -466,7 +471,8 @@ } 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)); + var charstring reg_action_id := f_gen_action_id(); + f_ami_transceive_match_response_success(pt, ts_AMI_Action_Login(username, secret, reg_action_id)); } function f_ami_action_PJSIPRegister(AMI_Msg_PT pt, charstring register) { diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 08a5f65..acaafb8 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -37,6 +37,7 @@ charstring mp_local_ims_host := "127.0.0.3"; integer mp_local_ims_port := 5060; + charstring mp_ims_imsi := "001010000000002"; /* Asterisk AMI: */ charstring mp_ami_remote_host := "127.0.0.1"; @@ -45,6 +46,7 @@ integer mp_ami_local_port := 0; charstring mp_ami_user := "test_user"; charstring mp_ami_secret := "1234"; + charstring mp_volte_ims_outbound_registration := "volte_ims"; } type component test_CT { @@ -74,6 +76,15 @@ return valueof(pars); } +function f_init_IMS_ConnHdlrPars(integer idx := 1) runs on test_CT return IMS_ConnHdlrPars { + var template (value) IMS_CallPars cp := t_IMS_CallPars(mp_local_sip_host, 1234 + 2*idx); + var template (value) IMS_ConnHdlrPars pars := t_IMS_Pars(mp_local_ims_host, + mp_local_ims_port, + mp_ims_imsi, + cp := cp); + return valueof(pars); +} + /* Initialize connection towards Asterisk AMI */ private function f_init_ami() runs on test_CT { var charstring id := "Asterisk_Tests_AMI_EMU"; @@ -139,6 +150,22 @@ return vc_conn; } +function f_start_handler_IMS(ims_void_fn fn, IMS_ConnHdlrPars pars) +runs on test_CT return IMS_ConnHdlr { + var IMS_ConnHdlr vc_conn; + var charstring id := testcasename() & "-IMS_ConnHdlr-" & pars.user; + + vc_conn := IMS_ConnHdlr.create(id) alive; + + connect(vc_conn:SIP, vc_SIP:CLIENT); + connect(vc_conn:SIP_PROC, vc_SIP:CLIENT_PROC); + + connect(vc_conn:COORD, self:IMS_COORD); + + vc_conn.start(f_ims_handler_init(fn, id, pars)); + return vc_conn; +} + /* Test SIP registration of local clients */ private function f_TC_internal_registration(charstring id) runs on SIPConnHdlr { @@ -322,12 +349,48 @@ setverdict(pass); } +/* Test SIP registration of local clients */ +private function f_TC_ims_registration(charstring id) runs on IMS_ConnHdlr { + as_IMS_register(); + setverdict(pass); +} +testcase TC_ims_registration() 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), pars); + + /* Clear events: */ + AMI_CLIENT.clear; + /* Trigger registration: */ + f_ami_action_PJSIPRegister(AMI_CLIENT, mp_volte_ims_outbound_registration); + /* TODO: Rx "Event: AuthRequest" */ + /* TODO: Tx "Action: AuthResponse" */ + /* TODO: Rx "Response: Success" */ + /* TODO: once registration is successful, rx: + * Event: Registry + * ChannelType: pjsip + * Username: <value> + * Domain: <value> + * Status: <value> + * Cause: <value> */ + + /* TODO: test "Action: PJSIPUnregister" */ + + /* TODO: in another test emulating a call, test "Action: DedicatedBearerStatus" */ + + vc_conn.done; + f_shutdown(); +} + control { execute( TC_internal_registration() ); execute( TC_internal_call_momt() ); execute( TC_internal_call_all_2registered() ); execute( TC_internal_call_all_3registered() ); execute( TC_internal_call_all_4registered() ); + execute( TC_ims_registration() ); } } diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index a1baeb4..cded5fc 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -43,8 +43,8 @@ type record IMS_ConnHdlrPars { float t_guard, - charstring remote_sip_host, - uint16_t remote_sip_port, + charstring remote_sip_host optional, + uint16_t remote_sip_port optional, charstring user, charstring display_name, charstring password, @@ -66,6 +66,10 @@ /* Whether to expect CANCEL instead of ACK as answer to our OK */ boolean exp_cancel } +template (value) IMS_CallParsMT t_IMS_CallParsMT := { + wait_coord_cmd_pickup := false, + exp_cancel := false +} type record IMS_CallPars { SipAddr calling optional, @@ -85,4 +89,127 @@ IMS_CallParsMT mt } +template (value) IMS_CallPars t_IMS_CallPars(charstring local_rtp_addr, + uint16_t local_rtp_port := 0, + template (omit) SipAddr calling := omit, + template (omit) SipAddr called := omit) := { + calling := calling, + called := called, + from_addr := omit, + to_addr := omit, + sip_call_id := hex2str(f_rnd_hexstring(15)), + sip_seq_nr := f_sip_rand_seq_nr(), + sip_body := omit, + local_rtp_addr := local_rtp_addr, + local_rtp_port := local_rtp_port, + peer_sdp := omit, + mt := t_IMS_CallParsMT +} + +template (value) IMS_ConnHdlrPars t_IMS_Pars(charstring local_sip_host, + uint16_t local_sip_port, + charstring user, + charstring display_name := "Anonymous", + charstring password := "secret", + template (omit) IMS_CallPars cp := omit) := { + t_guard := 30.0, + remote_sip_host := omit, + remote_sip_port := omit, + user := user, + display_name := f_sip_str_quote(display_name), + password := password, + registrar_sip_req_uri := valueof(ts_SipUrlHost(local_sip_host)), + registrar_sip_record := ts_SipAddr(ts_HostPort(local_sip_host), + ts_UserInfo(user), + f_sip_str_quote(display_name)), + registrar_sip_call_id := hex2str(f_rnd_hexstring(15)) & "@" & local_sip_host, + registrar_sip_seq_nr := f_sip_rand_seq_nr(), + local_via := ts_Via_from(ts_HostPort(local_sip_host, local_sip_port)), + local_sip_url_ext := ts_SipUrl(ts_HostPort(local_sip_host, local_sip_port), + ts_UserInfo(user)), + local_sip_record := ts_SipAddr(ts_HostPort(local_sip_host), + ts_UserInfo(user)), + local_contact := valueof(ts_Contact({ + ts_ContactAddress( + ts_Addr_Union_SipUrl(ts_SipUrl(ts_HostPort( + local_sip_host, + local_sip_port), + ts_UserInfo(user))), + omit) + })), + cp := cp +} + +private altstep as_Tguard() runs on IMS_ConnHdlr { + [] g_Tguard.timeout { + setverdict(fail, "Tguard timeout"); + mtc.stop; + } +} + +type function ims_void_fn(charstring id) runs on IMS_ConnHdlr; +function f_ims_handler_init(ims_void_fn fn, charstring id, IMS_ConnHdlrPars pars) +runs on IMS_ConnHdlr { + g_name := id; + g_pars := pars; + g_Tguard.start(pars.t_guard); + activate(as_Tguard()); + + /* call the user-supied test case function */ + fn.apply(id); +} + +private altstep as_SIP_fail_req(charstring exp_msg_str := "") runs on IMS_ConnHdlr +{ + var PDU_SIP_Request sip_req; + [] SIP.receive(PDU_SIP_Request:?) -> value sip_req { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received unexpected SIP Req message := ", sip_req, "\nvs exp := ", exp_msg_str)); + } +} + +private altstep as_SIP_fail_resp(charstring exp_msg_str := "") runs on IMS_ConnHdlr +{ + var PDU_SIP_Response sip_resp; + [] SIP.receive(PDU_SIP_Response:?) -> value sip_resp { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received unexpected SIP Resp message := ", sip_resp, "\nvs exp := ", exp_msg_str)); + } +} + +/* Peer is calling us, accept it: */ +altstep as_IMS_register(boolean exp_update_to_direct_rtp := true, + boolean fail_others := true) runs on IMS_ConnHdlr +{ + var template (present) PDU_SIP_Request exp_req := + tr_SIP_REGISTER(g_pars.registrar_sip_req_uri, + ?, + tr_SipAddr(), + tr_SipAddr(), + tr_Via_from(?)); + var charstring sip_expect_str := log2str(exp_req); + + [] SIP.receive(exp_req) -> value g_rx_sip_req { + var template (value) PDU_SIP_Response tx_resp; + var Via via; + var charstring tx_sdp; + + via := g_rx_sip_req.msgHeader.via; + + /* Tx 200 OK + * TODO: Tx Unauthorized instead, with IMS params */ + tx_resp := ts_SIP_Response(g_pars.cp.sip_call_id, + g_pars.cp.from_addr, + g_pars.cp.to_addr, + "REGISTER", 200, + g_pars.cp.sip_seq_nr, + "OK", + via); + SIP.send(tx_resp); + } + [fail_others] as_SIP_fail_resp(sip_expect_str); + [fail_others] as_SIP_fail_req(sip_expect_str); + +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36756?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: Idbb390e34ab3d008009a0f1b182c4165c86100e4 Gerrit-Change-Number: 36756 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-bts[master]: rsl.adoc: document RSL_IE_OSMO_RTP_EXTENSIONS

by fixeria

Attention is currently required from: falconia, pespin. fixeria 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 2: (1 comment) File doc/manuals/abis/rsl.adoc: https://gerrit.osmocom.org/c/osmo-bts/+/36706/comment/181524d6_dc2387ba PS1, Line 1110: This information element requests the use of non-standard enhanced RTP > @falcon@freecalypso. […] One reason to use TLV would be backwards compatibility with old parsers not supporting this IEI. Having the `L` byte allows them to skip unknown TLV properly, assuming that all unknown IEIs are treated as TLVs. -- 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: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 May 2024 16:59:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

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

by fixeria

Attention is currently required from: falconia, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36712?usp=email ) Change subject: rsl.adoc: mention currently undocumented IEs ...................................................................... Patch Set 1: Code-Review+2 -- 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-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-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 08 May 2024 16:55:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Automatically report alarm condition to remote peer

by manawyrm

Attention is currently required from: jolly, roox, tnt. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36687?usp=email ) Change subject: icE1usb fw: Automatically report alarm condition to remote peer ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36687?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I5ccf6b92f7be512bad3dda42caaee5f7eabf3ca3 Gerrit-Change-Number: 36687 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 08 May 2024 16:42:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-e1-hardware[master]: icE1usb fw: Rework the way LEDs are used and updated

by manawyrm

Attention is currently required from: jolly, roox, tnt. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36686?usp=email ) Change subject: icE1usb fw: Rework the way LEDs are used and updated ...................................................................... Patch Set 3: Code-Review+1 (1 comment) Patchset: PS3: very nice, excellent to have this feedback! -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36686?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ib3215a676716cc60e27c5857e4559135928a8cf7 Gerrit-Change-Number: 36686 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 08 May 2024 16:42:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-e1-hardware[master]: icE1usb fw: Add AIS error flag and fill it along with LOS from linemon

by manawyrm

Attention is currently required from: jolly, roox, tnt. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36685?usp=email ) Change subject: icE1usb fw: Add AIS error flag and fill it along with LOS from linemon ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36685?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ied28b6b3da74f6a63a007fae889b571cc2c1e835 Gerrit-Change-Number: 36685 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 08 May 2024 16:41:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-e1-hardware[master]: icE1usb fw: Implement E1 line monitor task

by manawyrm

Attention is currently required from: jolly, roox, tnt. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36684?usp=email ) Change subject: icE1usb fw: Implement E1 line monitor task ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/36684?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id310b65b7cd83c3bbae90ecd4a82b09a3989d91f Gerrit-Change-Number: 36684 Gerrit-PatchSet: 3 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 08 May 2024 16:40:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

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

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder 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, 211 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/36755/2 -- 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: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: fix request sending in f_http_tx_request

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36710?usp=email ) Change subject: HTTP_Adapter: fix request sending in f_http_tx_request ...................................................................... HTTP_Adapter: fix request sending in f_http_tx_request The function f_http_tx_request has two parameters to spcifiy the body part of the HTTP request (body and binary_body). The function only sends a request when either body or binary_body is populated, but not when none of the two is populated. This means requests without body part (e.g. a GET request) can not be sent. There is also no proper interlocking between body and binary_body. We should make sure that this situation does not occur. Related: SYS#6824 Change-Id: I258ee6209c35d0601f5a4d82423d2f5c6fbb03cc --- M library/HTTP_Adapter.ttcn 1 file changed, 29 insertions(+), 2 deletions(-) Approvals: dexter: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn index f408ee4..97233e5 100644 --- a/library/HTTP_Adapter.ttcn +++ b/library/HTTP_Adapter.ttcn @@ -205,13 +205,21 @@ use_client_id := client_id; } - if (not istemplatekind(body, "omit")) { + if (not istemplatekind(body, "omit") and istemplatekind(binary_body, "omit")) { + /* HTTP message with ASCII content */ HTTP.send(ts_HTTP_Req(url, method, body, host := g_pars.http_host & ":" & int2str(g_pars.http_port), custom_hdr := custom_hdr, client_id := use_client_id)); - } else if (not istemplatekind(binary_body, "omit")) { + } else if (not istemplatekind(binary_body, "omit") and istemplatekind(body, "omit")) { + /* HTTP message with binary content */ HTTP.send(ts_HTTP_Req_Bin(url, method, binary_body, host := g_pars.http_host & ":" & int2str(g_pars.http_port), custom_hdr := custom_hdr, client_id := use_client_id)); + } else if (istemplatekind(binary_body, "omit") and istemplatekind(body, "omit")) { + /* HTTP message without content (e.g. a GET request) */ + HTTP.send(ts_HTTP_Req(url, method, host := g_pars.http_host & ":" & int2str(g_pars.http_port), + custom_hdr := custom_hdr, client_id := use_client_id)); + } else { + setverdict(fail, "either binary_body or body must be used (a request can contain either ASCII data or binary data, not both!"); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36710?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: I258ee6209c35d0601f5a4d82423d2f5c6fbb03cc Gerrit-Change-Number: 36710 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> 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]: HTTP_Adapter: fix request sending in f_http_tx_request

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36710?usp=email ) Change subject: HTTP_Adapter: fix request sending in f_http_tx_request ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36710?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: I258ee6209c35d0601f5a4d82423d2f5c6fbb03cc Gerrit-Change-Number: 36710 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 08 May 2024 15:50:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024