August 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: osmo_io: Use local variable to reference msghdr->msg

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34257 ) Change subject: osmo_io: Use local variable to reference msghdr->msg ...................................................................... osmo_io: Use local variable to reference msghdr->msg Change-Id: I336ef7a5460dd18bf8e0f4ac5e97747f9fec5a35 --- M src/core/osmo_io_uring.c 1 file changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/57/34257/1 diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index 84b7b4c..a6395fe 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -182,6 +182,7 @@ static void iofd_uring_handle_tx(struct iofd_msghdr *msghdr, int rc) { struct osmo_io_fd *iofd = msghdr->iofd; + struct msgb *msg = msghdr->msg; if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED)) goto out_free; @@ -189,27 +190,27 @@ /* Error during write */ if (rc < 0) { if (msghdr->action == IOFD_ACT_WRITE) - iofd->io_ops.write_cb(iofd, rc, msghdr->msg); + iofd->io_ops.write_cb(iofd, rc, msg); else if (msghdr->action == IOFD_ACT_SENDTO) - iofd->io_ops.sendto_cb(iofd, rc, msghdr->msg, &msghdr->osa); + iofd->io_ops.sendto_cb(iofd, rc, msg, &msghdr->osa); else OSMO_ASSERT(0); goto out_free; } /* Incomplete write */ - if (rc < msgb_length(msghdr->msg)) { + if (rc < msgb_length(msg)) { /* Re-enqueue remaining data */ - msgb_pull(msghdr->msg, rc); - msghdr->iov[0].iov_len = msgb_length(msghdr->msg); + msgb_pull(msg, rc); + msghdr->iov[0].iov_len = msgb_length(msg); iofd_txqueue_enqueue_front(iofd, msghdr); goto out; } if (msghdr->action == IOFD_ACT_WRITE) - iofd->io_ops.write_cb(iofd, rc, msghdr->msg); + iofd->io_ops.write_cb(iofd, rc, msg); else if (msghdr->action == IOFD_ACT_SENDTO) - iofd->io_ops.sendto_cb(iofd, rc, msghdr->msg, &msghdr->osa); + iofd->io_ops.sendto_cb(iofd, rc, msg, &msghdr->osa); else OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I336ef7a5460dd18bf8e0f4ac5e97747f9fec5a35 Gerrit-Change-Number: 34257 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in pysim[master]: sim-reset-server: fix error printing sw_match_error

by dexter

Attention is currently required from: osmith, laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34155 ) Change subject: sim-reset-server: fix error printing sw_match_error ...................................................................... Patch Set 2: (1 comment) File contrib/sim-rest-server.py: https://gerrit.osmocom.org/c/pysim/+/34155/comment/5e568e7f_80c4daf4 PS1, Line 104: failure.value > I think you need a __str__ method on the object in order for str() to work. […] I think there is presumably a problem in the stuff that gets called by the __str__ method in the ApiError object. The failure happens when there is a status word returned that is not 9862 or 6982. In practice this rarely happens. I have to cement out the if,elif,else branches before "return str(ApiError("Card Communication Error %s" % failure.value), sw)" in order to be able to trigger the problem. The backtrace looks like this: Traceback (most recent call last): File "/usr/local/lib/python3.9/dist-packages/klein/_resource.py", line 291, in processing_failed return processing_failed(failure, error_handlers[1:]) File "/usr/local/lib/python3.9/dist-packages/klein/_resource.py", line 291, in processing_failed return processing_failed(failure, error_handlers[1:]) File "/usr/local/lib/python3.9/dist-packages/klein/_resource.py", line 291, in processing_failed return processing_failed(failure, error_handlers[1:]) File "/usr/local/lib/python3.9/dist-packages/klein/_resource.py", line 280, in processing_failed d = maybeDeferred( --- <exception caught here> --- File "/usr/local/lib/python3.9/dist-packages/twisted/internet/defer.py", line 206, in maybeDeferred result = f(*args, **kwargs) File "/usr/local/lib/python3.9/dist-packages/klein/_app.py", line 241, in execute_error_handler return handler(self._instance, request, failure) File "/usr/local/lib/python3.9/dist-packages/klein/_app.py", line 512, in _f return _call(instance, f, request, failure) File "/usr/local/lib/python3.9/dist-packages/klein/_app.py", line 124, in _call result = __klein_f__(*args, **kwargs) File "/home/owner/git_master/pysim/./sim-rest-server.py", line 104, in sw_match_error return str(ApiError("Card Communication Error %s" % failure.value), sw) builtins.TypeError: decoding to str: need a bytes-like object, ApiError found -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5a1d19abeb00c2c9dc26517abc44a5c916f2d658 Gerrit-Change-Number: 34155 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 30 Aug 2023 15:09:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Components: fix confirm member in record BTS_CCCH_Block

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252 ) Change subject: PCUIF_Components: fix confirm member in record BTS_CCCH_Block ...................................................................... PCUIF_Components: fix confirm member in record BTS_CCCH_Block The record BTS_CCCH_Block has an optional field "confirm". However, this field is not marked as optional. Also f_BTS_CT_handler should make sure that this field is populated with "omit" when it is not present. Related: OS#5927 Change-Id: Ifcbb72c22b93855bed89f4970cf63bd2d6fcd128 --- M pcu/PCUIF_Components.ttcn 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index a18c774..01638b1 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -143,7 +143,7 @@ OCT4 msg_id optional, charstring imsi optional, GsmRrMessage rr_msg, - boolean confirm + boolean confirm optional }; template BTS_PDTCH_Block tr_PCUIF_DATA_PDTCH(template uint8_t bts_nr, template PCUIF_data raw, @@ -568,6 +568,7 @@ pcu_msg_rr.msg_id := omit; pcu_msg_rr.imsi := omit; pcu_msg_rr.rr_msg := dec_GsmRrMessage(data); + pcu_msg_rr.confirm := omit; } TC.send(pcu_msg_rr); repeat; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252 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: Ifcbb72c22b93855bed89f4970cf63bd2d6fcd128 Gerrit-Change-Number: 34252 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: dia2gsup: initial refactoring

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34254 ) Change subject: dia2gsup: initial refactoring ...................................................................... dia2gsup: initial refactoring Do some refactoring to the core infrastructure of the tests before adding new testsi. Among others: - Move Tguard to main component - Avoid having to call f_init_handler in each handler (do it automatically during f_start_handler()). Change-Id: I4a1bf6ca03549688704815e3fec4e5152d0181a6 --- M dia2gsup/DIA2GSUP_Tests.ttcn 1 file changed, 40 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/34254/1 diff --git a/dia2gsup/DIA2GSUP_Tests.ttcn b/dia2gsup/DIA2GSUP_Tests.ttcn index d709512..6a3f85c 100644 --- a/dia2gsup/DIA2GSUP_Tests.ttcn +++ b/dia2gsup/DIA2GSUP_Tests.ttcn @@ -1,5 +1,6 @@ module DIA2GSUP_Tests { +import from Misc_Helpers all; import from General_Types all; import from Osmocom_Types all; import from L3_Common all; @@ -21,11 +22,11 @@ var IPA_Emulation_CT vc_GSUP_IPA; port IPA_CTRL_PT GSUP_IPA_EVENT; + timer g_Tguard; }; type component D2G_ConnHdlr extends DIAMETER_ConnHdlr, GSUP_ConnHdlr { var D2G_ConnHdlrPars g_pars; - timer g_Tguard := 30.0; }; type record D2G_ConnHdlrPars { @@ -33,7 +34,7 @@ AuthVector vec optional }; -private function f_init_pars(integer imsi_suffix) +private function f_init_pars(integer imsi_suffix := 1) runs on MTC_CT return D2G_ConnHdlrPars { var D2G_ConnHdlrPars pars := { imsi := f_gen_imsi(imsi_suffix), @@ -59,10 +60,9 @@ charstring mp_diam_realm := "localdomain"; } -private altstep as_Tguard() runs on D2G_ConnHdlr { +private altstep as_Tguard() runs on MTC_CT { [] g_Tguard.timeout { - setverdict(fail, "Tguard timeout"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Tguard timeout"); } } @@ -95,18 +95,18 @@ } } -private function f_init_handler(D2G_ConnHdlrPars pars, float t_guard := 20.0) runs on D2G_ConnHdlr { +private type function void_fn(charstring id) runs on D2G_ConnHdlr; + +private function f_init_handler(void_fn fn, charstring id, D2G_ConnHdlrPars pars) runs on D2G_ConnHdlr { g_pars := pars; - activate(as_Tguard()); - g_Tguard.start(t_guard); /* tell GSUP dispatcher to send this IMSI to us */ f_create_gsup_expect(hex2str(g_pars.imsi)); + + fn.apply(id); } -private type function void_fn(charstring id, D2G_ConnHdlrPars pars) runs on D2G_ConnHdlr; - -private function f_start_handler_with_pars(void_fn fn, D2G_ConnHdlrPars pars) +private function f_start_handler(void_fn fn, D2G_ConnHdlrPars pars) runs on MTC_CT return D2G_ConnHdlr { var D2G_ConnHdlr vc_conn; var charstring id := testcasename(); @@ -121,7 +121,7 @@ DIAMETER_UNIT.receive(DiameterCapabilityExchgInd:?); - vc_conn.start(derefers(fn)(id, pars)); + vc_conn.start(f_init_handler(fn, id, pars)); return vc_conn; } @@ -154,13 +154,17 @@ vc_DIAMETER.start(DIAMETER_Emulation.main(ops, pars, id)); } -private function f_init() runs on MTC_CT { +private function f_init(float t_guard := 40.0) runs on MTC_CT { + + g_Tguard.start(t_guard); + activate(as_Tguard()); + f_init_gsup(testcasename()); f_init_diameter(testcasename()); } -private function f_DIA_AI() runs on D2G_ConnHdlr { +private function f_DIA_AI_success() runs on D2G_ConnHdlr { var PDU_DIAMETER rx_dia; var UINT32 hbh_id := f_rnd_octstring(4); var UINT32 ete_id := f_rnd_octstring(4); @@ -191,25 +195,25 @@ [] DIAMETER.receive(tr_DIA_AIA) { setverdict(pass); } + [] DIAMETER.receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); + } } } -private function f_TC_authinfo_normal(charstring id, D2G_ConnHdlrPars pars) runs on D2G_ConnHdlr { - f_init_handler(pars); - f_DIA_AI(); +private function f_TC_authinfo_normal(charstring id) runs on D2G_ConnHdlr { + f_DIA_AI_success(); } testcase TC_authinfo_normal() runs on MTC_CT { - var D2G_ConnHdlrPars pars := f_init_pars(1); + var D2G_ConnHdlrPars pars := f_init_pars(); var D2G_ConnHdlr vc_conn; f_init(); - f_sleep(10.0); - vc_conn := f_start_handler_with_pars(refers(f_TC_authinfo_normal), pars); + vc_conn := f_start_handler(refers(f_TC_authinfo_normal), pars); vc_conn.done; setverdict(pass); } - control { execute ( TC_authinfo_normal() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34254 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: I4a1bf6ca03549688704815e3fec4e5152d0181a6 Gerrit-Change-Number: 34254 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: dia2gsup: Introduce new error scenario tests

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255 ) Change subject: dia2gsup: Introduce new error scenario tests ...................................................................... dia2gsup: Introduce new error scenario tests The tests expect so far that osmo_dia2gsup returns DIAMETER_AVP_UNSUPPORTED for all of them, which is the current behavior, but osmo_dia2gsup probably has to be improved to return matching errors. Related: OS#5757 Change-Id: Ic870a2c1de74bee3f7d8e26874635d58469ccbea --- M dia2gsup/DIA2GSUP_Tests.ttcn M library/DIAMETER_Templates.ttcn 2 files changed, 179 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/34255/1 diff --git a/dia2gsup/DIA2GSUP_Tests.ttcn b/dia2gsup/DIA2GSUP_Tests.ttcn index 6a3f85c..fecec12 100644 --- a/dia2gsup/DIA2GSUP_Tests.ttcn +++ b/dia2gsup/DIA2GSUP_Tests.ttcn @@ -214,8 +214,142 @@ setverdict(pass); } +private function f_DIA_AI_gsup_error(integer gsup_cause, DIAMETER_Resultcode res_code) runs on D2G_ConnHdlr { + var PDU_DIAMETER rx_dia; + var UINT32 hbh_id := f_rnd_octstring(4); + var UINT32 ete_id := f_rnd_octstring(4); + var octetstring sess_id := char2oct("foobar"); + var OCT3 vplmn := '00F110'O; + + /* Unlike AIR, AIA contains no IMSI. Register ete_id in DIAMETER_Emulation, + * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. + */ + f_diameter_expect_eteid(ete_id); + + /* Send AIR to translator; expect it to show up on GSUP side */ + DIAMETER.send(ts_DIA_AIR(g_pars.imsi, vplmn, sess_id, hbh_id := hbh_id, ete_id := ete_id)); + GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)); + + /* Send an error response back to the translator; expect AIA */ + GSUP.send(ts_GSUP_SAI_ERR(g_pars.imsi, gsup_cause)); + + alt { + /* Unlike AIR, AIA contains no IMSI, hence it is received in DIAMETER_UNIT: */ + [] DIAMETER.receive(tr_DIA_AIA_ERR(res_code)) { + setverdict(pass); + } + [] DIAMETER.receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); + } + } +} + +private function f_TC_authinfo_gsup_err_imsi_unknown(charstring id) runs on D2G_ConnHdlr { + f_DIA_AI_gsup_error(2, DIAMETER_AVP_UNSUPPORTED); +} +testcase TC_authinfo_gsup_err_imsi_unknown() runs on MTC_CT { + var D2G_ConnHdlrPars pars := f_init_pars(); + var D2G_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_authinfo_gsup_err_imsi_unknown), pars); + vc_conn.done; + setverdict(pass); +} + +private function f_TC_authinfo_gsup_err_illegal_ms(charstring id) runs on D2G_ConnHdlr { + f_DIA_AI_gsup_error(3, DIAMETER_AVP_UNSUPPORTED); +} +testcase TC_authinfo_gsup_err_illegal_ms() runs on MTC_CT { + var D2G_ConnHdlrPars pars := f_init_pars(); + var D2G_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_authinfo_gsup_err_illegal_ms), pars); + vc_conn.done; + setverdict(pass); +} + +private function f_TC_authinfo_gsup_err_plmn_not_allowed(charstring id) runs on D2G_ConnHdlr { + f_DIA_AI_gsup_error(11, DIAMETER_AVP_UNSUPPORTED); +} +testcase TC_authinfo_gsup_err_plmn_not_allowed() runs on MTC_CT { + var D2G_ConnHdlrPars pars := f_init_pars(); + var D2G_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_authinfo_gsup_err_plmn_not_allowed), pars); + vc_conn.done; + setverdict(pass); +} + +private function f_TC_authinfo_gsup_err_romaning_not_allowed(charstring id) runs on D2G_ConnHdlr { + f_DIA_AI_gsup_error(11, DIAMETER_AVP_UNSUPPORTED); +} +testcase TC_authinfo_gsup_err_romaning_not_allowed() runs on MTC_CT { + var D2G_ConnHdlrPars pars := f_init_pars(); + var D2G_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_authinfo_gsup_err_romaning_not_allowed), pars); + vc_conn.done; + setverdict(pass); +} + +private function f_TC_authinfo_gsup_err_net_fail(charstring id) runs on D2G_ConnHdlr { + f_DIA_AI_gsup_error(17, DIAMETER_AVP_UNSUPPORTED); +} +testcase TC_authinfo_gsup_err_net_fail() runs on MTC_CT { + var D2G_ConnHdlrPars pars := f_init_pars(); + var D2G_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_authinfo_gsup_err_net_fail), pars); + vc_conn.done; + setverdict(pass); +} + +private function f_TC_authinfo_gsup_err_congestion(charstring id) runs on D2G_ConnHdlr { + f_DIA_AI_gsup_error(22, DIAMETER_AVP_UNSUPPORTED); +} +testcase TC_authinfo_gsup_err_congestion() runs on MTC_CT { + var D2G_ConnHdlrPars pars := f_init_pars(); + var D2G_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_authinfo_gsup_err_congestion), pars); + vc_conn.done; + setverdict(pass); +} + +private function f_TC_authinfo_gsup_err_auth_unacceptable(charstring id) runs on D2G_ConnHdlr { + f_DIA_AI_gsup_error(23, DIAMETER_AVP_UNSUPPORTED); +} +testcase TC_authinfo_gsup_err_auth_unacceptable() runs on MTC_CT { + var D2G_ConnHdlrPars pars := f_init_pars(); + var D2G_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_authinfo_gsup_err_auth_unacceptable), pars); + vc_conn.done; + setverdict(pass); +} + +private function f_TC_authinfo_gsup_err_proto_unspec(charstring id) runs on D2G_ConnHdlr { + f_DIA_AI_gsup_error(23, DIAMETER_AVP_UNSUPPORTED); +} +testcase TC_authinfo_gsup_err_proto_unspec() runs on MTC_CT { + var D2G_ConnHdlrPars pars := f_init_pars(); + var D2G_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_authinfo_gsup_err_proto_unspec), pars); + vc_conn.done; + setverdict(pass); +} + control { execute ( TC_authinfo_normal() ); + execute ( TC_authinfo_gsup_err_imsi_unknown() ); + execute ( TC_authinfo_gsup_err_illegal_ms() ); + execute ( TC_authinfo_gsup_err_plmn_not_allowed() ); + execute ( TC_authinfo_gsup_err_romaning_not_allowed() ); + execute ( TC_authinfo_gsup_err_net_fail() ); + execute ( TC_authinfo_gsup_err_congestion() ); + execute ( TC_authinfo_gsup_err_auth_unacceptable() ); + execute ( TC_authinfo_gsup_err_proto_unspec() ); } } diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 63db7fc..cb664a5 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -471,11 +471,21 @@ } } } -template (present) GenericAVP tr_AVP_ResultCode(DIAMETER_Resultcode res_code) := { +private function f_tr_DIAMETER_Resultcode(template (present) DIAMETER_Resultcode res_code) +return template (present) BASE_NONE_Result_Code { + if (istemplatekind(res_code, "?")) { + return ?; + } else { + var template (present) BASE_NONE_Result_Code c; + c := int2oct(enum2int(valueof(res_code)), 4); + return c; + } +} +template (present) GenericAVP tr_AVP_ResultCode(template (present) DIAMETER_Resultcode res_code) := { avp := { avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Result_Code), avp_data := { - avp_BASE_NONE_Result_Code := int2oct(enum2int(res_code), 4) + avp_BASE_NONE_Result_Code := f_tr_DIAMETER_Resultcode(res_code) } } } @@ -1414,6 +1424,25 @@ tr_AVP_ResultCode(DIAMETER_SUCCESS), tr_AVP_3GPP_AuthInfo(auth_info_contents) )); +template (present) PDU_DIAMETER +tr_DIA_AIA_ERR(template (present) DIAMETER_Resultcode res_code := ?, + template (present) octetstring sess_id := ?, + template (present) charstring orig_host := ?, + template (present) charstring orig_realm := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?) := + tr_DIAMETER(flags := '0???????'B, + cmd_code := Authentication_Information, + app_id := int2oct(c_DIAMETER_3GPP_S6_AID, 4), + hbh_id := hbh_id, + ete_id := ete_id, + avps := superset( + tr_AVP_SessionId(sess_id), + tr_AVP_AuthSessionState(NO_STATE_MAINTAINED), + tr_AVP_OriginHost(orig_host), + tr_AVP_OriginRealm(orig_realm), + tr_AVP_ResultCode(res_code) + )); /* TS 29.272 7.2.3 Update Location Request */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34255 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: Ic870a2c1de74bee3f7d8e26874635d58469ccbea Gerrit-Change-Number: 34255 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-dia2gsup: Avoid retrieving unexisting talloc report

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34253 ) Change subject: ttcn3-dia2gsup: Avoid retrieving unexisting talloc report ...................................................................... ttcn3-dia2gsup: Avoid retrieving unexisting talloc report The OSMO_SUT_{HOST,PORT} envvars are used to trigger retrieving of talloc reportes from the VTY port in osmo-ttcn3-hacks.git ttcn3-tcpdump-stop.sh. osmo_dia2gsup is an erland app and hence it makes no sense trying to retrieve such information. Change-Id: I6ee3fa83758e09898d1cd05bf15bc3428e2ffd11 --- M ttcn3-dia2gsup-test/jenkins.sh 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/53/34253/1 diff --git a/ttcn3-dia2gsup-test/jenkins.sh b/ttcn3-dia2gsup-test/jenkins.sh index d8acc43..87eea24 100755 --- a/ttcn3-dia2gsup-test/jenkins.sh +++ b/ttcn3-dia2gsup-test/jenkins.sh @@ -33,8 +33,6 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ - -e "OSMO_SUT_PORT=4258" \ -v $VOL_BASE_DIR/dia2gsup-tester:/data \ --name ${BUILD_TAG}-ttcn3-dia2gsup-test \ $DOCKER_ARGS \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6ee3fa83758e09898d1cd05bf15bc3428e2ffd11 Gerrit-Change-Number: 34253 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Components: fix confirm member in record BTS_CCCH_Block

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252 ) Change subject: PCUIF_Components: fix confirm member in record BTS_CCCH_Block ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252 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: Ifcbb72c22b93855bed89f4970cf63bd2d6fcd128 Gerrit-Change-Number: 34252 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 13:50:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Components: fix confirm member in record BTS_CCCH_Block

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252 ) Change subject: PCUIF_Components: fix confirm member in record BTS_CCCH_Block ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252 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: Ifcbb72c22b93855bed89f4970cf63bd2d6fcd128 Gerrit-Change-Number: 34252 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 13:44:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Components: fix confirm member in record BTS_CCCH_Block

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252 ) Change subject: PCUIF_Components: fix confirm member in record BTS_CCCH_Block ...................................................................... PCUIF_Components: fix confirm member in record BTS_CCCH_Block The record BTS_CCCH_Block has an optional field "confirm". However, this field is not marked as optional. Also f_BTS_CT_handler should make sure that this field is populated with "omit" when it is not present. Related: OS#5927 Change-Id: Ifcbb72c22b93855bed89f4970cf63bd2d6fcd128 --- M pcu/PCUIF_Components.ttcn 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/34252/1 diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index a18c774..01638b1 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -143,7 +143,7 @@ OCT4 msg_id optional, charstring imsi optional, GsmRrMessage rr_msg, - boolean confirm + boolean confirm optional }; template BTS_PDTCH_Block tr_PCUIF_DATA_PDTCH(template uint8_t bts_nr, template PCUIF_data raw, @@ -568,6 +568,7 @@ pcu_msg_rr.msg_id := omit; pcu_msg_rr.imsi := omit; pcu_msg_rr.rr_msg := dec_GsmRrMessage(data); + pcu_msg_rr.confirm := omit; } TC.send(pcu_msg_rr); repeat; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34252 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: Ifcbb72c22b93855bed89f4970cf63bd2d6fcd128 Gerrit-Change-Number: 34252 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 11 months

1
0
0 0

[M] Change in osmo-bsc[master]: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH

by osmith

Attention is currently required from: dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34060 ) Change subject: pcu_sock: use PCU_IF_SAPI_AGCH_2 instead PCU_IF_SAPI_AGCH ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I709c27adaf09a6766cfde4d76d878626d30ebb3c Gerrit-Change-Number: 34060 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 30 Aug 2023 13:37:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023