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

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

by fixeria

Attention is currently required from: pespin. fixeria 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: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641/comment/d448a0d6_2e86… PS1, Line 9: it makes it impossible to reference the : component name under TESTPORT_PARAMETERS I run `git-grep` and found this: ``` msc/MSC_Tests.default:[TESTPORT_PARAMETERS] msc/MSC_Tests.default-"MSC_Test-MNCC".MNCC.socket_type := "SEQPACKET"; ``` So escaping dashes should not be a problem. We follow this naming style in other testcases. so I would suggest to stick to it. File library/SIP_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641/comment/58aa9a96_0341… PS1, Line 229: _EMU We also don't have the `EMU` in other emulation components, so why making this different... -- 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-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 Apr 2024 17:32:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Emulation: Remove duplicated map()

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36640?usp=email ) Change subject: SIP_Emulation: Remove duplicated map() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36640?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: I5632c94d03a9dce0d04d94766ce72e6700b6116b Gerrit-Change-Number: 36640 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 Apr 2024 17:25:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-ci[master]: OBS: move gerrit-binpkgs logic to separate script

by fixeria

Attention is currently required from: neels, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36639?usp=email ) Change subject: OBS: move gerrit-binpkgs logic to separate script ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36639?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I100d8dfc0c58bdafe7efb0fa4108031ce10398a5 Gerrit-Change-Number: 36639 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 Apr 2024 17:18:26 +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]: HTTP_Adaptor: allow keeping an HTTP client connection

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?usp=email ) Change subject: HTTP_Adaptor: allow keeping an HTTP client connection ...................................................................... Patch Set 1: (1 comment) File library/HTTP_Adapter.ttcn: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15829): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646/comment/5c877b87_dbb5… PS1, Line 188: /* In case the caller didn't specifiy a client_id, we will create a new connection. */ 'specifiy' may be misspelled - perhaps 'specify'? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?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: Ic6994c504143820dde498c1a2bad2ad6a523dd70 Gerrit-Change-Number: 36646 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 25 Apr 2024 16:05:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: improve ts_initiateAuthenticationRequestE...

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36647?usp=email ) Change subject: SGP32Definitions_Templates: improve ts_initiateAuthenticationRequestEsipa ...................................................................... SGP32Definitions_Templates: improve ts_initiateAuthenticationRequestEsipa The template ts_initiateAuthenticationRequestEsipa has a field for smdpAddress and euiccInfo1. Those fields are optional fields, but they still play a central role in the protocol, so that they are effectively mandatory. Let's make the fields available to the template user and populate them with meaningful default values. Related: SYS#6824 Change-Id: I97aa039810ad9fffea4226254fa675fd24647de1 --- M library/euicc/SGP32Definitions_Templates.ttcn 1 file changed, 20 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/36647/1 diff --git a/library/euicc/SGP32Definitions_Templates.ttcn b/library/euicc/SGP32Definitions_Templates.ttcn index c178a9c..86c2055 100644 --- a/library/euicc/SGP32Definitions_Templates.ttcn +++ b/library/euicc/SGP32Definitions_Templates.ttcn @@ -77,11 +77,13 @@ } } template (value) EsipaMessageFromIpaToEim -ts_initiateAuthenticationRequestEsipa(template (value) octetstring euiccChallenge := '00112233445566778899aabbccddeeff'O) := { +ts_initiateAuthenticationRequestEsipa(template (value) octetstring euiccChallenge := '00112233445566778899aabbccddeeff'O, + template (omit) charstring smdpAddress := "smdp.example.com", + template (omit) EUICCInfo1 euiccInfo1 := ts_EUICCInfo1) := { initiateAuthenticationRequestEsipa := { euiccChallenge := euiccChallenge, - smdpAddress := omit, - euiccInfo1 := omit + smdpAddress := smdpAddress, + euiccInfo1 := euiccInfo1 } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36647?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: I97aa039810ad9fffea4226254fa675fd24647de1 Gerrit-Change-Number: 36647 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: add testsuite for an IPAd

by dexter

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email to look at the new patch set (#8). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: IPAd_Tests: add testsuite for an IPAd ...................................................................... IPAd_Tests: add testsuite for an IPAd With this patch we add a testsuite that can be used to test an IPAd implementation. The testsuite emulates the ESipa and the ES10x (pcsc cardreader) interface and is capable of testing a direct profile download and other ESipa features like the execution of an eIM package (eCO, PSMO). Change-Id: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Related: SYS#6564 --- M .checkpatch.conf M Makefile A ipad/IPAd_Tests.cfg A ipad/IPAd_Tests.default A ipad/IPAd_Tests.ttcn A ipad/example_ca/easyrsa A ipad/example_ca/openssl-easyrsa.cnf A ipad/example_ca/pki/ca.crt A ipad/example_ca/pki/certs_by_serial/2AA3F8FFC3B562AFC67845389A5F2C5A.pem A ipad/example_ca/pki/certs_by_serial/FAEE71AC9CF85B804DCE4BD357F83209.pem A ipad/example_ca/pki/index.txt A ipad/example_ca/pki/index.txt.attr A ipad/example_ca/pki/index.txt.attr.old A ipad/example_ca/pki/index.txt.old A ipad/example_ca/pki/issued/alttest.cabundle A ipad/example_ca/pki/issued/alttest.crt A ipad/example_ca/pki/issued/alttest.notes A ipad/example_ca/pki/issued/testsuite.cabundle A ipad/example_ca/pki/issued/testsuite.crt A ipad/example_ca/pki/issued/testsuite.notes A ipad/example_ca/pki/openssl-easyrsa.cnf A ipad/example_ca/pki/private/alttest.key A ipad/example_ca/pki/private/ca.key A ipad/example_ca/pki/private/testsuite.key A ipad/example_ca/pki/reqs/alttest.req A ipad/example_ca/pki/reqs/testsuite.req A ipad/example_ca/pki/safessl-easyrsa.cnf A ipad/example_ca/pki/serial A ipad/example_ca/pki/serial.old A ipad/example_ca/pki/vars A ipad/example_ca/pki/vars.example A ipad/example_ca/x509-types A ipad/gen_links.sh A ipad/regen_makefile.sh M regen-makefile.sh 35 files changed, 2,180 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/36229/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?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: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Gerrit-Change-Number: 36229 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: HTTP_Adapter: add support for binary messages

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36645?usp=email ) Change subject: HTTP_Adapter: add support for binary messages ...................................................................... HTTP_Adapter: add support for binary messages The HTTP_Adapter currently only supports text only HTTP messages. However, the HTTPmsg testport API also has a way to deal with binary HTTP messages. Related: SYS#6824 Change-Id: I18340f19ed462bf80af683dc9f2831b602f4bdf7 --- M library/HTTP_Adapter.ttcn 1 file changed, 76 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/36645/1 diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn index d26cce5..1b7605f 100644 --- a/library/HTTP_Adapter.ttcn +++ b/library/HTTP_Adapter.ttcn @@ -71,11 +71,17 @@ } function f_ts_HTTP_Header(template (omit) charstring body := omit, + template (omit) octetstring binary_body := omit, template (omit) charstring host := omit, HeaderLines custom_hdr := { }) return template (value) HeaderLines { var HeaderLines hdr := { }; + /* Make sure we never use body or binary_body at the same time */ + if (not istemplatekind(body, "omit") and not istemplatekind(body, "omit")) { + setverdict(fail, "use wither (ascii) body or binary_body"); + } + /* Build default header */ if (not istemplatekind(host, "omit")) { hdr := hdr & {valueof(ts_HeaderLine("Host", valueof(host)))}; @@ -84,6 +90,9 @@ if (not istemplatekind(body, "omit")) { hdr := hdr & {valueof(ts_HeaderLine("Content-Length", int2str(lengthof(body))))}; } + if (not istemplatekind(binary_body, "omit")) { + hdr := hdr & {valueof(ts_HeaderLine("Content-Length", int2str(lengthof(binary_body))))}; + } return f_overlay_HTTP_Header(hdr, custom_hdr); } @@ -107,11 +116,36 @@ uri := url, version_major := v_maj, version_minor := v_min, - header := f_ts_HTTP_Header(body, host, custom_hdr), + header := f_ts_HTTP_Header(body, omit, host, custom_hdr), body := f_ts_body_or_empty(body) } } +function f_ts_body_or_empty_bin(template (omit) octetstring body) return template (value) octetstring { + if (istemplatekind(body, "omit")) { + return ''O; + } + return body; +} + +template (value) HTTPMessage ts_HTTP_Req_Bin(charstring url, + charstring method := "GET", + template (omit) octetstring body := omit, + integer v_maj := 1, integer v_min := 1, + charstring host, + HeaderLines custom_hdr := { }) := { + request_binary := { + client_id := omit, + method := method, + uri := url, + version_major := v_maj, + version_minor := v_min, + header := f_ts_HTTP_Header(omit, body, host, custom_hdr), + body := f_ts_body_or_empty_bin(body) + } +} + + template HTTPMessage tr_HTTP_Resp(template integer sts := ?) := { response := { client_id := ?, @@ -124,14 +158,33 @@ } }; +template HTTPMessage tr_HTTP_Resp_Bin(template integer sts := ?) := { + response_binary := { + client_id := ?, + version_major := ?, + version_minor := ?, + statuscode := sts, + statustext := ?, + header := ?, + body := ? + } +}; + template HTTPMessage tr_HTTP_Resp2xx := tr_HTTP_Resp((200..299)); -function f_http_tx_request(charstring url, charstring method := "GET", template charstring body := omit, +function f_http_tx_request(charstring url, charstring method := "GET", + template charstring body := omit, + template octetstring binary_body := omit, HeaderLines custom_hdr := { }) runs on http_CT { HTTP.send(ts_HTTP_Connect(g_pars.http_host, g_pars.http_port, g_pars.use_ssl)); HTTP.receive(Connect_result:?); - HTTP.send(ts_HTTP_Req(url, method, body, host := g_pars.http_host & ":" & int2str(g_pars.http_port), custom_hdr := custom_hdr)); + + if (not istemplatekind(body, "omit")) { + HTTP.send(ts_HTTP_Req(url, method, body, host := g_pars.http_host & ":" & int2str(g_pars.http_port), custom_hdr := custom_hdr)); + } else if (not istemplatekind(binary_body, "omit")) { + HTTP.send(ts_HTTP_Req_Bin(url, method, binary_body, host := g_pars.http_host & ":" & int2str(g_pars.http_port), custom_hdr := custom_hdr)); + } } function f_http_rx_response(template HTTPMessage exp := tr_HTTP_Resp2xx, float tout := 2.0) @@ -146,6 +199,9 @@ [] HTTP.receive(tr_HTTP_Resp) -> value resp { setverdict(fail, "Unexpected HTTP response ", resp); } + [] HTTP.receive(tr_HTTP_Resp_Bin) -> value resp { + setverdict(fail, "Unexpected (binary) HTTP response ", resp); + } [] T.timeout { setverdict(fail, "Timeout waiting for HTTP response"); self.stop; @@ -157,10 +213,12 @@ /* run a HTTP request and return the response */ function f_http_transact(charstring url, charstring method := "GET", - template (omit) charstring body := omit, template HTTPMessage exp := tr_HTTP_Resp2xx, + template (omit) charstring body := omit, + template (omit) octetstring binary_body := omit, + template HTTPMessage exp := tr_HTTP_Resp2xx, float tout := 2.0, HeaderLines custom_hdr := { }) runs on http_CT return HTTPMessage { - f_http_tx_request(url, method, body, custom_hdr); + f_http_tx_request(url, method, body, binary_body, custom_hdr); return f_http_rx_response(exp, tout); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36645?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: I18340f19ed462bf80af683dc9f2831b602f4bdf7 Gerrit-Change-Number: 36645 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: add testsuite for an IPAd

by dexter

Attention is currently required from: laforge, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email ) Change subject: IPAd_Tests: add testsuite for an IPAd ...................................................................... Patch Set 8: (2 comments) File ipad/IPAd_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/edeac0e6_8aa0… PS7, Line 161: f_sleep(2.0); > is this time something configurable in IPAd? If so, add a mp_ float module parameter and add a comme […] Its not configurable in the iPAD, but it still make sense to give this a module parameter. File ipad/example_ca/pki/issued/alttest.notes: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/810dfd6a_b51b… PS7, Line 7: The alttest.cabundle file has been created manually (alttest certificate at the > the certificate which we only use for tests here should not expire in 2027. […] The time-bomb problem is now fixed. The ca-bundle creation is really that simple, paste the ca-certificate at the bottom and then paste put the signed certificate on top of it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?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: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Gerrit-Change-Number: 36229 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 Apr 2024 16:05:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> 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]: HTTP_Adaptor: allow keeping an HTTP client connection

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?usp=email ) Change subject: HTTP_Adaptor: allow keeping an HTTP client connection ...................................................................... HTTP_Adaptor: allow keeping an HTTP client connection At the moment the HTTP_Adaptor automatically creates a new connection, performs the HTTP request and closes the connection again. This means the connection lives only for a single request. Let's add some flexibility so that we can perform multiple consecutive requests through the same connection. Change-Id: Ic6994c504143820dde498c1a2bad2ad6a523dd70 Related: SYS#6824 --- M library/HTTP_Adapter.ttcn 1 file changed, 77 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/36646/1 diff --git a/library/HTTP_Adapter.ttcn b/library/HTTP_Adapter.ttcn index 1b7605f..411a9a0 100644 --- a/library/HTTP_Adapter.ttcn +++ b/library/HTTP_Adapter.ttcn @@ -40,7 +40,7 @@ portnumber := http_port, use_ssl := use_ssl } -template (value) Close ts_HTTP_Close := { client_id := omit }; +template (value) Close ts_HTTP_Close(template (omit) integer client_id := omit) := { client_id := client_id }; /* function to add HeaderLines to a an existing set of HeaderLines. HeaderLines that are already present, are updated. */ function f_overlay_HTTP_Header(HeaderLines hdr, HeaderLines additional_hdr) return template (value) HeaderLines @@ -109,9 +109,10 @@ template (omit) charstring body := omit, integer v_maj := 1, integer v_min := 1, charstring host, - HeaderLines custom_hdr := { }) := { + HeaderLines custom_hdr := { }, + template (omit) integer client_id := omit) := { request := { - client_id := omit, + client_id := client_id, method := method, uri := url, version_major := v_maj, @@ -133,9 +134,10 @@ template (omit) octetstring body := omit, integer v_maj := 1, integer v_min := 1, charstring host, - HeaderLines custom_hdr := { }) := { + HeaderLines custom_hdr := { }, + template (omit) integer client_id := omit) := { request_binary := { - client_id := omit, + client_id := client_id, method := method, uri := url, version_major := v_maj, @@ -175,19 +177,48 @@ function f_http_tx_request(charstring url, charstring method := "GET", template charstring body := omit, template octetstring binary_body := omit, - HeaderLines custom_hdr := { }) + HeaderLines custom_hdr := { }, + float tout := 2.0, + template integer client_id := omit) runs on http_CT { - HTTP.send(ts_HTTP_Connect(g_pars.http_host, g_pars.http_port, g_pars.use_ssl)); - HTTP.receive(Connect_result:?); + var Connect_result rc; + timer T := tout; + var template integer use_client_id := omit; + + /* In case the caller didn't specifiy a client_id, we will create a new connection. */ + if (istemplatekind(client_id, "omit")) { + HTTP.send(ts_HTTP_Connect(g_pars.http_host, g_pars.http_port, g_pars.use_ssl)); + T.start; + alt { + [] HTTP.receive(Connect_result:?) -> value rc; + [] HTTP.receive { + setverdict(fail, "HTTP connection to client failed"); + self.stop; + } + [] T.timeout { + setverdict(fail, "Timeout waiting for completion of HTTP connection"); + self.stop; + } + } + use_client_id := rc.client_id; + } else { + use_client_id := client_id; + } if (not istemplatekind(body, "omit")) { - HTTP.send(ts_HTTP_Req(url, method, body, host := g_pars.http_host & ":" & int2str(g_pars.http_port), custom_hdr := custom_hdr)); + 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")) { - HTTP.send(ts_HTTP_Req_Bin(url, method, binary_body, host := g_pars.http_host & ":" & int2str(g_pars.http_port), custom_hdr := custom_hdr)); + 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)); } } -function f_http_rx_response(template HTTPMessage exp := tr_HTTP_Resp2xx, float tout := 2.0) +function f_http_rx_response(template HTTPMessage exp := tr_HTTP_Resp2xx, + float tout := 2.0, + template integer client_id := omit, + boolean keep_connection := false) runs on http_CT return HTTPMessage { var HTTPMessage resp; timer T := tout; @@ -207,7 +238,11 @@ self.stop; } } - HTTP.send(ts_HTTP_Close); + + if (not keep_connection) { + HTTP.send(ts_HTTP_Close(client_id)); + } + return resp; } @@ -216,10 +251,22 @@ template (omit) charstring body := omit, template (omit) octetstring binary_body := omit, template HTTPMessage exp := tr_HTTP_Resp2xx, - float tout := 2.0, HeaderLines custom_hdr := { }) + float tout := 2.0, HeaderLines custom_hdr := { }, + template integer client_id := omit, + boolean keep_connection := false) runs on http_CT return HTTPMessage { - f_http_tx_request(url, method, body, binary_body, custom_hdr); - return f_http_rx_response(exp, tout); + f_http_tx_request(url, method, body, binary_body, custom_hdr, tout, client_id); + return f_http_rx_response(exp, tout, client_id, keep_connection); +} + +function f_http_client_id_from_http_response(template HTTPMessage response_http) return template integer { + if (ispresent(response_http.response_binary)) { + return response_http.response_binary.client_id; + } else if (ispresent(response_http.response)) { + return response_http.response.client_id; + } + + return omit; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?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: Ic6994c504143820dde498c1a2bad2ad6a523dd70 Gerrit-Change-Number: 36646 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ipad: add an extra certificate+bundle for host "testsuite"

by dexter

dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36621?usp=email ) Change subject: ipad: add an extra certificate+bundle for host "testsuite" ...................................................................... Abandoned this patch is no longer needed -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36621?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: I2d4ba8b710b9cf518b90c7f7acc8982350705531 Gerrit-Change-Number: 36621 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2024