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

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

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36647?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. 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/2 -- 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: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(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

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36645?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder 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/2 -- 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: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: 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

Attention is currently required from: laforge, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36645?usp=email ) Change subject: HTTP_Adapter: add support for binary messages ...................................................................... Patch Set 2: (1 comment) File library/HTTP_Adapter.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36645/comment/b6ddf3d8_d8ce… PS1, Line 93: if (not istemplatekind(binary_body, "omit")) { > else if Done -- 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: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 30 Apr 2024 10:04:31 +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]: HTTP_Adaptor: allow keeping an HTTP client connection

by dexter

Attention is currently required from: laforge, osmith. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by osmith, Verified-1 by Jenkins Builder 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, 78 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/36646/2 -- 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: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add separate template for serverSigned1

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36671?usp=email ) Change subject: RSPDefinitions: add separate template for serverSigned1 ...................................................................... RSPDefinitions: add separate template for serverSigned1 The field serverSigned1 is used in many messages, so it might be helpful to add a separate template for it. Change-Id: Ic50676ac2863173b72765afc44794a56d03413a5 Related: SYS#6824 --- M library/euicc/RSPDefinitions_EncDec.cc M library/euicc/RSPDefinitions_Templates.ttcn M library/euicc/RSPDefinitions_Types.ttcn M library/euicc/SGP32Definitions_Templates.ttcn 4 files changed, 75 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/71/36671/1 diff --git a/library/euicc/RSPDefinitions_EncDec.cc b/library/euicc/RSPDefinitions_EncDec.cc index 6441201..b46a73c 100644 --- a/library/euicc/RSPDefinitions_EncDec.cc +++ b/library/euicc/RSPDefinitions_EncDec.cc @@ -278,4 +278,38 @@ return msg; } +OCTETSTRING enc__RemoteProfileProvisioningResponse(const RemoteProfileProvisioningResponse &msg) { + TTCN_Buffer buf; + + buf.clear(); + msg.encode(RemoteProfileProvisioningResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); + return OCTETSTRING(buf.get_len(), buf.get_data()); +} + +RemoteProfileProvisioningResponse dec__RemoteProfileProvisioningResponse(const OCTETSTRING &stream) { + TTCN_Buffer buf; + RemoteProfileProvisioningResponse msg; + buf.put_os(stream); + + msg.decode(RemoteProfileProvisioningResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); + return msg; +} + +OCTETSTRING enc__RemoteProfileProvisioningRequest(const RemoteProfileProvisioningRequest &msg) { + TTCN_Buffer buf; + + buf.clear(); + msg.encode(RemoteProfileProvisioningRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); + return OCTETSTRING(buf.get_len(), buf.get_data()); +} + +RemoteProfileProvisioningRequest dec__RemoteProfileProvisioningRequest(const OCTETSTRING &stream) { + TTCN_Buffer buf; + RemoteProfileProvisioningRequest msg; + buf.put_os(stream); + + msg.decode(RemoteProfileProvisioningRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); + return msg; +} + } diff --git a/library/euicc/RSPDefinitions_Templates.ttcn b/library/euicc/RSPDefinitions_Templates.ttcn index 86cdb0c..52e1788 100644 --- a/library/euicc/RSPDefinitions_Templates.ttcn +++ b/library/euicc/RSPDefinitions_Templates.ttcn @@ -74,6 +74,25 @@ '515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151'O} } +template (present) ServerSigned1 tr_serverSigned1(template (present) octetstring transactionId := ?, + template (present) octetstring euiccChallenge := ?, + template (present) universal charstring serverAddress := ?, + template (present) octetstring serverChallenge := ?) := { + transactionId := transactionId, + euiccChallenge := euiccChallenge, + serverAddress := serverAddress, + serverChallenge := serverChallenge +} +template (value) ServerSigned1 ts_serverSigned1(template (value) octetstring transactionId := 'ABCDEF'O, + template (value) octetstring euiccChallenge := '00112233445566778899AABBCCDDEEFF'O, + template (value) universal charstring serverAddress := "smdp.example.com", + template (value) octetstring serverChallenge := '01020304050607080910111213141516'O) := { + transactionId := transactionId, + euiccChallenge := euiccChallenge, + serverAddress := serverAddress, + serverChallenge := serverChallenge +} + /* GSMA SGP.22, section 2.5.6 */ template (present) ProfileInstallationResult tr_profileInstallationResult := { @@ -576,4 +595,4 @@ eidValue := eidValue } -} \ No newline at end of file +} diff --git a/library/euicc/RSPDefinitions_Types.ttcn b/library/euicc/RSPDefinitions_Types.ttcn index b031aa3..5bb3925 100644 --- a/library/euicc/RSPDefinitions_Types.ttcn +++ b/library/euicc/RSPDefinitions_Types.ttcn @@ -51,4 +51,10 @@ external function dec_SmdpSigned2(in octetstring stream) return SmdpSigned2; external function enc_SmdpSigned2(in SmdpSigned2 msg) return octetstring; +external function dec_RemoteProfileProvisioningResponse(in octetstring stream) return RemoteProfileProvisioningResponse; +external function enc_RemoteProfileProvisioningResponse(in RemoteProfileProvisioningResponse msg) return octetstring; + +external function dec_RemoteProfileProvisioningRequest(in octetstring stream) return RemoteProfileProvisioningRequest; +external function enc_RemoteProfileProvisioningRequest(in RemoteProfileProvisioningRequest msg) return octetstring; + } diff --git a/library/euicc/SGP32Definitions_Templates.ttcn b/library/euicc/SGP32Definitions_Templates.ttcn index 86c2055..98a2bba 100644 --- a/library/euicc/SGP32Definitions_Templates.ttcn +++ b/library/euicc/SGP32Definitions_Templates.ttcn @@ -28,12 +28,7 @@ initiateAuthenticationResponseEsipa := { initiateAuthenticationOkEsipa := { transactionId := *, - serverSigned1 := { - transactionId := ?, - euiccChallenge := euiccChallenge, - serverAddress := serverAddress, - serverChallenge := ? - }, + serverSigned1 := tr_serverSigned1(euiccChallenge := euiccChallenge, serverAddress := serverAddress), serverSignature1 := ?, euiccCiPKIdToBeUsed := ?, serverCertificate := ?, @@ -49,12 +44,7 @@ initiateAuthenticationResponseEsipa := { initiateAuthenticationOkEsipa := { transactionId := omit, - serverSigned1 := { - transactionId := 'ABCDEF'O, - euiccChallenge := euiccChallenge, - serverAddress := "smdp.example.com", - serverChallenge := '01020304050607080910111213141516'O - }, + serverSigned1 := ts_serverSigned1(euiccChallenge := euiccChallenge, serverAddress := serverAddress), serverSignature1 := '01020304'O, euiccCiPKIdToBeUsed := 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O, /* NIST */ serverCertificate := ts_cert_s_sm_dpauth_nist, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36671?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: Ic50676ac2863173b72765afc44794a56d03413a5 Gerrit-Change-Number: 36671 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

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

Attention is currently required from: laforge, osmith. dexter 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 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36646/comment/8b62e7e7_6c86… PS1, Line 9: At the moment the HTTP_Adaptor automatically creates a new connection, performs > (if you break lines at 72 characters max - except for error/log messages - it wraps properly in gerr […] Done -- 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: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 30 Apr 2024 10:04:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: RSPDefinitions: add defaults for initiateAuthenticationResponse/Request

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36672?usp=email ) Change subject: RSPDefinitions: add defaults for initiateAuthenticationResponse/Request ...................................................................... RSPDefinitions: add defaults for initiateAuthenticationResponse/Request Related: SYS#6824 Change-Id: I3842569f36dfb94e61afffaa03353b552e001c72 --- M library/euicc/RSPDefinitions_Templates.ttcn 1 file changed, 18 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/36672/1 diff --git a/library/euicc/RSPDefinitions_Templates.ttcn b/library/euicc/RSPDefinitions_Templates.ttcn index 52e1788..7c1707d 100644 --- a/library/euicc/RSPDefinitions_Templates.ttcn +++ b/library/euicc/RSPDefinitions_Templates.ttcn @@ -143,9 +143,9 @@ } } template (value) RemoteProfileProvisioningRequest -ts_initiateAuthenticationRequest(template (value) octetstring euiccChallenge, - template (value) charstring smdpAddress, - template (value) EUICCInfo1 euiccInfo1) := { +ts_initiateAuthenticationRequest(template (value) octetstring euiccChallenge := '00112233445566778899aabbccddeeff'O, + template (value) charstring smdpAddress := "smdp.example.com", + template (value) EUICCInfo1 euiccInfo1 := ts_EUICCInfo1) := { initiateAuthenticationRequest := { euiccChallenge := euiccChallenge, smdpAddress := smdpAddress, @@ -169,11 +169,11 @@ } } template (value) RemoteProfileProvisioningResponse -ts_initiateAuthenticationResponse(template (value) octetstring transactionId, - template (value) ServerSigned1 serverSigned1, - template (value) octetstring serverSignature1, - template (value) SubjectKeyIdentifier euiccCiPKIdToBeUsed, - template (value) Certificate serverCertificate) := { +ts_initiateAuthenticationResponse(template (value) octetstring transactionId := 'ABCDEF'O, + template (value) ServerSigned1 serverSigned1 := ts_serverSigned1, + template (value) octetstring serverSignature1 := '01020304'O, + template (value) SubjectKeyIdentifier euiccCiPKIdToBeUsed := 'F54172BDF98A95D65CBEB88A38A1C11D800A85C3'O, /* NIST */ + template (value) Certificate serverCertificate := ts_cert_s_sm_dpauth_nist) := { initiateAuthenticationResponse := { initiateAuthenticationOk := { transactionId := transactionId, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36672?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: I3842569f36dfb94e61afffaa03353b552e001c72 Gerrit-Change-Number: 36672 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: make use of IpaUnitId codec

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36612?usp=email ) Change subject: bsc: make use of IpaUnitId codec ...................................................................... bsc: make use of IpaUnitId codec Change-Id: Iaf38fdb0a1c3ada5af6f1a05c7a9008e4eae0727 --- M bsc/BSC_Tests.ttcn 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 5e4ebbc..8dcff83 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -981,7 +981,7 @@ clnt.vc_IPA := IPA_Emulation_CT.create(clnt.id & "-IPA") alive; clnt.ccm_pars := c_IPA_default_ccm_pars; clnt.ccm_pars.name := "Osmocom TTCN-3 BTS Simulator"; - clnt.ccm_pars.unit_id := int2str(1234 + idx.bts) & "/0/" & int2str(idx.trx); + clnt.ccm_pars.unit_id := enc_IpaUnitId({1234 + idx.bts, 0, idx.trx}); if (handler_mode) { clnt.vc_RSL := RSL_Emulation_CT.create(clnt.id & "-RSL") alive; connect(clnt.vc_RSL:CCHAN_PT, self:RSL_CCHAN[idx.bts]); @@ -3946,7 +3946,7 @@ client.vc_IPA := IPA_Emulation_CT.create(client.id & "-IPA") alive; client.ccm_pars := c_IPA_default_ccm_pars; client.ccm_pars.name := "Osmocom TTCN-3 BTS Simulator"; - client.ccm_pars.unit_id := "99/0/0"; /* value which is unknown at BTS */ + client.ccm_pars.unit_id := enc_IpaUnitId({99, 0, 0}); /* value which is unknown at BTS */ f_ipa_ctrl_start_client(mp_bsc_ip, mp_bsc_ctrl_port); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36612?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: Iaf38fdb0a1c3ada5af6f1a05c7a9008e4eae0727 Gerrit-Change-Number: 36612 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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-MessageType: merged

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: make use of IpaUnitId codec

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36612?usp=email ) Change subject: bsc: make use of IpaUnitId codec ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36612?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: Iaf38fdb0a1c3ada5af6f1a05c7a9008e4eae0727 Gerrit-Change-Number: 36612 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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-Comment-Date: Tue, 30 Apr 2024 09:22:16 +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]: library/RSL_Emulation: make use of IpaUnitId codec

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36611?usp=email ) Change subject: library/RSL_Emulation: make use of IpaUnitId codec ...................................................................... library/RSL_Emulation: make use of IpaUnitId codec Change-Id: I20e1ac35707affc6aab60397a22e33fe2bd1106e --- M library/RSL_Emulation.ttcn 1 file changed, 19 insertions(+), 20 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index 891e565..17e35ab 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -370,9 +370,7 @@ private function f_trx_conn_map_register(integer conn_id, in IpaCcmIdResp id_resp) runs on RSL_Emulation_CT return IpaStreamId { - var template charstring unit_id_fmt := pattern "(\d+)/(\d+)/(\d+)"; - var charstring unit_id; - var integer trx_nr; + var IpaUnitId unit_id; var integer idx; /* Check if we have room for a new connection */ @@ -386,29 +384,21 @@ testcase.stop("IPA IDENTITY RESPONSE contains no unit-id"); } - /* Make sure that IPA unit-id is valid */ - unit_id := oct2char(id_resp[idx].data); - if (not match(unit_id, unit_id_fmt)) { - testcase.stop("IPA unit-id has unknown/unexpected format"); - } + /* Parse IPA unit-id */ + unit_id := dec_IpaUnitId(oct2char(id_resp[idx].data)); - /* Parse transceiver number (site/bts/trx). - * TODO: implement and use declaratice types. */ - unit_id := regexp(unit_id, unit_id_fmt, 2); - trx_nr := str2int(unit_id); - - if (trx_nr >= sizeof(TrxConnMap)) { - testcase.stop("Transceiver #", trx_nr, " does not fit"); - } else if (TrxConnMap[trx_nr] != -1) { - testcase.stop("Transceiver #", trx_nr, " is already connected?!?"); + if (unit_id.trx_id >= sizeof(TrxConnMap)) { + testcase.stop("Transceiver #", unit_id.trx_id, " does not fit"); + } else if (TrxConnMap[unit_id.trx_id] != -1) { + testcase.stop("Transceiver #", unit_id.trx_id, " is already connected?!?"); } /* Finally, store the connection ID */ - log("Mapped TRX#", trx_nr, " to TCP/IP conn_id=", conn_id); - TrxConnMap[trx_nr] := conn_id; + log("Mapped TRX#", unit_id.trx_id, " to TCP/IP conn_id=", conn_id); + TrxConnMap[unit_id.trx_id] := conn_id; TrxConnNum := TrxConnNum + 1; - return f_streamId_by_trx(trx_nr); + return f_streamId_by_trx(unit_id.trx_id); } private function f_trx_conn_map_unregister(integer conn_id) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36611?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: I20e1ac35707affc6aab60397a22e33fe2bd1106e Gerrit-Change-Number: 36611 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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-MessageType: merged

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2024